git_reflow 0.8.6 → 0.8.7

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/bit_bucket.rb

@@ -1,101 +1,101 @@
-require 'bitbucket_rest_api'
-require 'git_reflow/git_helpers'
-
-module GitReflow
-  module GitServer
-    class BitBucket < Base
-      require_relative 'bit_bucket/pull_request'
-
-      attr_accessor :connection
-
-      def initialize(config_options = {})
-        project_only = !!config_options.delete(:project_only)
-
-        # We remove any existing setup first, then setup our required config settings
-        GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
-        GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}") if project_only
-        GitReflow::Config.set('reflow.git-server', 'BitBucket', local: project_only)
-      end
-
-      def self.connection
-        if api_key_setup?
-          @connection ||= ::BitBucket.new login: remote_user, password: api_key
-        end
-      end
-
-      def self.api_endpoint
-        endpoint         = GitReflow::Config.get("bitbucket.endpoint", local: project_only?)
-        (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
-      end
-
-      def self.site_url
-        site_url     = GitReflow::Config.get("bitbucket.site", local: project_only?)
-        (site_url.length > 0) ? site_url : 'https://bitbucket.org'
-      end
-
-      def self.api_key
-        GitReflow::Config.get("bitbucket.api-key", reload: true, local: project_only?)
-      end
-
-      def self.api_key=(key)
-        GitReflow::Config.set("bitbucket.api-key", key, local: project_only?)
-      end
-      def self.api_key_setup?
-        (self.api_key.length > 0)
-      end
-
-      def self.user
-        GitReflow::Config.get('bitbucket.user', local: project_only?)
-      end
-
-      def self.user=(bitbucket_user)
-        GitReflow::Config.set('bitbucket.user', bitbucket_user, local: project_only?)
-      end
-
-      def authenticate(options = {silent: false})
-        begin
-          if connection and self.class.api_key_setup?
-            unless options[:silent]
-              GitReflow.say "\nYour BitBucket account was already setup with:"
-              GitReflow.say "\tUser Name: #{self.class.user}"
-            end
-          else
-            self.class.user = options[:user] || ask("Please enter your BitBucket username: ")
-            GitReflow.say "\nIn order to connect your BitBucket account,"
-            GitReflow.say "you'll need to generate an API key for your team"
-            GitReflow.say "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
-            self.class.api_key = ask("Please enter your team's API key: ")
-            connection.repos.all(self.class.remote_user).count
-            GitReflow.say "Connected to BitBucket\!", :success
-          end
-        rescue ::BitBucket::Error::Unauthorized => e
-          GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
-          GitReflow.say "Invalid API key for team #{self.class.remote_user}.", :error
-        end
-      end
-
-      def connection
-        @connection ||= self.class.connection
-      end
-
-      def get_build_status(sha)
-        # BitBucket does not currently support build status via API
-        # for updates: https://bitbucket.org/site/master/issue/8548/better-ci-integration-add-a-build-status
-        return nil
-      end
-
-      def colorized_build_description(state, description)
-        ""
-      end
-
-      def create_pull_request(options = {})
-        PullRequest.create(options)
-      end
-
-      def find_open_pull_request(options = {})
-        PullRequest.find_open(options)
-      end
-
-    end
-  end
-end
+require 'bitbucket_rest_api'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module GitServer
+    class BitBucket < Base
+      require_relative 'bit_bucket/pull_request'
+
+      attr_accessor :connection
+
+      def initialize(config_options = {})
+        project_only = !!config_options.delete(:project_only)
+
+        # We remove any existing setup first, then setup our required config settings
+        GitReflow::Config.unset('reflow.local-projects', value: "#{self.class.remote_user}/#{self.class.remote_repo_name}")
+        GitReflow::Config.add('reflow.local-projects', "#{self.class.remote_user}/#{self.class.remote_repo_name}") if project_only
+        GitReflow::Config.set('reflow.git-server', 'BitBucket', local: project_only)
+      end
+
+      def self.connection
+        if api_key_setup?
+          @connection ||= ::BitBucket.new login: remote_user, password: api_key
+        end
+      end
+
+      def self.api_endpoint
+        endpoint         = GitReflow::Config.get("bitbucket.endpoint", local: project_only?)
+        (endpoint.length > 0) ? endpoint : ::BitBucket::Configuration::DEFAULT_ENDPOINT
+      end
+
+      def self.site_url
+        site_url     = GitReflow::Config.get("bitbucket.site", local: project_only?)
+        (site_url.length > 0) ? site_url : 'https://bitbucket.org'
+      end
+
+      def self.api_key
+        GitReflow::Config.get("bitbucket.api-key", reload: true, local: project_only?)
+      end
+
+      def self.api_key=(key)
+        GitReflow::Config.set("bitbucket.api-key", key, local: project_only?)
+      end
+      def self.api_key_setup?
+        (self.api_key.length > 0)
+      end
+
+      def self.user
+        GitReflow::Config.get('bitbucket.user', local: project_only?)
+      end
+
+      def self.user=(bitbucket_user)
+        GitReflow::Config.set('bitbucket.user', bitbucket_user, local: project_only?)
+      end
+
+      def authenticate(options = {silent: false})
+        begin
+          if connection and self.class.api_key_setup?
+            unless options[:silent]
+              GitReflow.say "\nYour BitBucket account was already setup with:"
+              GitReflow.say "\tUser Name: #{self.class.user}"
+            end
+          else
+            self.class.user = options[:user] || ask("Please enter your BitBucket username: ")
+            GitReflow.say "\nIn order to connect your BitBucket account,"
+            GitReflow.say "you'll need to generate an API key for your team"
+            GitReflow.say "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
+            self.class.api_key = ask("Please enter your team's API key: ")
+            connection.repos.all(self.class.remote_user).count
+            GitReflow.say "Connected to BitBucket\!", :success
+          end
+        rescue ::BitBucket::Error::Unauthorized => e
+          GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
+          GitReflow.say "Invalid API key for team #{self.class.remote_user}.", :error
+        end
+      end
+
+      def connection
+        @connection ||= self.class.connection
+      end
+
+      def get_build_status(sha)
+        # BitBucket does not currently support build status via API
+        # for updates: https://bitbucket.org/site/master/issue/8548/better-ci-integration-add-a-build-status
+        return nil
+      end
+
+      def colorized_build_description(state, description)
+        ""
+      end
+
+      def create_pull_request(options = {})
+        PullRequest.create(options)
+      end
+
+      def find_open_pull_request(options = {})
+        PullRequest.find_open(options)
+      end
+
+    end
+  end
+end

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

@@ -118,6 +118,9 @@ 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}",
@@ -126,7 +129,7 @@ module GitReflow
                   "commit_title"   => "#{options[:title]}",
                   "commit_message" => "#{options[:body]}",
                   "sha"            => "#{self.head.sha}",
