eac_tools 0.37.2 → 0.38.0

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_address_spec.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/source_address'
+
+RSpec.describe ::Aranha::Parsers::SourceAddress do
+  describe '#detect_sub' do
+    {
+      { method: :post, url: 'http://postdata.net', params: { key1: :value1 } } => {
+        klass: ::Aranha::Parsers::SourceAddress::HashHttpBase,
+        url: 'http://postdata.net',
+        serialization: <<~SERIALIZATION
+          --- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
+          method: :post
+          url: http://postdata.net
+          params: !ruby/hash:ActiveSupport::HashWithIndifferentAccess
+            key1: :value1
+        SERIALIZATION
+      },
+      { method: :get, url: 'http://getdata.net', params: { headers: %w[abc] } } => {
+        klass: ::Aranha::Parsers::SourceAddress::HashHttpBase,
+        url: 'http://getdata.net',
+        serialization: <<~SERIALIZATION
+          --- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
+          method: :get
+          url: http://getdata.net
+          params: !ruby/hash:ActiveSupport::HashWithIndifferentAccess
+            headers:
+            - abc
+        SERIALIZATION
+      },
+      'http://postdata.net' => {
+        klass: ::Aranha::Parsers::SourceAddress::HttpGet,
+        url: 'http://postdata.net',
+        serialization: 'http://postdata.net'
+      },
+      'https://getdata.com.br' => {
+        klass: ::Aranha::Parsers::SourceAddress::HttpGet,
+        url: 'https://getdata.com.br',
+        serialization: 'https://getdata.com.br'
+      },
+      'file:///postdata.net' => {
+        klass: ::Aranha::Parsers::SourceAddress::File,
+        url: 'file:///postdata.net',
+        serialization: 'file:///postdata.net'
+      },
+      '/postdata.net' => {
+        klass: ::Aranha::Parsers::SourceAddress::File,
+        url: 'file:///postdata.net',
+        serialization: 'file:///postdata.net'
+      }
+    }.each do |source, expected|
+      context "when source is #{source}" do
+        let(:sub) { described_class.detect_sub(source) }
+        let(:deserialized) { described_class.deserialize(sub.serialize).sub }
+
+        it "sub is a #{expected.fetch(:klass)}" do
+          expect(sub).to be_a(expected.fetch(:klass))
+        end
+
+        it "sub #{expected.fetch(:klass)} return properly URL" do
+          expect(sub.url).to eq(expected.fetch(:url))
+        end
+
+        it "sub #{expected.fetch(:klass)} serialize properly" do
+          expect(sub.serialize).to eq(expected.fetch(:serialization))
+        end
+
+        it 'deserialize properly' do
+          expect(deserialized).to eq(sub)
+        end
+      end
+    end
+  end
+end

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/source_target_fixtures'
+
+RSpec.describe ::Aranha::Parsers::SourceTargetFixtures do
+  let(:fixtures_dir) { ::File.join(__dir__, 'source_target_fixtures_spec_files') }
+  let(:instance) { described_class.new(fixtures_dir) }
+
+  describe '#source_target_files' do
+    it { expect(instance.source_target_files.count).to eq(3) }
+
+    (1..3).each do |index|
+      basename = "stub#{index}"
+      let(basename) { instance.source_target_files.find { |stf| stf.basename == basename } }
+
+      it { expect(send(basename)).to be_present }
+      it { expect(send(basename).basename).to eq(basename) }
+    end
+
+    it { expect(stub1.source).to eq(::File.join(fixtures_dir, 'stub1.source.txt')) }
+    it { expect(stub1.target).to eq(::File.join(fixtures_dir, 'stub1.target.html')) }
+    it { expect(stub2.source).to eq(::File.join(fixtures_dir, 'stub2.source.html')) }
+    it { expect(stub2.target).to eq(nil) }
+    it { expect(stub3.source).to eq(nil) }
+    it { expect(stub3.target).to eq(::File.join(fixtures_dir, 'stub3.target.yaml')) }
+  end
+end

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub1.source.txt

@@ -0,0 +1 @@
+

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub1.target.html

@@ -0,0 +1 @@
+

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub2.source.html

@@ -0,0 +1 @@
+

data/sub/aranha-parsers/spec/lib/aranha/parsers/source_target_fixtures_spec_files/stub3.target.yaml

@@ -0,0 +1 @@
+

data/sub/aranha-parsers/spec/lib/rubocop_check_spec.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+::EacRubyUtils::Rspec.default_setup.describe_rubocop

data/sub/aranha-parsers/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/rspec/default_setup'
+::EacRubyUtils::Rspec.default_setup_create(::File.expand_path('..', __dir__))

data/sub/avm/avm.gemspec

@@ -12,9 +12,11 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
+  s.add_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.4'
   s.add_dependency 'eac_cli', '~> 0.28'
   s.add_dependency 'eac_config', '~> 0.11', '>= 0.11.1'
   s.add_dependency 'eac_docker', '~> 0.5'
+  s.add_dependency 'eac_fs', '~> 0.12', '>= 0.12.3'
   s.add_dependency 'eac_git', '~> 0.13'
   s.add_dependency 'eac_ruby_utils', '~> 0.105'
   s.add_dependency 'eac_templates', '~> 0.3', '>= 0.3.2'

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

@@ -14,7 +14,7 @@ module Avm
 
       private
 
-      %w[file git js-beautify latex php-cs-fixer tidy yapf xdg-open].each do |program|
+      %w[xdg-open].each do |program|
         define_method(program.underscore + '_uncached') do
           env.executable(program, '--version')
         end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/file_formats/utf8_assert'
 require 'eac_fs/file_info'
 require 'ostruct'
 
@@ -10,7 +11,7 @@ module Avm
 
       def apply(files)
         old_content = Hash[files.map { |f| [f, File.read(f)] }]
-        ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { internal_apply(files) }
+        ::Avm::FileFormats::Utf8Assert.assert_files(files) { internal_apply(files) }
         files.map { |f| build_file_result(f, old_content[f]) }
       end
 

data/sub/{avm-files/lib/avm/files/formatter.rb → avm/lib/avm/file_formats/search_formatter.rb}

@@ -5,8 +5,8 @@ require 'eac_ruby_utils/core_ext'
 require 'eac_fs/traversable'
 
 module Avm
-  module Files
-    class Formatter
+  module FileFormats
+    class SearchFormatter
       include ::EacFs::Traversable
       require_sub __FILE__
       enable_simple_cache
@@ -27,9 +27,9 @@ module Avm
       private
 
       def apply
-        infom "Applying #{@formats_files.count} format(s)... "
+        speak(:infom, "Applying #{@formats_files.count} format(s)... ")
         @formats_files.each do |format, files|
-          infom "Applying format #{format.name} (Files matched: #{files.count})..."
+          speak(:infom, "Applying format #{format.name} (Files matched: #{files.count})...")
           next unless options[OPTION_APPLY]
 
           @result += format.apply(files)
@@ -38,7 +38,7 @@ module Avm
 
       def traverser_check_file(file)
         format = find_format(file)
-        infov file, format ? format.class : '-' if options[OPTION_VERBOSE]
+        speak(:infov, file, format ? format.class : '-')
         return unless format
 
         @formats_files[format] ||= []
@@ -66,9 +66,9 @@ module Avm
       end
 
       def search_files
-        infov 'Directories to search', source_paths.count
+        speak(:infov, 'Directories to search', source_paths.count)
         source_paths.each do |source_path|
-          infom "Searching files on \"#{source_path}\"..."
+          speak(:infom, "Searching files on \"#{source_path}\"...")
           traverser_check_path(source_path)
         end
       end
@@ -76,16 +76,22 @@ module Avm
       def show_results
         changed = @result.select(&:changed)
         changed.each do |h|
-          out h.file.to_s.cyan
-          out " (#{h.format})".yellow
-          puts ' changed'.green
+          speak(:out, h.file.to_s.cyan)
+          speak(:out, " (#{h.format})".yellow)
+          speak(:puts, ' changed'.green)
         end
-        infov('Files changed', "#{changed.count}/#{@result.count}")
+        speak(:infov, 'Files changed', "#{changed.count}/#{@result.count}")
       end
 
       def traverser_recursive
         options[OPTION_RECURSIVE]
       end
+
+      def speak(method, *method_args)
+        return unless options[OPTION_VERBOSE].to_bool
+
+        send(method, *method_args)
+      end
     end
   end
 end

data/sub/avm/lib/avm/file_formats/utf8_assert.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+
+module Avm
+  module FileFormats
+    class Utf8Assert
+      UTF8_CHARSET = 'utf-8'
+      UTF8_CHARSETS = [UTF8_CHARSET, 'us-ascii'].freeze
+
+      class << self
+        def assert_files(files)
+          asserters = files.map { |file| new(file) }
+          begin
+            asserters.each(&:assert)
+            yield
+          ensure
+            asserters.each(&:revert)
+          end
+        end
+      end
+
+      enable_simple_cache
+      common_constructor :path
+
+      def assert
+        return if original_utf8?
+
+        convert_self(original_charset, UTF8_CHARSET)
+      end
+
+      def revert
+        return if original_utf8?
+
+        convert_self(UTF8_CHARSET, original_charset)
+      end
+
+      private
+
+      def original_info_uncached
+        ::EacFs::FileInfo.new(path)
+      end
+
+      def original_charset_uncached
+        return original_info.content_type.charset if original_info.content_type.charset.present?
+
+        raise 'No charset found'
+      rescue StandardError => e
+        raise "Unable to determine the charset of #{path} (#{e.message})"
+      end
+
+      def original_utf8?
+        UTF8_CHARSETS.include?(original_charset)
+      end
+
+      def convert_file(from_path, from_charset, to_path, to_charset)
+        File.open(from_path, "r:#{from_charset}") do |input|
+          File.open(to_path, "w:#{to_charset}") do |output|
+            output.write(input.read)
+          end
+        end
+      end
+
+      def convert_self(from_charset, to_charset)
+        temp = ::Tempfile.new
+        temp.close
+        convert_file(path, from_charset, temp.path, to_charset)
+        ::FileUtils.mv(temp.path, path)
+      end
+    end
+  end
+end

data/sub/avm/lib/avm/rspec/setup.rb

@@ -7,7 +7,8 @@ module Avm
   module Rspec
     module Setup
       require_sub __FILE__
-      EXAMPLES = %w[entries_values in_avm_registry not_in_avm_registry].freeze
+      EXAMPLES = %w[avm_file_formats_with_fixtures entries_values in_avm_registry
+                    not_in_avm_registry].freeze
 
       def self.extended(obj)
         obj.setup_examples

data/sub/avm/lib/avm/rspec/shared_examples/avm_file_formats_with_fixtures.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/source_target_fixtures'
+require 'avm/file_formats/search_formatter'
+require 'eac_ruby_utils/core_ext'
+
+::RSpec.shared_examples 'avm_file_formats_with_fixtures' do |the_spec_file|
+  include_examples 'source_target_fixtures', the_spec_file
+
+  def format_files_in_directory(target_dir)
+    ::Avm::FileFormats::SearchFormatter
+      .new([target_dir], recursive: true, apply: true, verbose: false)
+      .run
+  end
+
+  def source_data(source_file)
+    dir = temp_dir
+    source_basename = source_file_basename_without_source_extname(source_file)
+    source_path = dir.join(source_basename)
+    ::FileUtils.cp(source_file, source_path)
+    format_files_in_directory(dir)
+    source_path.read
+  end
+
+  def source_file_basename_without_source_extname(source_file)
+    source_file.to_pathname.basename_sub { |b| b.to_path.gsub(/\.source/, '') }.basename
+  end
+
+  def target_data(target_file)
+    ::File.read(target_file)
+  end
+end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avm
-  VERSION = '0.51.0'
+  VERSION = '0.52.0'
 end

data/sub/avm-eac_generic_base0/avm-eac_generic_base0.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.51'
+  s.add_dependency 'avm', '~> 0.52'
   s.add_dependency 'eac_ruby_utils', '~> 0.105'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'

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

@@ -6,8 +6,8 @@ module Avm
   module EacGenericBase0
     class FileFormats
       class Base < ::Avm::FileFormats::Base
-        VALID_BASENAMES = %w[*.asm *.bat *.css.coffee *.java *.js *.rb *.s *.scss *.sql *.tex
-                             *.url *.yml *.yaml].freeze
+        VALID_BASENAMES = %w[*.asm *.bat *.coffee *.java *.js *.rb *.s *.sql *.tex *.url *.yml
+                             *.yaml].freeze
 
         VALID_TYPES = %w[plain x-shellscript].freeze
 

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacGenericBase0
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

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

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

data/sub/avm-eac_latex_base0/avm-eac_latex_base0.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib}/**/*']
 
-  s.add_dependency 'avm', '~> 0.45'
-  s.add_dependency 'avm-eac_webapp_base0', '~> 0.9'
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'avm', '~> 0.52'
+  s.add_dependency 'avm-eac_webapp_base0', '~> 0.12'
+  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_latex_base0/lib/avm/eac_latex_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[latex].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_latex_base0/lib/avm/eac_latex_base0/sources/build.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avm/executables'
+require 'avm/eac_latex_base0/executables'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/fs/temp'
 require 'eac_ruby_utils/fs/clearable_directory'
@@ -62,7 +63,8 @@ module Avm
         end
 
         def compile_command
-          ::Avm::Executables.latex.command(*compile_command_args).chdir(source_temp_dir)
+          ::Avm::EacLatexBase0::Executables.latex.command(*compile_command_args)
+                                           .chdir(source_temp_dir)
         end
 
         def compile_command_args

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacLatexBase0
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/sub/avm-eac_php_base0/avm-eac_php_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_php_base0/lib/avm/eac_php_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 EacPhpBase0
+    module Executables
+      class << self
+        enable_simple_cache
+
+        private
+
+        %w[php-cs-fixer].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_php_base0/lib/avm/eac_php_base0/file_formats/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'avm/executables'
+require 'avm/eac_php_base0/executables'
 require 'avm/eac_generic_base0/file_formats/base'
 
 module Avm
@@ -11,7 +11,7 @@ module Avm
         VALID_TYPES = ['x-php'].freeze
 
         def file_apply(file)
-          ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!
+          ::Avm::EacPhpBase0::Executables.php_cs_fixer.command.append(['fix', file]).system!
           super(file)
         end
       end

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

@@ -2,6 +2,6 @@
 
 module Avm
   module EacPhpBase0
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

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

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

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'