dldinternet-mixlib-thor 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e514a24e53b9e7fcb0f1fa73351a0dd13094728f
-  data.tar.gz: e84ce7160a7bb7c8f830ad1372341e44da96107f
+  metadata.gz: 92e001459d25a189e5430f6794b22de3a9729853
+  data.tar.gz: c3f18989af8e2419050f606b07ba417a7589f0b5
 SHA512:
-  metadata.gz: ddaf17824e3cb6444869eb9d1248e06ef4c629b910b8adbaed403249156f34654f9c5c0f5e2c219364c82160909fc5c92fb338c63449a2c9f294e44376e0eeea
-  data.tar.gz: 295010865bc6e1373a7b5f1268a38bbff5fc6066126024d8ce1874fa538de18251b90c0c44f921e1241cf3baec54d6a09b1620e280d0011b6744e3594b2825d1
+  metadata.gz: 5a80c92d83ba89917814d6c7581895bc1ff568e562ffee76b60f81f84821ef84a8ce6f31cab26f865ce18adfd52eca8c53b92b3a554ffbb95595b6a54079a859
+  data.tar.gz: c3e32340ceeae019939d0853366c89e1b226ac24d61c693b0610a11af676c6a41e37a96569960def018a6753e165b7395f9f92c0e93bc688b7b455f5f4cca2c7

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-thor (0.6.0)
+    dldinternet-mixlib-thor (0.7.0)
+      activesupport (~> 5.1, >= 5.1.4)
       awesome_print
       command_line_reporter (~> 3.3, >= 3.3.6)
       config-factory
@@ -9,16 +10,23 @@ PATH
       hashie
       inifile
       paint-shortcuts
-      thor (~> 0.19, >= 0)
+      thor (~> 0.19, >= 0.19.4)
+      vcr (~> 3.0, >= 3.0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     awesome_print (1.8.0)
     builder (3.2.3)
     colored (1.2)
     command_line_reporter (3.3.6)
       colored (>= 1.2)
+    concurrent-ruby (1.0.5)
     config-factory (0.0.9)
     cucumber (0.10.7)
       builder (>= 2.1.2)
@@ -32,13 +40,15 @@ GEM
     gherkin (2.4.21)
       json (>= 1.4.6)
     hashie (3.5.6)
+    i18n (0.8.6)
     inifile (3.0.0)
     json (2.0.3)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    multi_json (1.12.1)
+    minitest (5.10.3)
+    multi_json (1.12.2)
     paint (2.0.0)
     paint-shortcuts (2.0.0)
       paint (>= 1.0, < 3.0)
@@ -47,7 +57,11 @@ GEM
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.20.0)
+    thread_safe (0.3.6)
     tins (1.13.2)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    vcr (3.0.3)
 
 PLATFORMS
   ruby

data/dldinternet-mixlib-thor.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 			'thor', '~> 0.19', '>= 0'
+  gem.add_runtime_dependency 			'thor', '~> 0.19', '>= 0.19.4'
   gem.add_dependency              'awesome_print'                       #, '~> 1.2'
   gem.add_dependency              'paint-shortcuts', '>= 0'
   gem.add_dependency              'inifile'                             #, '~> '
@@ -25,6 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency              'command_line_reporter', '~> 3.3', '>= 3.3.6'
   gem.add_dependency              'dldinternet-mixlib-logging', '>= 0.7.0'
   gem.add_dependency              'config-factory'                      #, '~> '
+  gem.add_dependency              'vcr', '~> 3.0', '>= 3.0.3'
+  gem.add_dependency              'activesupport', '~> 5.1', '>= 5.1.4'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 10'

data/lib/dldinternet/thor/command.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'dldinternet/thor/dynamic_command'
 require 'awesome_print'
 
 module DLDInternet
@@ -11,6 +12,8 @@ module DLDInternet
 
       end
 
+      attr_reader :cassette,:vcr_logger
+
       class << self
         attr_accessor :invocations
 
@@ -33,6 +36,10 @@ module DLDInternet
           0
         end
 
+        def dynamic_command_class #:nodoc:
+          ::DLDInternet::Thor::DynamicCommand
+        end
+
         def handle_argument_error(command, error, args, arity) #:nodoc:
           command_s = banner(command)
           # msg = "ERROR: \"#{basename} #{command.name}\" was called with "
