git_reflow 0.8.9 → 0.9.3

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

@@ -1,84 +1,84 @@
-require 'git_reflow/git_server/pull_request'
-
-module GitReflow
-  module GitServer
-    class BitBucket
-      class PullRequest < GitReflow::GitServer::PullRequest
-        def initialize(attributes)
-          self.number              = attributes.id
-          self.description         = attributes.body || attributes.description
-          self.html_url            = "#{attributes.source.repository.links.html.href}/pull-request/#{self.number}"
-          self.feature_branch_name = attributes.source.branch.name[/[^:]+$/]
-          self.base_branch_name    = attributes.destination.branch.name[/[^:]+$/]
-          self.build               = Build.new
-          self.source_object       = attributes
-        end
-
-        def self.create(options = {})
-          self.new GitReflow.git_server.connection.repos.pull_requests.create(
-            GitReflow.git_server.class.remote_user,
-            GitReflow.git_server.class.remote_repo_name,
-            title: options[:title],
-            description: options[:body] || options[:description],
-            source: {
-              branch: { name: GitReflow.git_server.class.current_branch },
-              repository: { full_name: "#{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}" }
-            },
-            destination: {
-              branch: { name: options[:base] }
-            },
-            reviewers: [username: GitReflow.git_server.class.user])
-        end
-
-        def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
-          begin
-            matching_pull = GitReflow.git_server.connection.repos.pull_requests.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, limit: 1).select do |pr|
-              pr.source.branch.name == from and
-              pr.destination.branch.name == to
-            end.first
-
-            if matching_pull
-              self.new matching_pull
-            end
-          rescue ::BitBucket::Error::NotFound => e
-            GitReflow.git_server.say "No BitBucket repo found for #{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}", :error
-          rescue ::BitBucket::Error::Forbidden => e
-            GitReflow.git_server.say "You don't have API access to this repo", :error
-          end
-        end
-
-        def commit_author
-          # use the author of the pull request
-          self.author.username
-        end
-
-        def comments
-          GitReflow.git_server.connection.repos.pull_requests.comments.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id)
-        end
-
-        def last_comment
-          last_comment = comments.first
-          return "" unless last_comment
-          "#{last_comment.content.raw}"
-        end
-
-        def reviewers
-          return [] unless comments.size > 0
-          comments.map {|c| c.user.username }.uniq - [GitReflow.git_server.class.user]
-        end
-
-        def approvals
-          approved  = []
-
-          GitReflow.git_server.connection.repos.pull_requests.activity(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id).each do |activity|
-            break unless activity.respond_to?(:approval) and activity.approval.user.username != GitReflow.git_server.class.user
-            approved |= [activity.approval.user.username]
-          end
-
-          approved
-        end
-
-      end
-    end
-  end
-end
+require 'git_reflow/git_server/pull_request'
+
+module GitReflow
+  module GitServer
+    class BitBucket
+      class PullRequest < GitReflow::GitServer::PullRequest
+        def initialize(attributes)
+          self.number              = attributes.id
+          self.description         = attributes.body || attributes.description
+          self.html_url            = "#{attributes.source.repository.links.html.href}/pull-request/#{self.number}"
+          self.feature_branch_name = attributes.source.branch.name[/[^:]+$/]
+          self.base_branch_name    = attributes.destination.branch.name[/[^:]+$/]
+          self.build               = Build.new
+          self.source_object       = attributes
+        end
+
+        def self.create(options = {})
+          self.new GitReflow.git_server.connection.repos.pull_requests.create(
+            GitReflow.git_server.class.remote_user,
+            GitReflow.git_server.class.remote_repo_name,
+            title: options[:title],
+            description: options[:body] || options[:description],
+            source: {
+              branch: { name: GitReflow.git_server.class.current_branch },
+              repository: { full_name: "#{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}" }
+            },
+            destination: {
+              branch: { name: options[:base] }
+            },
+            reviewers: [username: GitReflow.git_server.class.user])
+        end
+
+        def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
+          begin
+            matching_pull = GitReflow.git_server.connection.repos.pull_requests.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, limit: 1).select do |pr|
+              pr.source.branch.name == from and
+              pr.destination.branch.name == to
+            end.first
+
+            if matching_pull
+              self.new matching_pull
+            end
+          rescue ::BitBucket::Error::NotFound => e
+            GitReflow.git_server.say "No BitBucket repo found for #{GitReflow.git_server.class.remote_user}/#{GitReflow.git_server.class.remote_repo_name}", :error
+          rescue ::BitBucket::Error::Forbidden => e
+            GitReflow.git_server.say "You don't have API access to this repo", :error
+          end
+        end
+
+        def commit_author
+          # use the author of the pull request
+          self.author.username
+        end
+
+        def comments
+          GitReflow.git_server.connection.repos.pull_requests.comments.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id)
+        end
+
+        def last_comment
+          last_comment = comments.first
+          return "" unless last_comment
+          "#{last_comment.content.raw}"
+        end
+
+        def reviewers
+          return [] unless comments.size > 0
+          comments.map {|c| c.user.username }.uniq - [GitReflow.git_server.class.user]
+        end
+
+        def approvals
+          approved  = []
+
+          GitReflow.git_server.connection.repos.pull_requests.activity(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, self.id).each do |activity|
+            break unless activity.respond_to?(:approval) and activity.approval.user.username != GitReflow.git_server.class.user
+            approved |= [activity.approval.user.username]
+          end
+
+          approved
+        end
+
+      end
+    end
+  end
+end

