git_reflow 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64b5781cd74b023d9f5a94c91949cac9528636f7
-  data.tar.gz: f509d8459ca0b092d4bd710722987613bfb6cd5f
+  metadata.gz: c6773486dad59a6ec3d71cd0047234005b8d06f1
+  data.tar.gz: 07665f57499a6aab0bd31218a0bf8d5e147c8581
 SHA512:
-  metadata.gz: 0ec9acd3327e943147292d1a6f794b23ae5cedbc80250e4c29c3884d26d7382f4b972ef0151ece4ea989e524721248a02ffc2df453c1c1bd094c7f1cd6de62bd
-  data.tar.gz: 860b02e97c65b9121ec31428ee8218a463fe5ccfab846767ee7312891a2321853e053902448bd29111f65200153b0cca775b4432d674465b5d6422239c2c9b02
+  metadata.gz: 930b0d1bb58185c59c0d759ef2aad44a10d2b2481bd78843f842c4b703c4b4770a29574cb34be888d01035db40fd66f10df45e343427c2fafee37e06791a1602
+  data.tar.gz: 8aa0cbcf0db37dcbb527f2275cef16125d7f736a18787700e1fc16c2934b68ac75f0f0e2713d1790c5e90efca256926be9df200f3baa61ae8aae427411facd1c

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 **/.DS_Store
 .rspec
 gemfiles
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.7.4)
+    git_reflow (0.7.5)
       colorize (>= 0.7.0)
       github_api (= 0.12.4)
       gli (= 2.13.2)
@@ -104,13 +104,13 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (= 1.0.3)
-  bundler
+  bundler (~> 1.11)
   chronic
   git_reflow!
   pry-byebug
-  rake
+  rake (~> 10.0)
   rdoc
-  rspec (~> 3.0.0)
+  rspec (~> 3.0)
   webmock
   wwtd (= 0.7.0)
 

data/Rakefile

@@ -1,11 +1,8 @@
 #!/usr/bin/env rake
-require 'rake'
-require 'bundler/gem_tasks'
-require 'bundler/setup'
-require 'rspec/core/rake_task'
-
-Dir[File.join(File.dirname(__FILE__),'lib/tasks/*.rake')].each { |f| load f }
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [:spec]
+task :default => :spec
+

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "git_reflow"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/git_reflow.gemspec

@@ -10,22 +10,22 @@ spec = Gem::Specification.new do |s|
   s.summary          = "A better git process"
   s.description      = "Git Reflow manages your git workflow."
   s.platform         = Gem::Platform::RUBY
-  s.files            = `git ls-files`.split("\n")
+  s.files            = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables      = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.has_rdoc         = true
   s.extra_rdoc_files = ['README.rdoc']
-  s.bindir           = 'bin'
-  s.require_paths    << 'lib'
+  s.bindir           = "exe"
+  s.require_paths    = ["lib"]
   s.rdoc_options     << '--title' << 'git_reflow' << '--main' << 'README.rdoc' << '-ri'
 
   s.add_development_dependency('appraisal', '1.0.3')
-  s.add_development_dependency('bundler')
+  s.add_development_dependency('bundler', "~> 1.11")
   s.add_development_dependency('chronic')
   s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake')
+  s.add_development_dependency('rake', "~> 10.0")
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', '~> 3.0.0')
+  s.add_development_dependency('rspec', "~> 3.0")
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '0.7.0')
 

data/lib/git_reflow/commands/setup.rb

@@ -15,11 +15,15 @@ command :setup do |c|
     end
 
     choose do |menu|
-      menu.header = "Available remote Git Server services:"
+      menu.header = "Available remote Git Server services"
       menu.prompt = "Which service would you like to use for this project?  "
 
       menu.choice('GitHub')    { GitReflow::GitServer.connect reflow_options.merge({ provider: 'GitHub', silent: false }) }
       menu.choice('BitBucket (team-owned repos only)') { GitReflow::GitServer.connect reflow_options.merge({ provider: 'BitBucket', silent: false }) }
     end
+
+    GitReflow::Config.add "constants.minimumApprovals", ask("Set the minimum number of approvals (leaving blank will require approval from all commenters): "), local: reflow_options[:project_only]
+    GitReflow::Config.add "constants.approvalRegex", GitReflow::GitServer::PullRequest::DEFAULT_APPROVAL_REGEX, local: reflow_options[:project_only]
+    
   end
 end

data/lib/git_reflow/git_server/git_hub/pull_request.rb

@@ -52,7 +52,7 @@ module GitReflow
 
         def approvals
           pull_last_committed_at = get_committed_time(self.head.sha)
-          comment_authors(with: LGTM, after: pull_last_committed_at)
+          comment_authors(with: self.class.approval_regex, after: pull_last_committed_at)
         end
 
         def comments
@@ -63,7 +63,19 @@ module GitReflow
         end
 
         def last_comment
-          "#{comments.last.body.inspect}"
+          if comments.last.nil?
+            ""
+          else
+            "#{comments.last.body.inspect}"
+          end
+        end
+
+        def approved?
+          if self.class.minimum_approvals.to_i == 0
+            super
+          else
+            approvals.size >= self.class.minimum_approvals.to_i and !last_comment.match(self.class.approval_regex).nil?
+          end
         end
 
         def build

data/lib/git_reflow/git_server/pull_request.rb

@@ -3,6 +3,20 @@ module GitReflow
     class PullRequest
       attr_accessor :description, :html_url, :feature_branch_name, :base_branch_name, :build_status, :source_object, :number
 
+      DEFAULT_APPROVAL_REGEX = /(?i-mx:lgtm|looks good to me|:\+1:|:thumbsup:|:shipit:)/
+
+      def self.minimum_approvals
+        "#{GitReflow::Config.get('constants.minimumApprovals')}"
+      end
+
+      def self.approval_regex
+        if "#{GitReflow::Config.get('constants.approvalRegex')}".length > 0
+          Regexp.new("#{GitReflow::Config.get('constants.approvalRegex')}")
+        else
+          DEFAULT_APPROVAL_REGEX
+        end
+      end
+
       def initialize(attributes)
         raise "PullRequest#initialize must be implemented"
       end
@@ -35,13 +49,47 @@ module GitReflow
         reviewers - approvals
       end
 
+      def approved?
+        has_comments_or_approvals = (has_comments? or approvals.any?)
+
+        case self.class.minimum_approvals
+        when "0"
+          true
+        when "", nil
+          # Approvals from every commenter
+          has_comments_or_approvals && reviewers_pending_response.empty?
+        else
+          approvals.size >= self.class.minimum_approvals.to_i
+        end
+      end
+
+      def rejection_message
+        if !build_status.nil? and build_status != "success"
+          "#{build.description}: #{build.url}"
+        elsif !approval_minimums_reached?
+          "You need approval from at least #{self.class.minimum_approvals} users!"
+        elsif !all_comments_addressed?
+          # Maybe add what the last comment is?
+          "The last comment is holding up approval:\n#{last_comment}"
+        elsif reviewers_pending_response.count > 0
+          "You still need a LGTM from: #{reviewers_pending_response.join(', ')}"
+        else
+          "Your code has not been reviewed yet."
+        end
+      end
+
+      def approval_minimums_reached?
+        self.class.minimum_approvals.length <= 0 or approvals.size >= self.class.minimum_approvals.to_i
+      end
+
+      def all_comments_addressed?
+        self.class.minimum_approvals.length <= 0 or last_comment.match(self.class.approval_regex)
+      end
+
       def good_to_merge?(force: false)
         return true if force
-        has_comments_or_approvals = (has_comments? or approvals.any?)
 
-        force == true or (
-          (build_status.nil? or build_status == "success") and
-          (has_comments_or_approvals and reviewers_pending_response.empty?))
+        (build_status.nil? or build_status == "success") and approved?
       end
 
       def display_pull_request_summary

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/lib/git_reflow.rb

@@ -21,8 +21,6 @@ module GitReflow
 
   extend self
 
-  LGTM = /lgtm|looks good to me|:\+1:|:thumbsup:|:shipit:/i
-
   def status(destination_branch)
     pull_request = git_server.find_open_pull_request( :from => current_branch, :to => destination_branch )
 
@@ -156,12 +154,8 @@ module GitReflow
           else
             say "There were problems commiting your feature... please check the errors above and try again.", :error
           end
-        elsif !existing_pull_request.build_status.nil? and existing_pull_request.build_status != "success"
-          say "#{existing_pull_request.build.description}: #{existing_pull_request.build.url}", :deliver_halted
-        elsif existing_pull_request.reviewers_pending_response.count > 0
-          say "You still need a LGTM from: #{existing_pull_request.reviewers_pending_response.join(', ')}", :deliver_halted
         else
-          say "Your code has not been reviewed yet.", :deliver_halted
+          say existing_pull_request.rejection_message, :deliver_halted
         end
       end
 

data/spec/git_reflow_spec.rb

