multi_repo 0.1.2 → 0.2.1

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 569dd39745ef1ab573d95ef3c1724aed8c96afb4fddc72d09c7f24774acce7f8
4
- data.tar.gz: 9272ee6b4996a0f28a5d5af60c9ed201845306cde7f4ceafb67aec473417733d
3
+ metadata.gz: 363ca04276f3d649809c39b6fb2edb051e2eb51f8fd87f945409d08172984e0d
4
+ data.tar.gz: 8267789b5af70973998fb0ecb0e59107347f7e6403a746fa98c0bc5f43a93f3c
5
5
  SHA512:
6
- metadata.gz: 56011154b9371332679c7d46a78c0bf7c125acce711dcd5e36ecb0c2960c96b2136b103b51fc675a7b5bc6dec4d352794c7f4b77cf4816ea032e26e38d1cd988
7
- data.tar.gz: d18605c473b2bc80bf3805bfa53048eae473f99488843b863fe697443df30a2239436021cd2901f038982c01dadc71170b361f99ee034890bdd6bc0d22ca0af1
6
+ metadata.gz: 501f688e2084d24d9bcb39633d974bb08cbb97c8586d25983d1a7d76f41cf4d37836f7455f6d81addff4d03c40655c10a79b668f42a12eee61f378807f06784e
7
+ data.tar.gz: 43f1aff7d976517022e22ce9903fd21ea20367b2e155bd418c03d66cb960026f0ff0f43b953382b703c3badd47d65e1761234c47325803e07ca0df0e4b000a01
@@ -164,7 +164,7 @@ module MultiRepo::Helpers
164
164
 
165
165
  success =
166
166
  system("git checkout -B #{dest_name} #{start_point}") &&
167
- system("git pull --rebase=merges #{source_remote} #{source_name}") &&
167
+ system("git pull --no-rebase #{source_remote} #{source_name}") &&
168
168
  system("git push -f #{dest_remote} #{dest_name}")
169
169
 
170
170
  if backup_remote_defined?
@@ -1,3 +1,3 @@
1
1
  module MultiRepo
2
- VERSION = "0.1.2"
2
+ VERSION = "0.2.1"
3
3
  end
data/multi_repo.gemspec CHANGED
@@ -36,6 +36,9 @@ Gem::Specification.new do |spec|
36
36
  spec.add_runtime_dependency "rest-client"
37
37
  spec.add_runtime_dependency "travis"
38
38
 
39
+ # config gem brings in newer versions of dry-configurable that are not compatible with Ruby 2.7
40
+ spec.add_runtime_dependency "dry-configurable", "= 1.0.1"
41
+
39
42
  spec.add_development_dependency "bundler"
40
43
  spec.add_development_dependency "manageiq-style"
41
44
  spec.add_development_dependency "rake"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: multi_repo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - ManageIQ Authors
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-06-07 00:00:00.000000000 Z
11
+ date: 2023-07-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -192,6 +192,20 @@ dependencies:
192
192
  - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
+ - !ruby/object:Gem::Dependency
196
+ name: dry-configurable
197
+ requirement: !ruby/object:Gem::Requirement
198
+ requirements:
199
+ - - '='
200
+ - !ruby/object:Gem::Version
201
+ version: 1.0.1
202
+ type: :runtime
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - '='
207
+ - !ruby/object:Gem::Version
208
+ version: 1.0.1
195
209
  - !ruby/object:Gem::Dependency
196
210
  name: bundler
197
211
  requirement: !ruby/object:Gem::Requirement