papa 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce70540dead41684251bf8b645acbef540c4ae70
-  data.tar.gz: 91f2e872e23ada8658d1a838aab027dff320eb14
+  metadata.gz: 853034b608141d86767408b88093c750a314199e
+  data.tar.gz: 899e6af3f7a610394844ab316fc2929156c4723b
 SHA512:
-  metadata.gz: 3ebb3b43866d7b6d662b32a2f44c27fb654588decc8df2a0e54d5857e979421366e359d9dfbb55e48b3f70a9a06615a1dfc07312dd315e933c1e460a69beae64
-  data.tar.gz: 6356f191cce45628d6f4cd8a09fe631ab1bd53a8201d483579a9ba7d95dccb25d887accb29e69f85c3882ae1713a491096bd2f0c82485d1c1d4430608ed7ac88
+  metadata.gz: 61f9aecb052ade89db1f3ff70bca4e6ae8745a86977ca7c3e35f45d69726f512c5dd36a9750765094a137b84b6a970371a8700fabd4ad3ab2693051ed929c4df
+  data.tar.gz: b3a77c180a79c9f20445432a007358880909916183ff01781a4ae7e8fde1e3b0cb48000c89dddb08cdf0db09825113ecd67aae78ac7023effef5aa355d2f7549

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0
+* Allow adding release branches to integration branches
+* Hard reset build branch for integration-related tasks
+
 ## 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

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

@@ -28,6 +28,7 @@ module Papa
         end
 
         def check_if_branches_are_valid
+          return if @build_type == 'integration'
           invalid_branch_prefixes = ['hotfix', 'release']
           @branches.each do |branch|
             has_invalid_branches = invalid_branch_prefixes.any? do |invalid_branch_prefix|

data/lib/papa/task/integration/add.rb

@@ -14,6 +14,7 @@ module Papa
         def queue(branch)
           [
             Command::Git::Checkout.new(build_branch),
+            Command::Git::ResetHard.new('origin', build_branch),
             Command::Git::Checkout.new(branch),
             Command::Git::ResetHard.new('origin', branch),
             Command::Git::Rebase.new(build_branch),

data/lib/papa/version.rb

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

metadata

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