avm-tools 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f7b0d99cc8ad01cab62e8b140114290035e233b898fd34b7c4aa91be927a1a
-  data.tar.gz: e63aef5208960e0a69578669e120493e24cc52354b8a94dc018b49645c0211a0
+  metadata.gz: f6ddfc7d16b8fdfe9667b1946cce15ec58148f16bd8f0df9eeb20017e37b6410
+  data.tar.gz: b04f18cc844998d78c2f0f9e337c2f276e092d10bc8f7d43bb88dfe5dc024425
 SHA512:
-  metadata.gz: 3b61fd2e8df381376ee6ed62b5e269d1f2e3202b698ef72757246b140cfe86c8f7d8582fd8064b8cb1808769af9f557203eba90f133a7228677513f8a74e92a7
-  data.tar.gz: d2a648257b9440a06c032030a055d5bc26bb411728fa6275e5f7bed29b42134825f1cbdc7f30e415fb6a3982768943627ff058aaf197cfb020e9720e9a5d7443
+  metadata.gz: 3a1fdec71e84673c36e350c9802e60e16159da27bd8761c196e3adafaa6b4528d2a51de0b2a0ad19a3a9eabeddaf590242e860eae3421cd839a9cc69d02043c5
+  data.tar.gz: 6e0e9d04f05d2d9c62342930bf572bab4304725fa012a710fe1f69569ef8d6673271a68c4e0562bfa4e3de8a8a4af2996714788383421693ca0604167ebe2705

data/lib/avm/fs_cache.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/filesystem_cache'
+
+module Avm
+  class << self
+    def fs_cache
+      @fs_cache ||= ::EacRubyUtils::FilesystemCache.new(ENV['HOME'], '.cache', 'avm')
+    end
+  end
+end

data/lib/avm/git/revision_test.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'avm/fs_cache'
+require 'avm/ruby'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Git
+    class RevisionTest
+      enable_simple_cache
+      enable_console_speaker
+      common_constructor :git, :sha1, :options
+
+      def banner
+        infov 'Revision to test', sha1
+        on_speaker_node do |node|
+          node.stderr_line_prefix = '  '
+          infov '* Subject', commit.subject
+          infov '* Success?', successful_label
+          infov '* STDOUT', stdout_cache.content_path
+          infov '* STDERR', stderr_cache.content_path
+        end
+      end
+
+      def successful_label
+        successful?.to_s.send((successful? ? :green : :red))
+      end
+
+      def to_s
+        sha1
+      end
+
+      def successful?
+        successful
+      end
+
+      private
+
+      def checkout_revision
+        infom 'Checking out revision...'
+        git.execute!('checkout', sha1)
+      end
+
+      def commit_uncached
+        ::Avm::Git::Commit.new(git, sha1)
+      end
+
+      def git_absolute_path
+        ::File.expand_path(git.to_s)
+      end
+
+      def root_cache
+        ::Avm.fs_cache.child('git', 'revision_test', git_absolute_path.parameterize, sha1,
+                             options.fetch(:test_command).to_s.parameterize)
+      end
+
+      def run_test
+        infom "Running test command \"#{::Shellwords.join(test_command_args)}\"" \
+          " on \"#{git_absolute_path}\"..."
+        result = ::Avm::Ruby.on_clean_environment { test_command.execute }
+        infom 'Test done'
+        write_result_cache(result)
+      end
+
+      def stdout_cache
+        root_cache.child('stdout')
+      end
+
+      def stderr_cache
+        root_cache.child('stderr')
+      end
+
+      def successful_cache
+        root_cache.child('successful')
+      end
+
+      def successful_uncached
+        if options.fetch(:no_cache) || !successful_cache.cached?
+          checkout_revision
+          run_test
+        end
+        successful_cache.read == 'true'
+      end
+
+      def test_command
+        ::EacRubyUtils::Envs.local.command(*test_command_args).chdir(git.to_s)
+      end
+
+      def test_command_args
+        r = ::Shellwords.split(options.fetch(:test_command).to_s)
+        return r if r.any?
+
+        raise 'No command found'
+      end
+
+      def write_result_cache(result)
+        stdout_cache.write(result[:stdout])
+        stderr_cache.write(result[:stderr])
+        successful_cache.write(result[:exit_code].zero? ? 'true' : 'false')
+      end
+    end
+  end
+end

data/lib/avm/patches/eac_launcher_git_base.rb

@@ -19,6 +19,10 @@ module Avm
         ::EacRubyUtils::Envs.local.command(*args)
       end
 
+      def dirty?
+        dirty_files.any?
+      end
+
       def dirty_files
         execute!('status', '--porcelain', '--untracked-files').each_line.map do |line|
           parse_status_line(line.gsub(/\n\z/, ''))

data/lib/avm/ruby.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Avm
+  module Ruby
+    class << self
+      def on_clean_environment
+        on_clean_envvars('BUNDLE', 'RUBY') { yield }
+      end
+
+      private
+
+      def on_clean_envvars(*start_with_vars)
+        old_values = envvars_starting_with(start_with_vars)
+        old_values.keys.each { |k| ENV.delete(k) }
+        yield
+      ensure
+        old_values&.each { |k, v| ENV[k] = v }
+      end
+
+      def envvars_starting_with(start_with_vars)
+        ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
+      end
+    end
+  end
+end

data/lib/avm/stereotypes/eac_redmine_base0/deploy.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avm/ruby'
 require 'avm/stereotypes/eac_webapp_base0/deploy'
 
 module Avm
@@ -10,7 +11,7 @@ module Avm
 
         def run_installer
           infom 'Running installer'
-          on_clean_ruby do
+          ::Avm::Ruby.on_clean_environment do
             installer_command.system!
           end
         end
@@ -31,24 +32,6 @@ module Avm
             'redmine_as_apache_base'
           end
         end
-
-        def on_clean_ruby
-          on_clear_envvars('BUNDLE', 'RUBY') { yield }
-        end
-
-        private
-
-        def on_clear_envvars(*start_with_vars)
-          old_values = envvars_starting_with(start_with_vars)
-          old_values.keys.each { |k| ENV.delete(k) }
-          yield
-        ensure
-          old_values&.each { |k, v| ENV[k] = v }
-        end
-
-        def envvars_starting_with(start_with_vars)
-          ENV.select { |k, _v| start_with_vars.any? { |var| k.start_with?(var) } }
-        end
       end
     end
   end

data/lib/avm/tools/runner/git/revisions_test.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/console/docopt_runner'
+require 'avm/git/revision_test'
+
+module Avm
+  module Tools
+    class Runner < ::EacRubyUtils::Console::DocoptRunner
+      class Git < ::EacRubyUtils::Console::DocoptRunner
+        class RevisionsTest < ::EacRubyUtils::Console::DocoptRunner
+          enable_simple_cache
+          enable_console_speaker
+
+          DOC = <<~DOCOPT
+            Test multiple revisions until a error is found.
+
+            Usage:
+              __PROGRAM__ [options]
+              __PROGRAM__ -h | --help
+
+            Options:
+              -h --help                     Mostra esta ajuda.
+              -c --command=<test-command>   Command to test instance.
+              -n --no-cache                 Does not use cache.
+          DOCOPT
+
+          def run
+            fatal_error('Repository is dirty') if context(:git).dirty?
+
+            return_to_branch_on_end do
+              infov 'Revisions found', revisions.count
+              if revision_with_error
+                warn("First revision with error: #{revision_with_error}")
+              else
+                success('No error found in revisions')
+              end
+            end
+          end
+
+          private
+
+          def return_to_branch_on_end
+            current_branch = context(:git).current_branch
+            yield
+          ensure
+            infom "Returning to original branch \"#{current_branch}\""
+            context(:git).execute!('checkout', current_branch)
+          end
+
+          def revision_with_error_uncached
+            revision_with_error = nil
+            revisions.each do |revision|
+              revision.banner
+              unless revision.successful?
+                revision_with_error = revision
+                break
+              end
+            end
+            revision_with_error
+          end
+
+          def revisions_uncached
+            context(:git).execute!('log', '--pretty=format:%H', 'origin/master..HEAD')
+                         .each_line.map(&:strip).reverse.map do |sha1|
+              ::Avm::Git::RevisionTest.new(context(:git), sha1, test_revision_options)
+            end
+          end
+
+          def test_revision_options
+            { test_command: options.fetch('--command'), no_cache: options.fetch('--no-cache') }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.32.0'
+    VERSION = '0.33.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -194,6 +194,7 @@ files:
 - lib/avm/executables.rb
 - lib/avm/files.rb
 - lib/avm/files/rotate.rb
+- lib/avm/fs_cache.rb
 - lib/avm/git.rb
 - lib/avm/git/commit.rb
 - lib/avm/git/commit/deploy.rb
@@ -209,6 +210,7 @@ files:
 - lib/avm/git/issue/complete/_remote.rb
 - lib/avm/git/issue/complete/_tracker.rb
 - lib/avm/git/issue/complete/_validations.rb
+- lib/avm/git/revision_test.rb
 - lib/avm/git/spec_helper.rb
 - lib/avm/instances.rb
 - lib/avm/instances/application.rb
@@ -232,6 +234,7 @@ files:
 - lib/avm/patches/object/template.rb
 - lib/avm/path_string.rb
 - lib/avm/result.rb
+- lib/avm/ruby.rb
 - lib/avm/self.rb
 - lib/avm/self/docker_image.rb
 - lib/avm/self/instance.rb
@@ -293,6 +296,7 @@ files:
 - lib/avm/tools/runner/git/dirty_files.rb
 - lib/avm/tools/runner/git/issue.rb
 - lib/avm/tools/runner/git/issue/complete.rb
+- lib/avm/tools/runner/git/revisions_test.rb
 - lib/avm/tools/runner/self.rb
 - lib/avm/tools/runner/self/docker.rb
 - lib/avm/tools/version.rb