@@ -43,6 +50,11 @@ module DLDInternet
           raise ::Thor::InvocationError, msg
         end
 
+        def handle_no_command_error(command, has_namespace = $thor_runner) #:nodoc:
+          raise ::Thor::UndefinedCommandError, "Could not find command #{command.inspect} in #{namespace.inspect} namespace." if has_namespace
+          raise ::Thor::UndefinedCommandError, "Could not find command #{command.inspect}."
+        end
+
         protected
 
         def banner(command, namespace = nil, subcommand = false)

data/lib/dldinternet/thor/dynamic_command.rb

@@ -0,0 +1,34 @@
+require 'thor'
+require 'thor/command'
+
+module DLDInternet
+  module Thor
+    class DynamicCommand < ::Thor::DynamicCommand
+      # By default, a command invokes a method in the thor class. You can change this
+      # implementation to create custom commands.
+      def run(instance, args = [])
+        arity = nil
+
+        if private_method?(instance)
+          instance.class.handle_no_command_error(name)
+        elsif public_method?(instance)
+          arity = instance.method(name).arity
+          instance.__send__(name, *args)
+        elsif local_method?(instance, :method_missing)
+          instance.__send__(:method_missing, name.to_sym, *args)
+        else
+          if instance.class.instance_methods.include?(:handle_no_command_error)
+            instance.handle_no_command_error(name)
+          else
+            instance.class.handle_no_command_error(name)
+          end
+        end
+      rescue ArgumentError => e
+        handle_argument_error?(instance, e, caller) ? instance.class.handle_argument_error(self, e, args, arity) : (raise e)
+      rescue ::Thor::NoMethodError => e
+        handle_no_method_error?(instance, e, caller) ? instance.class.handle_no_command_error(name) : (raise e)
+      end
+
+    end
+  end
+end

data/lib/dldinternet/thor/mixins/no_commands.rb

@@ -6,6 +6,39 @@ require 'hashie/mash'
 require 'dldinternet/thor/version'
 require 'inifile'
 require 'config/factory'
+require 'dldinternet/thor/vcr'
+require 'active_support/core_ext/object/blank'
+
+class String
+  def to_bool
+    return true   if self == true   || !self.match(/^(true|t|yes|y|1|on)$/i).nil?
+    return false  if self == false  || self.blank? || !self.match(/^(false|f|no|n|0|off)$/i).nil?
+    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+  end
+  alias :to_b :to_bool
+
+  def class_from
+    self.split('::').inject(Object) do |mod, class_name|
+      mod.const_get(class_name)
+    end
+  end
+  alias :to_class :class_from
+
+end
+
+class TrueClass
+  def to_bool
+    true
+  end
+  alias :to_b :to_bool
+end
+
+class FalseClass
+  def to_bool
+    false
+  end
+  alias :to_b :to_bool
+end
 
 module DLDInternet
   module Thor
@@ -19,8 +52,7 @@ module DLDInternet
         include DLDInternet::Mixlib::Logging
 
         def validate_options
-          OptionsMash.disable_warnings
-          @options = OptionsMash.new(@options.to_h)
+          writeable_options
           if options[:log_level]
             log_level = options[:log_level].to_sym
             raise "Invalid log-level: #{log_level}" unless LOG_LEVELS.include?(log_level)
@@ -31,8 +63,14 @@ module DLDInternet
           @options[:output] ||= @options[:format]
         end
 
+        def writeable_options
+          return if @options.is_a?(OptionsMash)
+          OptionsMash.disable_warnings
+          @options = OptionsMash.new(@options.to_h)
+        end
+
         def load_inifile
-          unless File.exist?(@options[:inifile])
+          unless !@options[:inifile].blank? && File.exist?(@options[:inifile])
             raise "#{@options[:inifile]} not found!"
           end
           begin
@@ -75,36 +113,73 @@ module DLDInternet
         end
 
         def load_config
-          if File.exist?(@options[:config])
-            begin
-              envs = ::Config::Factory::Environments.load_file(@options[:config])
-              if envs and envs.is_a?(Hash) and @options[:environment]
-                @options[:environments] = ::Hashie::Mash.new(envs)
-              else
-                yaml = ::YAML.load(File.read(@options[:config]))
-                if yaml
-                  yaml.each {|key, value|
-                    @options[key.to_s.gsub(%r{[-]}, '_').to_sym]=value
-                  }
+          unless @options[:config].blank?
+            @options[:config] = File.expand_path(@options[:config])
+            if ::File.exist?(@options[:config])
+              begin
+                envs = ::Config::Factory::Environments.load_file(@options[:config])
+                if envs and envs.is_a?(Hash) and @options[:environment]
+                  @options[:environments] = ::Hashie::Mash.new(envs)
                 else
