eac_tools 0.37.2 → 0.39.0

data/sub/avm-eac_python_base0/avm-eac_python_base0.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.105'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
 end

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/executables.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module Avm
+  module EacPythonBase0
+    module Executables
+      class << self
+        enable_simple_cache
+
+        private
+
+        %w[yapf].each do |program|
+          define_method(program.underscore + '_uncached') do
+            ::EacRubyUtils::Envs.local.executable(program, '--version')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_python_base0/lib/avm/eac_python_base0/file_formats/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/executables'
+require 'avm/eac_python_base0/executables'
 require 'avm/eac_generic_base0/file_formats/base'
 
 module Avm
@@ -11,7 +11,7 @@ module Avm
         VALID_TYPES = ['x-python'].freeze
 
         def internal_apply(files)
-          ::Avm::Executables.yapf.command.append(['--in-place', *files]).system!
+          ::Avm::EacPythonBase0::Executables.yapf.command.append(['--in-place', *files]).system!
           super(files)
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPythonBase0
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_python_base0/spec/lib/avm/eac_python_base0/file_formats/base_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_python_base0/file_formats/base'
+
+::RSpec.describe ::Avm::EacPythonBase0::FileFormats::Base do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+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.51'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
-  s.add_dependency 'eac_ruby_utils', '~> 0.105'
+  s.add_dependency 'avm', '~> 0.52'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106'
 
   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/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRubyBase1
-    VERSION = '0.26.0'
+    VERSION = '0.26.1'
   end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_ruby_base1/file_formats/base'
+
+::RSpec.describe ::Avm::EacRubyBase1::FileFormats::Base do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

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.51'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.52'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.7'
   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.105'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.2'
 end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/envs'
+
+module Avm
+  module EacWebappBase0
+    module Executables
+      class << self
+        enable_simple_cache
+
+        def env
+          ::EacRubyUtils::Envs.local
+        end
+
+        private
+
+        %w[cssbeautify-cli js-beautify tidy].each do |program|
+          define_method(program.underscore + '_uncached') do
+            env.executable(program, '--version')
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/css/file_apply.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Css < ::Avm::EacGenericBase0::FileFormats::Base
+        class FileApply
+          EXECUTABLE_NAME = 'cssbeautify-cli'
+          EXECUTABLE_CHECK_ARGS = ['--version'].freeze
+          EXECUTABLE_STATIC_ARGS = ['--autosemicolon', '--indent', '  ', '--openbrace',
+                                    'end-of-line', '--stdin'].freeze
+
+          common_constructor :file
+
+          def perform
+            on_temp_output_file do |_temp_file|
+              run_command
+            end
+          end
+
+          private
+
+          attr_accessor :output_file
+
+          def command
+            ::Avm::EacWebappBase0::Executables.cssbeautify_cli.command(*EXECUTABLE_STATIC_ARGS)
+          end
+
+          def on_temp_output_file
+            ::EacRubyUtils::Fs::Temp.on_file do |temp_output_file|
+              self.output_file = temp_output_file
+              yield
+              ::FileUtils.mv(temp_output_file.to_path, file)
+            end
+          end
+
+          def run_command
+            command.system!(input_file: file, output_file: output_file.to_path)
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/css.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'eac_ruby_utils/envs'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Css < ::Avm::EacGenericBase0::FileFormats::Base
+        require_sub __FILE__
+
+        VALID_BASENAMES = %w[*.css *.scss].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(file)
+          ::Avm::EacWebappBase0::FileFormats::Css::FileApply.new(file).perform
+          super(file)
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/javascript.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/executables'
 require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
 
 module Avm
   module EacWebappBase0
@@ -11,7 +11,7 @@ module Avm
         VALID_TYPES = [].freeze
 
         def internal_apply(files)
-          ::Avm::Executables.js_beautify.command.append(
+          ::Avm::EacWebappBase0::Executables.js_beautify.command.append(
             ['--indent-size=2', '--end-with-newline', '--replace', *files]
           ).system!
           super(files)

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/provider.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/eac_webapp_base0/file_formats/css'
 require 'avm/eac_webapp_base0/file_formats/html'
 require 'avm/eac_webapp_base0/file_formats/javascript'
 require 'avm/eac_webapp_base0/file_formats/json'
@@ -10,7 +11,7 @@ module Avm
   module EacWebappBase0
     module FileFormats
       class Provider
-        ALL_NAMES = %w[html javascript json xml].freeze
+        ALL_NAMES = %w[css html javascript json xml].freeze
 
         def all
           @all ||= ALL_NAMES.map do |name|

data/sub/avm-eac_webapp_base0/lib/avm/eac_webapp_base0/file_formats/xml.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'avm/executables'
 require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_webapp_base0/executables'
 
 module Avm
   module EacWebappBase0
@@ -16,7 +16,7 @@ module Avm
         end
 
         def format_command(files)
-          ::Avm::Executables.tidy.command.append(
+          ::Avm::EacWebappBase0::Executables.tidy.command.append(
             %w[-xml -modify --indent auto --indent-spaces 2 --wrap 100] + files
           )
         end

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

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

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/css_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/css'
+
+::RSpec.describe ::Avm::EacWebappBase0::FileFormats::Css do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/css_spec_files/css1.source.css

@@ -0,0 +1,11 @@
+
+h1, h2 { font-color: red }
+
+
+/* Comment */
+
+
+.teste
+{
+             border-style: dashed
+}

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/css_spec_files/css1.target.css

@@ -0,0 +1,11 @@
+h1, h2 {
+  font-color: red;
+}
+
+
+/* Comment */
+
+
+.teste {
+  border-style: dashed;
+}

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/html_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/html'
+
+::RSpec.describe ::Avm::EacWebappBase0::FileFormats::Html do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/javascript_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/javascript'
+
+::RSpec.describe ::Avm::EacWebappBase0::FileFormats::Javascript do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/json_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/json'
+
+::RSpec.describe ::Avm::EacWebappBase0::FileFormats::Json do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

data/sub/avm-eac_webapp_base0/spec/lib/avm/eac_webapp_base0/file_formats/xml_spec.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'avm/eac_webapp_base0/file_formats/xml'
+
+::RSpec.describe ::Avm::EacWebappBase0::FileFormats::Xml do
+  include_examples 'avm_file_formats_with_fixtures', __FILE__
+end

data/sub/avm-files/avm-files.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.51'
+  s.add_dependency 'avm', '~> 0.52'
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
-  s.add_dependency 'eac_ruby_utils', '~> 0.105'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.50'
-  s.add_dependency 'avm-files', '~> 0.4', '>= 0.4.1'
+  s.add_dependency 'avm', '~> 0.53'
+  s.add_dependency 'avm-files', '~> 0.6'
   s.add_dependency 'eac_git', '~> 0.13'
-  s.add_dependency 'eac_ruby_utils', '~> 0.105'
+  s.add_dependency 'eac_ruby_utils', '~> 0.106', '>= 0.106.1'
   s.add_dependency 'git', '~> 1.12'
 
   s.add_development_dependency 'aranha-parsers', '~> 0.8', '>= 0.8.5'

data/sub/avm-git/lib/avm/git/scms/git/commit/deploy.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/files/appendable'
+require 'avm/files/deploy'
+require 'avm/scms/base'
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          class Deploy
+            include ::Avm::Files::Appendable
+            enable_simple_cache
+
+            attr_reader :build_dir, :commit, :target_env, :target_path
+
+            def initialize(commit, target_env, target_path)
+              @commit = commit
+              @target_env = target_env
+              @target_path = target_path
+            end
+
+            def run
+              fd = ::Avm::Files::Deploy.new(target_env, target_path)
+              fd.append_tar_output_command(git_archive_command)
+              fd.appended.push(*appended)
+              fd.run
+            end
+
+            private
+
+            def git_archive_command
+              commit.git_repo.command('archive', '--format=tar', commit.id)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/commit/deploy_methods.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'avm/git/commit'
+require 'avm/git/scms/git/commit/deploy'
+require 'avm/scms/base'
+require 'avm/scms/commit'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    module Scms
+      class Git < ::Avm::Scms::Base
+        class Commit < ::Avm::Scms::Commit
+          module DeployMethods
+            def deploy_to_env_path(target_env, target_path)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(self, target_env, target_path)
+            end
+
+            def deploy_to_url(target_url)
+              ::Avm::Git::Scms::Git::Commit::Deploy.new(
+                self,
+                *::Avm::Git::Commit.target_url_to_env_path(target_url)
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-git/lib/avm/git/scms/git/commit.rb

@@ -8,10 +8,12 @@ module Avm
     module Scms
       class Git < ::Avm::Scms::Base
         class Commit < ::Avm::Scms::Commit
+          require_sub __FILE__, include_modules: true
           common_constructor :git_scm, :git_commit do
             git_commit.assert_argument(::EacGit::Local::Commit, 'git_commit')
           end
           delegate :git_repo, to: :git_scm
+          delegate :id, to: :git_commit
 
           # @return [Array<Pathname>]
           def changed_files

data/sub/avm-git/lib/avm/git/scms/git.rb

@@ -18,7 +18,7 @@ module Avm
         end
 
         # @return [Avm::Git::Scms::Git::Commit,nil]
-        def commitize(source)
+        def commit(source)
           if source.is_a?(::Avm::Git::Scms::Git::Commit)
             return source if source.git_repo == self
 
@@ -36,7 +36,7 @@ module Avm
           git_repo.command('add', '.').execute!
           git_repo.command('commit', '-m',
                            message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
-          commitize(git_repo.head)
+          commit(git_repo.head)
         end
 
         # @return [Avm::Git::Scms::Git::Commit,nil]
@@ -53,7 +53,7 @@ module Avm
 
         # @return [Avm::Git::Scms::Git::Commit]
         def reset_and_commit(commit_to_reset, message)
-          git_repo.command('reset', '--soft', commitize(commit_to_reset).git_commit.id).execute!
+          git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
           commit_dirty(message)
         end
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.8.0'
+    VERSION = '0.9.0'
   end
 end

data/sub/avm-git/spec/lib/avm/git/{commit → scms/git/commit}/deploy_spec.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'avm/git/commit'
-require 'avm/git/commit/deploy'
+require 'avm/git/scms/git'
 require 'eac_ruby_utils/fs/temp'
 
-RSpec.describe ::Avm::Git::Commit::Deploy, git: true do
+RSpec.describe ::Avm::Git::Scms::Git::Commit::Deploy, git: true do
   class << self
     FROM_DEPLOY = %w[a.txt b.txt c.txt appended].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
     NOT_FROM_DEPLOY = %w[to_be_removed].freeze # rubocop:disable RSpec/LeakyConstantDeclaration
@@ -58,7 +57,7 @@ RSpec.describe ::Avm::Git::Commit::Deploy, git: true do
     r
   end
 
-  let(:commit) { ::Avm::Git::Commit.new(git, commit_sha1) }
+  let(:commit) { ::Avm::Git::Scms::Git.new(git.root_path).commit(commit_sha1) }
   let(:variables_source_class) do
     ::Class.new do
       attr_reader :abc

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

@@ -14,12 +14,12 @@ 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.14', '>= 0.14.3'
-  s.add_dependency 'avm', '~> 0.51'
-  s.add_dependency 'avm-eac_ruby_base1', '~> 0.26'
+  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
+  s.add_dependency 'avm', '~> 0.53'
+  s.add_dependency 'avm-eac_ruby_base1', '~> 0.26', '>= 0.26.1'
   s.add_dependency 'avm-eac_ubuntu_base0', '~> 0.3'
-  s.add_dependency 'avm-files', '~> 0.5'
-  s.add_dependency 'avm-git', '~> 0.8'
+  s.add_dependency 'avm-files', '~> 0.6'
+  s.add_dependency 'avm-git', '~> 0.9'
   s.add_dependency 'clipboard', '~> 1.3', '>= 1.3.6'
   s.add_dependency 'curb', '~> 0.9', '>= 0.9.11'
   s.add_dependency 'eac_git', '~> 0.13'
@@ -28,8 +28,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'git', '~> 1.12'
   s.add_dependency 'ruby-progressbar', '~> 1.11'
 
-  s.add_development_dependency 'avm-eac_php_base0', '~> 0.2'
-  s.add_development_dependency 'avm-eac_python_base0', '~> 0.1'
-  s.add_development_dependency 'avm-eac_webapp_base0', '~> 0.11'
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-tools/lib/avm/tools/runner/files/format.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/files/formatter'
+require 'avm/file_formats/search_formatter'
 require 'eac_cli/core_ext'
 require 'avm/git/launcher/base'
 
@@ -19,13 +19,13 @@ module Avm
           end
 
           def run
-            ::Avm::Files::Formatter.new(source_paths, formatter_options).run
+            ::Avm::FileFormats::SearchFormatter.new(source_paths, formatter_options).run
           end
 
           def formatter_options
-            { ::Avm::Files::Formatter::OPTION_APPLY => parsed.apply?,
-              ::Avm::Files::Formatter::OPTION_RECURSIVE => !parsed.no_recursive?,
-              ::Avm::Files::Formatter::OPTION_VERBOSE => parsed.verbose? }
+            { ::Avm::FileFormats::SearchFormatter::OPTION_APPLY => parsed.apply?,
+              ::Avm::FileFormats::SearchFormatter::OPTION_RECURSIVE => !parsed.no_recursive?,
+              ::Avm::FileFormats::SearchFormatter::OPTION_VERBOSE => parsed.verbose? }
           end
 
           def git