eac_tools 0.37.1 → 0.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a06d6cf3c9faa8f37538fc898007ccf3501d0fbff41a883ba7b36a9d8f9a366
-  data.tar.gz: 6bf1bd1dce7b5cedce59963194408964ed49ea4cf85a44609df482e29bddc9d0
+  metadata.gz: adddd8b71bf6e7fea8707749d003c2b70c48a9788a89203936cc2caf44577d21
+  data.tar.gz: 33e2a116d3f440f20a6dcdb1472d11ed1b62225c2d5c83e670d675cb707b3e22
 SHA512:
-  metadata.gz: 55243dbe562ad019575f0014096a024aeb844723597fe4b00dc415c1f234a1424fca4d80498c7c679d9ace63fc0ead2c205b4a224ebf8bbca1f95d9fb96fd92d
-  data.tar.gz: 5b47516144519424c1d3345460f6d36b5fd9d011015a1daa7342b9656d9512e53d0954c59a4545f71395f0a0fcedb74bc352edc7ba6406bf33806fe7c46726e7
+  metadata.gz: 81a7b7abf41d216ddcf599907100e128be48f1a45af08d16501ba842f6eb083f17c8dc8b35ee022b6708d840f6a3189e1604afbe816c0192d43a439cbe7819ee
+  data.tar.gz: 292a5afc0448b0010973a90a9ab8a7e92e932d1475368e2c11130bad74046c7961639f9a56d00b9a41b675b098b5850cdef351678aa880b8d611459c2dd22043

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.37.1)
-      avm (~> 0.50)
+    eac_tools (0.37.2)
+      avm (~> 0.51)
       avm-eac_asciidoctor_base0 (~> 0.7, >= 0.7.1)
-      avm-eac_generic_base0 (~> 0.5)
+      avm-eac_generic_base0 (~> 0.6)
       avm-eac_latex_base0 (~> 0.2, >= 0.2.1)
-      avm-eac_php_base0 (~> 0.1)
+      avm-eac_php_base0 (~> 0.2)
       avm-eac_rails_base0 (~> 0.8, >= 0.8.1)
       avm-eac_rails_base1 (~> 0.7)
       avm-eac_redmine_base0 (~> 0.16)
       avm-eac_redmine_plugin_base0 (~> 0.3)
-      avm-eac_ruby_base1 (~> 0.25)
-      avm-eac_webapp_base0 (~> 0.10)
+      avm-eac_ruby_base1 (~> 0.26)
+      avm-eac_webapp_base0 (~> 0.11)
       avm-eac_wordpress_base0 (~> 0.2, >= 0.2.1)
-      avm-tools (~> 0.142, >= 0.142.1)
+      avm-tools (~> 0.142, >= 0.142.2)
       eac_ruby_utils (~> 0.105)
 
 PATH
@@ -30,9 +30,9 @@ PATH
 PATH
   remote: sub/avm-eac_generic_base0
   specs:
-    avm-eac_generic_base0 (0.5.0)
-      avm (~> 0.28)
-      eac_ruby_utils (~> 0.96)
+    avm-eac_generic_base0 (0.6.0)
+      avm (~> 0.51)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_latex_base0
@@ -45,8 +45,16 @@ PATH
 PATH
   remote: sub/avm-eac_php_base0
   specs:
-    avm-eac_php_base0 (0.1.0)
-      eac_ruby_utils (~> 0.104)
+    avm-eac_php_base0 (0.2.0)
+      avm-eac_generic_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.105)
+
+PATH
+  remote: sub/avm-eac_python_base0
+  specs:
+    avm-eac_python_base0 (0.1.0)
+      avm-eac_generic_base0 (~> 0.6)
+      eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_rails_base0
@@ -87,17 +95,17 @@ PATH
 PATH
   remote: sub/avm-eac_ruby_base1
   specs:
-    avm-eac_ruby_base1 (0.25.0)
-      avm (~> 0.50)
-      avm-eac_generic_base0 (~> 0.5)
+    avm-eac_ruby_base1 (0.26.0)
+      avm (~> 0.51)
+      avm-eac_generic_base0 (~> 0.6)
       eac_ruby_utils (~> 0.105)
 
 PATH
   remote: sub/avm-eac_webapp_base0
   specs:
-    avm-eac_webapp_base0 (0.10.0)
-      avm (~> 0.50)
-      avm-eac_generic_base0 (~> 0.5)
+    avm-eac_webapp_base0 (0.11.0)
+      avm (~> 0.51)
+      avm-eac_generic_base0 (~> 0.6)
       avm-eac_postgresql_base0 (~> 0.2)
       avm-eac_ubuntu_base0 (~> 0.3)
       eac_ruby_utils (~> 0.105)
@@ -113,11 +121,11 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.4.1)
-      avm (~> 0.43)
+    avm-files (0.5.0)
+      avm (~> 0.51)
       eac_cli (~> 0.28)
       eac_fs (~> 0.12, >= 0.12.3)
-      eac_ruby_utils (~> 0.103)
+      eac_ruby_utils (~> 0.105)
       eac_templates (~> 0.3, >= 0.3.2)
 
 PATH
@@ -133,12 +141,12 @@ PATH
 PATH
   remote: sub/avm-tools
   specs:
-    avm-tools (0.142.1)
+    avm-tools (0.142.2)
       aranha-parsers (~> 0.14, >= 0.14.3)
-      avm (~> 0.50)
-      avm-eac_ruby_base1 (~> 0.25)
+      avm (~> 0.51)
+      avm-eac_ruby_base1 (~> 0.26)
       avm-eac_ubuntu_base0 (~> 0.3)
-      avm-files (~> 0.4, >= 0.4.1)
+      avm-files (~> 0.5)
       avm-git (~> 0.8)
       clipboard (~> 1.3, >= 1.3.6)
       curb (~> 0.9, >= 0.9.11)
@@ -151,11 +159,11 @@ PATH
 PATH
   remote: sub/avm
   specs:
-    avm (0.50.0)
+    avm (0.51.0)
       eac_cli (~> 0.28)
       eac_config (~> 0.11, >= 0.11.1)
       eac_docker (~> 0.5)
-      eac_git (~> 0.12, >= 0.12.3)
+      eac_git (~> 0.13)
       eac_ruby_utils (~> 0.105)
       eac_templates (~> 0.3, >= 0.3.2)
       filesize (~> 0.2)
@@ -306,7 +314,7 @@ GEM
     minitest (5.16.3)
     multipart-post (2.2.3)
     net-ssh (4.2.0)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     ofx-parser (1.1.0)
       hpricot (>= 0.6)
@@ -367,6 +375,7 @@ DEPENDENCIES
   avm-eac_generic_base0!
   avm-eac_latex_base0!
   avm-eac_php_base0!
+  avm-eac_python_base0!
   avm-eac_rails_base0!
   avm-eac_rails_base1!
   avm-eac_redmine_base0!

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.37.1'
+  VERSION = '0.37.2'
 end

data/sub/avm/avm.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   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_git', '~> 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'
   s.add_dependency 'filesize', '~> 0.2'

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'ostruct'
+
+module Avm
+  module FileFormats
+    class Base
+      enable_abstract_methods
+
+      def apply(files)
+        old_content = Hash[files.map { |f| [f, File.read(f)] }]
+        ::Avm::Files::Formatter::Utf8Assert.assert_files(files) { internal_apply(files) }
+        files.map { |f| build_file_result(f, old_content[f]) }
+      end
+
+      def name
+        self.class.name.demodulize
+      end
+
+      def match?(file)
+        match_by_filename?(file) || match_by_type?(file)
+      end
+
+      def valid_basenames
+        constant_or_array('VALID_BASENAMES')
+      end
+
+      def valid_types
+        constant_or_array('VALID_TYPES')
+      end
+
+      private
+
+      def constant_or_array(name)
+        return [] unless self.class.const_defined?(name)
+
+        self.class.const_get(name)
+      end
+
+      def build_file_result(file, old_content)
+        ::OpenStruct.new(file: file, format: self.class,
+                         changed: (old_content != File.read(file)))
+      end
+
+      def match_by_filename?(file)
+        valid_basenames.any? do |valid_basename|
+          file.basename.fnmatch?(valid_basename)
+        end
+      end
+
+      def match_by_type?(file)
+        info = ::EacFs::FileInfo.new(file)
+        return unless info.content_type.type == 'text'
+
+        valid_types.include?(info.content_type.subtype)
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'avm/registry/from_gems'
+
+module Avm
+  module Registry
+    class FileFormats < ::Avm::Registry::FromGems
+    end
+  end
+end

data/sub/avm/lib/avm/registry.rb

@@ -7,8 +7,8 @@ module Avm
   module Registry
     require_sub __FILE__
     enable_listable
-    lists.add_symbol :category, :application_stereotypes, :instances, :launcher_stereotypes,
-                     :runners, :scms, :source_generators, :sources
+    lists.add_symbol :category, :application_stereotypes, :file_formats, :instances,
+                     :launcher_stereotypes, :runners, :scms, :source_generators, :sources
 
     class << self
       enable_simple_cache

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

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

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

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

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'avm/file_formats/base'
+
+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_TYPES = %w[plain x-shellscript].freeze
+
+        def internal_apply(files)
+          files.each { |file| file_apply(file) }
+        end
+
+        def file_apply(file)
+          file.write(string_apply(file.read))
+        end
+
+        def string_apply(string)
+          b = ''
+          string.each_line do |line|
+            b += "#{line.rstrip}\n"
+          end
+          "#{b.strip}\n".gsub(/\t/, '  ')
+        end
+      end
+    end
+  end
+end

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

@@ -3,11 +3,9 @@
 require 'eac_ruby_utils/core_ext'
 
 module Avm
-  module Files
-    class Formatter
-      module Formats
-        require_sub __FILE__
-      end
+  module EacGenericBase0
+    module FileFormats
+      require_sub __FILE__
     end
   end
 end

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

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

data/sub/avm-eac_php_base0/avm-eac_php_base0.gemspec

@@ -12,7 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'eac_ruby_utils', '~> 0.104'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
+  s.add_dependency 'eac_ruby_utils', '~> 0.105'
 
   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/file_formats/base.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacPhpBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.php].freeze
+        VALID_TYPES = ['x-php'].freeze
+
+        def file_apply(file)
+          ::Avm::Executables.php_cs_fixer.command.append(['fix', file]).system!
+          super(file)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacPhpBase0
+    module FileFormats
+      require_sub __FILE__
+    end
+  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.1.0'
+    VERSION = '0.2.0'
   end
 end

data/sub/avm-eac_python_base0/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_python_base0/avm-eac_python_base0.gemspec

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'avm/eac_python_base0/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'avm-eac_python_base0'
+  s.version     = Avm::EacPythonBase0::VERSION
+  s.authors     = ['Eduardo H. Bogoni']
+  s.summary     =  'AVM stereotype for Python applications.'
+
+  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_development_dependency 'eac_ruby_gem_support', '~> 0.5', '>= 0.5.1'
+end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacPythonBase0
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.py].freeze
+        VALID_TYPES = ['x-python'].freeze
+
+        def internal_apply(files)
+          ::Avm::Executables.yapf.command.append(['--in-place', *files]).system!
+          super(files)
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Avm
+  module EacPythonBase0
+    VERSION = '0.1.0'
+  end
+end

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

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

data/sub/avm-eac_python_base0/spec/rubocop_spec.rb

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

data/sub/avm-eac_python_base0/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-eac_ruby_base1/avm-eac_ruby_base1.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.50'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  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_development_dependency 'aranha-parsers', '~> 0.14', '>= 0.14.1'

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'avm/eac_ruby_base1/rubocop'
+
+module Avm
+  module EacRubyBase1
+    module FileFormats
+      class Base < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.gemspec *.rake *.rb Gemfile Rakefile].freeze
+        VALID_TYPES = ['x-ruby'].freeze
+
+        def internal_apply(files)
+          ::Avm::EacRubyBase1::Rubocop.new('.', ['-a', '--ignore-parent-exclusion'] + files).run
+          super(files)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacRubyBase1
+    module FileFormats
+      require_sub __FILE__
+    end
+  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.25.0'
+    VERSION = '0.26.0'
   end
 end

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

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,template}/**/*']
 
-  s.add_dependency 'avm', '~> 0.50'
-  s.add_dependency 'avm-eac_generic_base0', '~> 0.5'
+  s.add_dependency 'avm', '~> 0.51'
+  s.add_dependency 'avm-eac_generic_base0', '~> 0.6'
   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'

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+require 'htmlbeautifier'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Html < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.html *.html.erb].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(path)
+          input = ::File.read(path)
+          temppath = tempfile_path
+          ::File.open(temppath, 'w') do |output|
+            beautify path, input, output
+          end
+          ::FileUtils.mv(temppath, path)
+          super(path)
+        end
+
+        private
+
+        def beautify(name, input, output)
+          output.puts ::HtmlBeautifier.beautify(input, htmlbeautify_options)
+        rescue StandardError => e
+          raise "Error parsing #{name}: #{e}"
+        end
+
+        def htmlbeautify_options
+          @htmlbeautify_options ||= { indent: '  ' }
+        end
+
+        def tempfile_path
+          tempfile = ::Tempfile.new
+          tempfile.close
+          tempfile.path
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'avm/executables'
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Javascript < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.js].freeze
+        VALID_TYPES = [].freeze
+
+        def internal_apply(files)
+          ::Avm::Executables.js_beautify.command.append(
+            ['--indent-size=2', '--end-with-newline', '--replace', *files]
+          ).system!
+          super(files)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avm/eac_generic_base0/file_formats/base'
+
+module Avm
+  module EacWebappBase0
+    module FileFormats
+      class Json < ::Avm::EacGenericBase0::FileFormats::Base
+        VALID_BASENAMES = %w[*.json].freeze
+        VALID_TYPES = [].freeze
+
+        def file_apply(file)
+          ::File.write(file, ::JSON.pretty_generate(::JSON.parse(::File.read(file))))
+        end
+
+        def json_file?(file)
+          ::JSON.parse(::File.read(file))
+          true
+        rescue JSON::ParserError
+          false
+        end
+      end
+    end
+  end
+end