flash_flow 1.4.14 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/flash_flow.yml.erb.example +6 -1
- data/lib/flash_flow/git.rb +2 -2
- data/lib/flash_flow/merge/acceptance.rb +3 -2
- data/lib/flash_flow/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6afda2b38eb992aadb2ce598dbc419e89df7c708
|
|
4
|
+
data.tar.gz: c1125d844a6d4716c1fe44773cc861e46a5d0a59
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 229f2e6192a286d4e9994f52b4fab5950c40a23b857ea153b2216c4fbfe72bd7ad83fd070aa9b3ab0909cca44cdcef985cc8a1da862c79bd0fe1b0a0fd793536
|
|
7
|
+
data.tar.gz: d9b22f0e08dc78f509014e86c41178a5a9d89e06f1326da100ba586910d84d0d557e8614b8091b8a961b00ee0798f577be400e6950d84b952d5a1ba77cdb969e
|
data/Gemfile.lock
CHANGED
data/flash_flow.yml.erb.example
CHANGED
|
@@ -113,9 +113,14 @@ branch_info_file: 'your/random/file'
|
|
|
113
113
|
# authentication: 'plain'
|
|
114
114
|
# enable_starttls_auto: true
|
|
115
115
|
# emails:
|
|
116
|
-
#
|
|
116
|
+
# compliance:
|
|
117
117
|
# from: 'sender@domain.com'
|
|
118
118
|
# to: 'receiver@domain.com'
|
|
119
119
|
# cc: 'cc@domain.com'
|
|
120
120
|
# subject: 'The engineering team has a new release candidate'
|
|
121
|
+
# body_file: 'app/views/flash_flow_mailer/percy_snapshots.txt.erb'
|
|
122
|
+
# release_ready:
|
|
123
|
+
# from: 'sender@domain.com'
|
|
124
|
+
# to: 'receiver@domain.com'
|
|
125
|
+
# subject: 'Release build has been approved for release'
|
|
121
126
|
# body_file: 'path/to/email_template.erb'
|
data/lib/flash_flow/git.rb
CHANGED
|
@@ -130,10 +130,10 @@ module FlashFlow
|
|
|
130
130
|
|
|
131
131
|
# git rerere doesn't give you a deterministic way to determine which resolution was used
|
|
132
132
|
def resolution_candidates(file)
|
|
133
|
-
@cmd_runner.run("diff -q --from-file #{file} .git/rr-cache/*/postimage", log: CmdRunner::LOG_CMD)
|
|
133
|
+
@cmd_runner.run("diff -q --from-file #{file} .git/rr-cache/*/postimage*", log: CmdRunner::LOG_CMD)
|
|
134
134
|
different_files = split_diff_lines(@cmd_runner.last_stdout)
|
|
135
135
|
|
|
136
|
-
@cmd_runner.run('ls -la .git/rr-cache/*/postimage', log: CmdRunner::LOG_CMD)
|
|
136
|
+
@cmd_runner.run('ls -la .git/rr-cache/*/postimage*', log: CmdRunner::LOG_CMD)
|
|
137
137
|
all_files = split_diff_lines(@cmd_runner.last_stdout)
|
|
138
138
|
|
|
139
139
|
all_files - different_files
|
|
@@ -41,9 +41,10 @@ module FlashFlow
|
|
|
41
41
|
|
|
42
42
|
@git.copy_temp_to_branch(@git.merge_branch, commit_message)
|
|
43
43
|
@git.delete_temp_merge_branch
|
|
44
|
-
@git.push(@git.merge_branch
|
|
44
|
+
@git.push(@git.merge_branch)
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
+
raise OutOfSyncWithRemote.new("#{@git.merge_branch} is out of sync with the remote.") unless @git.last_success?
|
|
47
48
|
print_errors
|
|
48
49
|
logger.info "### Finished #{@local_git.merge_branch} merge ###"
|
|
49
50
|
rescue Lock::Error, OutOfSyncWithRemote => e
|
|
@@ -147,4 +148,4 @@ Removed branches:
|
|
|
147
148
|
|
|
148
149
|
end
|
|
149
150
|
end
|
|
150
|
-
end
|
|
151
|
+
end
|
data/lib/flash_flow/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: flash_flow
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.5.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Flashfunders
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-10-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: octokit
|