@@ -18,6 +18,11 @@ describe GitReflow do
   let(:existing_pull_request)  { GitReflow::GitServer::GitHub::PullRequest.new existing_pull_requests.first }
 
   before do
+
+    # Stubbing out numlgtm value to test all reviewers in gitconfig file
+    allow(GitReflow::Config).to receive(:get).with("constants.minimumApprovals").and_return('')
+    allow(GitReflow::Config).to receive(:get).and_call_original
+
     HighLine.any_instance.stub(:ask) do |terminal, question|
       values = {
         "Please enter your GitHub username: "                                                      => user,
@@ -211,18 +216,18 @@ describe GitReflow do
 
     context "and pull request exists for the feature branch to the destination branch" do
       before do
-        github.stub(:get_build_status).and_return(build_status)
-        github.should_receive(:find_open_pull_request).and_return(existing_pull_request)
-        existing_pull_request.stub(:has_comments?).and_return(true)
-        github.stub(:reviewers).and_return(['codenamev'])
+        allow(github).to receive(:build_status).and_return(build_status)
+        allow(github).to receive(:find_open_pull_request).and_return(existing_pull_request)
+        allow(existing_pull_request).to receive(:has_comments?).and_return(true)
+        allow(github).to receive(:reviewers).and_return(['codenamev'])
       end
 
       context 'and build status is not "success"' do
         let(:build_status) { Hashie::Mash.new({ state: 'failure', description: 'Build resulted in failed test(s)' }) }
 
         before do
-          existing_pull_request.stub(:build).and_return(build_status)
-          existing_pull_request.stub(:has_comments?).and_return(true)
+          allow(existing_pull_request).to receive(:build).and_return(build_status)
+          allow(existing_pull_request).to receive(:has_comments?).and_return(true)
         end
 
         it "halts delivery and notifies user of a failed build" do
@@ -236,8 +241,8 @@ describe GitReflow do
 
         before do
           # stubbing unrelated results so we can just test that it made it insdide the conditional block
-          existing_pull_request.stub(:has_comments?).and_return(true)
-          existing_pull_request.stub(:reviewers).and_return([])
+          allow(existing_pull_request).to receive(:has_comments?).and_return(true)
+          allow(existing_pull_request).to receive(:reviewers).and_return([])
           GitReflow.stub(:update_destination).and_return(true)
           GitReflow.stub(:merge_feature_branch).and_return(true)
           GitReflow.stub(:append_to_squashed_commit_message).and_return(true)
@@ -269,6 +274,34 @@ describe GitReflow do
               subject
             end
 
+            context "build status failure, testing description and target_url" do
+              let(:build_status) { Hashie::Mash.new({ state: 'failure', description: 'Build resulted in failed test(s)', target_url: "www.error.com" }) }
+
+              before do
+                existing_pull_request.stub(:build).and_return(build_status)
+                existing_pull_request.stub(:reviewers).and_return(lgtm_comment_authors)
+                existing_pull_request.stub(:has_comments?).and_return(true)
+              end
+
+              it "halts delivery and notifies user of a failed build" do
+                expect { subject }.to have_said "#{build_status.description}: #{build_status.url}", :deliver_halted
+              end
+            end
+
+            context "build status nil" do
+              let(:build_status) { nil }
+
+              before do
+                github.stub(:build).and_return(build_status)
+                existing_pull_request.stub(:reviewers_pending_response).and_return([])
+                existing_pull_request.stub(:has_comments_or_approvals).and_return(true)
+              end
+
+              it "commits the changes if the build status is nil but has comments/approvals and no pending response" do
+                expect{ subject }.to have_said 'Merge complete!', :success
+              end
+            end
+
             context "and the pull request has no body" do
               let(:first_commit_message) { "We'll do it live." }
 
@@ -325,7 +358,8 @@ describe GitReflow do
 
               context "not always" do
                 before do
-                  GitReflow::Config.stub(:get) { "false" }
+                  GitReflow::Config.stub(:get).with("reflow.always-deploy-and-cleanup").and_return("false")
+                  GitReflow::Config.stub(:get).and_call_original
                 end
 
                 it "pushes local squash merged base branch to remote repo" do
@@ -343,7 +377,8 @@ describe GitReflow do
 
               context "always" do
                 before do
-                  GitReflow::Config.stub(:get) { "true" }
+                  GitReflow::Config.stub(:get).with("reflow.always-deploy-and-cleanup").and_return("true")
+                  GitReflow::Config.stub(:get).and_call_original
                 end
 
                 it "pushes local squash merged base branch to remote repo" do