eac_tools 0.36.0 → 0.36.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.
Files changed (58) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -0
  3. data/Gemfile.lock +13 -13
  4. data/lib/eac_tools/version.rb +1 -1
  5. data/sub/avm/lib/avm/launcher/paths/logical.rb +2 -1
  6. data/sub/{avm-tools/lib/avm/projects → avm/lib/avm/launcher}/stereotype.rb +1 -1
  7. data/sub/avm/lib/avm/version.rb +1 -1
  8. data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec +1 -1
  9. data/sub/{avm-tools/lib/avm/launcher/ruby → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher}/gem/build.rb +4 -4
  10. data/sub/{avm-tools/lib/avm/launcher/ruby → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher}/gem/specification.rb +2 -2
  11. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher/gem.rb +13 -0
  12. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/launcher.rb +11 -0
  13. data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb +1 -1
  14. data/sub/avm-git/avm-git.gemspec +1 -1
  15. data/sub/avm-git/lib/avm/git/issue/complete.rb +1 -1
  16. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/class_methods.rb +3 -3
  17. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/dirty_files.rb +2 -2
  18. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/remotes.rb +5 -5
  19. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/subrepo.rb +2 -2
  20. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base/underlying.rb +2 -2
  21. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/base.rb +9 -9
  22. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/error.rb +2 -2
  23. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/mirror_update.rb +5 -5
  24. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/publish_base.rb +4 -4
  25. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/remote.rb +2 -2
  26. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/sub_warp_base.rb +4 -4
  27. data/sub/{avm-tools/lib/avm/launcher/git → avm-git/lib/avm/git/launcher}/warp_base.rb +6 -6
  28. data/sub/avm-git/lib/avm/git/launcher.rb +7 -0
  29. data/sub/avm-git/lib/avm/git/organize/repository.rb +1 -0
  30. data/sub/avm-git/lib/avm/git/version.rb +1 -1
  31. data/sub/avm-tools/avm-tools.gemspec +3 -3
  32. data/sub/avm-tools/lib/avm/projects/stereotypes/git/publish.rb +2 -2
  33. data/sub/avm-tools/lib/avm/projects/stereotypes/git/warp.rb +2 -2
  34. data/sub/avm-tools/lib/avm/projects/stereotypes/git.rb +2 -2
  35. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subrepo/publish.rb +2 -2
  36. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subrepo/warp.rb +7 -7
  37. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subrepo.rb +4 -4
  38. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subtree/publish.rb +2 -2
  39. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subtree/warp.rb +4 -4
  40. data/sub/avm-tools/lib/avm/projects/stereotypes/git_subtree.rb +3 -3
  41. data/sub/avm-tools/lib/avm/projects/stereotypes/ruby_gem/publish.rb +2 -2
  42. data/sub/avm-tools/lib/avm/projects/stereotypes/ruby_gem.rb +4 -4
  43. data/sub/avm-tools/lib/avm/tools/runner/files/format.rb +2 -2
  44. data/sub/avm-tools/lib/avm/tools/runner/git/commit.rb +2 -2
  45. data/sub/avm-tools/lib/avm/tools/runner/git/deploy.rb +2 -2
  46. data/sub/avm-tools/lib/avm/tools/runner/git.rb +2 -2
  47. data/sub/avm-tools/lib/avm/tools/version.rb +1 -1
  48. data/sub/avm-tools/spec/lib/avm/launcher/context_spec.rb +50 -36
  49. data/sub/avm-tools/spec/lib/avm/launcher/git/base_spec.rb +2 -2
  50. data/sub/avm-tools/spec/lib/avm/launcher/ruby/gem/build_spec.rb +2 -2
  51. data/sub/avm-tools/spec/lib/avm/launcher/ruby/gem/specification_spec.rb +1 -1
  52. data/sub/avm-tools/spec/lib/avm/projects/stereotypes/git_subrepo/warp_spec.rb +1 -1
  53. data/sub/avm-tools/spec/lib/avm/tools/runner/source/issue/complete_spec.rb +2 -2
  54. data/sub/avm-tools/spec/spec_helper/eac_launcher.rb +4 -4
  55. metadata +25 -25
  56. data/sub/avm-tools/lib/avm/launcher/git.rb +0 -7
  57. data/sub/avm-tools/lib/avm/launcher/ruby/gem.rb +0 -4
  58. data/sub/avm-tools/lib/avm/launcher/ruby.rb +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ae4239b30a17da4a1f143e5aeddcf1b845a6234b2b95049d44a18c7fe7d8c041
4
- data.tar.gz: 394046628010ad6317a184017d7749895373a58ffdf03413bd8f899c77c9b70f
3
+ metadata.gz: cbfe0ab59e6f9c5c8c7bbfa72dac3511b3c666ec50a219da0cb72b68bd6fd57e
4
+ data.tar.gz: 44c539a327ce1f33448e91091198bc4e932571e7fffc8780110f9fa21b2d6a2a
5
5
  SHA512:
6
- metadata.gz: a950c92642fa1ed6ef188d2d4383356b5857d917a4be35ef504cab08a1f10d9dff64dcfc0d65b29c0665b52ca0be36d5d773796045209445c896c5a8c521cc6a
7
- data.tar.gz: 74983a5dab48ace1f6c06638e421aed086c32b9c9579e1585289c6a97aad8db4ab76423881a7700a319ea1c877671c5749f232962dc1f8791739dd014fcb5db0
6
+ metadata.gz: cdd20d0375d461660c5c92b11ac386b6c920fabec8abadeae17e08cc18f441a300c7f2d5cc1852f9c16fd9495b62ac25b83d34f789676a4fd89dc5f835a26e80
7
+ data.tar.gz: b07bd715ddbc48a80c8d1529d5972690f726d35a31ddfa2a42f50385fab31c294f814fe49dbf6dc5199ea51a88152f7dd8de09ad0b113ce908fffb268c8b1d73
data/Gemfile CHANGED
@@ -5,5 +5,10 @@ source 'https://rubygems.org'
5
5
  gemspec
6
6
 
7
7
  ::Dir["#{::File.join(__dir__, 'sub')}/*"].each do |dir|
8
+ next unless ::File.exist?(::File.join(dir, "#{::File.basename(dir)}.gemspec"))
9
+
8
10
  gem ::File.basename(dir), path: dir, require: false
9
11
  end
12
+
13
+ local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
14
+ eval_gemfile local_gemfile if ::File.exist?(local_gemfile)
data/Gemfile.lock CHANGED
@@ -1,8 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- eac_tools (0.36.0)
5
- avm (~> 0.47)
4
+ eac_tools (0.36.1)
5
+ avm (~> 0.48)
6
6
  avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
7
7
  avm-eac_generic_base0 (~> 0.5)
8
8
  avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
@@ -11,10 +11,10 @@ PATH
11
11
  avm-eac_rails_base1 (~> 0.7)
12
12
  avm-eac_redmine_base0 (~> 0.16)
13
13
  avm-eac_redmine_plugin_base0 (~> 0.3)
14
- avm-eac_ruby_base1 (~> 0.22)
14
+ avm-eac_ruby_base1 (~> 0.23)
15
15
  avm-eac_webapp_base0 (~> 0.9, >= 0.9.2)
16
16
  avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
17
- avm-tools (~> 0.140)
17
+ avm-tools (~> 0.141)
18
18
  eac_ruby_utils (~> 0.104)
19
19
 
20
20
  PATH
@@ -87,8 +87,8 @@ PATH
87
87
  PATH
88
88
  remote: sub/avm-eac_ruby_base1
89
89
  specs:
90
- avm-eac_ruby_base1 (0.22.0)
91
- avm (~> 0.45)
90
+ avm-eac_ruby_base1 (0.23.0)
91
+ avm (~> 0.48)
92
92
  avm-eac_generic_base0 (~> 0.5)
93
93
  eac_ruby_utils (~> 0.104)
94
94
 
@@ -123,8 +123,8 @@ PATH
123
123
  PATH
124
124
  remote: sub/avm-git
125
125
  specs:
126
- avm-git (0.5.0)
127
- avm (~> 0.46)
126
+ avm-git (0.6.0)
127
+ avm (~> 0.48)
128
128
  avm-files (~> 0.4, >= 0.4.1)
129
129
  eac_git (~> 0.12, >= 0.12.3)
130
130
  eac_ruby_utils (~> 0.104)
@@ -132,13 +132,13 @@ PATH
132
132
  PATH
133
133
  remote: sub/avm-tools
134
134
  specs:
135
- avm-tools (0.140.0)
135
+ avm-tools (0.141.0)
136
136
  aranha-parsers (~> 0.14, >= 0.14.3)
137
- avm (~> 0.46)
138
- avm-eac_ruby_base1 (~> 0.22)
137
+ avm (~> 0.48)
138
+ avm-eac_ruby_base1 (~> 0.23)
139
139
  avm-eac_ubuntu_base0 (~> 0.3)
140
140
  avm-files (~> 0.4, >= 0.4.1)
141
- avm-git (~> 0.5)
141
+ avm-git (~> 0.6)
142
142
  clipboard (~> 1.3, >= 1.3.6)
143
143
  curb (~> 0.9, >= 0.9.11)
144
144
  eac_git (~> 0.12, >= 0.12.3)
@@ -150,7 +150,7 @@ PATH
150
150
  PATH
151
151
  remote: sub/avm
152
152
  specs:
153
- avm (0.47.0)
153
+ avm (0.48.0)
154
154
  eac_cli (~> 0.28)
155
155
  eac_config (~> 0.11, >= 0.11.1)
156
156
  eac_docker (~> 0.5)
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module EacTools
4
- VERSION = '0.36.0'
4
+ VERSION = '0.36.1'
5
5
  end
@@ -2,6 +2,7 @@
2
2
 
3
3
  require 'avm/projects/stereotypes'
4
4
  require 'avm/launcher/paths/real'
5
+ require 'avm/launcher/stereotype'
5
6
 
6
7
  module Avm
7
8
  module Launcher
@@ -61,7 +62,7 @@ module Avm
61
62
  private
62
63
 
63
64
  def stereotypes_uncached
64
- ::Avm::Projects::Stereotype.stereotypes.select { |s| s.match?(self) }
65
+ ::Avm::Launcher::Stereotype.stereotypes.select { |s| s.match?(self) }
65
66
  end
66
67
 
67
68
  def build_child(name)
@@ -4,7 +4,7 @@ require 'active_support/core_ext/string/inflections'
4
4
  require 'colorized_string'
5
5
 
6
6
  module Avm
7
- module Projects
7
+ module Launcher
8
8
  module Stereotype
9
9
  class << self
10
10
  attr_reader :stereotypes
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- VERSION = '0.47.0'
4
+ VERSION = '0.48.0'
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib,locale,template}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.45'
15
+ s.add_dependency 'avm', '~> 0.48'
16
16
  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
17
17
  s.add_dependency 'eac_ruby_utils', '~> 0.104'
18
18
 
@@ -3,11 +3,11 @@
3
3
  require 'tmpdir'
4
4
  require 'eac_cli/speaker'
5
5
  require 'eac_ruby_utils/envs'
6
- require 'avm/launcher/ruby/gem/specification'
6
+ require 'avm/eac_ruby_base1/launcher/gem/specification'
7
7
 
8
8
  module Avm
9
- module Launcher
10
- module Ruby
9
+ module EacRubyBase1
10
+ module Launcher
11
11
  module Gem
12
12
  class Build
13
13
  enable_speaker
@@ -88,7 +88,7 @@ module Avm
88
88
  end
89
89
 
90
90
  def check_gem_version
91
- spec = ::Avm::Launcher::Ruby::Gem::Specification.new(gemspec_file)
91
+ spec = ::Avm::EacRubyBase1::Launcher::Gem::Specification.new(gemspec_file)
92
92
  return if ::File.basename(output_file, '.gem') == spec.full_name
93
93
 
94
94
  raise("Builded gem is not the same version of gemspec (#{spec}, #{output_file})")
@@ -3,8 +3,8 @@
3
3
  require 'active_support/core_ext/object'
4
4
 
5
5
  module Avm
6
- module Launcher
7
- module Ruby
6
+ module EacRubyBase1
7
+ module Launcher
8
8
  module Gem
9
9
  class Specification
10
10
  class << self
@@ -0,0 +1,13 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRubyBase1
7
+ module Launcher
8
+ module Gem
9
+ require_sub __FILE__
10
+ end
11
+ end
12
+ end
13
+ end
@@ -0,0 +1,11 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'eac_ruby_utils/core_ext'
4
+
5
+ module Avm
6
+ module EacRubyBase1
7
+ module Launcher
8
+ require_sub __FILE__
9
+ end
10
+ end
11
+ end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRubyBase1
5
- VERSION = '0.22.0'
5
+ VERSION = '0.23.0'
6
6
  end
7
7
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
 
13
13
  s.files = Dir['{lib}/**/*']
14
14
 
15
- s.add_dependency 'avm', '~> 0.46'
15
+ s.add_dependency 'avm', '~> 0.48'
16
16
  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
17
17
  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
18
18
  s.add_dependency 'eac_ruby_utils', '~> 0.104'
@@ -58,7 +58,7 @@ module Avm
58
58
  end
59
59
 
60
60
  def launcher_git_uncached
61
- ::Avm::Launcher::Git::Base.new(dir)
61
+ ::Avm::Git::Launcher::Base.new(dir)
62
62
  end
63
63
  end
64
64
  end
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- module Launcher
5
- module Git
4
+ module Git
5
+ module Launcher
6
6
  class Base < ::Avm::Launcher::Paths::Real
7
7
  module ClassMethods
8
- # @return [Avm::Launcher::Git::Base]
8
+ # @return [Avm::Git::Launcher::Base]
9
9
  def by_root(search_base_path)
10
10
  new(find_root(search_base_path).to_path)
11
11
  end
@@ -3,8 +3,8 @@
3
3
  require 'active_support/core_ext/object'
4
4
 
5
5
  module Avm
6
- module Launcher
7
- module Git
6
+ module Git
7
+ module Launcher
8
8
  class Base < ::Avm::Launcher::Paths::Real
9
9
  module DirtyFiles
10
10
  delegate :dirty?, to: :eac_git
@@ -1,16 +1,16 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_ruby_utils/core_ext'
4
- require 'avm/launcher/git/remote'
4
+ require 'avm/git/launcher/remote'
5
5
 
6
6
  module Avm
7
- module Launcher
8
- module Git
7
+ module Git
8
+ module Launcher
9
9
  class Base < ::Avm::Launcher::Paths::Real
10
10
  module Remotes
11
- # @return [Avm::Launcher::Git::Remote]
11
+ # @return [Avm::Git::Launcher::Remote]
12
12
  def remote(name)
13
- ::Avm::Launcher::Git::Remote.new(self, name)
13
+ ::Avm::Git::Launcher::Remote.new(self, name)
14
14
  end
15
15
 
16
16
  def remote_hashs(remote_name)
@@ -3,8 +3,8 @@
3
3
  require 'active_support/core_ext/object'
4
4
 
5
5
  module Avm
6
- module Launcher
7
- module Git
6
+ module Git
7
+ module Launcher
8
8
  class Base < ::Avm::Launcher::Paths::Real
9
9
  module Subrepo
10
10
  def subrepo_status(subrepo_path)
@@ -6,8 +6,8 @@ require 'git'
6
6
  require 'avm/launcher/paths/real'
7
7
 
8
8
  module Avm
9
- module Launcher
10
- module Git
9
+ module Git
10
+ module Launcher
11
11
  class Base < ::Avm::Launcher::Paths::Real
12
12
  module Underlying
13
13
  def command(*args)
@@ -4,19 +4,19 @@ require 'eac_git/local'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
  require 'eac_ruby_utils/envs'
6
6
  require 'avm/launcher/paths/real'
7
- require 'avm/launcher/git/error'
7
+ require 'avm/git/launcher/error'
8
8
 
9
9
  module Avm
10
- module Launcher
11
- module Git
10
+ module Git
11
+ module Launcher
12
12
  class Base < ::Avm::Launcher::Paths::Real
13
13
  require_sub __FILE__
14
14
  enable_simple_cache
15
- extend ::Avm::Launcher::Git::Base::ClassMethods
16
- include ::Avm::Launcher::Git::Base::DirtyFiles
17
- include ::Avm::Launcher::Git::Base::Remotes
18
- include ::Avm::Launcher::Git::Base::Subrepo
19
- include ::Avm::Launcher::Git::Base::Underlying
15
+ extend ::Avm::Git::Launcher::Base::ClassMethods
16
+ include ::Avm::Git::Launcher::Base::DirtyFiles
17
+ include ::Avm::Git::Launcher::Base::Remotes
18
+ include ::Avm::Git::Launcher::Base::Subrepo
19
+ include ::Avm::Git::Launcher::Base::Underlying
20
20
 
21
21
  attr_reader :eac_git
22
22
  delegate :descendant?, :merge_base, :rev_parse, to: :eac_git
@@ -78,7 +78,7 @@ module Avm
78
78
  end
79
79
 
80
80
  def raise(message)
81
- ::Kernel.raise Avm::Launcher::Git::Error.new(self, message)
81
+ ::Kernel.raise Avm::Git::Launcher::Error.new(self, message)
82
82
  end
83
83
  end
84
84
  end
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Avm
4
- module Launcher
5
- module Git
4
+ module Git
5
+ module Launcher
6
6
  class Error < StandardError
7
7
  def initialize(git_instance, message)
8
8
  super("#{message} (Repository: #{git_instance})")
@@ -1,17 +1,17 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/launcher/git/base'
3
+ require 'avm/git/launcher/base'
4
4
 
5
5
  module Avm
6
- module Launcher
7
- module Git
6
+ module Git
7
+ module Launcher
8
8
  class MirrorUpdate < ::Avm::Launcher::Paths::Real
9
9
  include ::EacRubyUtils::SimpleCache
10
10
 
11
11
  def initialize(target_path, source_path, source_rev)
12
12
  super(target_path)
13
- @target_git = ::Avm::Launcher::Git::Base.new(self)
14
- @source_git = ::Avm::Launcher::Git::Base.new(source_path)
13
+ @target_git = ::Avm::Git::Launcher::Base.new(self)
14
+ @source_git = ::Avm::Git::Launcher::Base.new(source_path)
15
15
  @source_rev = source_rev
16
16
  run
17
17
  end
@@ -6,8 +6,8 @@ require 'avm/launcher/publish/base'
6
6
  require 'avm/launcher/publish/check_result'
7
7
 
8
8
  module Avm
9
- module Launcher
10
- module Git
9
+ module Git
10
+ module Launcher
11
11
  class PublishBase < ::Avm::Launcher::Publish::Base
12
12
  include ::EacRubyUtils::SimpleCache
13
13
  enable_speaker
@@ -92,7 +92,7 @@ module Avm
92
92
  end
93
93
 
94
94
  def sgit_uncached
95
- ::Avm::Launcher::Git::Base.new(instance.warped)
95
+ ::Avm::Git::Launcher::Base.new(instance.warped)
96
96
  end
97
97
 
98
98
  def publish
@@ -117,7 +117,7 @@ module Avm
117
117
  end
118
118
 
119
119
  def remote_name
120
- ::Avm::Launcher::Git::WarpBase::TARGET_REMOTE
120
+ ::Avm::Git::Launcher::WarpBase::TARGET_REMOTE
121
121
  end
122
122
  end
123
123
  end
@@ -3,8 +3,8 @@
3
3
  require 'eac_ruby_utils/core_ext'
4
4
 
5
5
  module Avm
6
- module Launcher
7
- module Git
6
+ module Git
7
+ module Launcher
8
8
  class Remote
9
9
  common_constructor :git, :name
10
10
 
@@ -1,11 +1,11 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/projects/stereotype'
4
3
  require 'avm/launcher/errors/base'
4
+ require 'avm/launcher/stereotype'
5
5
 
6
6
  module Avm
7
- module Launcher
8
- module Git
7
+ module Git
8
+ module Launcher
9
9
  module SubWarpBase
10
10
  private
11
11
 
@@ -17,7 +17,7 @@ module Avm
17
17
  end
18
18
 
19
19
  def find_parent_instance(current)
20
- if ::Avm::Projects::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
20
+ if ::Avm::Launcher::Stereotype.git_stereotypes.any? { |s| current.stereotype?(s) }
21
21
  return current
22
22
  end
23
23
 
@@ -1,13 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/launcher/git/mirror_update'
3
+ require 'avm/git/launcher/mirror_update'
4
4
  require 'avm/launcher/instances/error'
5
5
  require 'avm/git/vendor/github'
6
6
  require 'avm/projects/stereotypes/git/publish'
7
7
 
8
8
  module Avm
9
- module Launcher
10
- module Git
9
+ module Git
10
+ module Launcher
11
11
  # Métodos abstratos:
12
12
  # * source_instance
13
13
  # * source_remote_name
@@ -39,7 +39,7 @@ module Avm
39
39
 
40
40
  def update
41
41
  validate_source_current_revision
42
- ::Avm::Launcher::Git::MirrorUpdate.new(
42
+ ::Avm::Git::Launcher::MirrorUpdate.new(
43
43
  path,
44
44
  source_instance.real,
45
45
  source_instance.options.git_current_revision
@@ -51,11 +51,11 @@ module Avm
51
51
  end
52
52
 
53
53
  def source_git_uncached
54
- ::Avm::Launcher::Git::Base.new(source_instance.real)
54
+ ::Avm::Git::Launcher::Base.new(source_instance.real)
55
55
  end
56
56
 
57
57
  def cache_git_uncached
58
- ::Avm::Launcher::Git::Base.new(update)
58
+ ::Avm::Git::Launcher::Base.new(update)
59
59
  end
60
60
 
61
61
  def target_remote_url
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'avm/git/launcher/base'
4
+ require 'avm/git/launcher/error'
5
+ require 'avm/git/launcher/mirror_update'
6
+ require 'avm/git/launcher/publish_base'
7
+ require 'avm/git/launcher/warp_base'
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/git/organize/reference_update'
3
4
  require 'eac_ruby_utils/core_ext'
4
5
 
5
6
  module Avm
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module Git
5
- VERSION = '0.5.0'
5
+ VERSION = '0.6.0'
6
6
  end
7
7
  end
@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
15
15
  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
16
16
 
17
17
  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.3'
18
- s.add_dependency 'avm', '~> 0.46'
19
- s.add_dependency 'avm-eac_ruby_base1', '~> 0.22'
18
+ s.add_dependency 'avm', '~> 0.48'
19
+ s.add_dependency 'avm-eac_ruby_base1', '~> 0.23'
20
20
  s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
21
21
  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
22
- s.add_dependency 'avm-git', '~> 0.5'
22
+ s.add_dependency 'avm-git', '~> 0.6'
23
23
  s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
24
24
  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
25
25
  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.3'
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/launcher/git/publish_base'
3
+ require 'avm/git/launcher/publish_base'
4
4
 
5
5
  module Avm
6
6
  module Projects
7
7
  module Stereotypes
8
8
  class Git
9
- class Publish < ::Avm::Launcher::Git::PublishBase
9
+ class Publish < ::Avm::Git::Launcher::PublishBase
10
10
  PUBLISH_GIT_REMOTE_NAME = 'publish'
11
11
  end
12
12
  end
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/launcher/git/warp_base'
3
+ require 'avm/git/launcher/warp_base'
4
4
 
5
5
  module Avm
6
6
  module Projects
7
7
  module Stereotypes
8
8
  class Git
9
- class Warp < ::Avm::Launcher::Git::WarpBase
9
+ class Warp < ::Avm::Git::Launcher::WarpBase
10
10
  private
11
11
 
12
12
  def current_ref
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/projects/stereotype'
3
+ require 'avm/launcher/stereotype'
4
4
  require 'eac_ruby_utils/core_ext'
5
5
 
6
6
  module Avm
@@ -8,7 +8,7 @@ module Avm
8
8
  module Stereotypes
9
9
  class Git
10
10
  require_sub __FILE__
11
- include Avm::Projects::Stereotype
11
+ include Avm::Launcher::Stereotype
12
12
 
13
13
  class << self
14
14
  def match?(path)
@@ -1,12 +1,12 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/launcher/git/publish_base'
3
+ require 'avm/git/launcher/publish_base'
4
4
 
5
5
  module Avm
6
6
  module Projects
7
7
  module Stereotypes
8
8
  class GitSubrepo
9
- class Publish < ::Avm::Launcher::Git::PublishBase
9
+ class Publish < ::Avm::Git::Launcher::PublishBase
10
10
  end
11
11
  end
12
12
  end
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_ruby_utils/simple_cache'
4
- require 'avm/launcher/git/sub_warp_base'
4
+ require 'avm/git/launcher/sub_warp_base'
5
5
  require 'avm/launcher/errors/base'
6
6
  require 'avm/launcher/paths/real'
7
7
  require 'avm/git/vendor/github'
@@ -11,7 +11,7 @@ module Avm
11
11
  module Stereotypes
12
12
  class GitSubrepo
13
13
  class Warp < ::Avm::Launcher::Paths::Real
14
- include ::Avm::Launcher::Git::SubWarpBase
14
+ include ::Avm::Git::Launcher::SubWarpBase
15
15
  include ::EacRubyUtils::SimpleCache
16
16
 
17
17
  attr_reader :instance
@@ -46,11 +46,11 @@ module Avm
46
46
  end
47
47
 
48
48
  def init_aux
49
- ::Avm::Launcher::Git::Base.new(aux_path).init_bare
49
+ ::Avm::Git::Launcher::Base.new(aux_path).init_bare
50
50
  end
51
51
 
52
52
  def parent_git_warped_uncached
53
- ::Avm::Launcher::Git::Base.new(parent_instance.warped)
53
+ ::Avm::Git::Launcher::Base.new(parent_instance.warped)
54
54
  end
55
55
 
56
56
  def aux_path
@@ -58,7 +58,7 @@ module Avm
58
58
  end
59
59
 
60
60
  def warped_git_uncached
61
- ::Avm::Launcher::Git::Base.new(instance.cache_path('git_repository'))
61
+ ::Avm::Git::Launcher::Base.new(instance.cache_path('git_repository'))
62
62
  end
63
63
 
64
64
  def push_to_aux
@@ -68,11 +68,11 @@ module Avm
68
68
  end
69
69
 
70
70
  def reset
71
- ::Avm::Launcher::Git::MirrorUpdate.new(warped_git, aux_path, 'master')
71
+ ::Avm::Git::Launcher::MirrorUpdate.new(warped_git, aux_path, 'master')
72
72
  end
73
73
 
74
74
  def assert_target_remote
75
- warped_git.assert_remote_url(::Avm::Launcher::Git::WarpBase::TARGET_REMOTE,
75
+ warped_git.assert_remote_url(::Avm::Git::Launcher::WarpBase::TARGET_REMOTE,
76
76
  target_remote_url)
77
77
  end
78
78