gitcycle 0.2.0 → 0.2.1

data/README.md

@@ -127,11 +127,10 @@ Todo
 * Label issues with ticket milestone?
 * gitc LH-ticket should not created a redis record right away, what happens if someone control-c
 * gitc -h or gitc help
-* gitc discuss should tag issue with 'Discuss'
 * gitc qa pass # since we're changing this to pass all the tickets, we need to loop through all the merged issues and update the lighthouse state to pending-qa
 * gitc pull doesnt work in rc: https://gist.github.com/7e508977fbb762d186a6
 * Tag issue with milestone
 * There's still a Tagging Issue I tried to fix parseLabel http://d.pr/8eOS , Pass should remove Pending *, but remove the Branch Name
-* gitc log, diff, merge, rm, status, reset, mv, commit, diff
+* gitc discuss should tag issue with 'Discuss'
 * gitc ready - possibly do syntax checks
 * gitc commands should not track branches, so that they have to use the gitc push vs using git push

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -37,17 +37,37 @@ class Gitcycle
     start(args) if args
   end
 
-  def checkout(branch)
+  def checkout(remote, branch=nil)
     require_git && require_config
 
-    puts "\nRetrieving repo information from gitcycle.\n".green
-    repo = get('repo')
+    branch, remote = remote, nil if branch.nil?
 
     unless branches(:match => branch)
-      add_remote_and_fetch(:owner => repo['owner'], :repo => repo['name'])
+      collab = branch && remote
+
+      unless collab
+        puts "\nRetrieving repo information from gitcycle.\n".green
+        repo = get('repo')
+        remote = repo['owner']
+      end
       
-      puts "Creating branch '#{branch}' from '#{repo['owner']}/#{branch}'.\n".green
-      run("git branch --no-track #{branch} #{repo['owner']}/#{branch}")
+      add_remote_and_fetch(
+        :owner => remote,
+        :repo => @git_repo
+      )
+      
+      puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
+      run("git branch --no-track #{branch} #{remote}/#{branch}")
+
+      if collab
+        puts "Sending branch information to gitcycle.".green
+        get('branch',
+          'branch[home]' => remote,
+          'branch[name]' => branch,
+          'branch[collab]' => 1,
+          'create' => 1
+        )
+      end
     end
 
     puts "Checking out '#{branch}'.\n".green
@@ -165,11 +185,19 @@ class Gitcycle
     )
 
     if branch
-      merge_remote_branch(
-        :owner => branch['repo']['owner'],
-        :repo => branch['repo']['name'],
-        :branch => branch['source']
-      )
+      if branch['collab']
+        merge_remote_branch(
+          :owner => branch['home'],
+          :repo => branch['repo']['name'],
+          :branch => branch['name']
+        )
+      else
+        merge_remote_branch(
+          :owner => branch['repo']['owner'],
+          :repo => branch['repo']['name'],
+          :branch => branch['source']
+        )
+      end
     else
       puts "\nRetrieving repo information from gitcycle.".green
       repo = get('repo')
@@ -179,13 +207,16 @@ class Gitcycle
       puts "\nPulling '#{repo['owner']}/#{current_branch}'.\n".green
       run("git pull #{repo['owner']} #{current_branch}")
     end
+
+    branch
   end
 
   def push
-    branch = branches(:current => true)
+    branch = pull
+    remote = branch ? branch['home'] : 'origin'
 
-    puts "\nPushing branch '#{branch}'.\n".green
-    run("git push origin #{branch}")
+    puts "\nPushing branch '#{remote}/#{branch}'.\n".green
+    run("git push #{remote} #{branch}")
   end
 
   def qa(*issues)
@@ -194,7 +225,7 @@ class Gitcycle
     if issues.empty?
       puts "\n"
       get('qa_branch').each do |branches|
-        puts "qa_#{branches['user']}_#{branches['source']}".green
+        puts "qa_#{branches['source']}_#{branches['user']}".green
         branches['branches'].each do |branch|
           puts "  #{"issue ##{branch['issue']}".yellow}\t#{branch['user']}/#{branch['branch']}"
         end
@@ -270,7 +301,7 @@ class Gitcycle
           run("git add . && git add . -u && git commit -a -F .git/MERGE_MSG")
 
           puts "Pushing merge resolution of #{conflict['branch']} (issue ##{conflict['issue']}).\n".green
-          run("git push origin qa_#{qa_branch['user']}_#{qa_branch['source']}")
+          run("git push origin qa_#{qa_branch['source']}_#{qa_branch['user']}")
 
           puts "\nDe-conflicting on gitcycle.\n".green
           get('qa_branch',
@@ -506,7 +537,7 @@ class Gitcycle
       end
 
       source = qa_branch['source']
-      name = "qa_#{qa_branch['user']}_#{source}"
+      name = "qa_#{source}_#{qa_branch['user']}"
 
       unless qa_branch['branches'].empty?
         unless options[:preserve]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-02 00:00:00 -08:00
+date: 2012-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency