git_reflow 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5bf85403018fe65d93819c76418ba327d13691d
-  data.tar.gz: 075171ddb73fd21d79f7e06c61ea300922dea1e1
+  metadata.gz: d3b0fe812dbfd336ccb9e40f083419d607300978
+  data.tar.gz: 876d2c887f6b2a68487dcb1fa8cca1ea34e32550
 SHA512:
-  metadata.gz: 6df2eb16d00275c2f50bc2f9ae453979e7e001b2d9a2241c924ef6e4480d7ce6adacd3b0078c2f56e097900976f5e1ceac1898840209f03c6ab81bf82630ee33
-  data.tar.gz: 4128834c2d0f5e4d679938e8abc96b5bcfb45bcdbe96d1b62f3857d788568cf3bc2efb4b73b3b61bf15b74ba9f89a699574c436e067ac5b6d81e101861c0edba
+  metadata.gz: 021be79b7f91b842c1d18ddd9af022dcbde108c644ed6eb9e2a7acca2e754083d8d80b22d060003c8e63c3857b9b4ecc0ec27c9dc3ba609a281895707ca14c6c
+  data.tar.gz: 0c45b168febf5b66177b034ac54868c55bdcc9bbad012110eb03f7dc5e349c619922eb2cb0f30945c7c0a34a8a79e210251a6c277a53a2e4b4ab7bf3504f8b7f

data/CHANGELOG.md

@@ -1,12 +1,45 @@
 # Change Log
 
