ehbrs-tools 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa659c13e85b5935fb4c1f79c3dacece337e2a2c4305d3696447a63585d8cf9f
-  data.tar.gz: 760fe597d4e550c63c5ecc5a6a94d22b5ee70d2d5ea73a3b036c7a21c7bf3d92
+  metadata.gz: 96df751900aa306378007272674b8421190952ee71b133b05c10fd247397ec50
+  data.tar.gz: 80cce53bd76f46cb08de212d227ac639345198a5c93e9fb3deedd7c214831bf9
 SHA512:
-  metadata.gz: 84aaa531f252a3a05242866c3593056cb33df6cce824a186067d610cf51a2ad01b5077f61d726d23fd19b75218809df0a44bf7cab842780da47642e1f274a80d
-  data.tar.gz: 7ccbf1c9fe7be6a41a1a6acffdcabff9ca4c821ee313606e3ddaf8cc3d89daa3d7357ea77b972b0c824499e8c39836f9d97b5094eceac57b5f03b522a46294b5
+  metadata.gz: 538ff43fc795b7dac1aa2ab1cd24974aa8155603e0f4929c5a2a8e7186e2f546625293b6db799c73f46198114541a213bd33d9a27b819d91182e6cbf743a81a7
+  data.tar.gz: 2292ab898b428f1afb0c490816c0756d832c2cc40fd81ef7e7aa5dfb90a11b28b257ed09de45563d12d84d915b054081db71475da169dedc26bdaab5aa1945ac

data/lib/ehbrs/executables.rb

@@ -16,7 +16,7 @@ module Ehbrs
 
       {
         '-version' => %w[ffmpeg ffprobe],
-        '--version' => %w[flips-linux wit]
+        '--version' => %w[flips wit]
       }.each do |validate_arg, commands|
         commands.each do |command|
           define_method("#{command}_uncached") do

data/lib/ehbrs/runner/vg/ips.rb

@@ -4,6 +4,7 @@ require 'eac_cli/runner'
 require 'eac_cli/default_runner'
 require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/console/docopt_runner'
+require 'eac_ruby_utils/fs/temp'
 require 'ehbrs/executables'
 
 module Ehbrs
@@ -17,71 +18,119 @@ module Ehbrs
           arg_opt '-o', '--output-file', ' Saída no arquivo <output-file>.'
           bool_opt '-w', '--overwrite', 'Sobrescreve o arquivo de saída se existente.'
           pos_arg 'source-file'
-          pos_arg 'ips-file'
+          pos_arg 'ips-files', repeat: true
         end
 
         def run
           validate
+          start_banner
+          run_patches
+          infov 'Concluído'
         end
 
         private
 
-        def run_patch
-          ::Ehbrs::Executables.floating_ips.command
-                              .append(['--apply', ips_file, source_file, output_file]).system!
+        def on_temp_files
+          ::EacRubyUtils::Fs::Temp.on_file do |input|
+            ::EacRubyUtils::Fs::Temp.on_file do |output|
+              yield TempFiles.new(source_file, input, output)
+            end
+          end
+        end
+
+        def run_patch(source_path, ips_path, output_path)
+          ::Ehbrs::Executables.flips.command
+                              .append(['--apply', ips_path, source_path, output_path]).system!
+        end
+
+        def run_patches
+          on_temp_files do |temp|
+            ips_files.each do |ips_file|
+              run_patch(temp.input, ips_file, temp.output)
+              temp.swap
+            end
+            temp.move_result_to(output_file)
+          end
         end
 
         def source_file
-          options.fetch('<source-file>')
+          options.fetch('<source-file>').to_pathname
         end
 
         def start_banner
           infov 'Source file', source_file
-          infov 'IPS file', ips_file
           infov 'Output file', output_file
+          infov 'IPS files', ips_files.count
+          ips_files.each { |ips_file| infov '  * ', ips_file }
         end
 
-        def ips_file
-          options.fetch('<ips-file>')
+        def ips_files
+          options.fetch('<ips-files>').map(&:to_pathname)
         end
 
         def output_file
-          options.fetch('--output-file') || default_output_file
+          options.fetch('--output-file').to_pathname || default_output_file
         end
 
         def default_output_file
-          ::File.join(
-            ::File.dirname(ips_file),
-            ::File.basename(ips_file, '.*') + ::File.extname(source_file)
+          ips_files.last.parent.join(
+            ips_files.map { |f| f.basename('.*').to_path }.join('_') + source_file.extname
           )
         end
 
         def validate
           validate_source_file
-          validate_ips_file
+          ips_files.each { |ips_file| validate_ips_file(ips_file) }
           validate_output_file
-          start_banner
-          run_patch
         end
 
         def validate_source_file
-          return if ::File.exist?(source_file)
+          return if source_file.exist?
 
           fatal_error("Arquivo fonte \"#{source_file}\" não existe")
         end
 
-        def validate_ips_file
+        def validate_ips_file(ips_file)
           return if ::File.exist?(ips_file)
 
           fatal_error("Arquivo IPS \"#{ips_file}\" não existe")
         end
 
         def validate_output_file
-          return unless ::File.exist?(output_file)
+          return unless output_file.exist?
           return if options.fetch('--overwrite')
 
           fatal_error("Arquivo de saída \"#{output_file}\" já existe")
         end
+
+        class TempFiles
+          common_constructor :initial, :temp0, :temp1
+
+          def input
+            swaped? ? temp0 : initial
+          end
+
+          def move_result_to(dest)
+            return unless swaped?
+
+            ::FileUtils.mv(temp0.to_path, dest.to_path)
+          end
+
+          def output
+            temp1
+          end
+
+          def swap
+            temp0_current = temp0
+            self.temp0 = temp1
+            self.temp1 = temp0_current
+            @swaped = true
+          end
+
+          def swaped?
+            @swaped ? true : false
+          end
+        end
       end
     end
   end

data/lib/ehbrs/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Ehbrs
   module Tools
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb

@@ -88,16 +88,22 @@ module EacRubyUtils
         Kernel.system(c)
       end
 
+      protected
+
+      def duplicate(command, extra_options)
+        self.class.new(@env, command, extra_options)
+      end
+
       private
 
       attr_reader :extra_options
 
       def duplicate_by_command(new_command)
-        self.class.new(@env, new_command, @extra_options)
+        duplicate(new_command, @extra_options)
       end
 
       def duplicate_by_extra_options(set_extra_options)
-        self.class.new(@env, @command, @extra_options.merge(set_extra_options))
+        duplicate(@command, @extra_options.merge(set_extra_options))
       end
 
       def debug?

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'tempfile'
+
+module EacRubyUtils
+  module Fs
+    # Utilities for temporary files.
+    module Temp
+      class << self
+        # @return [Pathname]
+        def file(*tempfile_args)
+          file = Tempfile.new(*tempfile_args)
+          r = ::Pathname.new(file.path)
+          file.close
+          file.unlink
+          r
+        end
+
+        # Run a block while a temporary file pathname is providade. The file is deleted when block
+        # is finished.
+        def on_file(*tempfile_args)
+          pathname = file(*tempfile_args)
+          begin
+            yield(pathname)
+          ensure
+            pathname.unlink if pathname.exist?
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/on_clean_ruby_environment.rb

@@ -1,23 +1,12 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/ruby/on_clean_environment'
+
 module EacRubyUtils
   class << self
-    def on_clean_ruby_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) } }
+    # <b>DEPRECATED:</b> Please use <tt>EacRubyUtils::Ruby.on_clean_environment</tt> instead.
+    def on_clean_ruby_environment(*args, &block)
+      ::EacRubyUtils::Ruby.on_clean_environment(*args, &block)
     end
   end
 end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/object/blank'
+require 'pathname'
+
+class Object
+  # Convert +self+ to String and then to Pathname. Return nil if +self+ is +blank?+.
+  #
+  # @return [Pathname]
+  def to_pathname
+    return self if is_a?(::Pathname)
+
+    to_s.blank? ? nil : ::Pathname.new(to_s)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/envs/command'
+require 'eac_ruby_utils/ruby/on_clean_environment'
+
+module EacRubyUtils
+  module Ruby
+    # A [EacRubyUtils::Envs::Command] which runs in a clean Ruby environment.
+    class Command < ::EacRubyUtils::Envs::Command
+      def initialize(bundle_args, extra_options = {})
+        super(::EacRubyUtils::Envs.local, bundle_args, extra_options)
+      end
+
+      %w[system execute].each do |method_prefix|
+        [method_prefix, "#{method_prefix}!"].each do |method_name|
+          define_method method_name do |*args, &block|
+            ::EacRubyUtils::Ruby.on_clean_environment do
+              super(*args, &block)
+            end
+          end
+        end
+      end
+
+      protected
+
+      def duplicate(command, extra_options)
+        self.class.new(gem, command, extra_options)
+      end
+    end
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Ruby
+    class << self
+      # Executes a block in an environment when the variables BUNDLE* and RUBY* are removed.
+      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/vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/require_sub'
+
+module EacRubyUtils
+  module Ruby
+    ::EacRubyUtils.require_sub(__FILE__)
+  end
+end

data/vendor/eac_ruby_utils/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.28.0'
+  VERSION = '0.30.0'
 end

data/vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/fs/temp'
+
+RSpec.describe ::EacRubyUtils::Fs::Temp do
+  describe '#on_file' do
+    it do
+      temp_path = nil
+      described_class.on_file do |path|
+        temp_path = path
+        expect(temp_path).not_to exist
+        temp_path.write('StubText')
+        expect(temp_path).to exist
+      end
+      expect(temp_path).not_to exist
+    end
+
+    it 'not fail if already removed' do
+      temp_path = nil
+      described_class.on_file do |path|
+        temp_path = path
+        expect(temp_path).not_to exist
+        temp_path.write('StubText')
+        expect(temp_path).to exist
+        temp_path.unlink
+      end
+      expect(temp_path).not_to exist
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ehbrs-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
@@ -157,6 +157,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/envs/ssh_env.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/filesystem_cache.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/temp.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/traversable.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs/traverser.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/fs_cache.rb
@@ -187,6 +188,7 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/asserts.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/if_present.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/template.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/object/to_pathname.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/patches/pathname/basename_sub.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/paths_hash.rb
@@ -194,6 +196,9 @@ files:
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec/conditional.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/rspec/stubbed_ssh.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/command.rb
+- vendor/eac_ruby_utils/lib/eac_ruby_utils/ruby/on_clean_environment.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/settings_provider.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/simple_cache.rb
 - vendor/eac_ruby_utils/lib/eac_ruby_utils/templates.rb
@@ -212,6 +217,7 @@ files:
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/executable_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/envs/ssh_env_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/filesystem_cache_spec.rb
+- vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/fs/temp.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/listable_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/options_consumer_spec.rb
 - vendor/eac_ruby_utils/spec/lib/eac_ruby_utils/patches/hash/options_consumer_spec.rb