avm-eac_ruby_base1 0.21.0 → 0.22.0
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/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb +21 -4
- data/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.rb +60 -0
- data/lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb +89 -0
- data/lib/avm/eac_ruby_base1/version.rb +1 -1
- metadata +8 -12
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3dbe022e931d72a6273d17350c232661bb943b57a7b69f432e43fba5083088cf
|
4
|
+
data.tar.gz: 6315d5afaff312e6a410e1f06cfa13f064e1f2a571c4e4d8362d1622154aa378
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d005ee107b7eadcfd496e76ec2a88afeefdba7443f819d9a8b3d2f96c3d27d37bacde960ce9e44055dc847cfc1a68df457b161a6a407d14db0d4109cf5d3bc58
|
7
|
+
data.tar.gz: 228237474272dbc10f48062e96fa9adafce13709607d32e36d4fe195ce04456bce87fcf476d8693b74b5df73817dd5e35da0f644b9d96cf73ef7eb5b81f74ce6
|
@@ -29,17 +29,34 @@ module Avm
|
|
29
29
|
siblings.map { |s| sibling_gemfile_local_line(s) }.join
|
30
30
|
end
|
31
31
|
|
32
|
+
def on_unexisting_gemfile_local
|
33
|
+
return yield unless gemfile_local_path.exist?
|
34
|
+
|
35
|
+
::EacRubyUtils::Fs::Temp.on_file do |temp_file|
|
36
|
+
::FileUtils.cp(gemfile_local_path, temp_file)
|
37
|
+
begin
|
38
|
+
::FileUtils.rm_f(gemfile_local_path)
|
39
|
+
yield
|
40
|
+
ensure
|
41
|
+
::FileUtils.cp(temp_file, gemfile_local_path)
|
42
|
+
end
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
32
46
|
def run_bundle
|
33
|
-
|
34
|
-
|
35
|
-
|
47
|
+
on_unexisting_gemfile_local do
|
48
|
+
the_source.bundle.execute!
|
49
|
+
rescue ::RuntimeError
|
50
|
+
the_source.bundle('update').execute!
|
51
|
+
end
|
36
52
|
end
|
37
53
|
|
38
54
|
def sibling_gemfile_local_line(sibling)
|
39
55
|
["gem '#{sibling.gem_name}'",
|
40
56
|
"path: ::File.expand_path('" +
|
41
57
|
sibling.path.relative_path_from(the_source.path).to_path +
|
42
|
-
"', __dir__)"
|
58
|
+
"', __dir__)",
|
59
|
+
'require: false'].join(', ') + "\n"
|
43
60
|
end
|
44
61
|
|
45
62
|
def start_banner
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_ruby_utils/core_ext'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module EacRubyBase1
|
7
|
+
module Sources
|
8
|
+
module Runners
|
9
|
+
class Bundler
|
10
|
+
class GemfileLock
|
11
|
+
module Git
|
12
|
+
private
|
13
|
+
|
14
|
+
def git_continue
|
15
|
+
infom "Adding \"#{gemfile_lock}\"..."
|
16
|
+
git_repo.command('add', gemfile_lock).execute!
|
17
|
+
if rebase_conflict?
|
18
|
+
git_continue_run('rebase')
|
19
|
+
elsif cherry_conflict?
|
20
|
+
git_continue_run('cherry-pick')
|
21
|
+
else
|
22
|
+
raise 'Unknown how to continue'
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
def git_continue_run(command)
|
27
|
+
infom "\"#{command}\" --continue..."
|
28
|
+
cmd = git_repo.command(command, '--continue')
|
29
|
+
.envvar('GIT_EDITOR', 'true')
|
30
|
+
return unless !cmd.system && !conflict?
|
31
|
+
|
32
|
+
fatal_error "\"#{cmd}\" failed and there is no conflict"
|
33
|
+
end
|
34
|
+
|
35
|
+
def git_repo
|
36
|
+
instance.scm.git_repo
|
37
|
+
end
|
38
|
+
|
39
|
+
def git_reset_checkout
|
40
|
+
git_reset_gemfile_lock
|
41
|
+
git_checkout_gemfile_lock
|
42
|
+
end
|
43
|
+
|
44
|
+
def git_checkout_gemfile_lock
|
45
|
+
infom 'Checkouting...'
|
46
|
+
git_repo.command('checkout', '--', gemfile_lock).system!
|
47
|
+
end
|
48
|
+
|
49
|
+
def git_reset_gemfile_lock
|
50
|
+
infom 'Reseting...'
|
51
|
+
git_repo.command('reset', gemfile_lock).system! if
|
52
|
+
::File.exist?(gemfile_lock)
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
@@ -0,0 +1,89 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'eac_cli/core_ext'
|
4
|
+
|
5
|
+
module Avm
|
6
|
+
module EacRubyBase1
|
7
|
+
module Sources
|
8
|
+
module Runners
|
9
|
+
class Bundler
|
10
|
+
class GemfileLock
|
11
|
+
require_sub __FILE__, include_modules: true
|
12
|
+
runner_with :help do
|
13
|
+
desc 'Manipulage a "Gemfile.lock" file.'
|
14
|
+
bool_opt '-c', '--continue', 'Continue Git rebase/cherry-pick.'
|
15
|
+
bool_opt '-i', '--install', 'Run "bundle install".'
|
16
|
+
bool_opt '-u', '--update', 'Run "bundle update".'
|
17
|
+
bool_opt '-r', '--recursive', 'Run until Git rebase/cherry-pick is finished.'
|
18
|
+
bool_opt '-a', '--all', 'Same as "-cirud".'
|
19
|
+
bool_opt '-d', '--delete', 'Delete Gemfile.lock'
|
20
|
+
end
|
21
|
+
|
22
|
+
def run
|
23
|
+
loop do
|
24
|
+
git_reset_checkout
|
25
|
+
delete_gemfile_lock
|
26
|
+
bundle_update
|
27
|
+
bundle_install
|
28
|
+
git_continue
|
29
|
+
break if complete?
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
private
|
34
|
+
|
35
|
+
def complete?
|
36
|
+
!option_or_all?(:recursive) || !conflict?
|
37
|
+
end
|
38
|
+
|
39
|
+
def delete_gemfile_lock
|
40
|
+
::FileUtils.rm_f(gemfile_lock)
|
41
|
+
end
|
42
|
+
|
43
|
+
def rebasing?
|
44
|
+
git_repo.root_path.join('.git', 'rebase-merge').exist?
|
45
|
+
end
|
46
|
+
|
47
|
+
def bundle_install
|
48
|
+
infom '"bundle install"...'
|
49
|
+
bundle_run('install')
|
50
|
+
end
|
51
|
+
|
52
|
+
def bundle_update
|
53
|
+
infom '"bundle update"...'
|
54
|
+
bundle_run('update')
|
55
|
+
end
|
56
|
+
|
57
|
+
def gemfile_lock
|
58
|
+
'Gemfile.lock'
|
59
|
+
end
|
60
|
+
|
61
|
+
def bundle_run(*args)
|
62
|
+
instance.bundle(*args).system!
|
63
|
+
end
|
64
|
+
|
65
|
+
def conflict?
|
66
|
+
rebase_conflict? || cherry_conflict?
|
67
|
+
end
|
68
|
+
|
69
|
+
def rebase_conflict?
|
70
|
+
git_repo.root_path.join('.git', 'REBASE_HEAD').exist?
|
71
|
+
end
|
72
|
+
|
73
|
+
def cherry_conflict?
|
74
|
+
git_repo.root_path.join('.git', 'CHERRY_PICK_HEAD').exist?
|
75
|
+
end
|
76
|
+
|
77
|
+
def option_or_all?(option)
|
78
|
+
parsed[option] || parsed.all?
|
79
|
+
end
|
80
|
+
|
81
|
+
def instance
|
82
|
+
runner_context.call(:subject)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
end
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
89
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: avm-eac_ruby_base1
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.22.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Put here the authors
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-10-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: avm
|
@@ -16,20 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '0.
|
20
|
-
- - ">="
|
21
|
-
- !ruby/object:Gem::Version
|
22
|
-
version: 0.41.1
|
19
|
+
version: '0.45'
|
23
20
|
type: :runtime
|
24
21
|
prerelease: false
|
25
22
|
version_requirements: !ruby/object:Gem::Requirement
|
26
23
|
requirements:
|
27
24
|
- - "~>"
|
28
25
|
- !ruby/object:Gem::Version
|
29
|
-
version: '0.
|
30
|
-
- - ">="
|
31
|
-
- !ruby/object:Gem::Version
|
32
|
-
version: 0.41.1
|
26
|
+
version: '0.45'
|
33
27
|
- !ruby/object:Gem::Dependency
|
34
28
|
name: avm-eac_generic_base0
|
35
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -50,14 +44,14 @@ dependencies:
|
|
50
44
|
requirements:
|
51
45
|
- - "~>"
|
52
46
|
- !ruby/object:Gem::Version
|
53
|
-
version: '0.
|
47
|
+
version: '0.104'
|
54
48
|
type: :runtime
|
55
49
|
prerelease: false
|
56
50
|
version_requirements: !ruby/object:Gem::Requirement
|
57
51
|
requirements:
|
58
52
|
- - "~>"
|
59
53
|
- !ruby/object:Gem::Version
|
60
|
-
version: '0.
|
54
|
+
version: '0.104'
|
61
55
|
- !ruby/object:Gem::Dependency
|
62
56
|
name: aranha-parsers
|
63
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -139,6 +133,8 @@ files:
|
|
139
133
|
- lib/avm/eac_ruby_base1/sources/runners.rb
|
140
134
|
- lib/avm/eac_ruby_base1/sources/runners/bundler.rb
|
141
135
|
- lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_local.rb
|
136
|
+
- lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock.rb
|
137
|
+
- lib/avm/eac_ruby_base1/sources/runners/bundler/gemfile_lock/git.rb
|
142
138
|
- lib/avm/eac_ruby_base1/sources/runners/bundler/incompatible.rb
|
143
139
|
- lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb
|
144
140
|
- lib/avm/eac_ruby_base1/sources/tests.rb
|