-## [v0.8.1](https://github.com/reenhanced/gitreflow/tree/v0.8.1)
+## [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:**
+
+- git-reflow setup not working on Windows [\#187](https://github.com/reenhanced/gitreflow/issues/187)
+
+**Closed issues:**
+
+- GitHub authentication issues [\#193](https://github.com/reenhanced/gitreflow/issues/193)
+- non-master base branch does not work for the deliver command [\#192](https://github.com/reenhanced/gitreflow/issues/192)
+- git-reflow fork command [\#188](https://github.com/reenhanced/gitreflow/issues/188)
+- Bitbucket setup not working [\#186](https://github.com/reenhanced/gitreflow/issues/186)
+- Default approval regex not respecting :+1: [\#182](https://github.com/reenhanced/gitreflow/issues/182)
+- \[SOLVED\] Unable To Install the GEM \(install nokogiri manually to solve the issue\) [\#178](https://github.com/reenhanced/gitreflow/issues/178)
+- Can we switch off LGTM reviews? [\#177](https://github.com/reenhanced/gitreflow/issues/177)
+- gitreflow does not cache github token? [\#173](https://github.com/reenhanced/gitreflow/issues/173)
+- message below the fold in review [\#105](https://github.com/reenhanced/gitreflow/issues/105)
+
+**Merged pull requests:**
+
+- \[\#187\] Update git-reflow config file path to use $HOME for windows support [\#195](https://github.com/reenhanced/gitreflow/pull/195) ([codenamev](https://github.com/codenamev))
+- \[192\] Allow delivery to custom base branch [\#194](https://github.com/reenhanced/gitreflow/pull/194) ([codenamev](https://github.com/codenamev))
+- Refactor tests to allow for use of reflow test helpers in third-party gems [\#189](https://github.com/reenhanced/gitreflow/pull/189) ([codenamev](https://github.com/codenamev))
+- \[Issue \#182\] Fix LGTM Expression [\#185](https://github.com/reenhanced/gitreflow/pull/185) ([simonzhu24](https://github.com/simonzhu24))
+- Use $EDITOR as text editor fallback [\#184](https://github.com/reenhanced/gitreflow/pull/184) ([timraasveld](https://github.com/timraasveld))
+- Respect GitHub pull request template [\#179](https://github.com/reenhanced/gitreflow/pull/179) ([timraasveld](https://github.com/timraasveld))
+
+## [v0.8.1](https://github.com/reenhanced/gitreflow/tree/v0.8.1) (2016-05-26)
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.0...v0.8.1)
 
 **Closed issues:**
 
-- Unable to review with latest changes to editor handling [\#176](https://github.com/reenhanced/gitreflow/issues/176)
+- undefined method `git\_editor\_comand' for GitReflow:Module [\#176](https://github.com/reenhanced/gitreflow/issues/176)
+- github PR ends up "closed" instead of "merged" [\#149](https://github.com/reenhanced/gitreflow/issues/149)
+- Update README to mention how to update an in-progress feature branch from origin/master [\#125](https://github.com/reenhanced/gitreflow/issues/125)
+- Option to silence the offer to open the PR in my browser? [\#117](https://github.com/reenhanced/gitreflow/issues/117)
+- command for merging updates from base branch [\#74](https://github.com/reenhanced/gitreflow/issues/74)
+- Support for non-master branch [\#73](https://github.com/reenhanced/gitreflow/issues/73)
 
 ## [v0.8.0](https://github.com/reenhanced/gitreflow/tree/v0.8.0) (2016-05-26)
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.5...v0.8.0)
@@ -222,10 +255,6 @@
 ## [v0.4.0](https://github.com/reenhanced/gitreflow/tree/v0.4.0) (2014-10-16)
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3.5...v0.4.0)
 
-**Closed issues:**
-
-- f has already been specified as a switch in the command deliver \(ArgumentError\) [\#59](https://github.com/reenhanced/gitreflow/issues/59)
-
 **Merged pull requests:**
 
 - Make sure to create feature branch with current branch as base [\#64](https://github.com/reenhanced/gitreflow/pull/64) ([esposito](https://github.com/esposito))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.8.1)
+    git_reflow (0.8.2)
       colorize (>= 0.7.0)
       github_api (= 0.14.0)
       gli (= 2.14.0)
@@ -44,18 +44,20 @@ GEM
     json (1.8.3)
     jwt (1.5.1)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0, < 1.5.2)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -63,7 +65,7 @@ GEM
     pry-byebug (3.4.0)
       byebug (~> 9.0)
       pry (~> 0.10)
-    rack (1.6.4)
+    rack (2.0.1)
     rake (11.1.2)
     rdoc (4.2.2)
       json (~> 1.4)
@@ -114,4 +116,4 @@ DEPENDENCIES
   wwtd (= 1.3.0)
 
 BUNDLED WITH
-   1.12.3
+   1.12.5

data/circle.yml

@@ -1,16 +1,26 @@
 dependencies:
-  pre:
-    - rvm install 2.1.10
-    - rvm install 2.2.5
-    - rvm install 2.3.1
+  cache_directories:
+    - '~/.rvm/rubies'
+    - 'vendor'
 
   override:
-    - 'rvm-exec 2.1.10 bundle install'
-    - 'rvm-exec 2.2.5 bundle install'
-    - 'rvm-exec 2.3.1 bundle install'
+    - >
+      case $CIRCLE_NODE_INDEX in
+       0)
+         rvm-exec 2.1.9 gem install bundler
+         rvm-exec 2.1.9 bash -c "bundle check --path=vendor/bundle_2.1 || bundle install --path=vendor/bundle_2.1"
+         ;;
+       1)
+         rvm-exec 2.2.5 gem install bundler
+         rvm-exec 2.2.5 bash -c "bundle check --path=vendor/bundle_2.2 || bundle install --path=vendor/bundle_2.2"
+         ;;
+       2)
+         rvm-exec ruby-head gem install bundler
+         rvm-exec ruby-head bash -c "bundle check --path=vendor/bundle_head || bundle install --path=vendor/bundle_head"
+         ;;
+      esac
 
 test:
   override:
-    - 'rvm-exec 2.1.10 bundle exec rake'
-    - 'rvm-exec 2.2.5 bundle exec rake'
-    - 'rvm-exec 2.3.1 bundle exec rake'
+    - case $CIRCLE_NODE_INDEX in 0) rvm-exec 2.1.9 bundle exec rake ;; 1) rvm-exec 2.2.5 bundle exec rake ;; 2) rvm-exec ruby-head bundle exec rake ;; esac:
+        parallel: true

data/lib/git_reflow/commands/deliver.rb

@@ -4,8 +4,12 @@ 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.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
-  c.action do |global_options,options,args|
-    deliver_options = {:skip_lgtm => options[:'skip-lgtm']}
+  c.action do |global_options, options, args|
+    deliver_options = {
+      base:      args[0],
+      skip_lgtm: options[:'skip-lgtm']
+    }
+
     GitReflow.deliver deliver_options
   end
 end

data/lib/git_reflow/commands/setup.rb

@@ -23,11 +23,11 @@ command :setup do |c|
     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.to_s, 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
+      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/config.rb

@@ -2,7 +2,7 @@ module GitReflow
   module Config
     extend self
 
-    CONFIG_FILE_PATH = "~/.gitconfig.reflow".freeze
+    CONFIG_FILE_PATH = "$HOME/.gitconfig.reflow".freeze
 
     def get(key, reload: false, all: false, local: false)
       if reload == false and cached_key_value = instance_variable_get(:"@#{key.tr('.-', '_')}")

data/lib/git_reflow/git_helpers.rb

@@ -10,7 +10,7 @@ module GitReflow
     end
 
     def git_editor_command
-      @git_editor_command ||= GitReflow::Config.get('core.editor')
+      GitReflow::Config.get('core.editor') || GitReflow.default_editor
     end
 
     def remote_user
@@ -27,6 +27,21 @@ module GitReflow
       run("git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'", loud: false).strip
     end
 
+    def pull_request_template
+      filenames_to_try = %w( github/PULL_REQUEST_TEMPLATE.md
+                             github/PULL_REQUEST_TEMPLATE
+                             PULL_REQUEST_TEMPLATE.md
+                             PULL_REQUEST_TEMPLATE ).map do |file|
+        "#{git_root_dir}/#{file}"
+      end
+
+      filename = filenames_to_try.detect do |file|
+        File.exist? file
+      end
+
+      File.read filename if filename
+    end
+
     def get_first_commit_message
       run('git log --pretty=format:"%s" --no-merges -n 1', loud: false).strip
     end

data/{spec/support → lib/git_reflow/rspec}/command_line_helpers.rb

@@ -1,59 +1,65 @@
-module CommandLineHelpers
-  def stub_command_line
-    $commands_ran     = []
-    $stubbed_commands = {}
-    $output           = []
-    $says             = []
-
-    stub_run_for GitReflow
-    stub_run_for GitReflow::Sandbox
-
-    stub_output_for(GitReflow)
-    stub_output_for(GitReflow::Sandbox)
-
-    allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:printf) do |format, *output|
-      $output << Array(output).join(" ")
-      output = ''
-    end.and_return("")
-  end
+module GitReflow
+  module RSpec
+    module CommandLineHelpers
+
+      def stub_command_line
+        $commands_ran     = []
+        $stubbed_commands = {}
+        $output           = []
+        $says             = []
+
+        stub_run_for GitReflow
+        stub_run_for GitReflow::Sandbox
+
+        stub_output_for(GitReflow)
+        stub_output_for(GitReflow::Sandbox)
+
+        allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:printf) do |format, *output|
+          $output << Array(output).join(" ")
+          output = ''
+        end.and_return("")
+      end
 
-  def stub_output_for(object_to_stub, method_to_stub = :puts)
-    allow_any_instance_of(object_to_stub).to receive(method_to_stub) do |output|
-      $output << output
-      output = ''
-    end
-  end
+      def stub_output_for(object_to_stub, method_to_stub = :puts)
+        allow_any_instance_of(object_to_stub).to receive(method_to_stub) do |output|
+          $output << output
+          output = ''
+        end
+      end
 
-  def stub_run_for(module_to_stub)
-    allow(module_to_stub).to receive(:run) do |command, options|
-      options ||= {}
-      $commands_ran << Hashie::Mash.new(command: command, options: options)
-      ret_value = $stubbed_commands[command] || ""
-      command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
-      ret_value
-    end
-    allow(module_to_stub).to receive(:say) do |output, type|
-      $says << {message: output, type: type}
-    end
-  end
+      def stub_run_for(module_to_stub)
+        allow(module_to_stub).to receive(:run) do |command, options|
+          options ||= {}
+          $commands_ran << Hashie::Mash.new(command: command, options: options)
+          ret_value = $stubbed_commands[command] || ""
+          command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
+          ret_value
+        end
+        allow(module_to_stub).to receive(:say) do |output, type|
+          $says << {message: output, type: type}
+        end
+      end
 
-  def reset_stubbed_command_line
-    $commands_ran = []
-    $stubbed_commands = {}
-    $output = []
-    $says = []
-  end
+      def reset_stubbed_command_line
+        $commands_ran = []
+        $stubbed_commands = {}
+        $output = []
+        $says = []
+      end
 
-  def stub_command(command, return_value)
-    $stubbed_commands[command] = return_value
-    allow(GitReflow::Sandbox).to receive(:run).with(command).and_return(return_value)
-  end
+      def stub_command(command, return_value)
+        $stubbed_commands[command] = return_value
+        allow(GitReflow::Sandbox).to receive(:run).with(command).and_return(return_value)
+      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
+        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
     end
   end
 end

data/lib/git_reflow/rspec/stub_helpers.rb

@@ -0,0 +1,13 @@
+module GitReflow
+  module RSpec
+    module StubHelpers
+
+      def stub_with_fallback(obj, method)
+        original_method = obj.method(method)
+        allow(obj).to receive(method).with(anything()) { |*args| original_method.call(*args) }
+        return allow(obj).to receive(method)
+      end
+
+    end
+  end
+end

data/lib/git_reflow/rspec.rb

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

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/git_reflow.rb

@@ -21,7 +21,9 @@ module GitReflow
   include GitHelpers
   extend self
 
-  DEFAULT_EDITOR = "#{ENV['EDITOR']}".freeze || "vi".freeze
+  def default_editor
+    "#{ENV['EDITOR']}".freeze || "vi".freeze
+  end
 
   def status(destination_branch)
     pull_request = git_server.find_open_pull_request( :from => current_branch, :to => destination_branch )
@@ -53,7 +55,7 @@ module GitReflow
           pull_request_msg_file = "#{GitReflow.git_root_dir}/.git/GIT_REFLOW_PR_MSG"
 
           File.open(pull_request_msg_file, 'w') do |file|
-            file.write(options[:title] || GitReflow.current_branch)
+            file.write(options[:title] || GitReflow.pull_request_template || GitReflow.current_branch)
           end
 
           GitReflow.run("#{GitReflow.git_editor_command} #{pull_request_msg_file}", with_system: true)
@@ -98,10 +100,10 @@ module GitReflow
   end
 
   def deliver(options = {})
-    base_branch = options[:base] || 'master'
+    options[:base] ||= 'master'
 
     begin
-      existing_pull_request = git_server.find_open_pull_request( :from => current_branch, :to => base_branch )
+      existing_pull_request = git_server.find_open_pull_request( from: current_branch, to: options[:base] )
 
       if existing_pull_request.nil?
         say "No pull request exists for #{remote_user}:#{current_branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
@@ -109,7 +111,7 @@ module GitReflow
 
         if existing_pull_request.good_to_merge?(force: options[:skip_lgtm])
           # displays current status and prompts user for confirmation
-          self.status base_branch
+          self.status options[:base]
           existing_pull_request.merge!(options)
         else
           say existing_pull_request.rejection_message, :deliver_halted

data/spec/fixtures/pull_requests/comments.json.erb

@@ -8,7 +8,7 @@
                     repo_owner: repo_owner,
                     repo_name: repo_name,
                     body: comment[:body] || 'Hammer time',
-                    created_at: comment[:created_at] || Chronic.parse('1 minute ago')
+                    created_at: comment[:created_at] || Chronic.parse('October 21, 2015 07:28:00')
                    ).to_s %>
   <% end %>
   <%= comments_json.join(", ") %>

data/spec/fixtures/repositories/commits.json.erb

@@ -6,7 +6,7 @@
                          author:              commit[:author],
                          repo_owner:          repo_owner,
                          repo_name:           repo_name,
-                         created_at:          commit[:created_at] || Chronic.parse("1.minute.ago")
+                         created_at:          commit[:created_at] || Chronic.parse("October 21, 2015 07:28:00")
                        ).to_s %>
   <% end %>
   <%= commits_json.join(", ") %>

data/spec/lib/git_reflow/config_spec.rb

@@ -29,7 +29,7 @@ describe GitReflow::Config do
 
   describe ".set(key)" do
     subject { GitReflow::Config.set('chucknorris.roundhouse', 'to the face') }
-    it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --replace-all chucknorris.roundhouse "to the face"' }
+    it      { expect{ subject }.to have_run_command_silently 'git config -f $HOME/.gitconfig.reflow --replace-all chucknorris.roundhouse "to the face"' }
 
     context "for current project only" do
       subject { GitReflow::Config.set('chucknorris.roundhouse', 'to the face', local: true) }
@@ -39,11 +39,11 @@ describe GitReflow::Config do
 
   describe ".unset(key)" do
     subject { GitReflow::Config.unset('chucknorris.roundhouse') }
-    it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --unset-all chucknorris.roundhouse ' }
+    it      { expect{ subject }.to have_run_command_silently 'git config -f $HOME/.gitconfig.reflow --unset-all chucknorris.roundhouse ' }
 
     context "for multi-value keys" do
       subject { GitReflow::Config.unset('chucknorris.roundhouse', value: 'to the face') }
-      it      { expect{ subject }.to have_run_command_silently 'git config -f ~/.gitconfig.reflow --unset-all chucknorris.roundhouse "to the face"' }
+      it      { expect{ subject }.to have_run_command_silently 'git config -f $HOME/.gitconfig.reflow --unset-all chucknorris.roundhouse "to the face"' }
     end
 
     context "for current project only" do

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -19,6 +19,23 @@ describe GitReflow::GitHelpers do
     it      { expect{ subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
   end
 
+  describe '.git_editor_command' do
+    subject { Gitacular.git_editor_command }
+    before { ENV['EDITOR'] = 'vim' }
+
+    it 'defaults to GitReflow config' do
+      allow(GitReflow::Config).to receive(:get).with('core.editor').and_return 'nano'
+
+      expect(subject).to eq 'nano'
+    end
+
+    it 'falls back to the environment variable $EDITOR' do
+      allow(GitReflow::Config).to receive(:get).with('core.editor').and_return nil
+
+      expect(subject).to eq 'vim'
+    end
+  end
+
   describe ".remote_user" do
     subject { Gitacular.remote_user }
 
@@ -56,6 +73,30 @@ describe GitReflow::GitHelpers do
     it      { expect{ subject }.to have_run_command_silently "git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'" }
   end
 
+  describe ".pull_request_template" do
+    subject { Gitacular.pull_request_template }
+
+    context "template file exists" do
+      let(:root_dir) { "/some_repo" }
+      let(:template_content) { "Template content" }
+
+      before do
+        allow(Gitacular).to receive(:git_root_dir).and_return(root_dir)
+        allow(File).to receive(:exist?).with("#{root_dir}/github/PULL_REQUEST_TEMPLATE.md").and_return(true)
+        allow(File).to receive(:read).with("#{root_dir}/github/PULL_REQUEST_TEMPLATE.md").and_return(template_content)
+      end
+      it { is_expected.to eq template_content }
+    end
+
+    context "template file does not exist" do
+      before do
+        allow(File).to receive(:exist?).and_return(false)
+      end
+
+      it { is_expected.to be_nil }
+    end
+  end
+
   describe ".get_first_commit_message" do
     subject { Gitacular.get_first_commit_message }
     it      { expect{ subject }.to have_run_command_silently 'git log --pretty=format:"%s" --no-merges -n 1' }

data/spec/{git_reflow_spec.rb → lib/git_reflow_spec.rb}

@@ -207,6 +207,14 @@ describe GitReflow do
       subject
     end
 
+    context "and a base branch is provided" do
+      let(:inputs) { { title: "new-feature", message: "message", head: "reenhanced:new-feature", base: 'live'}}
+      it "looks for a pull request with the custom base branch" do
+        expect(github).to receive(:find_open_pull_request).with(from: branch, to: inputs[:base])
+        subject
+      end
+    end
+
     context "and pull request exists for the feature branch to the destination branch" do
       before do
         allow(github).to receive(:build_status).and_return(build_status)

data/spec/spec_helper.rb

@@ -7,14 +7,15 @@ require 'pry'
 $LOAD_PATH << 'lib'
 require 'git_reflow'
 
+require 'git_reflow/rspec'
+
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include GithubHelpers
   config.include WebMock::API
-  config.include CommandLineHelpers
+  config.include GitReflow::RSpec::CommandLineHelpers
   config.include GithubHelpers
-  config.include RspecStubHelpers
+  config.include GitReflow::RSpec::StubHelpers
 
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]

data/spec/support/fake_github.rb

@@ -8,7 +8,7 @@ class FakeGitHub
   attr_accessor :repo_owner, :repo_name
 
   DEFAULT_COMMIT_AUTHOR = "reenhanced".freeze
-  DEFAULT_COMMIT_TIME   = "1 minute ago".freeze
+  DEFAULT_COMMIT_TIME   = "October 21, 2015 07:28:00".freeze
 
   # EXAMPLE:
   #
@@ -75,7 +75,7 @@ class FakeGitHub
                                          comments:            object_data[:comments],
                                          pull_request_number: object_data[:number] || 1,
                                          body:                object_data[:body] || 'Hammer time',
-                                         created_at:          object_data[:created_at] || Chronic.parse("1.minute ago")).to_s,
+                                         created_at:          object_data[:created_at] || Chronic.parse(DEFAULT_COMMIT_TIME)).to_s,
                     status: 201,
                     headers: {content_type: "application/json; charset=utf-8"})
       else
@@ -113,7 +113,7 @@ class FakeGitHub
                                       repo_name:           self.repo_name,
                                       comments:            object_data[:comments],
                                       pull_request_number: object_data[:number] || 1,
-                                      created_at:          object_data[:created_at] || Time.parse('1pm')).to_s,
+                                      created_at:          object_data[:created_at] || Chronic.parse(DEFAULT_COMMIT_TIME)).to_s,
                     status: 201,
                     headers: {content_type: "application/json; charset=utf-8"})
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -264,6 +264,9 @@ files:
 - lib/git_reflow/git_server/pull_request.rb
 - lib/git_reflow/merge_error.rb
 - lib/git_reflow/os_detector.rb
+- lib/git_reflow/rspec.rb
+- lib/git_reflow/rspec/command_line_helpers.rb
+- lib/git_reflow/rspec/stub_helpers.rb
 - lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb
 - spec/fixtures/git/git_config
@@ -283,21 +286,19 @@ files:
 - spec/fixtures/repositories/commit.json.erb
 - spec/fixtures/repositories/commits.json.erb
 - spec/fixtures/repositories/statuses.json
-- spec/git_reflow_spec.rb
 - spec/lgtm_git_reflow_spec.rb
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server_spec.rb
+- spec/lib/git_reflow_spec.rb
 - spec/lib/git_server/bit_bucket_spec.rb
 - spec/lib/git_server/git_hub/pull_request_spec.rb
 - spec/lib/git_server/git_hub_spec.rb
 - spec/lib/git_server/pull_request_spec.rb
 - spec/spec_helper.rb
-- spec/support/command_line_helpers.rb
 - spec/support/fake_github.rb
 - spec/support/fixtures.rb
 - spec/support/github_helpers.rb
-- spec/support/rspec_stub_helpers.rb
 - spec/support/web_mocks.rb
 homepage: http://github.com/reenhanced/gitreflow
 licenses:
@@ -348,19 +349,17 @@ test_files:
 - spec/fixtures/repositories/commit.json.erb
 - spec/fixtures/repositories/commits.json.erb
 - spec/fixtures/repositories/statuses.json
-- spec/git_reflow_spec.rb
 - spec/lgtm_git_reflow_spec.rb
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server_spec.rb
+- spec/lib/git_reflow_spec.rb
 - spec/lib/git_server/bit_bucket_spec.rb
 - spec/lib/git_server/git_hub/pull_request_spec.rb
 - spec/lib/git_server/git_hub_spec.rb
 - spec/lib/git_server/pull_request_spec.rb
 - spec/spec_helper.rb
-- spec/support/command_line_helpers.rb
 - spec/support/fake_github.rb
 - spec/support/fixtures.rb
 - spec/support/github_helpers.rb
-- spec/support/rspec_stub_helpers.rb
 - spec/support/web_mocks.rb

data/spec/support/rspec_stub_helpers.rb

@@ -1,7 +0,0 @@
-module RspecStubHelpers
-  def stub_with_fallback(obj, method)
-    original_method = obj.method(method)
-    allow(obj).to receive(method).with(anything()) { |*args| original_method.call(*args) }
-    return allow(obj).to receive(method)
-  end
-end