git_reflow 0.7.5 → 0.8.0

data/git_reflow.gemspec

@@ -1,6 +1,6 @@
 # Ensure we require the local version and not one we might have installed already
 require File.join([File.dirname(__FILE__),'lib','git_reflow/version.rb'])
-spec = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name             = 'git_reflow'
   s.version          = GitReflow::VERSION
   s.license          = 'MIT'
@@ -19,21 +19,21 @@ spec = Gem::Specification.new do |s|
   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', "~> 1.11")
+  s.add_development_dependency('appraisal', '2.1.0')
+  s.add_development_dependency('bundler', "~> 1.12")
   s.add_development_dependency('chronic')
   s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake', "~> 10.0")
+  s.add_development_dependency('rake', "~> 11.0")
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', "~> 3.0")
+  s.add_development_dependency('rspec', "~> 3.4.0")
   s.add_development_dependency('webmock')
-  s.add_development_dependency('wwtd', '0.7.0')
+  s.add_development_dependency('wwtd', '1.3.0')
 
   s.add_dependency('colorize', '>= 0.7.0')
-  s.add_dependency('gli', '2.13.2')
+  s.add_dependency('gli', '2.14.0')
   s.add_dependency('highline')
   s.add_dependency('httpclient')
-  s.add_dependency('github_api', '0.12.4')
+  s.add_dependency('github_api', '0.14.0')
   s.add_dependency('reenhanced_bitbucket_api', '0.3.2')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"

data/lib/git_reflow/commands/deliver.rb

@@ -3,17 +3,9 @@ long_desc 'merge your feature branch down to your base branch, and cleanup your
 
 command :deliver do |c|
   c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
-  c.arg_name 'base_branch - the branch you want to merge into'
   c.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
   c.action do |global_options,options,args|
-    deliver_options = {'base' => nil, 'head' => nil, 'skip_lgtm' => options[:'skip-lgtm']}
-    case args.length
-    when 2
-      deliver_options['base'] = args[0]
-      deliver_options['head'] = args[1]
-    when 1
-      deliver_options['base'] = args[0]
-    end
+    deliver_options = {:skip_lgtm => options[:'skip-lgtm']}
     GitReflow.deliver deliver_options
   end
 end

data/lib/git_reflow/commands/refresh.rb

@@ -0,0 +1,23 @@
+desc 'Updates and synchronizes your base branch and feature branch.'
+long_desc <<LONGTIME
+  Performs the following:\n
+  \t$ git checkout <base_branch>\n
+  \t$ git pull <remote_location> <base_branch>\n
+  \t$ git checkout <current_branch>\n
+  \t$ git pull origin <current_branch>\n
+  \t$ git merge <base_branch>\n
+LONGTIME
+arg_name '[remote_location] - remote repository name to fetch updates from (origin by default), [base_branch] - branch that you want to merge with (master by default)'
+command :refresh do |c|
+  c.desc 'updates base_branch based on remote and merges the base with your feature_branch'
+  c.flag [:r,:remote], default_value: 'origin'
+  c.flag [:b,:base], default_value: 'master'
+  c.action do |global_options, options, args|
+    refresh_options = {
+      :remote => options[:remote],
+      :base => options[:base]
+    }
+
+    GitReflow.update_feature_branch(refresh_options)
+  end
+end

data/lib/git_reflow/commands/review.rb

@@ -3,17 +3,17 @@ arg_name 'Describe arguments to review here'
 command :review do |c|
   c.desc 'push your latest feature branch changes to your remote repo and create a pull request against the destination branch'
   c.arg_name '[destination_branch] - the branch you want to merge your feature branch into'
-  c.flag [:t, :title], default_value: 'last commit message'
-  c.flag [:m, :message], default_value: 'title'
+  c.flag [:t, :title]
+  c.flag [:m, :message]
   c.action do |global_options,options,args|
-    if global_options[:title] || global_options[:message]
+    if options[:title] || options[:message]
       review_options = {
-        'base' => args[0],
-        'title' => global_options[:title],
-        'body' =>  global_options[:message]
+        :base => args[0],
+        :title => options[:title],
+        :body =>  options[:message]
       }
     else
-      review_options = { 'base' => args[0] }
+      review_options = { :base => args[0] }
     end
 
     GitReflow.review(review_options)

data/lib/git_reflow/commands/setup.rb

@@ -22,8 +22,12 @@ command :setup do |c|
       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]
-    
+    GitReflow::Config.set "constants.minimumApprovals", ask("Set the minimum number of approvals (leaving blank will require approval from all commenters): "), local: reflow_options[:project_only]
+    GitReflow::Config.set "constants.approvalRegex", GitReflow::GitServer::PullRequest::DEFAULT_APPROVAL_REGEX.to_s, local: reflow_options[:project_only]
+
+    if GitReflow::Config.get('core.editor').length <= 0
+      GitReflow::Config.set('core.editor', GitReflow::DEFAULT_EDITOR, local: reflow_options[:project_only])
+      GitReflow.say "Updated git's editor (via git config key 'core.editor') to: #{GitReflow::DEFAULT_EDITOR}.", :notice
+    end
   end
 end

data/lib/git_reflow/commands/start.rb

@@ -1,19 +1,27 @@
+
 desc 'Start will create a new feature branch and setup remote tracking'
 long_desc <<LONGTIME
   Performs the following:\n
-  \t$ git pull origin <current_branch>\n
-  \t$ git push origin <current_branch>:refs/heads/[new_feature_branch]\n
+  \t$ git checkout <base_branch>\n
+  \t$ git pull origin <base_branch>\n
+  \t$ git push origin <base_branch>:refs/heads/[new_feature_branch]\n
   \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
 LONGTIME
 arg_name '[new-feature-branch-name] - name of the new feature branch'
 command :start do |c|
+  c.flag [:b,:base], default_value: 'master'
   c.action do |global_options, options, args|
     if args.empty?
       raise "usage: git-reflow start [new-branch-name]"
     else
-      `git pull origin #{GitReflow.current_branch}`
-      `git push origin #{GitReflow.current_branch}:refs/heads/#{args[0]}`
-      `git checkout --track -b #{args[0]} origin/#{args[0]}`
+      # base_branch is the branch that you want to base your feature branch off of
+      # This command allows you to 'git reflow start' off your base branch
+      base_branch = options[:base]
+
+      GitReflow.run_command_with_label "git checkout #{base_branch}"
+      GitReflow.run_command_with_label "git pull origin #{base_branch}"
+      GitReflow.run_command_with_label "git push origin #{GitReflow.current_branch}:refs/heads/#{args[0]}"
+      GitReflow.run_command_with_label "git checkout --track -b #{args[0]} origin/#{args[0]}"
     end
   end
 end

data/lib/git_reflow/git_helpers.rb

@@ -9,6 +9,10 @@ module GitReflow
       @git_root_dir ||= run('git rev-parse --show-toplevel', loud: false).strip
     end
 
+    def git_editor_command
+      @git_editor_comand ||= GitReflow::Config.get('core.editor')
+    end
+
     def remote_user
       return "" unless "#{GitReflow::Config.get('remote.origin.url')}".length > 0
       extract_remote_user_and_repo_from_remote_url(GitReflow::Config.get('remote.origin.url'))[:user]
@@ -27,43 +31,38 @@ module GitReflow
       run('git log --pretty=format:"%s" --no-merges -n 1', loud: false).strip
     end
 
-    def push_current_branch
-      run_command_with_label "git push origin #{current_branch}"
+    def push_current_branch(options = {})
+      remote = options[:remote] || "origin"
+      run_command_with_label "git push #{remote} #{current_branch}"
     end
 
-    def update_current_branch
-      run_command_with_label "git pull origin #{current_branch}"
-      push_current_branch
+    def update_current_branch(options = {})
+      remote = options[:remote] || "origin"
+      run_command_with_label "git pull #{remote} #{current_branch}"
+      push_current_branch(options)
     end
 
     def fetch_destination(destination_branch)
       run_command_with_label "git fetch origin #{destination_branch}"
     end
 
-    def update_destination(destination_branch)
+    def update_destination(destination_branch, options = {})
       origin_branch = current_branch
+      remote = options[:remote] || 'origin'
       run_command_with_label "git checkout #{destination_branch}"
-      run_command_with_label "git pull origin #{destination_branch}"
+      run_command_with_label "git pull #{remote} #{destination_branch}"
       run_command_with_label "git checkout #{origin_branch}"
     end
 
-    def merge_feature_branch(feature_branch_name, options = {})
-      options[:destination_branch] ||= 'master'
-
-      message = "#{options[:message]}"
-
-      if "#{options[:pull_request_number]}".length > 0
-        message << "\nCloses ##{options[:pull_request_number]}\n"
-      end
-
-      if lgtm_authors = Array(options[:lgtm_authors]) and lgtm_authors.any?
-        message << "\nLGTM given by: @#{lgtm_authors.join(', @')}\n"
-      end
+    def update_feature_branch(options = {})
+      base_branch = options[:base]
+      remote = options[:remote]
+      update_destination(base_branch, options) 
 
-      run_command_with_label "git checkout #{options[:destination_branch]}"
-      run_command_with_label "git merge --squash #{feature_branch_name}"
-
-      append_to_squashed_commit_message(message) if message.length > 0
+      # update feature branch in case there are multiple authors and remote changes
+      run_command_with_label "git pull origin #{current_branch}"
+      # rebase on base branch
+      run_command_with_label "git merge #{base_branch}"
     end
 
     def append_to_squashed_commit_message(message = '')

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

@@ -6,10 +6,10 @@ module GitReflow
       class PullRequest < GitReflow::GitServer::PullRequest
         def initialize(attributes)
           self.number              = attributes.id
-          self.description         = attributes.description
+          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.feature_branch_name = attributes.source.branch.name[/[^:]+$/]
+          self.base_branch_name    = attributes.destination.branch.name[/[^:]+$/]
           self.build_status        = nil
           self.source_object       = attributes
         end
@@ -19,7 +19,7 @@ module GitReflow
             GitReflow.git_server.class.remote_user,
             GitReflow.git_server.class.remote_repo_name,
             title: options[:title],
-            body: options[:body],
+            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}" }

data/lib/git_reflow/git_server/bit_bucket.rb

@@ -56,21 +56,21 @@ module GitReflow
         begin
           if connection and self.class.api_key_setup?
             unless options[:silent]
-              puts "\nYour BitBucket account was already setup with:"
-              puts "\tUser Name: #{self.class.user}"
+              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: ")
-            puts "\nIn order to connect your BitBucket account,"
-            puts "you'll need to generate an API key for your team"
-            puts "Visit #{self.class.site_url}/account/user/#{self.class.remote_user}/api-key/, to generate it\n"
+            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
-            self.class.say "Connected to BitBucket\!", :success
+            GitReflow.say "Connected to BitBucket\!", :success
           end
         rescue ::BitBucket::Error::Unauthorized => e
           GitReflow::Config.unset('bitbucket.api-key', local: self.class.project_only?)
-          self.class.say "Invalid API key for team #{self.class.remote_user}.", :error
+          GitReflow.say "Invalid API key for team #{self.class.remote_user}.", :error
         end
       end
 

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

@@ -8,8 +8,8 @@ module GitReflow
           self.number              = attributes.number
           self.description         = attributes[:body]
           self.html_url            = attributes.html_url
-          self.feature_branch_name = attributes.head.label
-          self.base_branch_name    = attributes.base.label
+          self.feature_branch_name = attributes.head.label[/[^:]+$/]
+          self.base_branch_name    = attributes.base.label[/[^:]+$/]
           self.source_object       = attributes
           self.build_status        = build.state
         end
@@ -78,6 +78,79 @@ module GitReflow
           end
         end
 
+        def merge!(options = {})
+
+          # fallback to default merge process if user "forces" merge
+          if(options[:skip_lgtm])
+            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
+
+              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.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)
+
+                title  = merge_message.shift
+
+                File.delete(squash_merge_message_file)
+
+                unless merge_message.empty?
+                  merge_message.shift if merge_message.first.empty?
+                end
+
+                options[:title] = title
+                options[:body]  = "#{merge_message.join("\n")}\n"
+
+                GitReflow.say "\nReview your merge commit message:\n"
+                GitReflow.say "--------\n"
+                GitReflow.say "Title:\n#{options[:title]}\n\n"
+                GitReflow.say "Body:\n#{options[:body]}\n"
+                GitReflow.say "--------\n"
+              end
+
+              merge_response = GitReflow::GitServer::GitHub.connection.pull_requests.merge(
+                "#{GitReflow.git_server.class.remote_user}",
+                "#{GitReflow.git_server.class.remote_repo_name}",
+                "#{self.number}",
+                {
+                  "commit_title" => "#{options[:title]}",
+                  "commit_message" => "#{options[:body]}",
+                  "sha" => "#{self.head.sha}",
+                  "squash" => true
+                }
+              )
+
+              if merge_response.success?
+                GitReflow.run_command_with_label "git checkout #{self.base_branch_name}"
+                # Pulls merged changes from remote base_branch
+                GitReflow.run_command_with_label "git pull origin #{self.base_branch_name}"
+                GitReflow.say "Pull request ##{self.number} successfully merged.", :success
+
+                if cleanup_feature_branch?
+                  GitReflow.run_command_with_label "git push origin :#{self.feature_branch_name}"
+                  GitReflow.run_command_with_label "git branch -D #{self.feature_branch_name}"
+                  GitReflow.say "Nice job buddy."
+                else
+                  cleanup_failure_message
+                end
+              else
+                GitReflow.say merge_response.to_s, :deliver_halted
+                GitReflow.say "There were problems commiting your feature... please check the errors above and try again.", :error
+              end
+            else
+              GitReflow.say "Merge aborted", :deliver_halted
+            end
+          end
+        end
+
         def build
           github_build_status = GitReflow.git_server.get_build_status(self.head.sha)
           build_status_object = Struct.new(:state, :description, :url)

data/lib/git_reflow/git_server/git_hub.rb

@@ -86,9 +86,9 @@ module GitReflow
       def authenticate(options = {silent: false})
         if connection and self.class.oauth_token.length > 0
           unless options[:silent]
-            puts "Your GitHub account was already setup with: "
-            puts "\tUser Name: #{self.class.user}"
-            puts "\tEndpoint: #{self.class.api_endpoint}"
+            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
@@ -107,6 +107,9 @@ module GitReflow
             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
@@ -115,15 +118,21 @@ module GitReflow
 
           rescue ::Github::Error::Unauthorized => e
             if e.inspect.to_s.include?('two-factor')
-              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})
+              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
-              puts "\nGithub Authentication Error: #{e.inspect}"
+              GitReflow.say "Github Authentication Error: #{e.inspect}", :error
             end
           rescue StandardError => e
-            puts "\nInvalid username or password: #{e.inspect}"
+            raise "We were unable to authenticate with Github."
           else
-            puts "\nYour GitHub account was successfully setup!"
+            GitReflow.say "Your GitHub account was successfully setup!", :success
           end
         end
 

data/lib/git_reflow/git_server/pull_request.rb

@@ -99,12 +99,12 @@ module GitReflow
           "url"         => self.html_url
         }
 
-        notices = ""
+        notices = []
         reviewed_by = []
 
         # check for CI build status
         if self.build_status
-          notices << "[notice] Your build status is not successful: #{self.build.url}.\n" unless self.build.state == "success"
+          notices << "Your build status is not successful: #{self.build.url}.\n" unless self.build.state == "success"
           summary_data.merge!( "Build status" => GitReflow.git_server.colorized_build_description(self.build.state, self.build.description) )
         end
 
@@ -117,9 +117,9 @@ module GitReflow
             reviewed_by.map! { |author| approvals.include?(author.uncolorize) ? author.colorize(:green) : author }
           end
 
-          notices << "[notice] You still need a LGTM from: #{reviewers_pending_response.join(', ')}\n" if reviewers_pending_response.any?
+          notices << "You still need a LGTM from: #{reviewers_pending_response.join(', ')}\n" if reviewers_pending_response.any?
         else
-          notices << "[notice] No one has reviewed your pull request.\n"
+          notices << "No one has reviewed your pull request.\n"
         end
 
         summary_data['reviewed by'] = reviewed_by.join(', ')
@@ -130,7 +130,9 @@ module GitReflow
           printf string_format, "#{name}:", summary_data[name]
         end
 
-        puts "\n#{notices}" unless notices.empty?
+        notices.each do |notice|
+          GitReflow.say notice, :notice
+        end
       end
 
       def method_missing(method_sym, *arguments, &block)
@@ -140,6 +142,72 @@ module GitReflow
           super
         end
       end
+
+      def commit_message_for_merge
+        message = ""
+
+        if "#{self.description}".length > 0
+          message << "#{self.description}"
+        else
+          message << "#{GitReflow.get_first_commit_message}"
+        end
+
+        message << "\nMerges ##{self.number}\n"
+
+        if lgtm_authors = Array(self.approvals) and lgtm_authors.any?
+          message << "\nLGTM given by: @#{lgtm_authors.join(', @')}\n"
+        end
+
+        "#{message}\n"
+      end
+
+      def cleanup_feature_branch?
+        GitReflow::Config.get('reflow.always-cleanup') == "true" || (ask "Would you like to push this branch to your remote repo and cleanup your feature branch? ") =~ /^y/i
+      end
+
+      def deliver?
+        GitReflow::Config.get('reflow.always-deliver') == "true" || (ask "This is the current status of your Pull Request. Are you sure you want to deliver? ") =~ /^y/i
+      end
+
+      def cleanup_failure_message
+        GitReflow.say "Cleanup halted.  Local changes were not pushed to remote repo.", :deliver_halted
+        GitReflow.say "To reset and go back to your branch run \`git reset --hard origin/#{self.base_branch_name} && git checkout #{self.feature_branch_name}\`"
+      end
+
+      def merge!(options = {})
+        if deliver?
+
+          GitReflow.say "Merging pull request ##{self.number}: '#{self.title}', from '#{self.feature_branch_name}' into '#{self.base_branch_name}'", :notice
+
+          GitReflow.update_current_branch
+          GitReflow.fetch_destination(self.base_branch_name)
+
+          message = commit_message_for_merge
+
+          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 --squash #{self.feature_branch_name}"
+
+          GitReflow.append_to_squashed_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
+
+            if cleanup_feature_branch?
+              GitReflow.run_command_with_label "git push origin #{self.base_branch_name}"
+              GitReflow.run_command_with_label "git push origin :#{self.feature_branch_name}"
+              GitReflow.run_command_with_label "git branch -D #{self.feature_branch_name}"
+              GitReflow.say "Nice job buddy."
+            else
+              cleanup_failure_message
+            end
+          else
+            GitReflow.say "There were problems commiting your feature... please check the errors above and try again.", :error
+          end
+        else
+          GitReflow.say "Merge aborted", :deliver_halted
+        end
+      end
     end
   end
 end

data/lib/git_reflow/git_server.rb

@@ -17,7 +17,7 @@ module GitReflow
         provider.authenticate(options.keep_if {|key, value| key == :silent })
         provider
       rescue ConnectionError => e
-        puts "Error connecting to #{provider_name}: #{e.message}"
+        GitReflow.say "Error connecting to #{provider_name}: #{e.message}", :error
       end
     end
 
@@ -32,11 +32,11 @@ module GitReflow
         begin
           provider_class_for(provider)
         rescue ConnectionError => e
-          puts e.message
+          GitReflow.say e.message, :error
           nil
         end
       else
-        puts "[notice] Reflow hasn't been setup yet.  Run 'git reflow setup' to continue"
+        GitReflow.say "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice
         nil
       end
     end

data/lib/git_reflow/merge_error.rb

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

data/lib/git_reflow/sandbox.rb

@@ -7,7 +7,8 @@ module GitReflow
       error:          :red,
       deliver_halted: :red,
       review_halted:  :red,
-      success:        :green
+      success:        :green,
+      plain:          :white
     }
 
     def run(command, options = {})
@@ -32,25 +33,12 @@ module GitReflow
 
     def say(message, label_type = :plain)
       if COLOR_FOR_LABEL[label_type]
-        puts "[#{ label_type.to_s.gsub('_', ' ').colorize(COLOR_FOR_LABEL[label_type]) }] #{message}"
+        label = (label_type.to_s == "plain") ? "" : "[#{ label_type.to_s.gsub('_', ' ').colorize(COLOR_FOR_LABEL[label_type]) }] "
+        puts "#{label}#{message}"
       else
         puts message
       end
     end
 
-    # WARNING: this currently only supports OS X and UBUNTU
-    def ask_to_open_in_browser(url)
-      if OS.unix?
-        open_in_browser = ask "Would you like to open it in your browser? "
-        if open_in_browser =~ /^y/i
-          if OS.mac?
-            run "open #{url}"
-          else
-            run "xdg-open #{url}"
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/git_reflow/version.rb

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