zenflow 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144c042bd4f6c48e0ef592b7eae3e6c5922c770c
-  data.tar.gz: 9d467737a9447df6af448f28ff3ef99551b21626
+  metadata.gz: b67040a126c62ab1469ef2a30368d38de33c5fca
+  data.tar.gz: dcba8ef01d0261d39ee5d4f69c5c7f15a5bfda03
 SHA512:
-  metadata.gz: c23c4e1f03681e23e8b640fd5e945da835f1d99c9e191ddf893a852143a987f954a4e9b3f8dbd83b9ac568a1b452531fd22536e51f221f41482cc5f72db1ac8c
-  data.tar.gz: f8a55bd01e6f6ad3811f2c7ec2ae3a8aa12e4169b43f11a3e058e6bb3cd4e32894f45d2cffcf65af3d93f81d583e14481fdcb46f88931c1405e4ea68722e885f
+  metadata.gz: 2ad33edb69aa5f56bd4946c1c05f60e7dcf3618e94c9ec30e04af4043be80ff0097af464d939431d070377f95b06088abaa27a80b0356ec663928a26505b1104
+  data.tar.gz: 99c6641438d33951e12418443b125d86dd1a35b56904d553508e0c1f6a3d8c8f036402ae10f5274fdfd9423a5a112c2101490e5e86a0fd82465132d7d9e71cb3

data/CHANGELOG.md

@@ -7,3 +7,6 @@ CHANGELOG
 
 ---- 0.8.8 / 2014-07-11 / prompt-for-changelog-entry-when-finishing-feature ----
 * fix issue #25, prompt for changelog update when finishing a feature
+
+---- 0.8.11 / 2014-07-11 / merge-hotfixes-and-releases-into-master-and-production 
+* hotfixes should merge into the development branch as well as the source branch

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zenflow (0.8.10)
+    zenflow (0.8.11)
       colored (~> 1.2)
       httparty (~> 0.13.0)
       terminal-table (~> 1.4.5)

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 major: 0
 minor: 8
-patch: 10
-pre:
+patch: 11
+pre: 

data/lib/zenflow/commands/hotfix.rb

@@ -3,9 +3,10 @@ module Zenflow
 
     flow "hotfix"
 
-    branch source: Zenflow::Config[:release_branch]
-    branch deploy: Zenflow::Config[:staging_branch]
-    branch deploy: Zenflow::Config[:qa_branch]
+    branch source:                Zenflow::Config[:release_branch]
+    branch deploy:                Zenflow::Config[:staging_branch]
+    branch deploy:                Zenflow::Config[:qa_branch]
+    branch secondary_destination: Zenflow::Config[:development_branch]
 
     changelog :rotate
     version :patch

data/lib/zenflow/helpers/branch_commands/finish.rb

@@ -51,7 +51,7 @@ module Zenflow
             end
 
             def merge_branch_into_destination
-              [branch(:source), branch(:destination)].compact.each do |finish|
+              [branch(:source), branch(:destination), branch(:secondary_destination)].compact.each do |finish|
                 Zenflow::Branch.checkout(finish)
                 Zenflow::Branch.merge("#{flow}/#{branch_name}")
                 Zenflow::Branch.push(finish) if !options[:offline]

data/spec/zenflow/commands/hotfix_spec.rb

@@ -7,6 +7,7 @@ describe Zenflow::Hotfix do
   it { expect(subject.flow).to eq("hotfix") }
   it { expect(subject.branch(:source)).to be_false }
   it { expect(subject.branch(:deploy)).to match_array(["staging", "qa"]) }
+  it { expect(subject.branch(:secondary_destination)).to eq("master") }
   it { expect(subject.changelog).to eq(:rotate) }
   it { expect(subject.version).to eq(:patch) }
   it { expect(subject.tag).to be_true }

data/spec/zenflow/helpers/changelog_spec.rb

@@ -131,7 +131,7 @@ describe Zenflow::Changelog do
   describe '.rotated_changelog' do
     it "returns the changelog with changes rotated to the bottom" do
       Zenflow::Changelog.should_receive(:get_changes).and_return(['test branching', 'amongst other things'])
-      expect(Zenflow::Changelog.rotated_changelog).to eq("amongst other things\n\n---- #{Zenflow::Version.current.to_s} / #{Time.now.strftime('%Y-%m-%d')} --------------------------------------------------------\ntest branching\n")
+      expect(Zenflow::Changelog.rotated_changelog).to match(/amongst other things\n\n---- #{Zenflow::Version.current.to_s} \/ #{Time.now.strftime('%Y-%m-%d')} [-]+\ntest branching\n/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zenflow
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Adam Kittelson