gitcycle 0.2.18 → 0.2.19

data/gitcycle.gemspec

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

data/lib/gitcycle.rb

@@ -422,7 +422,8 @@ class Gitcycle
     branch = pull
 
     if branch && !collab?(branch)
-      branch = create_pull_request(branch)
+      force = branch['labels'] && branch['labels'].include?('Pass')
+      branch = create_pull_request(branch, force)
     end
 
     if branch == false
@@ -596,7 +597,7 @@ class Gitcycle
     Launchy.open(readme)
   end
 
-  def create_pull_request(branch=nil)
+  def create_pull_request(branch=nil, force=false)
     unless branch
       puts "\nRetrieving branch information from gitcycle.\n".green  
       branch = get('branch',
@@ -605,7 +606,7 @@ class Gitcycle
       )
     end
 
-    if branch && !branch['issue_url']
+    if branch && (force || !branch['issue_url'])
       puts "Creating GitHub pull request.\n".green
       branch = get('branch',
         'branch[create_pull_request]' => true,
@@ -643,6 +644,13 @@ class Gitcycle
       name = "qa_#{source}_#{qa_branch['user']}"
 
       unless qa_branch['branches'].empty?
+        qa_branch['branches'][range].each do |branch|
+          if source != branch['source']
+            puts "You can only QA issues based on '#{source}'\n".red
+            exit
+          end
+        end
+
         unless options[:preserve]
           if branches(:match => name, :all => true)
             puts "Deleting old QA branch '#{name}'.\n".green
@@ -663,18 +671,11 @@ class Gitcycle
           puts "\n"
         end
 
-        warnings = {}
-
         qa_branch['branches'][range].each do |branch|
           issue = branch['issue']
           owner, repo = branch['repo'].split(':')
           home = branch['home']
 
-          if source != branch['source']
-            warnings[branch['source']] ||= []
-            warnings[branch['source']] << branch['issue']
-          end
-
           output = merge_remote_branch(
             :owner => home,
             :repo => repo,
@@ -689,17 +690,6 @@ class Gitcycle
           puts "\nType '".yellow + "gitc qa pass".green + "' to approve all issues in this branch.\n".yellow
           puts "Type '".yellow + "gitc qa fail".red + "' to reject all issues in this branch.\n".yellow
         end
-
-        unless warnings.empty?
-          puts "\n#{"WARNING:".red} If you pass this QA branch, the following branches will merge into '#{source.yellow}':\n"
-          
-          warnings.each do |(branch, issues)|
-            issues.collect! { |issue| "##{issue}" }
-            puts "  #{branch.yellow} (#{issues.join(', ')})"
-          end
-          
-          puts "\nBe sure this is correct!\n".yellow
-        end
       end
 
       qa_branch

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 19
+  version: 0.2.19
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 -07:00
+date: 2012-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency