git_reflow 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b9acdcd9558da180198608f42c0e65f51ce6ae
-  data.tar.gz: 161108a3bf8877b1b7ec8893e379d2d16a87cd22
+  metadata.gz: 34e27773b70add5bd01632ee991dda30f839404e
+  data.tar.gz: 499009182bc3266f823a20fb82149c595d1d5f6f
 SHA512:
-  metadata.gz: 581c01a3ba9c9db3a19a60cd69d92364e4387a650b649450f823d2a2b41b33cc7eb4820e031318316de6b8bf6c4f22b96294a074d4b797fb533e7d6f38c6b771
-  data.tar.gz: b443cfbc4749b6e85f0ceb9338f6c9fe7f4ded9d0eff3f9f0f29581856e9a50e053acb83f779c1cbb8dcfb2e3a3b7697fbd59196a1964c6f7f79748dc3ef4cc9
+  metadata.gz: 15bd0fdd708a8f75caff0dbcb68330b5958de09fc763b50e48b264070508844ac63f2b006b33130b326ce365fa674bb1db18f9dafaf5a77f4acfa74812bb69aa
+  data.tar.gz: 1efb8f91ea481b608320f0284717f303b36d21392966c344aff27215bd3a7791cd40a54093e55c9ba860a2e6eec0c6b3836eccf94b8930cbbb4483e55c578982

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
-## [v0.8.2](https://github.com/reenhanced/gitreflow/tree/v0.8.2) (2016-08-01)
+## [Unreleased](https://github.com/reenhanced/gitreflow/tree/v0.8.4)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.3...v0.8.4)
+
+**Closed issues:**
+
+- Introduce the idea of "Workflows" to customize steps [\#53](https://github.com/reenhanced/gitreflow/issues/53)
+- undefined method for strip during setup [\#197](https://github.com/reenhanced/gitreflow/issues/197)
 
+**Merged pull requests:**
+
+- \[53\] Create core workflow module to consolidate commands [\#198](https://github.com/reenhanced/gitreflow/pull/198) ([codenamev](https://github.com/codenamev))
+
+## [v0.8.3](https://github.com/reenhanced/gitreflow/tree/v0.8.3) (2016-08-04)
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.2...v0.8.3)
+
+## [v0.8.2](https://github.com/reenhanced/gitreflow/tree/v0.8.2) (2016-08-01)
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.1...v0.8.2)
 
 **Fixed bugs:**

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.8.3)
+    git_reflow (0.8.4)
       colorize (>= 0.7.0)
       github_api (= 0.14.0)
       gli (= 2.14.0)
       highline
       httpclient
+      rack (>= 1.2, < 2)
       reenhanced_bitbucket_api (= 0.3.2)
 
 GEM
@@ -42,7 +43,7 @@ GEM
     highline (1.7.8)
     httpclient (2.8.0)
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.4)
     method_source (0.8.2)
     mini_portile2 (2.1.0)
     multi_json (1.12.1)
@@ -51,9 +52,9 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    oauth2 (1.1.0)
+    oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -65,7 +66,7 @@ GEM
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (2.0.1)
+    rack (1.6.4)
     rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)

data/git_reflow.gemspec

@@ -34,6 +34,10 @@ Gem::Specification.new do |s|
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('github_api', '0.14.0')
+  # rack is a dependency of oauth2, which is a dependency of github_api
+  # The latest rack only supports ruby > 2.2.2, so we lock this down until
+  # support for ruby 2.1.x is dropped
+  s.add_dependency('rack', ['>= 1.2', '< 2'])
   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

@@ -5,11 +5,6 @@ command :deliver do |c|
   c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
   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:      args[0],
-      skip_lgtm: options[:'skip-lgtm']
-    }
-
-    GitReflow.deliver deliver_options
+    GitReflow.deliver base: args[0], force: options[:'skip-lgtm']
   end
 end

data/lib/git_reflow/commands/refresh.rb

@@ -13,11 +13,8 @@ command :refresh do |c|
   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)
+    GitReflow.refresh base: options[:base], remote: options[:remote]
+
   end
 end

data/lib/git_reflow/commands/review.rb

@@ -6,16 +6,8 @@ command :review do |c|
   c.flag [:t, :title]
   c.flag [:m, :message]
   c.action do |global_options,options,args|
-    if options[:title] || options[:message]
-      review_options = {
-        :base => args[0],
-        :title => options[:title],
-        :body =>  options[:message]
-      }
-    else
-      review_options = { :base => args[0] }
-    end
 
-    GitReflow.review(review_options)
+    GitReflow.review base: args[0], title: options[:title], body: options[:message]
+
   end
 end

data/lib/git_reflow/commands/setup.rb

@@ -4,30 +4,8 @@ command :setup do |c|
   c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
   c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
   c.action do |global_options, options, args|
-    reflow_options             = { project_only: options[:local], enterprise: options[:enterprise] }
-    existing_git_include_paths = GitReflow::Config.get('include.path', all: true).split("\n")
 
-    unless File.exist?(GitReflow::Config::CONFIG_FILE_PATH) or existing_git_include_paths.include?(GitReflow::Config::CONFIG_FILE_PATH)
-      GitReflow.run "touch #{GitReflow::Config::CONFIG_FILE_PATH}"
-      GitReflow.say "Created #{GitReflow::Config::CONFIG_FILE_PATH} for Reflow specific configurations", :notice
-      GitReflow::Config.add "include.path", GitReflow::Config::CONFIG_FILE_PATH, global: true
-      GitReflow.say "Added #{GitReflow::Config::CONFIG_FILE_PATH} to ~/.gitconfig include paths", :notice
-    end
+    GitReflow.setup local: options[:local], enterprise: options[:enterprise]
 
-    choose do |menu|
-      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.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, 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/stage.rb

@@ -2,30 +2,8 @@ desc 'Deliver your changes to a staging server'
 command :stage do |c|
   c.desc 'deliver your feature branch to the staging branch'
   c.action do |global_options, options, args|
-    feature_branch_name = GitReflow.current_branch
-    staging_branch_name = GitReflow::Config.get('reflow.staging-branch', local: true)
 
-    if staging_branch_name.empty?
-      staging_branch_name = GitReflow.ask("What's the name of your staging branch? (default: 'staging') ")
-      staging_branch_name = 'staging' if staging_branch_name.strip == ''
-      GitReflow::Config.set('reflow.staging-branch', staging_branch_name, local: true)
-    end
+    GitReflow.stage
 
-    GitReflow.run_command_with_label "git checkout #{staging_branch_name}"
-    GitReflow.run_command_with_label "git pull origin #{staging_branch_name}"
-
-    if GitReflow.run_command_with_label "git merge #{feature_branch_name}", with_system: true
-      GitReflow.run_command_with_label "git push origin #{staging_branch_name}"
-
-      staged = GitReflow.deploy(:staging)
-
-      if staged
-        GitReflow.say "Deployed to Staging.", :success
-      else
-        GitReflow.say "There were issues deploying to staging.", :error
-      end
-    else
-      GitReflow.say "There were issues merging your feature branch to staging.", :error
-    end
   end
 end

data/lib/git_reflow/commands/start.rb

@@ -11,17 +11,12 @@ 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
-      # 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]}"
+      GitReflow.start feature_branch: args[0], base: options[:base]
     end
+
   end
 end

data/lib/git_reflow/commands/status.rb

@@ -2,7 +2,6 @@ desc 'Display information about the status of your feature in the review process
 arg_name "destination_branch - the branch you're merging your feature into ('master' is default)"
 command :status do |c|
   c.action do |global_options, options, args|
-    destination_branch = args[0] || 'master'
-    GitReflow.status destination_branch
+    GitReflow.status destination_branch: args[0]
   end
 end

data/lib/git_reflow/config.rb

@@ -19,7 +19,7 @@ module GitReflow
     end
 
     def set(key, value, local: false)
-      value = value.strip
+      value = "#{value}".strip
       if local
         GitReflow::Sandbox.run "git config --replace-all #{key} \"#{value}\"", loud: false
       else

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

@@ -25,7 +25,7 @@ module GitReflow
         end
 
         def self.find_open(to: 'master', from: GitReflow.git_server.class.current_branch)
-          matching_pull = GitReflow.git_server.connection.pull_requests.all(GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, base: to, head: "#{GitReflow.git_server.class.remote_user}:#{from}", state: 'open').first
+          matching_pull = GitReflow.git_server.connection.pull_requests.all(GitReflow.remote_user, GitReflow.remote_repo_name, base: to, head: "#{GitReflow.remote_user}:#{from}", state: 'open').first
           if matching_pull
             self.new matching_pull
           end
@@ -56,8 +56,8 @@ module GitReflow
         end
 
         def comments
-          comments        = GitReflow.git_server.connection.issues.comments.all        GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, number: self.number
-          review_comments = GitReflow.git_server.connection.pull_requests.comments.all GitReflow.git_server.class.remote_user, GitReflow.git_server.class.remote_repo_name, number: self.number
+          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
         end

data/lib/git_reflow/rspec/command_line_helpers.rb

@@ -1,3 +1,5 @@
+require "highline"
+
 module GitReflow
   module RSpec
     module CommandLineHelpers
@@ -10,9 +12,12 @@ module GitReflow
 
         stub_run_for GitReflow
         stub_run_for GitReflow::Sandbox
+        stub_run_for GitReflow::Workflow
+        stub_run_for GitReflow::Workflows::Core if defined? GitReflow::Workflows
 
         stub_output_for(GitReflow)
         stub_output_for(GitReflow::Sandbox)
+        stub_output_for(GitReflow::Workflow)
 
         allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:printf) do |format, *output|
           $output << Array(output).join(" ")

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/lib/git_reflow/workflow.rb

@@ -0,0 +1,54 @@
+require 'git_reflow/sandbox'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module Workflow
+    def self.included base
+      base.extend ClassMethods
+    end
+
+    # @nodoc
+    def self.current
+      GitReflow::Workflows::Core
+    end
+
+    module ClassMethods
+      include GitReflow::Sandbox
+      include GitReflow::GitHelpers
+
+      # Creates a singleton method on the inlcuded class
+      #
+      # This method will take any number of keyword parameters. If @defaults keyword is provided, and the given
+      # key(s) in the defaults are not provided as keyword parameters, then it will use the value given in the
+      # defaults for that parameter.
+      #
+      # @param name [Symbol] the name of the method to create
+      # @param defaults [Hash] keyword arguments to provide fallbacks for
+      #
+      # @yield [a:, b:, c:, ...] Invokes the block with an arbitrary number of keyword arguments
+      def command(name, **params, &block)
+        defaults = params[:defaults] || {}
+        self.define_singleton_method(name) do |**args|
+          args_with_defaults = {}
+          args.each do |name, value|
+            if "#{value}".length <= 0
+              args_with_defaults[name] = defaults[name]
+            else
+              args_with_defaults[name] = value
+            end
+          end
+
+          defaults.each do |name, value|
+            if "#{args_with_defaults[name]}".length <= 0
+              args_with_defaults[name] = value
+            end
+          end
+
+          block.call(**args_with_defaults)
+        end
+      end
+    end
+  end
+end
+
+extend GitReflow::Workflow

data/lib/git_reflow/workflows/core.rb

@@ -0,0 +1,240 @@
+$: << File.expand_path(File.dirname(File.realpath(__FILE__)) + '/../..')
+require 'git_reflow/workflow'
+
+module GitReflow
+  module Workflows
+    # This class contains the core workflow for git-reflow. Going forward, this
+    # will act as the base class for customizing and extending git-reflow.
+    module Core
+      include GitReflow::Workflow
+
+      extend self
+
+      # Sets up the required git configurations that git-reflow depends on.
+      #
+      # @param local [Boolean] whether to configure git-reflow specific to the current project
+      # @param enterprise [Boolean] whether to configure git-reflow for use with Github Enterprise
+      command(:setup, defaults: {local: false, enterprise: false}) do |**params|
+        reflow_options             = { project_only: params[:local], enterprise: params[:enterprise] }
+        existing_git_include_paths = GitReflow::Config.get('include.path', all: true).split("\n")
+
+        unless File.exist?(GitReflow::Config::CONFIG_FILE_PATH) or existing_git_include_paths.include?(GitReflow::Config::CONFIG_FILE_PATH)
+          GitReflow.say "We'll walk you through setting up git-reflow's defaults for all your projects.", :notice
+          GitReflow.say "In the future, you can run \`git-reflow setup\` from the root of any project you want to setup differently.", :notice
+          GitReflow.say "To adjust these settings globally, you can run \`git-reflow setup --global\`.", :notice
+          GitReflow.run "touch #{GitReflow::Config::CONFIG_FILE_PATH}"
+          GitReflow.say "Created #{GitReflow::Config::CONFIG_FILE_PATH} for git-reflow specific configurations.", :notice
+          GitReflow::Config.add "include.path", GitReflow::Config::CONFIG_FILE_PATH, global: true
+          GitReflow.say "Added #{GitReflow::Config::CONFIG_FILE_PATH} to include.path in $HOME/.gitconfig.", :notice
+        end
+
+        choose do |menu|
+          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.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, 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
+
+      # Start a new feature branch
+      #
+      # @param feature_branch [String] the name of the branch to create your feature on
+      # @option base [String] the name of the base branch you want to checkout your feature from
+      command(:start, defaults: {base: 'master'}) do |**params|
+        base_branch    = params[:base]
+        feature_branch = params[:feature_branch]
+
+        if feature_branch.nil? or feature_branch.length <= 0
+          GitReflow.say "usage: git-reflow start [new-branch-name]", :error
+        else
+          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 #{base_branch}:refs/heads/#{feature_branch}"
+          GitReflow.run_command_with_label "git checkout --track -b #{feature_branch} origin/#{feature_branch}"
+        end
+      end
+
+      # Submit a feature branch for review
+      #
+      # @option base [String] the name of the base branch you want to merge your feature into
+      # @option title [String] the title of your pull request
+      # @option body [String] the body of your pull request
+      command(:review, defaults: {base: 'master'}) do |**params|
+        base_branch         = params[:base]
+        create_pull_request = true
+
+        GitReflow.fetch_destination base_branch
+        begin
+          GitReflow.push_current_branch
+
+          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: base_branch )
+          if existing_pull_request
+            say "A pull request already exists for these branches:", :notice
+            existing_pull_request.display_pull_request_summary
+          else
+            unless params[:title] || params[:body]
+              pull_request_msg_file = "#{GitReflow.git_root_dir}/.git/GIT_REFLOW_PR_MSG"
+
+              File.open(pull_request_msg_file, 'w') do |file|
+                file.write(params[:title] || GitReflow.pull_request_template || GitReflow.current_branch)
+              end
+
+              GitReflow.run("#{GitReflow.git_editor_command} #{pull_request_msg_file}", with_system: true)
+
+              pr_msg = File.read(pull_request_msg_file).split(/[\r\n]|\r\n/).map(&:strip)
+              title  = pr_msg.shift
+
+              File.delete(pull_request_msg_file)
+
+              unless pr_msg.empty?
+                pr_msg.shift if pr_msg.first.empty?
+              end
+
+              params[:title] = title
+              params[:body]  = "#{pr_msg.join("\n")}\n"
+
+              say "\nReview your PR:\n"
+              say "--------\n"
+              say "Title:\n#{params[:title]}\n\n"
+              say "Body:\n#{params[:body]}\n"
+              say "--------\n"
+
+              create_pull_request = ask("Submit pull request? (Y)") =~ /y/i
+            end
+
+            if create_pull_request
+              pull_request = GitReflow.git_server.create_pull_request(title: params[:title] || params[:body],
+                                                            body:  params[:body],
+                                                            head:  "#{GitReflow.remote_user}:#{GitReflow.current_branch}",
+                                                            base:  params[:base])
+
+              say "Successfully created pull request ##{pull_request.number}: #{pull_request.title}\nPull Request URL: #{pull_request.html_url}\n", :success
+            else
+              say "Review aborted.  No pull request has been created.", :review_halted
+            end
+          end
+        rescue Github::Error::UnprocessableEntity => e
+          say "Github Error: #{e.to_s}", :error
+        rescue StandardError => e
+          say "\nError: #{e.inspect}", :error
+        end
+      end
+
+      # Checks the status of an existing pull request
+      #
+      # @option destination_branch [String] the branch you're merging your feature into ('master' is default)
+      command(:status, defaults: {destination_branch: 'master'}) do |**params|
+        pull_request = GitReflow.git_server.find_open_pull_request( :from => GitReflow.current_branch, :to => params[:destination_branch] )
+
+        if pull_request.nil?
+          say "No pull request exists for #{GitReflow.current_branch} -> #{params[:destination_branch]}", :notice
+          say "Run 'git reflow review #{params[:destination_branch]}' to start the review process", :notice
+        else
+          say "Here's the status of your review:"
+          pull_request.display_pull_request_summary
+        end
+      end
+
+      command(:deploy) do |**params|
+        destination_server = params[:destination_server] || 'default'
+        deploy_command = GitReflow::Config.get("reflow.deploy-to-#{destination_server}-command", local: true)
+
+        # first check is to allow for automated setup
+        if deploy_command.empty?
+          deploy_command = ask("Enter the command you use to deploy to #{destination_server} (leaving blank will skip deployment)")
+        end
+
+        # second check is to see if the user wants to skip
+        if deploy_command.empty?
+          say "Skipping deployment..."
+          false
+        else
+          GitReflow::Config.set("reflow.deploy-to-#{destination_server}-command", deploy_command, local: true)
+          run_command_with_label(deploy_command, with_system: true)
+        end
+      end
+
+      # Merge and deploy a feature branch to a staging branch
+      command(:stage) do |**params|
+        feature_branch_name = GitReflow.current_branch
+        staging_branch_name = GitReflow::Config.get('reflow.staging-branch', local: true)
+
+        if staging_branch_name.empty?
+          staging_branch_name = GitReflow.ask("What's the name of your staging branch? (default: 'staging') ")
+          staging_branch_name = 'staging' if staging_branch_name.strip == ''
+          GitReflow::Config.set('reflow.staging-branch', staging_branch_name, local: true)
+        end
+
+        GitReflow.run_command_with_label "git checkout #{staging_branch_name}"
+        GitReflow.run_command_with_label "git pull origin #{staging_branch_name}"
+
+        if GitReflow.run_command_with_label "git merge #{feature_branch_name}", with_system: true
+          GitReflow.run_command_with_label "git push origin #{staging_branch_name}"
+
+          staged = self.deploy(destination_server: :staging)
+
+          if staged
+            GitReflow.say "Deployed to Staging.", :success
+          else
+            GitReflow.say "There were issues deploying to staging.", :error
+          end
+        else
+          GitReflow.say "There were issues merging your feature branch to staging.", :error
+        end
+      end
+
+      # Deliver a feature branch to a base branch
+      #
+      # @option base [String] base branch to merge your feature branch into
+      # @option force [Boolean] whether to force-deliver the feature branch, ignoring any QA checks
+      command(:deliver, defaults: {base: 'master'}) do |**params|
+        begin
+          existing_pull_request = GitReflow.git_server.find_open_pull_request( from: GitReflow.current_branch, to: params[:base] )
+
+          if existing_pull_request.nil?
+            say "No pull request exists for #{GitReflow.remote_user}:#{GitReflow.current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
+          else
+
+            if existing_pull_request.good_to_merge?(force: params[:force])
+              # displays current status and prompts user for confirmation
+              self.status destination_branch: params[:base]
+              # TODO: change name of this in the merge! method
+              params[:skip_lgtm] = params[:force] if params[:force]
+              existing_pull_request.merge!(params)
+            else
+              say existing_pull_request.rejection_message, :deliver_halted
+            end
+
+          end
+
+        rescue Github::Error::UnprocessableEntity => e
+          say "Github Error: #{e.inspect}", :error
+        end
+      end
+
+
+      # Updates and synchronizes your base branch and feature branch.
+      # 
+      # Performs the following:
+      #   $ git checkout <base_branch>
+      #   $ git pull <remote_location> <base_branch>
+      #   $ git checkout <current_branch>
+      #   $ git pull origin <current_branch>
+      #   $ git merge <base_branch>
+      # @param remote [String] the name of the remote repository to fetch updates from (origin by default)
+      # @param base [String] the branch that you want to fetch updates from (master by default)
+      command(:refresh, defaults: {remote: 'origin', base: 'master'}) do |**params|
+        GitReflow.update_feature_branch(params)
+      end
+    end
+  end
+end