-                  msg = "#{options.config} is not a valid configuration!"
-                  @logger.error msg
-                  raise StandardError.new(msg)
+                  yaml = ::YAML.load(File.read(@options[:config]))
+                  if yaml
+                    yaml.each {|key, value|
+                      @options[key.to_s.gsub(%r{[-]}, '_').to_sym]=value
+                    }
+                  else
+                    msg = "#{options.config} is not a valid configuration!"
+                    @logger.error msg
+                    raise StandardError.new(msg)
+                  end
                 end
+              rescue ::Exception => e
+                @logger.error "#{e.class.name} #{e.message}"
+                raise e
               end
-            rescue ::Exception => e
-              @logger.error "#{e.class.name} #{e.message}"
-              raise e
+            else
+              @logger.warn "#{options.config} not found"
+              @logger.error "Invalid/No configuration file specified"
+              exit 2
+              #@options[:environments] = ::Hashie::Mash.new
             end
           else
-            @logger.warn "#{options.config} not found"
+            @logger.error 'Invalid/No configuration file specified'
           end
         end
 
         def parse_options
           validate_options
 
-          lcs = ::Logging::ColorScheme.new( 'compiler', :levels => {
+          get_logger(true)
+
+          if @options[:inifile]
+            @options[:inifile] = File.expand_path(@options[:inifile])
+            load_inifile
+          elsif @options[:config]
+            if @options[:config] =~ /\.ini/i
+              @options[:inifile] = @options[:config]
+              load_inifile
+            else
+              load_config
+            end
+          end
+          if options[:debug]
+            @logger.info "Options:\n#{options.ai}"
+          end
+          if options[:stubber].is_a?(String)
+            options[:stubber] = options[:stubber].split(/\s*,\s*/).map(&:to_sym)
+          elsif options[:stubber].is_a?(Array) && options[:stubber].size == 1 && options[:stubber][0].is_a?(String)
+            options[:stubber] = options[:stubber][0].split(/\s*,\s*/).map(&:to_sym)
+          elsif options[:stubber].is_a?(Array) && options[:stubber].size > 1 && options[:stubber][0].is_a?(String)
+            options[:stubber] = options[:stubber].map(&:to_sym)
+          end
+
+        end
+
+        def get_logger(force=false)
+          return unless force || @logger.nil?
+          writeable_options
+          lcs             = ::Logging::ColorScheme.new('compiler', :levels => {
               :trace => :blue,
               :debug => :cyan,
               :info  => :green,
@@ -114,13 +189,13 @@ module DLDInternet
               :fatal => :red,
               :todo  => :purple,
           })
-          scheme = lcs.scheme
+          scheme          = lcs.scheme
           scheme['trace'] = "\e[38;5;33m"
           scheme['fatal'] = "\e[38;5;89m"
           scheme['todo']  = "\e[38;5;55m"
           lcs.scheme scheme
-          @config         = @options.dup
-          @config[:log_opts] = lambda{|mlll| {
+          @config               = @options.dup
+          @config[:log_opts]    = lambda {|mlll| {
               :pattern      => "%#{mlll}l: %m %g\n",
               :date_pattern => '%Y-%m-%d %H:%M:%S',
               :color_scheme => 'compiler',
@@ -130,27 +205,10 @@ module DLDInternet
               # :level        => @config[:log_level],
           }
           }
-          @config[:log_levels] ||= LOG_LEVELS
+          @config[:log_levels]  ||= LOG_LEVELS
           @options[:log_config] = @config
           # initLogging(@config)
           @logger = getLogger(@config)
-
-          if @options[:inifile]
-            @options[:inifile] = File.expand_path(@options[:inifile])
-            load_inifile
-          elsif @options[:config]
-            @options[:config] = File.expand_path(@options[:config])
-            if @options[:config] =~ /\.ini/i
-              @options[:inifile] = @options[:config]
-              load_inifile
-            else
-              load_config
-            end
-          end
-          if options[:debug]
-            @logger.info "Options:\n#{options.ai}"
-          end
-
         end
 
         def abort!(msg)
@@ -233,8 +291,16 @@ module DLDInternet
         end
 
         def command_pre(*args)
+          args.flatten!
           parse_options
           @logger.info @_invocations.map{ |_,v| v[0]}.join(' ') if options[:verbose]
+          command_pre_start_vcr(args)
+        end
+
+        def command_post(rc=0)
+          command_post_stop_vcr
+          @command_post = true
+          rc
         end
 
         def command_out(res, fmtr=nil)
@@ -284,6 +350,45 @@ module DLDInternet
           super
         end
 
+        def handle_no_command_error(command, has_namespace = $thor_runner)
+          get_logger unless @logger#:nodoc:
+          @logger.error "Could not find command #{command.inspect} in #{namespace.inspect} namespace." if has_namespace
+          @logger.error "Could not find command #{command.inspect}."
+          1
+        end
+
+        protected
+
+        def command_pre_start_vcr(*args)
+          args.flatten!
+          if options[:vcr]
+            unless options[:cassette_path].match(%r{^#{File::SEPARATOR}})
+              if File.dirname($0).eql?(Dir.pwd)
+                @logger.error "Saving fixtures to #{Dir.pwd}!"
+                exit 1
+              end
+            end
+
+            @vcr_logger ||= ::DLDInternet::Thor::VCR::Logger.new(nil, @logger)
+            ::VCR.configure do |config|
+              config.cassette_library_dir = options[:cassette_path]
+              config.hook_into *options[:stubber]
+              config.logger = @vcr_logger
+            end
+            opts = args[0].is_a?(Hash) ? args.shift : {}
+            options[:cassette] ||= @_invocations.map{ |_,v| v[0]}.join('-')
+            @cassette = ::VCR.insert_cassette(opts[:cassette] || options[:cassette], match_requests_on: [:method,:uri,:headers,:body], record: options[:record_mode])
+          end
+          yield if block_given?
+        end
+
+        def command_post_stop_vcr
+          if options[:vcr]
+            ::VCR.eject_cassette
+            @cassette = nil
+            @vcr_logger = nil
+          end
+        end
       end
     end
   end

data/lib/dldinternet/thor/vcr.rb

@@ -0,0 +1,20 @@
+require 'vcr'
+require 'dldinternet/thor/vcr/logger'
+
+
+module VCR
+  class Configuration
+
+    attr_accessor :logger
+
+  end
+end
+
+module VCR
+  # The media VCR uses to store HTTP interactions for later re-use.
+  class Cassette
+
+    attr_reader :options
+
+  end
+end

data/lib/dldinternet/thor/vcr/logger.rb

@@ -0,0 +1,24 @@
+require 'vcr/util/logger'
+
+module DLDInternet
+  module Thor
+    module VCR
+      class Logger < ::VCR::Logger
+        attr_reader :options
+
+        def initialize(stream, logger=nil, options = {})
+          super(stream)
+          @logger = logger
+          @options = options
+        end
+
+        def log(message, log_prefix, indentation_level = 0)
+          indentation = '  ' * indentation_level
+          log_message = indentation + log_prefix + message
+          @logger.debug(log_message)
+        end
+
+      end
+    end
+  end
+end

data/lib/dldinternet/thor/version.rb

@@ -1,7 +1,7 @@
 module Dldinternet
   module Mixlib
     module Thor
-      VERSION = '0.6.0'
+      VERSION = '0.7.0'
 
       module Version # :nodoc: all
         MAJOR, MINOR, RELEASE, *OTHER = VERSION.split '.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dldinternet-mixlib-thor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -19,7 +19,7 @@ dependencies:
         version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.4
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +238,10 @@ files:
 - lib/dldinternet/formatters/errors.rb
 - lib/dldinternet/formatters/table.rb
 - lib/dldinternet/thor/command.rb
+- lib/dldinternet/thor/dynamic_command.rb
 - lib/dldinternet/thor/mixins/no_commands.rb
+- lib/dldinternet/thor/vcr.rb
+- lib/dldinternet/thor/vcr/logger.rb
 - lib/dldinternet/thor/version.rb
 homepage: https://rubygems.org/gems/dldinternet-mixlib-thor
 licenses: