dldinternet-mixlib-thor 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c5c5697d1d7788438b26a74452482565af8a9a
-  data.tar.gz: 0db3c018cac4fda2ee2856ada1c61e9fdd540183
+  metadata.gz: a6efd1afc533c8d23bf9a984f4a57f70f99ef6cd
+  data.tar.gz: 18f57be1edfa890bdacf57b4fcd5ab000127dd40
 SHA512:
-  metadata.gz: 52cdf2066a5913bf9c2ad64e90b44c4514e19018f012a4ee4a813887ec3229ce8a229acf62cc4d6a2c58f75ca0dd4315fc5edc3cab104625c94ecccf120df15f
-  data.tar.gz: 10ffcba0c3623f93821970790d50d37a9b24ab136fec070a2c89401239535a9b6ebaec15d21cdbc2b9f39983faac40f983c47f6001532f30c50c6d94ec1d8ba7
+  metadata.gz: 6f4c54834b264f178a19f62d9a3e5084e3761386fee6921011229a179ce2cae52c532baba7a5a31ac5587b9c0ed639a9819d73cd165210e8aea55740e7b6ba0a
+  data.tar.gz: b155ad5382a1abe5dd1cfc8f952f17a058fa63dff690c7cfad22bd1a89bbb188107a2d5f60a178a606bea66b87583ed4d45fcff34e0026d27b20d32d0686edc4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-thor (0.9.9)
+    dldinternet-mixlib-thor (0.9.10)
       activesupport (~> 5.1, >= 5.1.4)
       awesome_print
       command_line_reporter (~> 3.3, >= 3.3.6)

data/lib/dldinternet/formatters/basic.rb

@@ -28,7 +28,7 @@ module DLDInternet
         if @columns
           @columns = Hashie::Mash.new(Hash[@columns.split(/\s*,\s*/).map{ |c| [c, nil]}])
           @columns.dup.map{ |h,v|
-            submap(h, v)
+            submap!(h, v)
           }
           @object = columnize_item(@object)
         end
@@ -253,7 +253,7 @@ module DLDInternet
             columnize_item(obj)
           }
         else
-          itm = ::Hashie::Mash.new
+          itm = {} # ::Hashie::Mash.new
           @columns.map {|k, _|
             itm[k] = item[k]
           }
@@ -261,13 +261,13 @@ module DLDInternet
         itm
       end
 
-      def submap(col, val, sub=nil)
+      def submap!(col, val, sub=nil)
         sub ||= @columns
         m = col.match(/^([^.]+)\.(.*)$/)
         if m
           val = sub[m[1]]
-          val ||= Hashie::Mash.new
-          submap(m[2], val, val)
+          val ||= {} # Hashie::Mash.new
+          submap!(m[2], val, val)
           sub[m[1]] = val
           sub.delete(col)
         else
@@ -348,20 +348,37 @@ module DLDInternet
               val.map {|v|
                 subvalues(k, v[k], sub[key])
               }
+            else
+              raise "Not catering for #{val.class.name}"
             end
           }
         elsif sk.is_a?(Array)
-          sk.map {|v|
+          fsk = sk.map {|v|
             h = @columns.nil? ? v : @columns[key]
-            h.keys.map { |k|
+            fv = h ? h.keys.map { |k|
               subvalues(k, v[k], v)
-            }
-          }.flatten!
+            } : v
+            fv = simple_value(fv)
+            fv
+          }.flatten
+          fsk
         else
           val
         end
       end
 
+      def simple_value(fv)
+        if fv.is_a?(Hash)
+          fv.to_hash
+        elsif fv.is_a?(Array)
+          fv.map{ |v| simple_value(v) }
+        elsif fv.is_a?(String)
+          fv
+        else
+          raise "Not catering for #{fv.class.name}"
+        end
+      end
+
       def subkeys(key, sub=nil)
         sub ||= @columns
         if sub && sub[key]

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

@@ -42,15 +42,17 @@ class FalseClass
 end
 
 module DLDInternet
+
+  class SilentMash < ::Hashie::Mash
+    def initialize(source_hash = nil, default = nil, &blk)
+      self.class.disable_warnings
+      super
+    end
+  end
+
   module Thor
     LOG_LEVELS = [:trace, :debug, :info, :note, :warn, :error, :fatal, :todo]
 
-    class SilentMash < ::Hashie::Mash
-      def initialize(source_hash = nil, default = nil, &blk)
-        self.class.disable_warnings
-        super
-      end
-    end
     class OptionsMash < SilentMash ; end
     class ConfigMash < SilentMash ; end
 
@@ -289,6 +291,8 @@ module DLDInternet
           when :none
           # when :basic
           when :text
+          when :plain
+          when :none
             # noop
           when :awesome
             format_helper = DLDInternet::Formatters::Awesome.new(obj, notation, title: opts[:title], columns: opts[:columns])
@@ -319,15 +323,20 @@ module DLDInternet
           end
           if robj.nil?
             robj
-          elsif robj.respond_to?(:to_hash)
-            robj.to_hash
-          elsif robj.respond_to?(:to_a)
-            robj.to_a.map { |obj| hash_it(obj) }
           elsif repre
             representation = repre.new(robj)
             representation.to_hash
-          elsif robj.respond_to?(:to_h)
-            robj.to_h
+          elsif robj.is_a?(Hash)
+            robj =  if robj.respond_to?(:to_hash)
+                      robj.to_hash
+                    elsif robj.respond_to?(:to_h)
+                      robj.to_h
+                    else
+                      raise "How to hash #{robj.ai}"
+                    end
+            Hash[robj.map{ |k,v| [k,hash_it(v)] }]
+          elsif robj.is_a?(Array)
+            robj.to_a.map { |obj| hash_it(obj) }
           else
             robj
           end
@@ -440,7 +449,9 @@ module DLDInternet
               options[:cassette] = @_invocations.map{ |_,v| v[0]}.join('-')
               options[:cassette_not_given] = true
             end
-            @cassette = ::VCR.insert_cassette(opts[:cassette] || options[:cassette])
+            options[:cassette_options] ||= {}
+            ::VCR::Cassette.logger ||= logger
+            @cassette = ::VCR.insert_cassette(opts[:cassette] || options[:cassette], options[:cassette_options])
           end
           yield if block_given?
         end

data/lib/dldinternet/thor/vcr.rb

@@ -1,6 +1,10 @@
 require 'vcr'
 require 'dldinternet/thor/vcr/logger'
 
+require 'vcr/cassette/http_interaction_list'
+require 'vcr/cassette/erb_renderer'
+require 'vcr/cassette/serializers'
+
 
 module VCR
   class Configuration
@@ -8,13 +12,26 @@ module VCR
     attr_accessor :logger
 
   end
-end
 
-module VCR
   # The media VCR uses to store HTTP interactions for later re-use.
   class Cassette
-
+    class << self
+      attr_accessor :logger
+    end
     attr_reader :options
 
+    def raw_cassette_bytes
+      unless @raw_cassette_bytes
+        path = @persister.absolute_path_to_file(storage_key)
+        if File.exist?(path)
+          # Log as info ONE time
+          VCR::Cassette.logger ? VCR::Cassette.logger.info( "Loading cassette '#{@name}' ...") : log( "Loading cassette ...")
+        else
+          # Log as debug on every request
+          VCR::Cassette.logger ? VCR::Cassette.logger.debug( "Cassette '#{@name}' not found!") : log( "Cassette not found ...")
+        end
+      end
+      @raw_cassette_bytes ||= VCR::Cassette::ERBRenderer.new(@persister[storage_key], erb, name).render
+    end
   end
 end

data/lib/dldinternet/thor/version.rb

@@ -1,7 +1,7 @@
 module Dldinternet
   module Mixlib
     module Thor
-      VERSION = '0.9.9'
+      VERSION = '0.9.10'
 
       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.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor