zenflow 0.8.10 → 0.8.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/Gemfile.lock +1 -1
- data/VERSION.yml +2 -2
- data/lib/zenflow/commands/hotfix.rb +4 -3
- data/lib/zenflow/helpers/branch_commands/finish.rb +1 -1
- data/spec/zenflow/commands/hotfix_spec.rb +1 -0
- data/spec/zenflow/helpers/changelog_spec.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b67040a126c62ab1469ef2a30368d38de33c5fca
|
|
4
|
+
data.tar.gz: dcba8ef01d0261d39ee5d4f69c5c7f15a5bfda03
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2ad33edb69aa5f56bd4946c1c05f60e7dcf3618e94c9ec30e04af4043be80ff0097af464d939431d070377f95b06088abaa27a80b0356ec663928a26505b1104
|
|
7
|
+
data.tar.gz: 99c6641438d33951e12418443b125d86dd1a35b56904d553508e0c1f6a3d8c8f036402ae10f5274fdfd9423a5a112c2101490e5e86a0fd82465132d7d9e71cb3
|
data/CHANGELOG.md
CHANGED
|
@@ -7,3 +7,6 @@ CHANGELOG
|
|
|
7
7
|
|
|
8
8
|
---- 0.8.8 / 2014-07-11 / prompt-for-changelog-entry-when-finishing-feature ----
|
|
9
9
|
* fix issue #25, prompt for changelog update when finishing a feature
|
|
10
|
+
|
|
11
|
+
---- 0.8.11 / 2014-07-11 / merge-hotfixes-and-releases-into-master-and-production
|
|
12
|
+
* hotfixes should merge into the development branch as well as the source branch
|
data/Gemfile.lock
CHANGED
data/VERSION.yml
CHANGED
|
@@ -3,9 +3,10 @@ module Zenflow
|
|
|
3
3
|
|
|
4
4
|
flow "hotfix"
|
|
5
5
|
|
|
6
|
-
branch source:
|
|
7
|
-
branch deploy:
|
|
8
|
-
branch deploy:
|
|
6
|
+
branch source: Zenflow::Config[:release_branch]
|
|
7
|
+
branch deploy: Zenflow::Config[:staging_branch]
|
|
8
|
+
branch deploy: Zenflow::Config[:qa_branch]
|
|
9
|
+
branch secondary_destination: Zenflow::Config[:development_branch]
|
|
9
10
|
|
|
10
11
|
changelog :rotate
|
|
11
12
|
version :patch
|
|
@@ -51,7 +51,7 @@ module Zenflow
|
|
|
51
51
|
end
|
|
52
52
|
|
|
53
53
|
def merge_branch_into_destination
|
|
54
|
-
[branch(:source), branch(:destination)].compact.each do |finish|
|
|
54
|
+
[branch(:source), branch(:destination), branch(:secondary_destination)].compact.each do |finish|
|
|
55
55
|
Zenflow::Branch.checkout(finish)
|
|
56
56
|
Zenflow::Branch.merge("#{flow}/#{branch_name}")
|
|
57
57
|
Zenflow::Branch.push(finish) if !options[:offline]
|
|
@@ -7,6 +7,7 @@ describe Zenflow::Hotfix do
|
|
|
7
7
|
it { expect(subject.flow).to eq("hotfix") }
|
|
8
8
|
it { expect(subject.branch(:source)).to be_false }
|
|
9
9
|
it { expect(subject.branch(:deploy)).to match_array(["staging", "qa"]) }
|
|
10
|
+
it { expect(subject.branch(:secondary_destination)).to eq("master") }
|
|
10
11
|
it { expect(subject.changelog).to eq(:rotate) }
|
|
11
12
|
it { expect(subject.version).to eq(:patch) }
|
|
12
13
|
it { expect(subject.tag).to be_true }
|
|
@@ -131,7 +131,7 @@ describe Zenflow::Changelog do
|
|
|
131
131
|
describe '.rotated_changelog' do
|
|
132
132
|
it "returns the changelog with changes rotated to the bottom" do
|
|
133
133
|
Zenflow::Changelog.should_receive(:get_changes).and_return(['test branching', 'amongst other things'])
|
|
134
|
-
expect(Zenflow::Changelog.rotated_changelog).to
|
|
134
|
+
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/)
|
|
135
135
|
end
|
|
136
136
|
end
|
|
137
137
|
|