git_reflow 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.2.4)
+    git_reflow (0.2.5)
       colorize (= 0.5.8)
       github_api (= 0.7.0)
       gli (= 2.1.0)
@@ -28,7 +28,7 @@ GEM
       gherkin (~> 2.11.0)
       json (>= 1.4.6)
     diff-lcs (1.1.3)
-    faraday (0.8.4)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
     ffi (1.1.5)
     gherkin (2.11.2)
@@ -43,8 +43,8 @@ GEM
     gli (2.1.0)
     hashie (1.2.0)
     highline (1.6.15)
-    httpauth (0.1)
-    httpclient (2.2.7)
+    httpauth (0.2.0)
+    httpclient (2.3.3)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -53,16 +53,18 @@ GEM
     json (1.7.5)
     jwt (0.1.5)
       multi_json (>= 1.0)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    nokogiri (1.5.5)
-    oauth2 (0.8.0)
+    multi_json (1.6.1)
+    multi_xml (0.5.3)
+    multipart-post (1.2.0)
+    nokogiri (1.5.6)
+    oauth2 (0.9.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.4.1)
+    rack (1.5.2)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/lib/git_reflow/commands/deliver.rb

@@ -2,6 +2,8 @@ desc 'deliver your feature branch'
 long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
 
 command :deliver do |c|
+  c.desc 'skip the lgtm checks and deliver your feature branch'
+  c.switch [:f, :'skip-lgtm']
   c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
   c.arg_name 'base_branch - the branch you want to merge into'
   c.action do |global_options,options,args|
@@ -13,6 +15,7 @@ command :deliver do |c|
     when 1
       deliver_options['base'] = args[0]
     end
+    deliver_options.merge({'skip_lgtm' => options[:'skip-lgtm']})
     GitReflow.deliver deliver_options
   end
 end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/git_reflow.rb

@@ -77,9 +77,9 @@ module GitReflow
         open_comment_authors = find_authors_of_open_pull_request_comments(existing_pull_request)
 
         # if there any comment_authors left, then they haven't given a lgtm after the last commit
-        if open_comment_authors.empty?
+        if open_comment_authors.empty? or options['skip-lgtm']
           lgtm_authors   = comment_authors_for_pull_request(existing_pull_request, :with => LGTM)
-          commit_message = get_first_commit_message
+          commit_message = existing_pull_request[:body] || get_first_commit_message
           puts "Merging pull request ##{existing_pull_request.number}: '#{existing_pull_request.title}', from '#{existing_pull_request.head.label}' into '#{existing_pull_request.base.label}'"
 
           update_destination(options['base'])
@@ -210,9 +210,9 @@ module GitReflow
       comment_created_at     = Time.parse(comment.created_at)
       if comment_created_at > pull_last_committed_at
         if comment[:body] =~ LGTM
-          lgtm_authors << comment.user.login
+          lgtm_authors |= [comment.user.login]
         else
-          comment_authors << comment.user.login unless comment_authors.include?(comment.user.login)
+          comment_authors |= [comment.user.login] unless comment_authors.include?(comment.user.login)
         end
       else
         comment_authors -= [comment.user.login] if comment_authors.include?(comment.user.login)
@@ -230,7 +230,7 @@ module GitReflow
 
     all_comments.each do |comment|
       next if options[:after] and Time.parse(comment.created_at) < options[:after]
-      comment_authors << comment.user.login if !comment_authors.include?(comment.user.login) and (options[:with].nil? or comment[:body] =~ options[:with])
+      comment_authors |= [comment.user.login] if !comment_authors.include?(comment.user.login) and (options[:with].nil? or comment[:body] =~ options[:with])
     end
 
     # remove the current user from the list to check

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1280650752481315877
+      hash: -3553381225246812940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,10 +264,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1280650752481315877
+      hash: -3553381225246812940
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A better git process