eac_tools 0.21.0 → 0.24.0

data/sub/avm-eac_redmine_base0/avm-eac_redmine_base0.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.29'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.4'
-  s.add_dependency 'avm-eac_rails_base1', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'avm-eac_rails_base1', '~> 0.5'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'curb', '~> 0.9.11'
-  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
+  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_rest', '~> 0.6', '>= 0.6.1'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.2'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances/base.rb

@@ -1,13 +1,57 @@
 # frozen_string_literal: true
 
-require 'avm/instances/base'
-require 'avm/eac_redmine_base0/instances/runners'
-require 'eac_ruby_utils/core_ext'
+require 'addressable/uri'
+require 'avm/eac_redmine_base0/data_unit'
+require 'avm/eac_redmine_base0/instances/docker_image'
+require 'avm/eac_redmine_base0/rest_api'
+require 'avm/eac_rails_base1/instances/base'
 
 module Avm
   module EacRedmineBase0
     module Instances
-      class Base < ::Avm::Instances::Base
+      class Base < ::Avm::EacRailsBase1::Instances::Base
+        enable_simple_cache
+
+        FILES_UNITS = { files: 'files' }.freeze
+
+        def docker_image_class
+          ::Avm::EacRedmineBase0::Instances::DockerImage
+        end
+
+        def docker_run_arguments
+          [
+            '--volume',
+            "#{read_entry(::Avm::Instances::EntryKeys::FS_PATH)}:/home/myuser/eac_redmine_base0",
+            '--publish', "#{read_entry(:ssh_port)}:22",
+            '--publish', "#{read_entry(:http_port)}:80",
+            '--publish', "#{read_entry(:https_port)}:443"
+          ]
+        end
+
+        def data_package
+          @data_package ||= ::Avm::Data::Instance::Package.new(
+            self,
+            units: {
+              all: ::Avm::EacRedmineBase0::DataUnit.new(self)
+            }
+          )
+        end
+
+        # @return [Addressable::URI]
+        def root_url
+          r = ::Addressable::URI.parse(read_entry(::Avm::Instances::EntryKeys::WEB_URL))
+          r.query_values = nil
+          r
+        end
+
+        private
+
+        # @return [Avm::EacRedmineBase0::RestApi]
+        def rest_api_uncached
+          url = root_url
+          url.query_values = { key: read_entry('api.key') }
+          ::Avm::EacRedmineBase0::RestApi.new(url)
+        end
       end
     end
   end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/instances.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Instances
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/eac_redmine_base0/instance'
+require 'avm/eac_redmine_base0/instances/base'
 require 'avm/eac_redmine_base0/deploy'
 require 'avm/eac_redmine_base0/apache_host'
 require 'avm/eac_rails_base1/runner'

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/runners.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Runners
+      require_sub __FILE__
+    end
+  end
+end

data/sub/avm-eac_redmine_base0/lib/avm/eac_redmine_base0/sources.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRedmineBase0
+    module Sources
+      require_sub __FILE__
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.11.0'
+    VERSION = '0.12.0'
   end
 end

data/sub/avm-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.2'
-  s.add_dependency 'eac_ruby_utils', '~> 0.95', '>= 0.95.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/base/bundler.rb

@@ -2,6 +2,7 @@
 
 require 'avm/eac_generic_base0/sources/base'
 require 'avm/eac_ruby_base1/sources/base/bundle_command'
+require 'avm/eac_ruby_base1/sources/bundle_update'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -18,6 +19,11 @@ module Avm
               .envvar_gemfile
           end
 
+          # @return [Avm::EacRubyBase1::Sources::BundleUpdate]
+          def bundle_update
+            ::Avm::EacRubyBase1::Sources::BundleUpdate.new(self)
+          end
+
           # @return [String]
           def configured_gemfile_path
             configuration_entry(CONFIGURED_GEMFILE_PATH_ENTRY_KEY).value

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/bundle_update.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module Sources
+      class BundleUpdate
+        common_constructor :source
+        delegate :bundle, to: :source
+
+        def execute!
+          bundle('update').execute! + bundle('install').execute!
+        end
+
+        def system!
+          bundle('update').system!
+          bundle('install').system!
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/runners/update_dependencies_requirements.rb

@@ -9,7 +9,7 @@ module Avm
     module Sources
       module Runners
         class UpdateDependenciesRequirements
-          runner_with :help, :subcommands do
+          runner_with :help do
             bool_opt '-a', '--all'
             pos_arg :gem_name, repeat: true, optional: true
           end

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update.rb

@@ -14,10 +14,8 @@ module Avm
         end
 
         def bundle_update
-          infom 'Running "bundle update"...'
-          source.bundle('update').execute!
-          infom 'Running "bundle install"...'
-          source.bundle('install').execute!
+          infom 'Running "bundle update && bundle install"...'
+          source.bundle_update.execute!
         end
 
         protected

data/sub/avm-eac_ruby_base1/lib/avm/eac_ruby_base1/sources/update_dependency_requirements.rb

@@ -35,9 +35,16 @@ module Avm
           ::Avm::EacRubyBase1::Rubygems::Gemspec.from_file(source.gemspec_path)
         end
 
+        def parent_bundle
+          return unless source.parent.if_present { |v| v.is_a?(::Avm::EacRubyBase1::Sources::Base) }
+
+          source.parent.bundle_update.execute!
+        end
+
         def update_code
           update_gemspec
           source.bundle.system!
+          parent_bundle
         end
 
         def update_gemspec

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.18.0'
+    VERSION = '0.19.1'
   end
 end

data/sub/avm-eac_ruby_base1/spec/lib/avm/eac_ruby_base1/source_generators/base_spec.rb

@@ -33,10 +33,17 @@ RSpec.describe ::Avm::EacRubyBase1::SourceGenerators::Base do
 
   def directory_to_h(dir)
     dir.children.map do |child|
-      [child.basename.to_path, fs_object_to_h(child)]
+      [fs_object_basename(child), fs_object_to_h(child)]
     end.to_h
   end
 
+  # @return [String]
+  def fs_object_basename(obj)
+    r = obj.basename.to_path
+    r = '.gitignore' if r == '_gitignore'
+    r
+  end
+
   def fs_object_to_h(obj)
     if obj.file?
       file_to_h(obj)

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

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

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

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

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

@@ -0,0 +1 @@
+Is expected that this content be replaced by "TRUNCATED\n".

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

@@ -0,0 +1,2 @@
+/Gemfile.local
+/Gemfile.lock

data/sub/avm-eac_webapp_base0/avm-eac_webapp_base0.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.1'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.1'
-  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.1'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'avm-eac_postgresql_base0', '~> 0.2'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.68'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base/subcommand_parent.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        class SubcommandParent
+          enable_simple_cache
+          common_constructor :instance
+
+          private
+
+          def runner_context_uncached
+            ::EacCli::Runner::Context.new(self, argv: runner_argv)
+          end
+
+          def runner_argv
+            [instance.class.name.split('::')[-2].dasherize, instance.id]
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/base.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'avm/instances/base'
+require 'avm/eac_postgresql_base0/instance_with'
+require 'avm/data/instance/files_unit'
+require 'avm/data/instance/package'
+require 'avm/eac_webapp_base0/deploy/file_unit'
+require 'avm/eac_webapp_base0/instances/runners'
+require 'avm/eac_ubuntu_base0/instances/base'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      class Base < ::Avm::Instances::Base
+        require_sub __FILE__
+        include ::Avm::EacPostgresqlBase0::InstanceWith
+        enable_simple_cache
+
+        FILES_UNITS = [].freeze
+
+        def data_dump(argv = [])
+          run_subcommand(data_dump_runner_class, argv)
+        end
+
+        def data_dump_runner_class
+          "#{stereotype_namespace_module}::Runner::Data::Dump".constantize
+        end
+
+        def run_subcommand(subcommand_class, argv)
+          subcommand_class.create(
+            argv: argv,
+            parent: ::Avm::EacWebappBase0::Instance::SubcommandParent.new(self)
+          ).run
+        end
+
+        def data_package
+          @data_package ||= ::Avm::Data::Instance::Package.new(
+            self, units: { database: database_unit }.merge(files_units)
+          )
+        end
+
+        def database_unit
+          pg.data_unit
+        end
+
+        private
+
+        # @return [Avm::EacUbuntuBase0::Instances::Base]
+        def platform_instance_uncached
+          ::Avm::EacUbuntuBase0::Instances::Base.by_id(id)
+        end
+
+        def files_units
+          self.class.const_get('FILES_UNITS').transform_values do |fs_path_subpath|
+            ::Avm::Data::Instance::FilesUnit.new(self, fs_path_subpath)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/dump.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'avm/data/package/dump'
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          class Dump
+            DUMP_EXPIRE_TIME = 1.day
+            DEFAULT_DUMP_PATH_ENTRY_SUFFIX = 'data.default_dump_path'
+            NO_DUMP_MESSAGE = 'Dump "%s" already exist and rewrite options was no setted nor ' \
+              'dump was expired.'
+
+            runner_with :help do
+              desc 'Dump utility for EacRailsBase instance.'
+              bool_opt '-w', '--rewrite', 'Forces dump overwrite.'
+              arg_opt '-p', '--dump-path', 'Set DUMP_PATH variable.'
+            end
+
+            def run
+              infov 'Instance to dump', "#{instance} (#{instance.class})"
+              if package_dump.runnable?
+                package_dump.run
+              else
+                warn(package_dump.cannot_run_reason)
+              end
+              success("Dump path: \"#{dump_path}\"")
+              dump_path
+            end
+
+            private
+
+            def instance
+              runner_context.call(:instance)
+            end
+
+            def package_dump_uncached
+              instance
+                .data_package.dump(dump_path, existing: package_dump_existing)
+            end
+
+            def dump_path
+              parsed.dump_path || default_dump_path
+            end
+
+            def default_dump_path
+              instance.read_entry(DEFAULT_DUMP_PATH_ENTRY_SUFFIX)
+            end
+
+            def package_dump_existing
+              if parsed.rewrite?
+                ::Avm::Data::Package::Dump::EXISTING_ROTATE
+              else
+                ::Avm::Data::Package::Dump::EXISTING_ROTATE_EXPIRED
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data/load.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/numeric/time'
+require 'eac_cli/speaker'
+require 'eac_ruby_utils/simple_cache'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          class Load
+            runner_with :help do
+              desc 'Load utility for EacRailsBase instance.'
+              arg_opt '-S', '--source-instance', 'Informa a instância a ser extraída o dump.'
+              pos_arg :dump_path, optional: true
+            end
+
+            def run
+              return ::Dev::Result.error("Dump \"#{dump_path}\" does not exist") unless
+              ::File.exist?(dump_path)
+
+              load_dump
+              success("Dump loaded from \"#{dump_path}\"")
+            end
+
+            def dump_path_uncached
+              return parsed.dump_path.to_s if parsed.dump_path.present?
+              return source_instance_dump_path if parsed.source_instance.present?
+
+              raise "Dump path unknown (Options: #{parsed})"
+            end
+
+            def source_instance_dump_path
+              runner_context.call(:instance).class.by_id(parsed.source_instance).data_dump
+            end
+
+            def load_dump
+              info "Loading dump \"#{dump_path}\"..."
+              package_load.run
+            end
+
+            def dump_instance_method
+              :dump_database
+            end
+
+            private
+
+            def package_load_uncached
+              runner_context.call(:instance).data_package.load(dump_path)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners/data.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'eac_cli/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        class Data
+          require_sub __FILE__
+          runner_with :help, :subcommands do
+            desc 'Data utilities for EacRailsBase0 instances.'
+            subcommands
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/instances/runners.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module Instances
+      module Runners
+        require_sub __FILE__
+      end
+    end
+  end
+end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacWebappBase0
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

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

@@ -12,9 +12,9 @@ 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'
+  s.add_dependency 'avm', '~> 0.35', '>= 0.35.1'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.4'
+  s.add_dependency 'eac_ruby_utils', '~> 0.98'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require 'avm/instances/entry_keys'
-require 'avm/eac_webapp_base0/instance'
+require 'avm/eac_webapp_base0/instances/base'
 
 module Avm
   module EacWordpressBase0
     module Instances
-      class Base < ::Avm::EacWebappBase0::Instance
+      class Base < ::Avm::EacWebappBase0::Instances::Base
         FILES_UNITS = { uploads: 'wp-content/uploads', themes: 'wp-content/themes' }.freeze
 
         def database_unit

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

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

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

@@ -14,19 +14,19 @@ Gem::Specification.new do |s|
   s.bindir = 'exe'
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
 
-  s.add_dependency 'aranha-parsers', '~> 0.4'
-  s.add_dependency 'avm', '~> 0.34'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.8'
+  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'
+  s.add_dependency 'avm', '~> 0.37'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.19', '>= 0.19.1'
   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 'avm-files', '~> 0.3', '>= 0.3.2'
+  s.add_dependency 'avm-git', '~> 0.4'
+  s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
+  s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
+  s.add_dependency 'eac_git', '~> 0.12', '>= 0.12.2'
+  s.add_dependency 'eac_ruby_base0', '~> 0.16', '>= 0.16.6'
   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'
+  s.add_dependency 'git', '~> 1.11'
+  s.add_dependency 'ruby-progressbar', '~> 1.11'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end