gitcycle 0.2.25 → 0.2.26

data/features/branch.feature

@@ -66,31 +66,4 @@ Scenario: Change source branch
     Pushing 'origin/master-ticket.id'.
     Sending branch information to gitcycle.
     """
-    And redis entries valid
-
-Scenario: Collaborator
-  Given a fresh set of repositories
-  When I cd to the owner repo
-    And I create a new branch "some_branch"
-    And I checkout some_branch
-    And I push some_branch
-    And I cd to the user repo
-    And I execute gitcycle branch with a new URL or string
-    And I enter "n"
-    And I enter "config.owner/some_branch"
-    And I enter "y"
-    And gitcycle runs
-  Then output includes
-    """
-    Your work will eventually merge into 'master'. Is this correct? (y/n)
-    What branch would you like to eventually merge into?
-    Retrieving branch information from gitcycle.
-    Would you like to name your branch 'ticket.id'? (y/n)
-    Adding remote repo 'config.owner/config.repo'.
-    Fetching remote 'config.owner'.
-    Checking out remote branch 'ticket.id' from 'config.owner/config.repo/some_branch'.
-    Fetching remote 'origin'.
-    Pushing 'origin/ticket.id'.
-    Sending branch information to gitcycle.
-    """
     And redis entries valid

data/features/ready.feature

@@ -56,27 +56,4 @@ Scenario: Reopen pull request
     """
     And output includes "Opening issue" with URL
     And URL is a valid issue
-    And URL is not the same as the last
-
-Scenario: Collaborator
-  Given a fresh set of repositories
-  When I cd to the owner repo
-    And I create a new branch "some_branch"
-    And I checkout some_branch
-    And I push some_branch
-    And I cd to the user repo
-    And I execute gitcycle branch with a new URL or string
-    And I enter "n"
-    And I enter "config.owner/some_branch"
-    And I enter "y"
-    And gitcycle runs
-    And I commit something
-    And I execute gitcycle with "ready"
-    And gitcycle runs
-  Then output includes
-    """
-    Retrieving branch information from gitcycle.
-    Fetching remote 'config.owner'.
-    Merging remote branch 'some_branch' from 'config.owner/gitcycle_test'.
-    Pushing branch 'config.owner/some_branch'.
-    """
+    And URL is not the same as the last

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -72,10 +72,6 @@ class Gitcycle
     end
 
     source = params['branch[source]']
-    if source.include?('/')
-      params['branch[home]'], params['branch[source]'] = source.split('/')
-      params['branch[collab]'] = 1
-    end
 
     puts "\nRetrieving branch information from gitcycle.\n".green
     branch = get('branch', params)
@@ -91,7 +87,7 @@ class Gitcycle
       end
 
       checkout_remote_branch(
-        :owner => branch['collab'] ? branch['home'] : owner,
+        :owner => owner,
         :repo => repo,
         :branch => branch['source'],
         :target => name
@@ -145,11 +141,12 @@ class Gitcycle
         remote = repo['owner'] unless collab
         
         output = add_remote_and_fetch(
+          :catch => false,
           :owner => remote,
           :repo => @git_repo
         )
 
-        if output.include?('ERROR')
+        if errored?(output)
           og_remote = remote
           remote = repo["owner"]
 
@@ -160,9 +157,9 @@ class Gitcycle
         end
         
         puts "Creating branch '#{branch}' from '#{remote}/#{branch}'.\n".green
-        output = run("git branch --no-track #{branch} #{remote}/#{branch}")
+        output = run("git branch --no-track #{branch} #{remote}/#{branch}", :catch => false)
 
-        if output.include?("fatal")
+        if errored?(output)
           puts "Could not find branch #{"'#{og_remote}/#{branch}' or " if og_remote}'#{remote}/#{branch}'.\n".red
           exit
         end
@@ -542,7 +539,7 @@ class Gitcycle
       end
 
       puts "Fetching remote '#{owner}'.\n".green
-      run("git fetch -q #{owner}")
+      run("git fetch -q #{owner}", :catch => options[:catch])
     end
   end
 
@@ -581,12 +578,12 @@ class Gitcycle
 
     if branches(:match => target)
       if yes?("You already have a branch called '#{target}'. Overwrite?")
-        run_safe("git push origin :#{target} -q")
-        run_safe("git checkout master -q")
-        run_safe("git branch -D #{target}")
+        run("git push origin :#{target} -q")
+        run("git checkout master -q")
+        run("git branch -D #{target}")
       else
-        run_safe("git checkout #{target} -q")
-        run_safe("git pull origin #{target} -q")
+        run("git checkout #{target} -q")
+        run("git pull origin #{target} -q")
         return
       end
     end
@@ -714,6 +711,10 @@ class Gitcycle
     end
   end
 
+  def errored?(output)
+    output.include?("fatal: ") || output.include?("ERROR: ") || $?.exitstatus != 0
+  end
+
   def exec_git(command, args)  
     args.unshift("git", command)
     Kernel.exec(*args.collect(&:to_s))
@@ -829,6 +830,11 @@ class Gitcycle
       b
     end
   end
+  
+  def q(question, extra='')
+    puts "#{question.yellow}#{extra}"
+    $input ? $input.shift : $stdin.gets.strip
+  end
 
   def require_config
     unless @login && @token
@@ -837,6 +843,7 @@ class Gitcycle
       puts "Have you set up this repository at http://gitcycle.com?\n".yellow
       exit
     end
+    true
   end
 
   def require_git
@@ -845,34 +852,30 @@ class Gitcycle
       puts "Are you sure you are in a git repository?\n".yellow
       exit
     end
+    true
   end
 
-  def save_config
-    FileUtils.mkdir_p(File.dirname(@config_path))
-    File.open(@config_path, 'w') do |f|
-      f.write(YAML.dump(@config))
-    end
-  end
-
-  def q(question, extra='')
-    puts "#{question.yellow}#{extra}"
-    $input ? $input.shift : $stdin.gets.strip
-  end
-
-  def run(cmd)
+  def run(cmd, options={})
     if ENV['RUN'] == '0'
       puts cmd
     else
-      `#{cmd} 2>&1`
+      output = `#{cmd} 2>&1`
     end
-  end
-
-  def run_safe(cmd)
-    run(cmd)
-    if $? != 0
-      puts "The last command was supposed to run without error, but it didn't :(\n".red
+    if options[:catch] != false && errored?(output)
+      puts "#{output}\n\n"
+      puts "Gitcycle encountered an error when running the last command:".red
+      puts "  #{cmd}\n"
       puts "Please copy this session's output and send it to gitcycle@bleacherreport.com.\n".yellow
       exit
+    else
+      output
+    end
+  end
+
+  def save_config
+    FileUtils.mkdir_p(File.dirname(@config_path))
+    File.open(@config_path, 'w') do |f|
+      f.write(YAML.dump(@config))
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber