eac_tools 0.16.0 → 0.18.0

data/sub/{avm-tools/lib/avm/ruby/gems/generator.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators/base.rb}

@@ -1,22 +1,33 @@
 # frozen_string_literal: true
 
 require 'avm/eac_ruby_base1/sources/base'
+require 'avm/source_generators/base'
 require 'eac_templates/core_ext'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Ruby
-    module Gems
-      class Generator
+  module EacRubyBase1
+    module SourceGenerators
+      class Base < ::Avm::SourceGenerators::Base
         IDENT = '  '
         JOBS = %w[root_directory gemspec root_lib version_lib static gemfile_lock].freeze
         TEMPLATE_VARIABLES = %w[lib_path name root_module].freeze
+        OPTIONS = {
+          'eac-ruby-utils-version'.to_sym => 'Version for "eac_ruby_utils" gem.',
+          'eac-ruby-gem-support-version'.to_sym => 'Version for "eac_ruby_gem_support" gem.'
+        }.freeze
 
         enable_speaker
         enable_simple_cache
-        common_constructor :root_directory, :options, default: [{}] do
-          self.root_directory = root_directory.to_pathname
-          run
+
+        class << self
+          def option_list
+            OPTIONS.inject(super) { |a, e| a.option(*e) }
+          end
+        end
+
+        def root_directory
+          target_path
         end
 
         def eac_ruby_gem_support_version
@@ -35,6 +46,15 @@ module Avm
           name.split('-').join('/')
         end
 
+        def perform
+          infov 'Root directory', root_directory
+          infov 'Gem name', name
+          JOBS.each do |job|
+            infom "Generating #{job.humanize}..."
+            send("generate_#{job}")
+          end
+        end
+
         def root_module
           lib_path.camelize
         end
@@ -101,15 +121,6 @@ module Avm
           template_apply('version', "lib/#{lib_path}/version.rb")
         end
 
-        def run
-          infov 'Root directory', root_directory
-          infov 'Gem name', name
-          JOBS.each do |job|
-            infom "Generating #{job.humanize}..."
-            send("generate_#{job}")
-          end
-        end
-
         def self_gem_uncached
           ::Avm::EacRubyBase1::Sources::Base.new(root_directory)
         end
@@ -154,7 +165,7 @@ module Avm
           end
 
           def options_version
-            options["#{gem_name}_version".to_sym].if_present do |v|
+            options["#{gem_name}_version".dasherize.to_sym].if_present do |v|
               ::Gem::Version.new(v)
             end
           end

data/sub/{avm-tools/sub/avm-git/lib/avm/git/organize.rb → avm-eac_ruby_base1/lib/avm/eac_ruby_base1/source_generators.rb}

@@ -3,8 +3,8 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Git
-    module Organize
+  module EacRubyBase1
+    module SourceGenerators
       require_sub __FILE__
     end
   end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.12.0'
+    VERSION = '0.15.0'
   end
 end

data/sub/{avm-tools/spec/lib/avm/tools/runner/ruby/gems/generate_spec.rb → avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb}

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
-require 'avm/tools/runner'
+require 'avm/eac_ruby_base1/source_generators/base'
+require 'avm/source_generators/runner'
 
-RSpec.describe ::Avm::Tools::Runner::Ruby::Gems::Generate do
-  let(:targets_root) { ::Pathname.new('generate_spec_files').expand_path(__dir__) }
+RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
+  let(:targets_root) { ::Pathname.new('base_spec_files').expand_path(__dir__) }
 
   %w[mygem dashed-mygem].each do |gem_name|
     context "when runner is executed for #{gem_name}" do
+      let(:stereotype) { 'EacRubyBase1' }
       let(:target_dir) { targets_root.join(gem_name) }
       let(:temp_dir) { ::EacRubyUtils::Fs::Temp.directory }
       let(:gem_path) { temp_dir.join(gem_name) }
       let(:argv) do
-        %w[ruby gems generate --eac-ruby-utils-version=0.35.0
-           --eac-ruby-gem-support-version=0.2.0] + [gem_path.to_path]
+        %w[--option eac-ruby-utils-version:0.35.0 --option eac-ruby-gem-support-version:0.2.0] +
+          [stereotype, gem_path.to_path]
       end
 
       before do
-        ::Avm::Tools::Runner.run(argv: argv)
+        ::Avm::SourceGenerators::Runner.run(argv: argv)
       end
 
       after do

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/dashed-mygem/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec_files/mygem/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_ruby_base1/template/avm/eac_ruby_base1/source_generators/base/static/Gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec
+
+local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
+eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-eac_wordpress_base0/avm-eac_wordpress_base0.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
+  s.add_dependency 'avm', '~> 0.35'
   s.add_dependency 'avm-eac_webapp_base0', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.97'
 

data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/instances/apache_host.rb

@@ -15,11 +15,11 @@ module Avm
         end
 
         def system_user
-          instance.read_entry('system.username')
+          instance.install_username
         end
 
         def system_group
-          instance.read_entry('system.groupname')
+          instance.install_groupname
         end
       end
     end

data/sub/avm-eac_wordpress_base0/lib/avm/eac_wordpress_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWordpressBase0
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/sub/avm-eac_wordpress_base0/spec/lib/avm/eac_wordpress_base0/instances/apache_host_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/instances/entry_keys'
 require 'avm/eac_wordpress_base0/instances/apache_host'
 require 'avm/eac_wordpress_base0/instances/base'
 
@@ -12,9 +13,9 @@ RSpec.describe ::Avm::EacWordpressBase0::Instances::ApacheHost do
     end
 
     before do
-      instance.entry('fs_path').write('/path/to/stub-app_0')
-      instance.entry('web.url').write('http://stubapp.net')
-      instance.entry('system.username').write('myuser')
+      instance.entry(::Avm::Instances::EntryKeys::FS_PATH).write('/path/to/stub-app_0')
+      instance.entry(::Avm::Instances::EntryKeys::WEB_URL).write('http://stubapp.net')
+      instance.entry(::Avm::Instances::EntryKeys::INSTALL_USERNAME).write('myuser')
     end
 
     it do

data/sub/avm-tools/Gemfile

@@ -4,12 +4,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gems_subdir = ::File.join(__dir__, 'sub')
-Dir["#{gems_subdir}/*"].each do |dir|
-  next unless ::File.file?(::File.join(dir, 'Gemfile'))
-
-  gem ::File.basename(dir), path: dir
-end
-
 local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/sub/avm-tools/avm-tools.gemspec

@@ -15,14 +15,16 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
   s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.30'
+  s.add_dependency 'avm', '~> 0.34'
   s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
   s.add_dependency 'avm-files', '~> 0.1'
   s.add_dependency 'avm-git', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.3'
   s.add_dependency 'curb', '~> 0.9.10'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.1'
   s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.4'
+  s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.1'
   s.add_dependency 'git', '~> 1.7'
   s.add_dependency 'ruby-progressbar', '~> 1.10', '>= 1.10.1'
 

data/sub/avm-tools/lib/avm/tools/runner/app_src.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
+require 'avm/sources/runner'
 require 'avm/tools/app_src'
 require 'eac_cli/core_ext'
 
 module Avm
   module Tools
     class Runner
-      class AppSrc
+      class AppSrc < ::Avm::Sources::Runner
         require_sub __FILE__
-        runner_with :help, :subcommands do
-          desc 'Utilities for local projects.'
-          arg_opt '-C', '--path', 'Path to local project instance.'
-          subcommands
-        end
 
         def instance_banner
           infov 'Instance', instance
@@ -20,19 +16,13 @@ module Avm
         end
 
         def subject
-          instance.avm_instance
+          source
         end
 
-        delegate :extra_available_subcommands, to: :subject
-
         private
 
         def instance_uncached
-          ::Avm::Tools::AppSrc.new(instance_path)
-        end
-
-        def instance_path_uncached
-          (parsed.path || '.').to_pathname.expand_path
+          ::Avm::Tools::AppSrc.new(source_path)
         end
       end
     end

data/sub/avm-tools/lib/avm/tools/runner/source_generate.rb

@@ -1,44 +1,11 @@
 # frozen_string_literal: true
 
-require 'avm/runners/base'
-require 'eac_cli/core_ext'
+require 'avm/source_generators/runner'
 
 module Avm
   module Tools
     class Runner
-      class SourceGenerate
-        runner_with :help do
-          pos_arg :stereotype_name
-          pos_arg :target_path
-        end
-
-        def run
-          start_banner
-          generate
-        end
-
-        def generate
-          infom 'Generating...'
-          generator.perform
-          success "Source generated in \"#{generator.target_path}\""
-        end
-
-        def start_banner
-          infov 'Stereotype', stereotype_name
-          infov 'Target path', target_path
-          infov 'Generator', generator.class
-        end
-
-        def generator_uncached
-          ::Avm::Registry.source_generators.detect_optional(stereotype_name, target_path) ||
-            fatal_error("No generator found for stereotype \"#{stereotype_name}\"")
-        end
-
-        delegate :stereotype_name, to: :parsed
-
-        def target_path
-          parsed.target_path.to_pathname
-        end
+      class SourceGenerate < ::Avm::SourceGenerators::Runner
       end
     end
   end

data/sub/avm-tools/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.129.0'
+    VERSION = '0.131.0'
   end
 end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/patches/addressable/uri/query_value.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'addressable'
+
+module Addressable
+  class URI
+    # @return [ActiveSupport:HashWithIndifferentAccess]
+    def hash_query_values
+      (query_values || {}).with_indifferent_access
+    end
+
+    def query_value(*args)
+      if args.count == 1
+        query_value_get(*args)
+      elsif args.count == 2
+        query_value_set(*args)
+      else
+        raise ::ArgumentError, "#{object.class}.#{__method__}: wrong number of arguments" \
+          " (given #{args.count}, expected 1..2)"
+      end
+    end
+
+    private
+
+    def query_value_get(name)
+      hash_query_values[name]
+    end
+
+    def query_value_set(name, value)
+      new_query_values = hash_query_values
+      new_query_values[name] = value
+      self.query_values = new_query_values
+
+      self
+    end
+  end
+end

data/sub/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.97.0'
+  VERSION = '0.98.0'
 end

data/sub/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/addressable/uri/query_value_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/patches/addressable/uri/query_value'
+
+RSpec.describe ::Addressable::URI do
+  subject(:instance) { described_class.parse('http://example.net') }
+
+  it { expect(instance.query_values).to be_nil }
+  it { expect(instance.hash_query_values).to eq({}) }
+
+  it { expect(instance.query_value('param1')).to be_nil }
+  it { expect(instance.query_value(:param1)).to be_nil }
+
+  context 'when param is set' do
+    let(:set_result) { instance.query_value(:param1, :value1) }
+
+    before { set_result }
+
+    it { expect(set_result).to eq(instance) }
+    it { expect(instance.query_values).to eq({ 'param1' => 'value1' }) }
+    it { expect(instance.hash_query_values).to eq({ 'param1' => 'value1' }) }
+    it { expect(instance.query_value('param1')).to eq('value1') }
+    it { expect(instance.query_value(:param1)).to eq('value1') }
+  end
+end