-                  "squash"         => !(options[:squash] == false)
+                  "merge_method"   => merge_method
                 }
               )
 

data/lib/git_reflow/git_server/pull_request.rb

@@ -196,11 +196,20 @@ module GitReflow
           GitReflow.update_current_branch
           GitReflow.fetch_destination(self.base_branch_name)
 
-          message = commit_message_for_merge
+          message      = commit_message_for_merge
+          merge_method = options[:merge_method] || GitReflow::Config.get("reflow.merge-method")
+          merge_method = "squash" if "#{merge_method}".length < 1
+
 
           GitReflow.run_command_with_label "git checkout #{self.base_branch_name}"
           GitReflow.run_command_with_label "git pull origin #{self.base_branch_name}"
-          GitReflow.run_command_with_label "git merge #{options[:squash] == false ? '' : '--squash '}#{self.feature_branch_name}"
+
+          case merge_method
+          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
 

data/lib/git_reflow/git_server.rb

@@ -1,63 +1,63 @@
-module GitReflow
-  module GitServer
-    autoload :Base,        'git_reflow/git_server/base'
-    autoload :GitHub,      'git_reflow/git_server/git_hub'
-    autoload :PullRequest, 'git_reflow/git_server/pull_request'
-
-    extend self
-
-    class ConnectionError < StandardError; end
-
-    def connect(options = {})
-      options ||= {}
-      options[:provider] = 'GitHub' if "#{options[:provider]}".length <= 0
-      begin
-        provider_name = options[:provider]
-        provider = provider_class_for(options.delete(:provider)).new(options)
-        provider.authenticate(options.keep_if {|key, value| key == :silent })
-        provider
-      rescue ConnectionError => e
-        GitReflow.say "Error connecting to #{provider_name}: #{e.message}", :error
-      end
-    end
-
-    def connection
-      return nil unless current_provider
-      current_provider.connection
-    end
-
-    def current_provider
-      provider = "#{GitReflow::Config.get('reflow.git-server', local: true)  || GitReflow::Config.get('reflow.git-server')}"
-      if provider.length > 0
-        begin
-          provider_class_for(provider)
-        rescue ConnectionError => e
-          GitReflow.say e.message, :error
-          nil
-        end
-      else
-        GitReflow.say "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice
-        nil
-      end
-    end
-
-    def can_connect_to?(provider)
-      GitReflow::GitServer.const_defined?(provider)
-    end
-
-    def create_pull_request(options = {})
-      raise "#{self.class.to_s}#create_pull_request method must be implemented"
-    end
-
-    def find_open_pull_request(options = {})
-      raise "#{self.class.to_s}#find_open_pull_request method must be implemented"
-    end
-
-    private
-
-    def provider_class_for(provider)
-      raise ConnectionError, "GitServer not setup for \"#{provider}\"" unless self.can_connect_to?(provider)
-      GitReflow::GitServer.const_get(provider)
-    end
-  end
-end
+module GitReflow
+  module GitServer
+    autoload :Base,        'git_reflow/git_server/base'
+    autoload :GitHub,      'git_reflow/git_server/git_hub'
+    autoload :PullRequest, 'git_reflow/git_server/pull_request'
+
+    extend self
+
+    class ConnectionError < StandardError; end
+
+    def connect(options = {})
+      options ||= {}
+      options[:provider] = 'GitHub' if "#{options[:provider]}".length <= 0
+      begin
+        provider_name = options[:provider]
+        provider = provider_class_for(options.delete(:provider)).new(options)
+        provider.authenticate(options.keep_if {|key, value| key == :silent })
+        provider
+      rescue ConnectionError => e
+        GitReflow.say "Error connecting to #{provider_name}: #{e.message}", :error
+      end
+    end
+
+    def connection
+      return nil unless current_provider
+      current_provider.connection
+    end
+
+    def current_provider
+      provider = "#{GitReflow::Config.get('reflow.git-server', local: true)  || GitReflow::Config.get('reflow.git-server')}"
+      if provider.length > 0
+        begin
+          provider_class_for(provider)
+        rescue ConnectionError => e
+          GitReflow.say e.message, :error
+          nil
+        end
+      else
+        GitReflow.say "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice
+        nil
+      end
+    end
+
+    def can_connect_to?(provider)
+      GitReflow::GitServer.const_defined?(provider)
+    end
+
+    def create_pull_request(options = {})
+      raise "#{self.class.to_s}#create_pull_request method must be implemented"
+    end
+
+    def find_open_pull_request(options = {})
+      raise "#{self.class.to_s}#find_open_pull_request method must be implemented"
+    end
+
+    private
+
+    def provider_class_for(provider)
+      raise ConnectionError, "GitServer not setup for \"#{provider}\"" unless self.can_connect_to?(provider)
+      GitReflow::GitServer.const_get(provider)
+    end
+  end
+end

data/lib/git_reflow/logger.rb

@@ -0,0 +1,49 @@
+require 'git_reflow/config'
+require 'logger'
+
+module GitReflow
+  class Logger < ::Logger
+    DEFAULT_LOG_FILE = "/tmp/git-reflow.log"
+    COLORS = {
+      "FATAL" => :red,
+      "ERROR" => :red,
+      "WARN"  => :orange,
+      "INFO"  => :yellow,
+      "DEBUG" => :white,
+    }
+
+    def initialize(*args)
+      log_file = args.shift || log_file_path
+      args.unshift(log_file)
+      super(*args)
+      @formatter = SimpleFormatter.new
+    end
+
+    # Simple formatter which only displays the message.
+    class SimpleFormatter < ::Logger::Formatter
+      # This method is invoked when a log event occurs
+      def call(severity, timestamp, progname, msg)
+        if $stdout.tty?
+          "#{severity.colorize(COLORS[severity])}: #{String === msg ? msg : msg.inspect}\n"
+        else
+          "#{severity}: #{String === msg ? msg : msg.inspect}\n"
+        end
+      end
+    end
+
+    private
+
+    def log_file_path
+      return @log_file_path if "#{@log_file_path}".length > 0
+
+      configured_log_file_path = GitReflow::Config.get('reflow.log_file_path')
+
+      if configured_log_file_path.length > 0
+        @log_file_path = configured_log_file_path
+      else
+        @log_file_path = DEFAULT_LOG_FILE
+      end
+    end
+
+  end
+end

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/os_detector.rb

@@ -1,23 +1,23 @@
-# Thanks to http://stackoverflow.com/questions/170956/how-can-i-find-which-operating-system-my-ruby-program-is-running-on
-# and to Thoughtbot: https://github.com/thoughtbot/cocaine/blob/master/lib/cocaine/os_detector.rb
-module GitReflow
-  class OSDetector
-    def windows?
-      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def mac?
-      (/darwin/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def unix?
-      !OS.windows?
-    end
-
-    def linux?
-      OS.unix? and not OS.mac?
-    end
-  end
-
-  OS = OSDetector.new
-end
+# Thanks to http://stackoverflow.com/questions/170956/how-can-i-find-which-operating-system-my-ruby-program-is-running-on
+# and to Thoughtbot: https://github.com/thoughtbot/cocaine/blob/master/lib/cocaine/os_detector.rb
+module GitReflow
+  class OSDetector
+    def windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def mac?
+      (/darwin/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def unix?
+      !OS.windows?
+    end
+
+    def linux?
+      OS.unix? and not OS.mac?
+    end
+  end
+
+  OS = OSDetector.new
+end