eac_ruby_utils 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fbe0a23a64fda20b9d611c418b3162e45a3f94efab0ab60f9e54d82c7c55d17
-  data.tar.gz: a48d1f5c6dad95964ada07635cc77f54df5dd681ca65bfdb44c7ca280231e665
+  metadata.gz: 97f124b1270ea6d57b09ae927a9bd660e433c65a04ac679e35eb8745c1af7f97
+  data.tar.gz: 20a01e6cc336bc653266b8672f8ec49bfd2e09284dbae017ed5d5e7a8d22bd46
 SHA512:
-  metadata.gz: 0a1552f7e33250db1f919be80116f186f6f8aa24df98a05a37f34189992b7930b1d37eb35a5e2d9948d38dce83b2e303ea32919b1916a8e3a6b7d717d5e50b0e
-  data.tar.gz: 53adc2c3785559368608d92e17b28d78174653f9c86629f697f46756c4630f6d636943cd814d9a6a09de2ec526dc9dc2e82f7cf80f30d2bb2d785ad363ca450a
+  metadata.gz: 8315c63630ea727fef3cea38712b0d33c7971b66e47e6dabe0ff8c5421253de4e520c4ee7f1c8b1946bbcbc66d7652b43c29488d7bfe9b0239d1d508e002f72c
+  data.tar.gz: 7fd0d6cfd670dd0c283ebedc165df7d0dd8675f623de67a5a8b86d39ad975e8ad7125497fa87ee60aaa709bf10cb503d49805c126c209c2a2cf73fd834706c7b

data/lib/eac_ruby_utils/envs/command.rb

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'command/extra_options'
+
 module EacRubyUtils
   module Envs
     class Command
       include EacRubyUtils::Console::Speaker
+      include EacRubyUtils::Envs::Command::ExtraOptions
 
-      def initialize(env, command)
+      def initialize(env, command, extra_options = {})
         @env = env
+        @extra_options = extra_options.with_indifferent_access
         if command.count == 1 && command.first.is_a?(Array)
           @command = command.first
         elsif command.is_a?(Array)
@@ -14,26 +18,24 @@ module EacRubyUtils
         else
           raise "Invalid argument command: #{command}|#{command.class}"
         end
-        @envvars = {}
+      end
+
+      def args
+        @command
       end
 
       def append(args)
-        self.class.new(@env, @command + args)
+        duplicate_by_command(@command + args)
       end
 
       def prepend(args)
-        self.class.new(@env, args + @command)
+        duplicate_by_command(args + @command)
       end
 
       def to_s
         "#{@command} [ENV: #{@env}]"
       end
 
-      def envvar(name, value)
-        @envvars[name] = value
-        self
-      end
-
       def command(options = {})
         c = @command
         c = c.map { |x| escape(x) }.join(' ') if c.is_a?(Enumerable)
@@ -45,11 +47,6 @@ module EacRubyUtils
         )
       end
 
-      def chdir(dir)
-        @chdir = dir
-        self
-      end
-
       def execute!(options = {})
         er = ExecuteResult.new(execute(options), options)
         return er.result if er.success?
@@ -67,11 +64,6 @@ module EacRubyUtils
         r
       end
 
-      def pipe(other_command)
-        @pipe = other_command
-        self
-      end
-
       def system!(options = {})
         return if system(options)
 
@@ -86,21 +78,18 @@ module EacRubyUtils
 
       private
 
-      def debug?
-        ENV['DEBUG'].to_s.strip != ''
-      end
+      attr_reader :extra_options
 
-      def append_envvars(command)
-        e = @envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
-        e.present? ? "#{e} #{command}" : command
+      def duplicate_by_command(new_command)
+        self.class.new(@env, new_command, @extra_options)
       end
 
-      def append_pipe(command)
-        @pipe.present? ? "#{command} | #{@pipe.command}" : command
+      def duplicate_by_extra_options(set_extra_options)
+        self.class.new(@env, @command, @extra_options.merge(set_extra_options))
       end
 
-      def append_chdir(command)
-        @chdir.present? ? "(cd '#{@chdir}' ; #{command} )" : command
+      def debug?
+        ENV['DEBUG'].to_s.strip != ''
       end
 
       def append_command_options(command, options)
@@ -114,8 +103,7 @@ module EacRubyUtils
       end
 
       def escape(arg)
-        raise "#{arg}|#{arg.class}" unless arg.is_a?(String)
-
+        arg = arg.to_s
         m = /^\@ESC_(.+)$/.match(arg)
         m ? m[1] : Shellwords.escape(arg)
       end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  module Envs
+    class Command
+      module ExtraOptions
+        def chdir(dir)
+          duplicate_by_extra_options(chdir: dir)
+        end
+
+        def envvar(name, value)
+          duplicate_by_extra_options(envvars: envvars.merge(name => value))
+        end
+
+        def pipe(other_command)
+          duplicate_by_extra_options(pipe: other_command)
+        end
+
+        private
+
+        attr_reader :extra_options
+
+        def envvars
+          extra_options[:envvars] ||= {}.with_indifferent_access
+        end
+
+        def append_envvars(command)
+          e = envvars.map { |k, v| "#{Shellwords.escape(k)}=#{Shellwords.escape(v)}" }.join(' ')
+          e.present? ? "#{e} #{command}" : command
+        end
+
+        def append_pipe(command)
+          extra_options[:pipe].present? ? "#{command} | #{extra_options[:pipe].command}" : command
+        end
+
+        def append_chdir(command)
+          extra_options[:chdir].present? ? "(cd '#{extra_options[:chdir]}' ; #{command} )" : command
+        end
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -79,6 +79,7 @@ files:
 - lib/eac_ruby_utils/envs.rb
 - lib/eac_ruby_utils/envs/base_env.rb
 - lib/eac_ruby_utils/envs/command.rb
+- lib/eac_ruby_utils/envs/command/extra_options.rb
 - lib/eac_ruby_utils/envs/local_env.rb
 - lib/eac_ruby_utils/envs/process.rb
 - lib/eac_ruby_utils/envs/ssh_env.rb