eac_ruby_utils 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5039f5c4f347e71881361fb3bcc462ebd88ee5bcd0140a677be9583591a34d40
-  data.tar.gz: 29e602fb349f046175a50b770433eccf92070aec71c8d7d8a3b41976254669d3
+  metadata.gz: c8b6e4d5bfab257e81419c888fb9463ec1e7766dde3cda6b9e36fa9fd741a35c
+  data.tar.gz: c5fdbab98b1e9b659c16ec8919995ba824380a140fee28697600ddee97a0cd4c
 SHA512:
-  metadata.gz: 1661013b929f15161d7288505dd7afa52e4f29354a7788d4f1adff038e804bb11c4c6ef7f3b1cf10f959bdda299617247a88125c106b75501adc6edcbc5531f6
-  data.tar.gz: 9fabf390c9845c25b059b4321858d17ab7ee57f36c6ccfd6b7be977c5dac1f97b20a82ad35e11b5e633e5e7c53a14a804f5833fe4f1d66590994c36e0c1ede7b
+  metadata.gz: 5c7279d045fdb2e6af2d3cc90f87605e562c9765a85c7b7988a57fd9da1aca598c14db699fc7af6d0256363352b0ffbebb60cd6ed9fbefe8c473941cee2004f4
+  data.tar.gz: 1e91ea3a626b6b0d2a439f30db473fef869a708d795e0a48341b2b7b66146813ae38530d8b029ecb6436f55c1c8927884ad8af0cc72bee3f34bcc4a9c42b139a

data/lib/eac_ruby_utils/console/docopt_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Console
     class DocoptRunner

data/lib/eac_ruby_utils/console/speaker.rb

@@ -1,33 +1,35 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Console
     # https://github.com/fazibear/colorize
     module Speaker
-      def puts(s = '')
-        STDERR.puts(s)
+      def puts(string = '')
+        STDERR.puts(string)
       end
 
-      def out(s = '')
-        STDOUT.write(s)
+      def out(string = '')
+        STDOUT.write(string)
       end
 
-      def fatal_error(s)
-        puts "ERROR: #{s}".white.on_red
+      def fatal_error(string)
+        puts "ERROR: #{string}".white.on_red
         Kernel.exit 1
       end
 
-      def title(s)
-        puts(('-' * (8 + s.length)).green)
-        puts("--- #{s} ---".green)
-        puts(('-' * (8 + s.length)).green)
+      def title(string)
+        puts(('-' * (8 + string.length)).green)
+        puts("--- #{string} ---".green)
+        puts(('-' * (8 + string.length)).green)
         puts
       end
 
-      def info(s)
-        puts s.white
+      def info(string)
+        puts string.white
       end
 
-      def warn(s)
-        puts s.yellow
+      def warn(string)
+        puts string.yellow
       end
 
       def infov(*args)
@@ -42,8 +44,8 @@ module EacRubyUtils
         puts r.join(', ')
       end
 
-      def success(s)
-        puts s.green
+      def success(string)
+        puts string.green
       end
     end
   end

data/lib/eac_ruby_utils/envs/base_env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class BaseEnv

data/lib/eac_ruby_utils/envs/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class Command
@@ -36,6 +38,7 @@ module EacRubyUtils
       def execute!(options = {})
         er = ExecuteResult.new(execute(options), options)
         return er.result if er.success?
+
         raise "execute! command failed: #{self}\n#{er.r.pretty_inspect}"
       end
 
@@ -51,6 +54,7 @@ module EacRubyUtils
 
       def system!(options = {})
         return if system(options)
+
         raise "system! command failed: #{self}"
       end
 
@@ -66,30 +70,35 @@ module EacRubyUtils
         ENV['DEBUG'].to_s.strip != ''
       end
 
-      def append_command_options(c, options)
-        c = options[:input].command + ' | ' + c if options[:input]
-        c = "cat #{Shellwords.escape(options[:input_file])} | #{c}" if options[:input_file]
-        c += ' > ' + Shellwords.escape(options[:output_file]) if options[:output_file]
-        c
+      def append_command_options(command, options)
+        command = options[:input].command + ' | ' + command if options[:input]
+        if options[:input_file]
+          command = "cat #{Shellwords.escape(options[:input_file])}" \
+            " | #{command}"
+        end
+        command += ' > ' + Shellwords.escape(options[:output_file]) if options[:output_file]
+        command
       end
 
