git_reflow 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b364c5682237839cb7166efcd0c673d9dbfbf8e3
-  data.tar.gz: 5ffcda3511f30d57806b66079aa152f64b8f058c
+  metadata.gz: a347ec9597dc6a1500fe2b1553c1fbccf26bfdb3
+  data.tar.gz: ff80647cdef77c93294142807d85ca2b1cf919ba
 SHA512:
-  metadata.gz: f5d6d393739d7d0d719a769c27b0fcc73c17af2ddb3f3e7cdf95d9c18a8cce444e62c5ca2e03d448ada9425667ebb1c805076628cd5cca6e76b46bb0bf089311
-  data.tar.gz: a3ad1c5ff48e6681440d580d3abea4e820025fb3df5baa460268f0def9f711f54fcacdd3980f0128b65b2f7f03f1d09997e08f00f7139f279943926d470160ab
+  metadata.gz: 5f7092e8b7ff099a93bd7fe4d555bb44d4bc81941931de0218933d5fa7d97565177caf751fda46bcdd6a32f45e75fb00ef80116b27d2f0754c0e2f19043b3bab
+  data.tar.gz: 31a1f2ccd61511599d86c6e78b5da81a3f4299473e4e4a7c9c3085ca452ab6cc06c5ab9bc01ae8006423bfa6549360d10ff6a528524287a606911e11296463c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.5.1)
+    git_reflow (0.5.2)
       colorize (= 0.6.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)
@@ -42,7 +42,7 @@ GEM
       nokogiri (~> 1.6.3)
       oauth2
     gli (2.12.2)
-    hashie (3.4.0)
+    hashie (3.4.1)
     highline (1.7.1)
     httpclient (2.6.0.1)
     json_pure (1.8.2)

data/lib/git_reflow/git_server/git_hub.rb

@@ -5,6 +5,7 @@ module GitReflow
   module GitServer
     class GitHub < Base
       extend GitHelpers
+      include Sandbox
 
       class PullRequest < Base::PullRequest
         def initialize(attributes)
@@ -133,7 +134,7 @@ module GitReflow
               puts "\nGithub Authentication Error: #{e.inspect}"
             end
           rescue StandardError => e
-            puts "\nInvalid username or password: #{e.body}"
+            puts "\nInvalid username or password: #{e.inspect}"
           else
             puts "\nYour GitHub account was successfully setup!"
           end
@@ -199,6 +200,7 @@ module GitReflow
 
         # remove the current user from the list to check
         comment_authors -= [self.class.user]
+        comment_authors.uniq
       end
 
       def get_commited_time(commit_sha)

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/lib/git_reflow.rb

@@ -77,7 +77,7 @@ module GitReflow
         say "No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
       else
 
-        has_comments         = (git_server.has_pull_request_comments?(existing_pull_request) or git_server.approvals(existing_pull_request))
+        has_comments         = (git_server.has_pull_request_comments?(existing_pull_request) or git_server.approvals(existing_pull_request).any?)
         open_comment_authors = git_server.reviewers_pending_response(existing_pull_request)
         status               = git_server.get_build_status existing_pull_request.build_status
         commit_message       = if "#{existing_pull_request.description}".length > 0

data/spec/git_reflow_spec.rb

@@ -349,6 +349,8 @@ describe GitReflow do
         context 'but has no comments' do
           before do
             github.stub(:has_pull_request_comments?).and_return(false)
+            github.stub(:approvals).and_return([])
+            github.stub(:reviewers_pending_response).and_return([])
           end
 
           it "notifies the user to get their code reviewed" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal