git_reflow 0.2 → 0.2.1

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.2)
+    git_reflow (0.2.1)
       github_api (= 0.6.5)
       gli (= 2.0.0)
       highline

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/lib/git_reflow.rb

@@ -13,7 +13,7 @@ module GitReflow
 
   def setup
     gh_user = ask "Please enter your GitHub username: "
-    gh_password = ask "Please enter your GitHub password (we do NOT store this): "
+    gh_password = ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
     puts "\nYour GitHub account was successfully setup!"
     github = Github.new :basic_auth => "#{gh_user}:#{gh_password}"
     authorization = github.oauth.create 'scopes' => ['repo']
@@ -40,6 +40,19 @@ module GitReflow
       if error_message =~ /request already exists/i
         existing_pull_request = find_pull_request( :from => current_branch, :to => options['base'] )
         puts "Existing pull request at: #{existing_pull_request[:html_url]}"
+
+        # check for needed lgtm's
+        pull_comments = pull_request_comments(existing_pull_request)
+        if pull_comments.any?
+          open_comment_authors = find_authors_of_open_pull_request_comments(existing_pull_request)
+          last_committed_at    = Time.parse existing_pull_request.head.repo.updated_at
+          lgtm_authors         = comment_authors_for_pull_request(existing_pull_request, :with => LGTM, :after => last_committed_at)
+          puts "[review] LGTM given by: #{lgtm_authors.join(', ')}" if lgtm_authors.any?
+          puts "[notice] You still need a LGTM from: #{open_comment_authors.join(', ')}" if open_comment_authors.any?
+        else
+          puts "[notice] No one has reviewed your pull request..."
+        end
+
         ask_to_open_in_browser(existing_pull_request.html_url)
       else
         puts error_message
@@ -81,7 +94,7 @@ module GitReflow
             if deploy_and_cleanup =~ /^y/i
               puts `git push origin #{options['base']}`
               puts `git push origin :#{feature_branch}`
-              puts `git br -D #{feature_branch}`
+              puts `git branch -D #{feature_branch}`
               puts "Nice job buddy."
             end
           else
@@ -177,11 +190,15 @@ module GitReflow
     existing_pull_request
   end
 
-  def find_authors_of_open_pull_request_comments(pull_request)
-    # first we'll gather all the authors that have commented on the pull request
+  def pull_request_comments(pull_request)
     comments        = github.issues.comments.all remote_user, remote_repo_name, pull_request[:number]
     review_comments = github.pull_requests.comments.all remote_user, remote_repo_name, pull_request[:number]
-    all_comments    = comments + review_comments
+    comments + review_comments
+  end
+
+  def find_authors_of_open_pull_request_comments(pull_request)
+    # first we'll gather all the authors that have commented on the pull request
+    all_comments    = pull_request_comments(pull_request)
     comment_authors = comment_authors_for_pull_request(pull_request)
 
     # now we need to check that all the commented authors have given a lgtm after the last commit
@@ -202,12 +219,11 @@ module GitReflow
   end
 
   def comment_authors_for_pull_request(pull_request, options = {})
-    comments        = github.issues.comments.all remote_user, remote_repo_name, pull_request[:number]
-    review_comments = github.pull_requests.comments.all remote_user, remote_repo_name, pull_request[:number]
-    all_comments    = comments + review_comments
+    all_comments    = pull_request_comments(pull_request)
     comment_authors = []
 
     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])
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3361931726722795654
+      hash: -1057923408803391323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3361931726722795654
+      hash: -1057923408803391323
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24