-      def escape(s)
-        raise "#{s}|#{s.class}" unless s.is_a?(String)
-        m = /^\@ESC_(.+)$/.match(s)
-        m ? m[1] : Shellwords.escape(s)
+      def escape(arg)
+        raise "#{arg}|#{arg.class}" unless arg.is_a?(String)
+
+        m = /^\@ESC_(.+)$/.match(arg)
+        m ? m[1] : Shellwords.escape(arg)
       end
 
       class ExecuteResult
         attr_reader :r, :options
 
-        def initialize(r, options)
-          @r = r
+        def initialize(result, options)
+          @r = result
           @options = options
         end
 
         def result
           return exit_code_zero_result if exit_code_zero?
           return expected_error_result if expected_error?
+
           raise 'Failed!'
         end
 
@@ -100,7 +109,7 @@ module EacRubyUtils
         private
 
         def exit_code_zero?
-          r[:exit_code] && r[:exit_code].zero?
+          r[:exit_code]&.zero?
         end
 
         def exit_code_zero_result

data/lib/eac_ruby_utils/envs/local_env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class LocalEnv < ::EacRubyUtils::Envs::BaseEnv

data/lib/eac_ruby_utils/envs/process.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class Process

data/lib/eac_ruby_utils/envs/ssh_env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class SshEnv < ::EacRubyUtils::Envs::BaseEnv
@@ -5,13 +7,14 @@ module EacRubyUtils
         def parse_uri(uri)
           r = parse_user_hostname(uri) || ::Addressable::URI.parse(uri)
           return r if r.scheme == 'ssh'
+
           raise "URI has no SSH scheme: #{uri}"
         end
 
         private
 
-        def parse_user_hostname(s)
-          m = /\A([^@]+)@([^@]+)\z/.match(s)
+        def parse_user_hostname(user_hostname)
+          m = /\A([^@]+)@([^@]+)\z/.match(user_hostname)
           m ? ::Addressable::URI.new(scheme: 'ssh', host: m[2], user: m[1]) : nil
         rescue Addressable::URI::InvalidURIError
           nil
@@ -44,7 +47,7 @@ module EacRubyUtils
 
       def ssh_command_line_options
         r = []
-        uri.query_values.each { |k, v| r += ['-o', "#{k}=#{v}"] } if uri.query_values
+        uri.query_values&.each { |k, v| r += ['-o', "#{k}=#{v}"] }
         r
       end
     end

data/lib/eac_ruby_utils/envs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module EacRubyUtils
   module Envs
     class << self

data/lib/eac_ruby_utils/options_consumer.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module EacRubyUtils
+  class OptionsConsumer
+    def initialize(data)
+      @data = data.with_indifferent_access
+    end
+
+    def consume(key, default_value = nil, &block)
+      return default_value unless data.key?(key)
+
+      value = data.delete(key)
+      value = yield(value) if block
+      value
+    end
+
+    def validate
+      return if data.empty?
+
+      raise "Invalid keys: #{data.keys}"
+    end
+
+    def left_data
+      data.dup
+    end
+
+    private
+
+    attr_reader :data
+  end
+end

data/lib/eac_ruby_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRubyUtils
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'
 end

data/lib/eac_ruby_utils/yaml.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module EacRubyUtils
+  class Yaml
+    class << self
+      def load_common(string)
+        ::YAML.safe_load(string, [::Symbol, ::Date])
+      end
+    end
+  end
+end

data/lib/eac_ruby_utils.rb

@@ -7,6 +7,7 @@ require 'pp'
 require 'net/ssh'
 
 module EacRubyUtils
+  require 'eac_ruby_utils/options_consumer'
   require 'eac_ruby_utils/console/docopt_runner'
   require 'eac_ruby_utils/console/speaker'
   require 'eac_ruby_utils/envs'
@@ -15,4 +16,5 @@ module EacRubyUtils
   require 'eac_ruby_utils/envs/local_env'
   require 'eac_ruby_utils/envs/process'
   require 'eac_ruby_utils/envs/ssh_env'
+  require 'eac_ruby_utils/yaml'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: eac_ruby_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +82,9 @@ files:
 - lib/eac_ruby_utils/envs/local_env.rb
 - lib/eac_ruby_utils/envs/process.rb
 - lib/eac_ruby_utils/envs/ssh_env.rb
+- lib/eac_ruby_utils/options_consumer.rb
 - lib/eac_ruby_utils/version.rb
+- lib/eac_ruby_utils/yaml.rb
 homepage: 
 licenses:
 - MIT