data/lib/git_reflow/git_server/git_hub.rb

@@ -9,7 +9,7 @@ module GitReflow
       extend GitHelpers
       include Sandbox
 
-      attr_accessor :connection
+      attr_reader :connection
 
       def initialize(config_options = {})
         project_only     = !!config_options.delete(:project_only)
@@ -84,56 +84,68 @@ module GitReflow
       end
 
       def authenticate(options = {silent: false})
+        self.class.user = options[:user]
+        if self.class.user.empty?
+          self.class.user = ask("Please enter your GitHub username: ")
+        end
+
         if connection and self.class.oauth_token.length > 0
-          unless options[:silent]
-            GitReflow.say "Your GitHub account was already setup with: "
-            GitReflow.say "\tUser Name: #{self.class.user}"
-            GitReflow.say "\tEndpoint: #{self.class.api_endpoint}"
-          end
-        else
           begin
-            gh_user     = options[:user] || ask("Please enter your GitHub username: ")
-            gh_password = options[:password] || ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
-
-            @connection = ::Github.new do |config|
-              config.basic_auth = "#{gh_user}:#{gh_password}"
-              config.endpoint   = GitServer::GitHub.api_endpoint
-              config.site       = GitServer::GitHub.site_url
-              config.adapter    = :net_http
+            connection.users.get
+            unless options[:silent]
+              GitReflow.say "Your GitHub account was already setup with: "
+              GitReflow.say "\tUser Name: #{self.class.user}"
+              GitReflow.say "\tEndpoint: #{self.class.api_endpoint}"
             end
+            return connection
+          rescue ::Github::Error::Unauthorized => e
+            GitReflow.logger.debug "[GitHub Error] Current oauth-token is invalid or expired..."
+          end
+        end
 
-            @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]
+        begin
+          gh_password = options[:password] || ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
 
-            previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
-            if previous_authorizations.any?
-              authorization = previous_authorizations.last
-              GitReflow.say "You have previously setup git-reflow on this machine, but we can no longer find the stored token.", :error
-              GitReflow.say "Please visit https://github.com/settings/tokens and delete the token for: git-reflow (#{run('hostname', loud: false).strip})", :notice
-              raise "Setup could not be completed."
-            else
-              authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
-            end
+          @connection = ::Github.new do |config|
+            config.basic_auth = "#{self.class.user}:#{gh_password}"
+            config.endpoint   = GitServer::GitHub.api_endpoint
+            config.site       = GitServer::GitHub.site_url
+            config.adapter    = :net_http
+          end
 
-            self.class.oauth_token = authorization.token
+          @connection.connection_options = {headers: {"X-GitHub-OTP" => options[:two_factor_auth_code]}} if options[:two_factor_auth_code]
 
