avm-tools 0.70.2 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0ca6899907a27aa6b201493d4333c63fd975ad79c0f705171af4cbb7d12254
-  data.tar.gz: f520c92fc4a738cb27a5b14cff784b4321a9bed091993571b1aa096484f1dc01
+  metadata.gz: 7f1459b957df5b13191a6411437651630d19ef6db3b12f62441d59238ede4679
+  data.tar.gz: 816d7f150ca0aa5e5cc573a77395b92c36fcba8fb41429f93dadc94f506233d8
 SHA512:
-  metadata.gz: 7e5335434368d606d4d6bd23736fdec437ee2511748612fa2fa1b1f4c991038b50e740ede71149affa736c8314e662568bbeef92cb7c60ff25b1b8e993de57f5
-  data.tar.gz: 2f675b8c6e57cb0f4eba761fdc227ec1f1f0a5dacea96ab5600733474a1c2d9258a5d8a8ae59c3566f3a2c492072bd8ff455dd36b076f97dd8e21e4763358814
+  metadata.gz: 422c93704e878d5894ac17e38f4df881d98a70ebd90696fa98fa9968b583710e2c2f7ff2f31cefb1df3fd9b01f2536d7ae6ee26ea35f6a98d5ae113415cec610
+  data.tar.gz: 3720efd94cdeb9dc295f53f7ac22e3460bf67f6e8c5ee1ef654ee4f3320de65138dfc70538d6bc2e2ae4f1b589c81960ca685af5685a4778f42158a59ce9118c

data/lib/avm/eac_rails_base0/instance.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
+require 'avm/rails/instance'
 
 module Avm
   module EacRailsBase0
     class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Stereotypes::Rails::Instance
+      include ::Avm::Rails::Instance
 
       FILES_UNITS = { uploads: 'public/uploads' }.freeze
     end

data/lib/avm/eac_redmine_base0/instance.rb

@@ -3,12 +3,12 @@
 require 'avm/eac_redmine_base0/data_unit'
 require 'avm/eac_ubuntu_base0/docker_image'
 require 'avm/eac_webapp_base0/instance'
-require 'avm/stereotypes/rails/instance'
+require 'avm/rails/instance'
 
 module Avm
   module EacRedmineBase0
     class Instance < ::Avm::EacWebappBase0::Instance
-      include ::Avm::Stereotypes::Rails::Instance
+      include ::Avm::Rails::Instance
 
       FILES_UNITS = { files: 'files' }.freeze
 

data/lib/avm/rails/instance.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Avm
+  module Rails
+    module Instance
+      def bundle(*args)
+        the_gem.bundle(*args).chdir_root.envvar('RAILS_ENV', 'production')
+      end
+
+      def rake(*args)
+        bundle('exec', 'rake', *args)
+      end
+
+      def the_gem
+        @the_gem ||= ::EacRubyGemsUtils::Gem.new(::File.join(read_entry('fs_path')), host_env)
+      end
+    end
+  end
+end

data/lib/avm/tools/runner/eac_rails_base0/rails_server.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/instances/entry_keys'
+require 'eac_cli/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'shellwords'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class EacRailsBase0 < ::EacRubyUtils::Console::DocoptRunner
+        class RailsServer
+          runner_with
+
+          runner_definition do
+            desc 'Run the embbeded Rails web server.'
+            arg_opt '-e', '--environment', 'Specifies the environment to run this server under' \
+              ' (development/test/production).'
+          end
+
+          def run
+            infov 'Bundle args', ::Shellwords.join(bundle_args)
+            infov 'Result', command.system
+          end
+
+          protected
+
+          def bundle_args
+            ['exec', 'rails', 'server', '--port',
+             runner_context.call(:instance).read_entry(::Avm::Instances::EntryKeys::WEB_PORT)] +
+              parsed.environment.if_present([]) { |v| ['--environment', v] }
+          end
+
+          def command
+            runner_context.call(:instance).bundle(*bundle_args).chdir_root
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.70.2'
+    VERSION = '0.71.0'
   end
 end

data/vendor/eac_cli/lib/eac_cli/runner.rb

@@ -45,7 +45,7 @@ module EacCli
     module AfterClassMethods
       def create(*runner_context_args)
         r = new
-        r.runner_context = ::EacCli::Runner::Context.new(*runner_context_args)
+        r.runner_context = ::EacCli::Runner::Context.new(r, *runner_context_args)
         r
       end
 

data/vendor/eac_cli/lib/eac_cli/runner/context.rb

@@ -5,13 +5,30 @@ require 'eac_ruby_utils/core_ext'
 module EacCli
   module Runner
     class Context
-      attr_reader :argv, :parent, :program_name
+      attr_reader :argv, :parent, :program_name, :runner
 
-      def initialize(*context_args)
+      def initialize(runner, *context_args)
         options = context_args.extract_options!
         @argv = (context_args[0] || options.delete(:argv) || ARGV).dup.freeze
         @parent = context_args[1] || options.delete(:parent)
         @program_name = options.delete(:program_name)
+        @runner = runner
+      end
+
+      # Call a method in the runner or in one of it ancestors.
+      def call(method_name, *args)
+        return runner.send(method_name, *args) if runner.respond_to?(method_name)
+        return parent_call(method_name, *args) if parent.present?
+
+        raise ::NameError, "No method \"#{method_name}\" found in #{runner} or in its ancestors"
+      end
+
+      protected
+
+      def parent_call(method_name, *args)
+        return parent.context(method_name, *args) if parent.respond_to?(:context)
+
+        parent.runner_context.call(method_name, *args)
       end
     end
   end

data/vendor/eac_cli/lib/eac_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacCli
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem.rb

@@ -11,8 +11,9 @@ module EacRubyGemsUtils
 
     GEMSPEC_EXTNAME = '.gemspec'
 
-    common_constructor :root do
+    common_constructor :root, :host_env, default: [nil] do
       @root = ::Pathname.new(root).expand_path
+      self.host_env ||= ::EacRubyUtils::Envs.local
     end
 
     def to_s

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/gem/command.rb

@@ -11,7 +11,7 @@ module EacRubyGemsUtils
 
       def initialize(gem, command_args, extra_options = {})
         @gem = gem
-        super(command_args, extra_options)
+        super(command_args, extra_options.merge(host_env: gem.host_env))
       end
 
       # Changes current directory to the gem's directory.

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/decorated_gem.rb

@@ -12,14 +12,12 @@ module EacRubyGemsUtils
           log('running "bundle install"...')
           return if bundle('install').execute.fetch(:exit_code).zero?
 
-          if can_remove_gemfile_lock?
-            log('"bundle install" failed, removing Gemfile.lock and trying again...')
-            gemfile_lock_path.unlink if gemfile_lock_path.exist?
-            bundle('install').execute!
-          else
+          unless can_remove_gemfile_lock?
             raise '"bundle install" failed and the Gemfile.lock is part of gem' \
-              '(Should be changed by developer)'
+                '(Should be changed by developer)'
           end
+
+          prepare_with_removable_gemfile_lock
         end
 
         def tests
@@ -33,6 +31,12 @@ module EacRubyGemsUtils
           infov self, message
         end
 
+        def prepare_with_removable_gemfile_lock
+          log('"bundle install" failed, removing Gemfile.lock and trying again...')
+          gemfile_lock_path.unlink if gemfile_lock_path.exist?
+          bundle('install').execute!
+        end
+
         def can_remove_gemfile_lock?
           !files.include?(gemfile_lock_path.relative_path_from(root))
         end

data/vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyGemsUtils
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb

@@ -8,7 +8,8 @@ module EacRubyUtils
     # A [EacRubyUtils::Envs::Command] which runs in a clean Ruby environment.
     class Command < ::EacRubyUtils::Envs::Command
       def initialize(bundle_args, extra_options = {})
-        super(::EacRubyUtils::Envs.local, bundle_args, extra_options)
+        host_env = extra_options.delete(:host_env)
+        super(host_env || ::EacRubyUtils::Envs.local, bundle_args, extra_options)
       end
 
       %w[system execute].each do |method_prefix|

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.70.2
+  version: 0.71.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -425,6 +425,7 @@ files:
 - lib/avm/projects/stereotypes/ruby_gem/update.rb
 - lib/avm/projects/stereotypes/ruby_gem/version_bump.rb
 - lib/avm/rails.rb
+- lib/avm/rails/instance.rb
 - lib/avm/rails/runners.rb
 - lib/avm/rails/runners/bundle.rb
 - lib/avm/rails/runners/runner.rb
@@ -454,7 +455,6 @@ files:
 - lib/avm/stereotypes/postgresql/instance/data_unit.rb
 - lib/avm/stereotypes/postgresql/instance_with.rb
 - lib/avm/stereotypes/rails.rb
-- lib/avm/stereotypes/rails/instance.rb
 - lib/avm/sync.rb
 - lib/avm/tools.rb
 - lib/avm/tools/runner.rb
@@ -464,6 +464,7 @@ files:
 - lib/avm/tools/runner/eac_rails_base0/bundle.rb
 - lib/avm/tools/runner/eac_rails_base0/data.rb
 - lib/avm/tools/runner/eac_rails_base0/deploy.rb
+- lib/avm/tools/runner/eac_rails_base0/rails_server.rb
 - lib/avm/tools/runner/eac_rails_base0/runner.rb
 - lib/avm/tools/runner/eac_redmine_base0.rb
 - lib/avm/tools/runner/eac_redmine_base0/bundle.rb
@@ -836,10 +837,10 @@ files:
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/multiple/result.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/tests/rspec.rb
 - vendor/eac_ruby_gems_utils/lib/eac_ruby_gems_utils/version.rb
+- vendor/eac_ruby_gems_utils/spec/code/rubocop_check_spec.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem/version_file_spec_files/a_version_file.rb
 - vendor/eac_ruby_gems_utils/spec/lib/eac_ruby_gems_utils/gem_spec.rb
-- vendor/eac_ruby_gems_utils/spec/rubocop_check_spec.rb
 - vendor/eac_ruby_gems_utils/spec/spec_helper.rb
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile
 - vendor/eac_ruby_gems_utils/spec/support/mygem/Gemfile.lock

data/lib/avm/stereotypes/rails/instance.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Avm
-  module Stereotypes
-    module Rails
-      module Instance
-        def bundle(*args)
-          host_env.command('bundle', *args)
-                  .envvar('BUNDLE_GEMFILE', ::File.join(read_entry('fs_path'), 'Gemfile'))
-                  .envvar('RAILS_ENV', 'production')
-                  .chdir(read_entry('fs_path'))
-        end
-
-        def rake(*args)
-          bundle('exec', 'rake', *args)
-        end
-      end
-    end
-  end
-end