using branch instead of tags

This commit is contained in:
Alan Hamlett 2013-08-15 00:09:27 -07:00
parent c410422c8a
commit 1aa88e4bf1
5 changed files with 22 additions and 39 deletions

View file

@ -120,7 +120,7 @@ def get_user_agent(plugin):
return user_agent return user_agent
def send_action(project=None, tags=None, key=None, targetFile=None, def send_action(project=None, branch=None, key=None, targetFile=None,
timestamp=None, endtime=None, isWrite=None, plugin=None, **kwargs): timestamp=None, endtime=None, isWrite=None, plugin=None, **kwargs):
url = 'https://www.wakati.me/api/v1/actions' url = 'https://www.wakati.me/api/v1/actions'
log.debug('Sending action to api at %s' % url) log.debug('Sending action to api at %s' % url)
@ -134,8 +134,8 @@ def send_action(project=None, tags=None, key=None, targetFile=None,
data['is_write'] = isWrite data['is_write'] = isWrite
if project: if project:
data['project'] = project data['project'] = project
if tags: if branch:
data['tags'] = list(set(tags)) data['branch'] = branch
log.debug(data) log.debug(data)
# setup api request headers # setup api request headers
@ -175,13 +175,13 @@ def main(argv=None):
args = parseArguments(argv) args = parseArguments(argv)
setup_logging(args, __version__) setup_logging(args, __version__)
if os.path.isfile(args.targetFile): if os.path.isfile(args.targetFile):
tags = [] branch = None
name = None name = None
project = find_project(args.targetFile) project = find_project(args.targetFile)
if project: if project:
tags = project.tags() branch = project.branch()
name = project.name() name = project.name()
if send_action(project=name, tags=tags, **vars(args)): if send_action(project=name, branch=branch, **vars(args)):
return 0 return 0
return 102 return 102
else: else:

View file

@ -47,8 +47,7 @@ class BaseProject(object):
""" """
return None return None
def tags(self): def branch(self):
""" Returns an array of tag strings for the """ Returns the current branch.
path and/or project.
""" """
return [] return None

View file

@ -37,29 +37,7 @@ class Git(BaseProject):
return os.path.basename(base) return os.path.basename(base)
return None return None
def tags(self): def branch(self):
tags = []
if self.config:
proj_name = self.name()
if proj_name:
tags.append(proj_name)
sections = self._parse_config()
for section in sections:
if section.split(' ', 1)[0] == 'remote' and 'url' in sections[section]:
remote = sections[section]['url'].rsplit(':', 1)[-1].rsplit('/', 1)[-1].split('.git', 1)[0]
if remote:
tags.append(remote)
branch = self._current_branch()
if branch is not None:
tags.append(branch)
return tags
def _project_base(self):
if self.config:
return os.path.dirname(os.path.dirname(self.config))
return None
def _current_branch(self):
stdout = None stdout = None
try: try:
stdout, stderr = Popen([ stdout, stderr = Popen([
@ -77,6 +55,12 @@ class Git(BaseProject):
return line[1] return line[1]
return None return None
def _project_base(self):
if self.config:
return os.path.dirname(os.path.dirname(self.config))
return None
def _find_config(self, path): def _find_config(self, path):
path = os.path.realpath(path) path = os.path.realpath(path)
if os.path.isfile(path): if os.path.isfile(path):

View file

@ -26,5 +26,5 @@ class Mercurial(BaseProject):
def name(self): def name(self):
return None return None
def tags(self): def branch(self):
return [] return None

View file

@ -31,11 +31,11 @@ class Subversion(BaseProject):
def name(self): def name(self):
return self.info['Repository Root'].split('/')[-1] return self.info['Repository Root'].split('/')[-1]
def tags(self): def branch(self):
tags = [] branch = None
if self.base: if self.base:
tags.append(os.path.basename(self.base)) branch = os.path.basename(self.base)
return tags return branch
def _get_info(self, path): def _get_info(self, path):
info = OrderedDict() info = OrderedDict()