papa 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e515a20ac342699b7c436983d5d933baf38040
-  data.tar.gz: 5db8638e6d5ec42cb22c37af240d50500a8ed8de
+  metadata.gz: ce70540dead41684251bf8b645acbef540c4ae70
+  data.tar.gz: 91f2e872e23ada8658d1a838aab027dff320eb14
 SHA512:
-  metadata.gz: 7e6b60ed370d216183b332550c34bc59c36cba9d6dccbabd5ef95760f62c18853df15eb1e3a409392822197b4270a6377976c3ee8ea5c5c0986d62a58ef73da5
-  data.tar.gz: d4f72fb75bbaa18ee91c04bfced7a99fecb62684c74763c1958d80ae2d82d25219a207e8be5c98af7ea7ea00ebd8895ba50bbb70ba0d4e640c27e38e9213e2fd
+  metadata.gz: 3ebb3b43866d7b6d662b32a2f44c27fb654588decc8df2a0e54d5857e979421366e359d9dfbb55e48b3f70a9a06615a1dfc07312dd315e933c1e460a69beae64
+  data.tar.gz: 6356f191cce45628d6f4cd8a09fe631ab1bd53a8201d483579a9ba7d95dccb25d887accb29e69f85c3882ae1713a491096bd2f0c82485d1c1d4430608ed7ac88

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.0
+* Allow merging release branches to other branches upon finishing by adding `-b` to `papa release finish`
+* Upon starting a new release or hotfix branch, reset base branch from origin after checking out
+
 ## 1.0.0
 * Add `whoami` and `hostname` to deployment message
 * Hard reset build branch before starting `papa [hotfix, release] finish`

data/README.md

@@ -74,6 +74,12 @@ $ papa release add -v 17.12.0
 $ papa release finish -v 17.12.0
 ```
 
+If the release branch will also be merged to another branch:
+
+```
+$ papa release finish -v 17.12.0 -b release/17.11.0
+```
+
 ### `papa hotfix`
 
 #### Starting a hotfix branch

data/lib/papa/cli/release.rb

@@ -23,11 +23,13 @@ module Papa
 
       desc 'finish', 'Merge the release branch to master and develop'
       option :version, aliases: '-v', required: true
+      option :additional_branches, aliases: '-b', type: :array
       def finish
         version = options[:version]
+        additional_branches = options[:additional_branches]
 
         require 'papa/task/release/finish'
-        Task::Release::Finish.new(version).run
+        Task::Release::Finish.new(version, additional_branches).run
       end
     end
   end

data/lib/papa/task/common/start.rb

@@ -1,6 +1,7 @@
 require 'papa/task/base'
 require 'papa/command/git/branch'
 require 'papa/command/git/push'
+require 'papa/command/git/reset_hard'
 
 module Papa
   module Task
@@ -12,6 +13,7 @@ module Papa
           [
             Command::Git::Fetch.new('origin'),
             Command::Git::Checkout.new(@base_branch),
+            Command::Git::ResetHard.new('origin', @base_branch),
             Command::Git::Branch.new(build_branch),
             Command::Git::Checkout.new(build_branch),
             Command::Git::Push.new('origin', build_branch)

data/lib/papa/task/release/finish.rb

@@ -4,11 +4,12 @@ module Papa
   module Task
     module Release
       class Finish < Common::Finish
-        def initialize(version)
+        def initialize(version, additional_branches)
           @build_type = 'release'
           @version = version
+          additional_branches ||= []
           @tag_name = version
-          @base_branches = ['develop', 'master']
+          @base_branches = ['develop', 'master'] + additional_branches
           super()
         end
       end

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor