git_reflow 0.9.4 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 328d9e72bc031e3fd7adedd2ed882c922937670ba95ac98d8c42f86f9e2ee129
-  data.tar.gz: 6ef4dcd1023199822a01140292c050ebda60d812909b479d9a4a57e0f40c4855
+  metadata.gz: 72b11a5519ef9749a971a39fe8f5db8184b690a20fd6252580ec9e065aa0cc2b
+  data.tar.gz: 22e88f4979e30671592e2c1ef5206cb71ea79aa51e194ed79731d15ffa096522
 SHA512:
-  metadata.gz: 193cd5e199b43000044f268157acc6c74e5075682d75fb3cd14a495367d99eb7e16565e1ab683a9a74b795bc7ce2acfb0783a191232092ebff6b13a52fb24da3
-  data.tar.gz: c272eb8a4b5fde35215a90b38763daa83bb1b87978ed3b24ee6f3415c02867f0c85e18d0c8ba5751865ebb7ca4008311d60d4c7e1798933e6fc37732340673cd
+  metadata.gz: 82605482502f22b09d7915aeba4222f7db16b10e42b7c8a9446f1770f6a1d22e663096832b806b4205be27d3045f2cb1c67e8194cca534dbdd9a5701e60fae03
+  data.tar.gz: f6f32d501815ffd8d66e0402db7c8433fafd5494e4da1af4c3106d4efd86a84b0c4909c54d9b9c00a0f5842d1f3bb0bd847dd9dca7066168f6c3d44b6e5dfd04

data/.github/workflows/multi-ruby-tests.yml

@@ -12,22 +12,13 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        ruby: ['2.5.8', '2.6.6', '2.7.1 ']
+        ruby: ['2.6.6', '2.7.2', '3.0.0 ']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - uses: actions/cache@v1
-      with:
-        path: vendor/bundle
-        key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
-        restore-keys: |
-          bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
-    - name: bundle install
-      run: |
-        bundle config path vendor/bundle
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
     - name: Run Tests for Ruby ${{ matrix.ruby }} on ${{ matrix.os }}
       run: bundle exec rake

data/.rubocop.yml

@@ -1,2 +1,9 @@
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*_spec.rb"
 Metrics/LineLength:
   Max: 120
+Style/ModuleFuction:
+  EnforcedStyle: extend_self
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.0

data/CHANGELOG.md

@@ -1,6 +1,57 @@
-# Change Log
+# Changelog
 
-## [Unreleased](https://github.com/reenhanced/gitreflow/tree/HEAD)
+## [v0.9.8](https://github.com/reenhanced/gitreflow/tree/v0.9.8) (2022-02-20)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.7...HEAD)
+
+**Bug fixes:**
+
+- Fixes a bug accidentally introduced when attempting to debug OptionParser issue.
+
+# Changelog
+
+## [v0.9.7](https://github.com/reenhanced/gitreflow/tree/v0.9.7) (2022-02-20)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.6...HEAD)
+
+**Bug fixes:**
+
+- Correctly parse command line flag and switch values when no help docs are provided
+
+## [v0.9.6](https://github.com/reenhanced/gitreflow/tree/v0.9.6) (2021-11-05)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.5...HEAD)
+
+**Implemented enhancements:**
+
+- Use GitHub PR Templates? [\#251](https://github.com/reenhanced/gitreflow/issues/251)
+
+**Merged pull requests:**
+
+- Introduce configurable PR and merge commit templates [\#252](https://github.com/reenhanced/gitreflow/pull/252) ([codenamev](https://github.com/codenamev))
+
+## [v0.9.5](https://github.com/reenhanced/gitreflow/tree/v0.9.5) (2021-03-25)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.4...v0.9.5)
+
+**Fixed bugs:**
+
+- Deprecation warnings with Ruby 2.7.0 [\#239](https://github.com/reenhanced/gitreflow/issues/239)
+
+**Merged pull requests:**
+
+- Support for Ruby 3.0 [\#249](https://github.com/reenhanced/gitreflow/pull/249) ([codenamev](https://github.com/codenamev))
+
+## [v0.9.4](https://github.com/reenhanced/gitreflow/tree/v0.9.4) (2020-11-10)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.3...v0.9.4)
+
+**Merged pull requests:**
+
+- Fix critical issue, and update deps [\#245](https://github.com/reenhanced/gitreflow/pull/245) ([codenamev](https://github.com/codenamev))
+- Fixed typo [\#244](https://github.com/reenhanced/gitreflow/pull/244) ([hsbt](https://github.com/hsbt))
+
+## [v0.9.3](https://github.com/reenhanced/gitreflow/tree/v0.9.3) (2020-06-02)
 
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.2...v0.9.3)
 
@@ -20,6 +71,8 @@
 - Documention for GitReflow::Config [\#238](https://github.com/reenhanced/gitreflow/pull/238) ([PuZZleDucK](https://github.com/PuZZleDucK))
 - Fixes several issues related to git-reflow setup [\#236](https://github.com/reenhanced/gitreflow/pull/236) ([codenamev](https://github.com/codenamev))
 
+## [v0.9.2](https://github.com/reenhanced/gitreflow/tree/v0.9.2) (2019-09-10)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.1...v0.9.2)
 
 **Closed issues:**
@@ -29,9 +82,9 @@
 **Merged pull requests:**
 
 - Update dependencies and trap INT signal [\#235](https://github.com/reenhanced/gitreflow/pull/235) ([codenamev](https://github.com/codenamev))
-- Allow installing gems from within Workflow files with `use_gem` and `use_gemfile` [\#233](https://github.com/reenhanced/gitreflow/pull/233) ([codenamev](https://github.com/codenamev))
 
 ## [v0.9.1](https://github.com/reenhanced/gitreflow/tree/v0.9.1) (2019-04-17)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.9.0...v0.9.1)
 
 **Closed issues:**
@@ -39,6 +92,7 @@
 - Purpose of core `stage` command? [\#232](https://github.com/reenhanced/gitreflow/issues/232)
 
 ## [v0.9.0](https://github.com/reenhanced/gitreflow/tree/v0.9.0) (2018-11-09)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.10...v0.9.0)
 
 **Implemented enhancements:**
@@ -68,17 +122,19 @@
 - Allow for custom commit/merge message templates [\#223](https://github.com/reenhanced/gitreflow/pull/223) ([codenamev](https://github.com/codenamev))
 
 ## [v0.8.10](https://github.com/reenhanced/gitreflow/tree/v0.8.10) (2018-04-19)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.9...v0.8.10)
 
 **Merged pull requests:**
 
 - Updates rubies and gems [\#221](https://github.com/reenhanced/gitreflow/pull/221) ([codenamev](https://github.com/codenamev))
-- Remove lingering `skip\_lgtm` options in favor of `force` option [\#218](https://github.com/reenhanced/gitreflow/pull/218) ([codenamev](https://github.com/codenamev))
+- Remove lingering `skip_lgtm` options in favor of `force` option [\#218](https://github.com/reenhanced/gitreflow/pull/218) ([codenamev](https://github.com/codenamev))
 - Remove dead code [\#217](https://github.com/reenhanced/gitreflow/pull/217) ([codenamev](https://github.com/codenamev))
 - Updates REAME to Markdown [\#216](https://github.com/reenhanced/gitreflow/pull/216) ([codenamev](https://github.com/codenamev))
 - Updates readme with details on customization [\#214](https://github.com/reenhanced/gitreflow/pull/214) ([codenamev](https://github.com/codenamev))
 
 ## [v0.8.9](https://github.com/reenhanced/gitreflow/tree/v0.8.9) (2017-04-26)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.8...v0.8.9)
 
 **Fixed bugs:**
@@ -91,9 +147,11 @@
 - Adds checks for new GH reviews when delivering [\#215](https://github.com/reenhanced/gitreflow/pull/215) ([codenamev](https://github.com/codenamev))
 
 ## [v0.8.8](https://github.com/reenhanced/gitreflow/tree/v0.8.8) (2017-04-24)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.7...v0.8.8)
 
 ## [v0.8.7](https://github.com/reenhanced/gitreflow/tree/v0.8.7) (2017-04-21)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.4...v0.8.7)
 
 **Implemented enhancements:**
@@ -111,7 +169,7 @@
 **Merged pull requests:**
 
 - 0.8.7 [\#213](https://github.com/reenhanced/gitreflow/pull/213) ([nhance](https://github.com/nhance))
-- Updates Github merge request to use new `merge\_method` param [\#211](https://github.com/reenhanced/gitreflow/pull/211) ([codenamev](https://github.com/codenamev))
+- Updates Github merge request to use new `merge_method` param [\#211](https://github.com/reenhanced/gitreflow/pull/211) ([codenamev](https://github.com/codenamev))
 - Adds a logger to log command runs [\#210](https://github.com/reenhanced/gitreflow/pull/210) ([codenamev](https://github.com/codenamev))
 - All commands that are run through reflow \(except git-config\) are now blocking [\#209](https://github.com/reenhanced/gitreflow/pull/209) ([codenamev](https://github.com/codenamev))
 - Fix loading of PR template from '.github' directory [\#208](https://github.com/reenhanced/gitreflow/pull/208) ([codenamev](https://github.com/codenamev))
@@ -120,6 +178,7 @@
 - \[53\] Allow workflows to be loaded from git config [\#199](https://github.com/reenhanced/gitreflow/pull/199) ([codenamev](https://github.com/codenamev))
 
 ## [v0.8.4](https://github.com/reenhanced/gitreflow/tree/v0.8.4) (2016-08-22)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.8.3...v0.8.4)
 
 **Closed issues:**
@@ -132,9 +191,11 @@
 - \[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:**
@@ -143,7 +204,6 @@
 
 **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)
@@ -163,6 +223,7 @@
 - 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:**
@@ -175,6 +236,7 @@
 - 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)
 
 **Implemented enhancements:**
@@ -201,6 +263,7 @@
 - \[issue: 162\] Updating Rspecs: Use "Allow" instead of "Stub" [\#163](https://github.com/reenhanced/gitreflow/pull/163) ([simonzhu24](https://github.com/simonzhu24))
 
 ## [v0.7.5](https://github.com/reenhanced/gitreflow/tree/v0.7.5) (2016-04-14)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.4...v0.7.5)
 
 **Implemented enhancements:**
@@ -219,6 +282,7 @@
 - Remove unused gitreflow-common [\#155](https://github.com/reenhanced/gitreflow/pull/155) ([pboling](https://github.com/pboling))
 
 ## [v0.7.4](https://github.com/reenhanced/gitreflow/tree/v0.7.4) (2016-04-08)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.3...v0.7.4)
 
 **Fixed bugs:**
@@ -227,6 +291,7 @@
 - SSL Verification is turned off [\#151](https://github.com/reenhanced/gitreflow/issues/151)
 
 ## [v0.7.3](https://github.com/reenhanced/gitreflow/tree/v0.7.3) (2016-03-24)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.2...v0.7.3)
 
 **Fixed bugs:**
@@ -240,6 +305,7 @@
 - Store OAuth token somewhere else? [\#54](https://github.com/reenhanced/gitreflow/issues/54)
 
 ## [v0.7.2](https://github.com/reenhanced/gitreflow/tree/v0.7.2) (2016-02-22)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.1...v0.7.2)
 
 **Closed issues:**
@@ -249,6 +315,7 @@
 - Deliver to custom branch? [\#144](https://github.com/reenhanced/gitreflow/issues/144)
 
 ## [v0.7.1](https://github.com/reenhanced/gitreflow/tree/v0.7.1) (2015-10-27)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.7.0...v0.7.1)
 
 **Merged pull requests:**
@@ -256,6 +323,7 @@
 - Fix the ask to open in browser dialog on Mac. [\#143](https://github.com/reenhanced/gitreflow/pull/143) ([squaresurf](https://github.com/squaresurf))
 
 ## [v0.7.0](https://github.com/reenhanced/gitreflow/tree/v0.7.0) (2015-10-14)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.7...v0.7.0)
 
 **Fixed bugs:**
@@ -267,9 +335,11 @@
 - Command Injection in append\_to\_squashed\_commit\_message. [\#134](https://github.com/reenhanced/gitreflow/issues/134)
 
 ## [v0.6.7](https://github.com/reenhanced/gitreflow/tree/v0.6.7) (2015-09-29)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.6...v0.6.7)
 
 ## [v0.6.6](https://github.com/reenhanced/gitreflow/tree/v0.6.6) (2015-09-28)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.5...v0.6.6)
 
 **Merged pull requests:**
@@ -277,6 +347,7 @@
 - Fix review message parsing from editor failed [\#133](https://github.com/reenhanced/gitreflow/pull/133) ([francois](https://github.com/francois))
 
 ## [v0.6.5](https://github.com/reenhanced/gitreflow/tree/v0.6.5) (2015-08-31)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.4...v0.6.5)
 
 **Closed issues:**
@@ -285,6 +356,7 @@
 - Feature Request: command to cleanly land a contributor's PR [\#128](https://github.com/reenhanced/gitreflow/issues/128)
 
 ## [v0.6.4](https://github.com/reenhanced/gitreflow/tree/v0.6.4) (2015-08-04)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.3...v0.6.4)
 
 **Fixed bugs:**
@@ -292,6 +364,7 @@
 - reflow needs an lgtm from myself [\#116](https://github.com/reenhanced/gitreflow/issues/116)
 
 ## [v0.6.3](https://github.com/reenhanced/gitreflow/tree/v0.6.3) (2015-08-03)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.2...v0.6.3)
 
 **Closed issues:**
@@ -300,6 +373,7 @@
 - Error: \#\<NameError: wrong constant name \> [\#120](https://github.com/reenhanced/gitreflow/issues/120)
 
 ## [v0.6.2](https://github.com/reenhanced/gitreflow/tree/v0.6.2) (2015-08-03)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.1...v0.6.2)
 
 **Fixed bugs:**
@@ -321,6 +395,7 @@
 - Add number attribute to Base:PullRequest [\#110](https://github.com/reenhanced/gitreflow/pull/110) ([tanin47](https://github.com/tanin47))
 
 ## [v0.6.1](https://github.com/reenhanced/gitreflow/tree/v0.6.1) (2015-06-02)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.6.0...v0.6.1)
 
 **Closed issues:**
@@ -328,13 +403,11 @@
 - git reflow setup not working [\#106](https://github.com/reenhanced/gitreflow/issues/106)
 
 ## [v0.6.0](https://github.com/reenhanced/gitreflow/tree/v0.6.0) (2015-05-15)
-[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.5.3...v0.6.0)
 
-**Merged pull requests:**
-
-- new functionality for review [\#99](https://github.com/reenhanced/gitreflow/pull/99) ([meesterdude](https://github.com/meesterdude))
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.5.3...v0.6.0)
 
 ## [v0.5.3](https://github.com/reenhanced/gitreflow/tree/v0.5.3) (2015-05-15)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.5.2...v0.5.3)
 
 **Closed issues:**
@@ -348,12 +421,15 @@
 - tmp\_squash\_msh is not removed if we use git reflow in other directories than root. [\#98](https://github.com/reenhanced/gitreflow/pull/98) ([tanin47](https://github.com/tanin47))
 
 ## [v0.5.2](https://github.com/reenhanced/gitreflow/tree/v0.5.2) (2015-04-03)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.5.1...v0.5.2)
 
 ## [v0.5.1](https://github.com/reenhanced/gitreflow/tree/v0.5.1) (2015-03-26)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.5.0...v0.5.1)
 
 ## [v0.5.0](https://github.com/reenhanced/gitreflow/tree/v0.5.0) (2015-03-26)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.4.2...v0.5.0)
 
 **Fixed bugs:**
@@ -365,6 +441,7 @@
 - Changing remote url in \reponame\.git\config to make reflow deliver work [\#75](https://github.com/reenhanced/gitreflow/issues/75)
 
 ## [v0.4.2](https://github.com/reenhanced/gitreflow/tree/v0.4.2) (2015-02-10)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.4.1...v0.4.2)
 
 **Fixed bugs:**
@@ -379,6 +456,7 @@
 - Github Enterprise Compatibility [\#42](https://github.com/reenhanced/gitreflow/issues/42)
 
 ## [v0.4.1](https://github.com/reenhanced/gitreflow/tree/v0.4.1) (2014-10-28)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.4.0...v0.4.1)
 
 **Closed issues:**
@@ -386,6 +464,7 @@
 - License does not have year and name filled in [\#69](https://github.com/reenhanced/gitreflow/issues/69)
 
 ## [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)
 
 **Merged pull requests:**
@@ -394,6 +473,7 @@
 - \[fix\] Show delivery halted message properly [\#63](https://github.com/reenhanced/gitreflow/pull/63) ([shirshendu](https://github.com/shirshendu))
 
 ## [v0.3.5](https://github.com/reenhanced/gitreflow/tree/v0.3.5) (2014-03-05)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3.4...v0.3.5)
 
 **Closed issues:**
@@ -410,6 +490,7 @@
 - Add note to created oauth token so users can find them on their tokens page [\#55](https://github.com/reenhanced/gitreflow/pull/55) ([marten](https://github.com/marten))
 
 ## [v0.3.4](https://github.com/reenhanced/gitreflow/tree/v0.3.4) (2013-11-01)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3.3...v0.3.4)
 
 **Fixed bugs:**
@@ -422,6 +503,7 @@
 - Print all git commands [\#43](https://github.com/reenhanced/gitreflow/issues/43)
 
 ## [v0.3.3](https://github.com/reenhanced/gitreflow/tree/v0.3.3) (2013-10-16)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3.2...v0.3.3)
 
 **Closed issues:**
@@ -430,37 +512,48 @@
 
 **Merged pull requests:**
 
-- Fix --skip-lgtm option was never passed to the `\#deliver` method [\#45](https://github.com/reenhanced/gitreflow/pull/45) ([francois](https://github.com/francois))
+- Fix --skip-lgtm option was never passed to the `#deliver` method [\#45](https://github.com/reenhanced/gitreflow/pull/45) ([francois](https://github.com/francois))
 
 ## [v0.3.2](https://github.com/reenhanced/gitreflow/tree/v0.3.2) (2013-07-25)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3.1...v0.3.2)
 
 ## [v0.3.1](https://github.com/reenhanced/gitreflow/tree/v0.3.1) (2013-07-12)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.3...v0.3.1)
 
 ## [v0.3](https://github.com/reenhanced/gitreflow/tree/v0.3) (2013-07-12)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2.5...v0.3)
 
 ## [v0.2.5](https://github.com/reenhanced/gitreflow/tree/v0.2.5) (2013-03-04)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2.5-with-tests...v0.2.5)
 
 ## [v0.2.5-with-tests](https://github.com/reenhanced/gitreflow/tree/v0.2.5-with-tests) (2013-03-04)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2.4...v0.2.5-with-tests)
 
 ## [v0.2.4](https://github.com/reenhanced/gitreflow/tree/v0.2.4) (2012-09-21)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2.2...v0.2.4)
 
 ## [v0.2.2](https://github.com/reenhanced/gitreflow/tree/v0.2.2) (2012-09-17)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2.1...v0.2.2)
 
 ## [v0.2.1](https://github.com/reenhanced/gitreflow/tree/v0.2.1) (2012-08-30)
+
 [Full Changelog](https://github.com/reenhanced/gitreflow/compare/v0.2...v0.2.1)
 
 ## [v0.2](https://github.com/reenhanced/gitreflow/tree/v0.2) (2012-08-28)
+
+[Full Changelog](https://github.com/reenhanced/gitreflow/compare/e84b48641d5ec6f5d87674c9152830e08ffe1b76...v0.2)
+
 **Merged pull requests:**
 
 - Adds documentation to reflow [\#13](https://github.com/reenhanced/gitreflow/pull/13) ([nhance](https://github.com/nhance))
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.9.4)
+    git_reflow (0.9.8)
       bundler (>= 1.10.0)
       codenamev_bitbucket_api (= 0.4.1)
-      colorize (>= 0.7.0)
+      colorize (>= 0.8.1)
       github_api (= 0.19)
       highline
       httpclient
@@ -12,18 +12,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    appraisal (2.2.0)
+    appraisal (2.4.0)
       bundler
       rake
       thor (>= 0.14.0)
+    async (1.28.9)
+      console (~> 1.10)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.54.1)
+      async (~> 1.25)
+      async-io (~> 1.28)
+      async-pool (~> 0.2)
+      protocol-http (~> 0.21.0)
+      protocol-http1 (~> 0.13.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.9.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.30.2)
+      async (~> 1.14)
+    async-pool (0.3.5)
+      async (~> 1.25)
     byebug (11.1.3)
     chronic (0.10.2)
     codenamev_bitbucket_api (0.4.1)
@@ -35,26 +53,34 @@ GEM
       simple_oauth (>= 0.3.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
-    crack (0.4.4)
+    concurrent-ruby (1.1.8)
+    console (1.10.1)
+      fiber-local
+    crack (0.4.5)
+      rexml
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.4.4)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    faraday_middleware (1.0.0)
+    faraday-net_http (1.0.1)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
+    fiber-local (1.0.0)
     github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
       faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    github_changelog_generator (1.15.2)
+    github_changelog_generator (1.16.1)
       activesupport
+      async (>= 1.25.0)
+      async-http-faraday
       faraday-http-cache
       multi_json
       octokit (~> 4.6)
@@ -65,81 +91,95 @@ GEM
     hashie (3.6.0)
     highline (2.0.3)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
+    jwt (2.3.0)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.7.1)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
+    nio4r (2.5.7)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.19.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
+    protocol-hpack (1.4.2)
+    protocol-http (0.21.0)
+    protocol-http1 (0.13.2)
+      protocol-http (~> 0.19)
+    protocol-http2 (0.14.2)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
     public_suffix (4.0.6)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
+    rake (13.0.3)
+    rdoc (6.3.0)
     retriable (3.1.2)
+    rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    ruby2_keywords (0.0.2)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    ruby_jard (0.3.1)
+      byebug (>= 9.1, < 12.0)
+      pry (~> 0.13.0)
+      tty-screen (~> 0.8.1)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     simple_oauth (0.3.1)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    webmock (3.9.3)
+    timers (4.3.3)
+    tty-screen (0.8.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    webmock (3.12.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     wwtd (1.4.0)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  appraisal (= 2.2.0)
+  appraisal (= 2.4.0)
   chronic
   git_reflow!
   github_changelog_generator
-  pry-byebug
-  rake (~> 13.0.1)
+  rake (~> 13.0.3)
   rdoc
-  rspec (~> 3.9)
+  rspec (~> 3.10)
+  ruby_jard
   webmock
   wwtd (= 1.4)
 
 BUNDLED WITH
-   2.1.4
+   2.2.4

data/git_reflow.gemspec

@@ -19,19 +19,19 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.rdoc_options << '--title' << 'git_reflow' << '-ri'
 
-  s.add_development_dependency('appraisal', '2.2.0')
+  s.add_development_dependency('appraisal', '2.4.0')
   s.add_development_dependency('chronic')
   s.add_development_dependency('github_changelog_generator')
-  s.add_development_dependency('pry-byebug')
-  s.add_development_dependency('rake', '~> 13.0.1')
+  s.add_development_dependency('ruby_jard')
+  s.add_development_dependency('rake', '~> 13.0.3')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', '~> 3.9')
+  s.add_development_dependency('rspec', '~> 3.10')
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '1.4')
 
   s.add_dependency('bundler', '>= 1.10.0')
   s.add_dependency('codenamev_bitbucket_api', '0.4.1')
-  s.add_dependency('colorize', '>= 0.7.0')
+  s.add_dependency('colorize', '>= 0.8.1')
   s.add_dependency('github_api', '0.19')
   s.add_dependency('highline')
   s.add_dependency('httpclient')

data/lib/git_reflow/git_helpers.rb

@@ -47,23 +47,29 @@ module GitReflow
     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|
+      custom_template = GitReflow::Config.get('templates.pull-request')
+      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
+      filenames_to_try.unshift(custom_template) unless custom_template.empty?
 
       parse_first_matching_template_file(filenames_to_try)
     end
 
     def merge_commit_template
+      custom_template = GitReflow::Config.get('templates.merge-commit')
       filenames_to_try = %w[.github/MERGE_COMMIT_TEMPLATE.md
                             .github/MERGE_COMMIT_TEMPLATE
                             MERGE_COMMIT_TEMPLATE.md
                             MERGE_COMMIT_TEMPLATE].map do |file|
         "#{git_root_dir}/#{file}"
       end
+      filenames_to_try.unshift(custom_template) unless custom_template.empty?
 
       parse_first_matching_template_file(filenames_to_try)
     end

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

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

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.9.4"
+  VERSION = "0.9.8"
 end

data/lib/git_reflow/workflow.rb

@@ -157,7 +157,8 @@ module GitReflow
         self.commands[name] = params
         self.command_docs[name] = params
 
-        self.define_singleton_method(name) do |**args|
+        GitReflow.logger.debug "adding new command '#{name}' with #{defaults.inspect}"
+        self.define_singleton_method(name) do |args = {}|
           args_with_defaults = {}
           args.each do |name, value|
             if "#{value}".length <= 0 && !defaults[name].nil?
@@ -310,13 +311,19 @@ module GitReflow
           opts.separator  "COMMAND OPTIONS:" if docs[:flags].any? || docs[:switches].any?
 
           self.commands[name][:flags].each do |flag_name, flag_default|
-            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", command_docs[name][:flags][flag_name]) do |f|
+            # There is a bug in Ruby that will not parse the flag value if no
+            # help text is provided.  Fallback to the flag name.
+            flag_help = command_docs[name][:flags][flag_name] || flag_name
+            opts.on("-#{flag_name[0]}", "--#{flag_name} #{flag_name.upcase}", flag_help) do |f|
               options[kebab_to_underscore(flag_name)] = f || flag_default
             end
           end
 
           self.commands[name][:switches].each do |switch_name, switch_default|
-            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", command_docs[name][:switches][switch_name]) do |s|
+            # There is a bug in Ruby that will not parse the switch value if no
+            # help text is provided.  Fallback to the switch name.
+            switch_help = command_docs[name][:switches][switch_name] || switch_name
+            opts.on("-#{switch_name[0]}", "--[no-]#{switch_name}", switch_help) do |s|
               options[kebab_to_underscore(switch_name)] = s || switch_default
             end
           end

data/spec/lib/git_reflow/git_helpers_spec.rb

@@ -1,15 +1,15 @@
-require 'spec_helper'
+require "spec_helper"
+
+module Gitacular
+  include GitReflow::GitHelpers
+  extend self
+end
 
 describe GitReflow::GitHelpers do
-  let(:origin_url) { 'git@github.com:reenhanced.spectacular/this-is-the.shit.git' }
+  let(:origin_url) { "git@github.com:reenhanced.spectacular/this-is-the.shit.git" }
 
   before do
-    stub_with_fallback(GitReflow::Config, :get).with('remote.origin.url').and_return(origin_url)
-
-    module Gitacular
-      include GitReflow::GitHelpers
-      extend self
-    end
+    stub_with_fallback(GitReflow::Config, :get).with("remote.origin.url").and_return(origin_url)
 
     stub_run_for Gitacular
   end
@@ -18,83 +18,86 @@ describe GitReflow::GitHelpers do
     subject { Gitacular.default_editor }
 
     context "when the environment has EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return('emacs') }
-      specify { expect( subject ).to eql('emacs') }
+      before  { allow(ENV).to receive(:[]).with("EDITOR").and_return("emacs") }
+      specify { expect(subject).to eql("emacs") }
     end
 
     context "when the environment has no EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return(nil) }
-      specify { expect( subject ).to eql('vi') }
+      before  { allow(ENV).to receive(:[]).with("EDITOR").and_return(nil) }
+      specify { expect(subject).to eql("vi") }
     end
   end
 
   describe ".git_root_dir" do
     subject { Gitacular.git_root_dir }
-    it      { expect{ subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
+    it      { expect { subject }.to have_run_command_silently "git rev-parse --show-toplevel" }
   end
 
-  describe '.git_editor_command' do
+  describe ".git_editor_command" do
     subject { Gitacular.git_editor_command }
-    before { ENV['EDITOR'] = 'vim' }
+    before { ENV["EDITOR"] = "vim" }
 
-    it 'defaults to GitReflow config' do
-      allow(GitReflow::Config).to receive(:get).with('core.editor').and_return 'nano'
+    it "defaults to GitReflow config" do
+      allow(GitReflow::Config).to receive(:get).with("core.editor").and_return "nano"
 
-      expect(subject).to eq '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 ''
+    it "falls back to the environment variable $EDITOR" do
+      allow(GitReflow::Config).to receive(:get).with("core.editor").and_return ""
 
-      expect(subject).to eq 'vim'
+      expect(subject).to eq "vim"
     end
   end
 
   describe ".remote_user" do
     subject { Gitacular.remote_user }
 
-    it { is_expected.to eq('reenhanced.spectacular') }
+    it { is_expected.to eq("reenhanced.spectacular") }
 
     context "remote origin url isn't set" do
-      let(:origin_url) { '' }
-      it { is_expected.to eq('') }
+      let(:origin_url) { "" }
+      it { is_expected.to eq("") }
     end
 
     context "remote origin uses HTTP" do
-      let(:origin_url) { 'https://github.com/reenhanced.spectacular/this-is-the.shit.git' }
-      it               { is_expected.to eq('reenhanced.spectacular') }
+      let(:origin_url) { "https://github.com/reenhanced.spectacular/this-is-the.shit.git" }
+      it               { is_expected.to eq("reenhanced.spectacular") }
     end
   end
 
   describe ".remote_repo_name" do
     subject { Gitacular.remote_repo_name }
 
-    it { is_expected.to eq('this-is-the.shit') }
+    it { is_expected.to eq("this-is-the.shit") }
 
     context "remote origin url isn't set" do
-      let(:origin_url) { '' }
-      it { is_expected.to eq('') }
+      let(:origin_url) { "" }
+      it { is_expected.to eq("") }
     end
 
     context "remote origin uses HTTP" do
-      let(:origin_url) { 'https://github.com/reenhanced.spectacular/this-is-the.shit.git' }
-      it               { is_expected.to eq('this-is-the.shit') }
+      let(:origin_url) { "https://github.com/reenhanced.spectacular/this-is-the.shit.git" }
+      it               { is_expected.to eq("this-is-the.shit") }
     end
   end
 
-  describe '.default_base_branch' do
+  describe ".default_base_branch" do
     subject { Gitacular.default_base_branch }
-    it      { is_expected.to eq('master') }
+    it      { is_expected.to eq("master") }
 
-    context 'when configured' do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.base-branch').and_return('tuba') }
-      it { is_expected.to eq('tuba') }
+    context "when configured" do
+      before { allow(GitReflow::Config).to receive(:get).with("reflow.base-branch").and_return("tuba") }
+      it { is_expected.to eq("tuba") }
     end
   end
 
   describe ".current_branch" do
     subject { Gitacular.current_branch }
-    it      { expect{ subject }.to have_run_command_silently "git branch --no-color | grep '^\* ' | grep -v 'no branch' | sed 's/^* //g'" }
+    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
@@ -119,36 +122,29 @@ describe GitReflow::GitHelpers do
 
       it { is_expected.to be_nil }
     end
-  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" }
 
+    context "custom template file configured" do
       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)
+        allow(GitReflow::Config).to receive(:get).with("templates.pull-request").and_return "pr_template_file.md"
       end
 
-      it { is_expected.to eq template_content }
+      context "template file exists" do
+        let(:template_content) { "Template content" }
 
-      context "when template has mustache tags" do
-        let(:template_content) { "This is the coolest {{current_branch}}" }
-        before { allow(GitReflow).to receive(:current_branch).and_return("tomato") }
-        it { is_expected.to eq "This is the coolest tomato" }
+        before do
+          allow(File).to receive(:exist?).with("pr_template_file.md").and_return(true)
+          allow(File).to receive(:read).with("pr_template_file.md").and_return(template_content)
+        end
+        it { is_expected.to eq template_content }
       end
-    end
 
-    context "template file does not exist" do
-      before do
-        allow(File).to receive(:exist?).and_return(false)
-      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 }
+        it { is_expected.to be_nil }
+      end
     end
   end
 
@@ -181,27 +177,51 @@ describe GitReflow::GitHelpers do
 
       it { is_expected.to be_nil }
     end
+
+    context "custom template file configured" do
+      before do
+        allow(GitReflow::Config).to receive(:get).with("templates.merge-commit").and_return "merge_template_file.md"
+      end
+
+      context "template file exists" do
+        let(:template_content) { "Template content" }
+
+        before do
+          allow(File).to receive(:exist?).with("merge_template_file.md").and_return(true)
+          allow(File).to receive(:read).with("merge_template_file.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
   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' }
+    it      { expect { subject }.to have_run_command_silently 'git log --pretty=format:"%s" --no-merges -n 1' }
   end
 
   describe ".push_current_branch" do
     subject { Gitacular.push_current_branch }
-    before  { allow(Gitacular).to receive(:current_branch).and_return('bingo') }
-    it      { expect{ subject }.to have_run_command "git push origin bingo" }
+    before  { allow(Gitacular).to receive(:current_branch).and_return("bingo") }
+    it      { expect { subject }.to have_run_command "git push origin bingo" }
   end
 
   describe ".fetch_destination(destination_branch)" do
-    subject { Gitacular.fetch_destination('new-feature') }
-    it      { expect{ subject }.to have_run_command "git fetch origin new-feature" }
+    subject { Gitacular.fetch_destination("new-feature") }
+    it      { expect { subject }.to have_run_command "git fetch origin new-feature" }
   end
 
   describe ".update_destination(destination_branch)" do
-    let(:current_branch)     { 'bananas' }
-    let(:destination_branch) { 'monkey-business' }
+    let(:current_branch)     { "bananas" }
+    let(:destination_branch) { "monkey-business" }
 
     before  { allow(Gitacular).to receive(:current_branch).and_return(current_branch) }
     subject { Gitacular.update_destination(destination_branch) }
@@ -217,7 +237,7 @@ describe GitReflow::GitHelpers do
 
   describe ".update_current_branch" do
     subject { Gitacular.update_current_branch }
-    before  { allow(Gitacular).to receive(:current_branch).and_return('new-feature') }
+    before  { allow(Gitacular).to receive(:current_branch).and_return("new-feature") }
 
     it "updates the remote changes and pushes any local changes" do
       expect { subject }.to have_run_commands_in_order [
@@ -228,9 +248,9 @@ describe GitReflow::GitHelpers do
   end
 
   describe ".update_feature_branch" do
-    options = {base: "base", remote: "remote"}
+    options = { base: "base", remote: "remote" }
     subject { Gitacular.update_feature_branch(options) }
-    before  { allow(Gitacular).to receive(:current_branch).and_return('feature') }
+    before  { allow(Gitacular).to receive(:current_branch).and_return("feature") }
 
     it "calls the correct methods" do
       expect { subject }.to have_run_commands_in_order [
@@ -246,14 +266,14 @@ describe GitReflow::GitHelpers do
   describe ".append_to_merge_commit_message(message)" do
     let(:original_commit_message) { "Oooooo, SQUASH IT" }
     let(:message)                 { "do do the voodoo that you do" }
-    let(:root_dir)                { '/home/gitreflow' }
+    let(:root_dir)                { "/home/gitreflow" }
     let(:merge_message_path)      { "#{root_dir}/.git/SQUASH_MSG" }
     let(:tmp_merge_message_path)  { "#{root_dir}/.git/tmp_merge_msg" }
     before                        { allow(Gitacular).to receive(:git_root_dir).and_return(root_dir) }
     subject                       { Gitacular.append_to_merge_commit_message(message) }
 
     it "appends the message to git's SQUASH_MSG temp file" do
-      tmp_file = double('file')
+      tmp_file = double("file")
       allow(File).to receive(:open).with(tmp_merge_message_path, "w").and_yield(tmp_file)
       allow(File).to receive(:exists?).with(merge_message_path).and_return(true)
       allow(File).to receive(:foreach).with(merge_message_path).and_yield(original_commit_message)
@@ -269,7 +289,7 @@ describe GitReflow::GitHelpers do
       let(:merge_message_path) { "#{root_dir}/.git/MERGE_MSG" }
       subject { Gitacular.append_to_merge_commit_message(message, merge_method: "merge") }
       it "appends the message to git's MERGE_MSG temp file if using a direct merge" do
-        tmp_file = double('file')
+        tmp_file = double("file")
         allow(File).to receive(:open).with(tmp_merge_message_path, "w").and_yield(tmp_file)
         allow(File).to receive(:exists?).with(merge_message_path).and_return(true)
         allow(File).to receive(:foreach).with(merge_message_path).and_yield(original_commit_message)

data/spec/lib/git_reflow_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe GitReflow do
-
   describe ".logger" do
     # Ignore memoization for tests
     before { GitReflow.instance_variable_set("@logger", nil) }

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'rspec'
+require 'ruby_jard'
 require 'multi_json'
 require 'webmock/rspec'
-require 'pry'
 
 $LOAD_PATH << 'lib'
 require 'git_reflow'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.8
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: ruby_jard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -172,14 +172,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A better git process