-          rescue ::Github::Error::Unauthorized => e
-            if e.inspect.to_s.include?('two-factor')
-              begin
-                # dummy request to trigger a 2FA SMS since a HTTP GET won't do it
-                @connection.oauth.create scopes: ['repo'], note: "thank Github for not making this straightforward"
-              rescue ::Github::Error::Unauthorized
-              ensure
-                two_factor_code = ask("Please enter your two-factor authentication code: ")
-                self.authenticate options.merge({user: gh_user, password: gh_password, two_factor_auth_code: two_factor_code})
-              end
-            else
-              GitReflow.say "Github Authentication Error: #{e.inspect}", :error
+          previous_authorizations = @connection.oauth.all.select {|auth| auth.note == "git-reflow (#{run('hostname', loud: false).strip})" }
+          if previous_authorizations.any?
+            authorization = previous_authorizations.last
+            GitReflow.say "You have previously setup git-reflow on this machine, but we can no longer find the stored token.", :error
+            GitReflow.say "Please visit https://github.com/settings/tokens and delete the token for: git-reflow (#{run('hostname', loud: false).strip})", :notice
+            raise "Setup could not be completed."
+          else
+            authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
+          end
+
+          self.class.oauth_token = authorization.token
+
+        rescue ::Github::Error::Unauthorized => e
+          if e.inspect.to_s.include?('two-factor')
+            begin
+              # dummy request to trigger a 2FA SMS since a HTTP GET won't do it
+              @connection.oauth.create scopes: ['repo'], note: "thank Github for not making this straightforward"
+            rescue ::Github::Error::Unauthorized
+            ensure
+              two_factor_code = ask("Please enter your two-factor authentication code: ")
+              self.authenticate options.merge({user: self.class.user, password: gh_password, two_factor_auth_code: two_factor_code})
             end
-          rescue StandardError => e
-            raise "We were unable to authenticate with Github."
           else
-            GitReflow.say "Your GitHub account was successfully setup!", :success
+            GitReflow.say "Github Authentication Error: #{e.inspect}", :error
+            raise "Setup could not be completed."
           end
+        rescue StandardError => e
+          raise "We were unable to authenticate with Github."
+        else
+          GitReflow.say "Your GitHub account was successfully setup!", :success
+
         end
 
         @connection

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

@@ -38,7 +38,7 @@ module GitReflow
 
         def commit_author
           begin
-            username, branch = base.label.split(':')
+            username, _  = base.label.split(':')
             first_commit = GitReflow.git_server.connection.pull_requests.commits(username, GitReflow.git_server.class.remote_repo_name, number.to_s).first
             "#{first_commit.commit.author.name} <#{first_commit.commit.author.email}>".strip
           rescue Github::Error::NotFound
@@ -47,7 +47,7 @@ module GitReflow
         end
 
         def reviewers
-          (comment_authors + pull_request_reviews.map(&:user).map(&:login)).uniq
+          (comment_authors + pull_request_reviews.map(&:user).map(&:login)).uniq - [user.login]
         end
 
         def approvals
@@ -65,7 +65,7 @@ module GitReflow
           comments        = GitReflow.git_server.connection.issues.comments.all        GitReflow.remote_user, GitReflow.remote_repo_name, number: self.number
           review_comments = GitReflow.git_server.connection.pull_requests.comments.all GitReflow.remote_user, GitReflow.remote_repo_name, number: self.number
 
-          review_comments.to_a + comments.to_a
+          (review_comments.to_a + comments.to_a).select { |c| c.user.login != user.login }
         end
 
         def last_comment
@@ -80,33 +80,38 @@ module GitReflow
           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?
+            approvals.size >= self.class.minimum_approvals.to_i and (
+              last_comment.empty? ||
+              !last_comment.match(self.class.approval_regex).nil?
+            )
           end
         end
 
         def merge!(options = {})
 
           # fallback to default merge process if user "forces" merge
-          if(options[:skip_lgtm])
+          if(options[:force])
             super options
           else
             if deliver?
               GitReflow.say "Merging pull request ##{self.number}: '#{self.title}', from '#{self.feature_branch_name}' into '#{self.base_branch_name}'", :notice
 
+              merge_method       = options[:merge_method] || GitReflow::Config.get("reflow.merge-method")
+              merge_method       = "squash" if "#{merge_method}".length < 1
+              merge_message_file = GitReflow.merge_message_path(merge_method: merge_method)
+
               unless options[:title] || options[:message]
                 # prompts user for commit_title and commit_message
-                squash_merge_message_file = "#{GitReflow.git_root_dir}/.git/SQUASH_MSG"
-
-                File.open(squash_merge_message_file, 'w') do |file|
+                File.open(merge_message_file, 'w') do |file|
                   file.write("#{self.title}\n#{self.commit_message_for_merge}\n")
                 end
 
-                GitReflow.run("#{GitReflow.git_editor_command} #{squash_merge_message_file}", with_system: true)
-                merge_message = File.read(squash_merge_message_file).split(/[\r\n]|\r\n/).map(&:strip)
+                GitReflow.run("#{GitReflow.git_editor_command} #{merge_message_file}", with_system: true)
+                merge_message = File.read(merge_message_file).split(/[\r\n]|\r\n/).map(&:strip)
 
                 title  = merge_message.shift
 
-                File.delete(squash_merge_message_file)
+                File.delete(merge_message_file)
 
                 unless merge_message.empty?
                   merge_message.shift if merge_message.first.empty?
@@ -124,9 +129,6 @@ module GitReflow
 
               options[:body] = "#{options[:message]}\n" if options[:body].nil? and "#{options[:message]}".length > 0
 
-              merge_method   = options[:merge_method] || GitReflow::Config.get("reflow.merge-method")
-              merge_method   = "squash" if "#{merge_method}".length < 1
-
               merge_response = GitReflow::GitServer::GitHub.connection.pull_requests.merge(
                 "#{GitReflow.git_server.class.remote_user}",
                 "#{GitReflow.git_server.class.remote_repo_name}",

data/lib/git_reflow/git_server/pull_request.rb

@@ -158,6 +158,8 @@ module GitReflow
       end
 
       def commit_message_for_merge
+        return GitReflow.merge_commit_template unless GitReflow.merge_commit_template.nil?
+
         message = ""
 
         if "#{self.description}".length > 0
@@ -204,14 +206,14 @@ module GitReflow
           GitReflow.run_command_with_label "git checkout #{self.base_branch_name}"
           GitReflow.run_command_with_label "git pull origin #{self.base_branch_name}"
 
-          case merge_method
+          case merge_method.to_s
           when /squash/i
             GitReflow.run_command_with_label "git merge --squash #{self.feature_branch_name}"
           else
             GitReflow.run_command_with_label "git merge #{self.feature_branch_name}"
           end
 
-          GitReflow.append_to_squashed_commit_message(message) if message.length > 0
+          GitReflow.append_to_merge_commit_message(message) if message.length > 0
 
           if GitReflow.run_command_with_label 'git commit', with_system: true
             GitReflow.say "Pull request ##{self.number} successfully merged.", :success

data/lib/git_reflow/merge_error.rb

@@ -1,9 +1,9 @@
-module GitReflow
-  module GitServer
-    class MergeError < StandardError
-      def initialize(msg="Merge failed")
-        super(msg)
-      end
-    end
-  end
-end
+module GitReflow
+  module GitServer
+    class MergeError < StandardError
+      def initialize(msg="Merge failed")
+        super(msg)
+      end
+    end
+  end
+end

data/lib/git_reflow/rspec.rb

@@ -1,2 +1,3 @@
-require_relative 'rspec/command_line_helpers'
-require_relative 'rspec/stub_helpers'
+require_relative 'rspec/command_line_helpers'
+require_relative 'rspec/stub_helpers'
+require_relative 'rspec/workflow_helpers'

data/lib/git_reflow/rspec/command_line_helpers.rb

@@ -2,11 +2,12 @@ require "highline"
 
 module GitReflow
   module RSpec
+    # @nodoc
     module CommandLineHelpers
-
       def stub_command_line
         $commands_ran     = []
         $stubbed_commands = {}
+        $stubbed_runners  = Set.new
         $output           = []
         $says             = []
 
@@ -33,6 +34,7 @@ module GitReflow
       end
 
       def stub_run_for(module_to_stub)
+        $stubbed_runners << module_to_stub
         allow(module_to_stub).to receive(:run) do |command, options|
           options = { loud: true, blocking: true }.merge(options || {})
           $commands_ran << Hashie::Mash.new(command: command, options: options)
@@ -52,16 +54,31 @@ module GitReflow
         $says = []
       end
 
-      def stub_command(command, return_value)
+      def stub_command(command:, return_value: "", options: {})
         $stubbed_commands[command] = return_value
-        allow(GitReflow::Sandbox).to receive(:run).with(command).and_return(return_value)
+        $stubbed_runners.each do |runner|
+          allow(runner).to receive(:run).with(command, options) do |command, options|
+            options = { loud: true, blocking: true }.merge(options || {})
+            $commands_ran << Hashie::Mash.new(command: command, options: options)
+            $stubbed_commands[command] = return_value
+            raise GitReflow::Sandbox::CommandError.new(return_value, "\"#{command}\" failed to run.") if options[:raise]
+          end
+        end
+      end
+
+      def stub_command_line_inputs_for(module_to_stub, inputs)
+        allow(module_to_stub).to receive(:ask) do |terminal, question|
+          return_value = inputs[question]
+          question = ""
+          return_value
+        end
       end
 
       def stub_command_line_inputs(inputs)
         allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
-        return_value = inputs[question]
-        question = ""
-        return_value
+          return_value = inputs[question]
+          question = ""
+          return_value
         end
       end