dldinternet-mixlib-thor 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e304facbf9df8b0d9f56707bb2fff2c05e7eeb33
-  data.tar.gz: acf675f70dfd8c77efb5f58ceaee071802094762
+  metadata.gz: 5f544e9a0b1ea51a7d7ed48b61d597ccbae1b90e
+  data.tar.gz: 3c2c1ce128e9a9c2cdc914e8c1196aa1b22c2366
 SHA512:
-  metadata.gz: 9981d254c00a9be82d1db0936dcd7222ad2dff0212ab1d01ed00486b71ab8d204a7d4ee893156dbaf6c7d01bc92c14ea9723c82531c3cd8797d020c7dc00ba56
-  data.tar.gz: e65fada56e6859ec0b78f1a1e30b9e4e2864d9ba45a267d0159c6b053a5f070cb69d4a5959768f9155082d1686aba5f573720707662b5c67d6813aa4b35ae362
+  metadata.gz: 7e12856ffccc77fa6b111aec39a7577875d8c869f3c55514742823336177af361bab18c75cb82b6ee94bb3c4d34955b7b5bf7644d6faadcc1a16eb481d3b9ce8
+  data.tar.gz: dd653631cc637f053dfb7d9d30546576740279bff7c9238724a5db78c692bc34a84532a59f3c443536230abf30119f04cdd64e66b231c74b6e9d0d88d52bdc44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-thor (0.9.1)
+    dldinternet-mixlib-thor (0.9.2)
       activesupport (~> 5.1, >= 5.1.4)
       awesome_print
       command_line_reporter (~> 3.3, >= 3.3.6)
@@ -76,4 +76,4 @@ DEPENDENCIES
   rubygems-tasks (~> 0.2)
 
 BUNDLED WITH
-   1.14.5
+   1.15.4

data/lib/dldinternet/formatters/basic.rb

@@ -44,6 +44,15 @@ module DLDInternet
             else
               object.to_s
             end
+        item = if item.is_a?(Hash)
+          if @columns.nil?
+            item.keys
+          else
+            @columns.keys
+          end
+        else
+          item
+        end
 
         format_item item, true
       end
@@ -110,26 +119,11 @@ module DLDInternet
 
       def format_item(item, header=false)
         fmt = format.to_s.downcase
-        if /json|yaml|csv/.match?(fmt)
-          item = if @columns.nil?
-                   item
-                 else
-                   item = item.dup
-                   if item.is_a?(Array)
-                     nitm = item.map do |itm|
-                       hitm = Hash[itm.map do |key, val|
-                         if @columns.keys.include?(key) && @columns[key].nil?
-                           [key,val]
-                         end
-                       end.select{ |e| !e.nil? }]
-                     end
-                     nitm
-                   elsif item.is_a?(Hash)
-                   else
-                     item
-                   end
-                 end
-        end
+        # if /json|yaml|csv/.match?(fmt)
+        #   item = if @columns.nil?
+                 #   item
+                 # else
+        item = object_item(item, header)
         case fmt
         when 'json'
           JSON.pretty_generate(item)
@@ -153,7 +147,7 @@ module DLDInternet
                         item
                       end
                     else
-                      @columns.keys
+                      @columns.keys.map{ |k| subkeys(k) }
                     end
           nitm = if item.is_a?(Array)
                   item.map { |itm|
@@ -179,6 +173,7 @@ module DLDInternet
           }
           csv = CSV::Table.new(nitm).to_csv
         when 'none'
+          # columnize_item(item).to_s
           item
         else
           if item.is_a?(Array) # header ||
@@ -198,19 +193,70 @@ module DLDInternet
             nitm.join(" ")
           elsif item.is_a?(Hash)
             nitm = item.map do |key, val|
-              if @columns.nil? || (@columns.keys.include?(key) && @columns[key].nil?)
-                sprintf("%-#{widths[key]}s", val.to_s)
-              elsif !key.index('.').nil?
+              if @columns.nil? || @columns.keys.include?(key) #&& @columns[key].nil?)
                 sprintf("%-#{widths[key]}s", subcolumn(key, val))
+                # sprintf("%-#{widths[key]}s", val.to_s)
+              # elsif !key.index('.').nil?
+              #   sprintf("%-#{widths[key]}s", subcolumn(key, val))
               end
             end
-            nitm.select{|s| !s.nil?}.join(" ")
+            nitm = nitm.select{|s| !s.nil?}.join(" ")
+            nitm
           else
             item.to_s
           end
         end
       end
 
+      def object_item(item, header=false)
+        unless @columns.nil? || header
+          item = if item.is_a?(Array)
+                   nitm = item.map do |itm|
+                     map_item(itm)
+                   end
+                   nitm
+                 elsif item.is_a?(Hash)
+                   map_item(item)
+                 else
+                   item
+                 end
+          # end
+        end
+        item
+      end
+
+      def map_item(item)
+        itm  = columnize_item(item)
+        mitm = itm.map do |key, val|
+          k, v = [subkeys(key), subcolumn(key, val)]
+          v.nil? ? nil : [k, v]
+          # if @columns.keys.include?(key)
+          # if @columns[key].nil?
+          #   [key,val]
+          # else
+          #   raise "What now"
+          # end
+          # end
+        end
+        mitm = mitm.select {|e| !e.nil?} #&& !e[1].nil? }
+        Hash[mitm]
+      end
+
+      def columnize_item(item)
+        return item if @columns.nil?
+        if item.is_a?(Array)
+          itm = item.map { |obj|
+            columnize_item(obj)
+          }
+        else
+          itm = ::Hashie::Mash.new
+          @columns.map {|k, _|
+            itm[k] = item[k]
+          }
+        end
+        itm
+      end
+
       def submap(col, val, sub=nil)
         sub ||= @columns
         m = col.match(/^([^.]+)\.(.*)$/)
@@ -242,7 +288,7 @@ module DLDInternet
       def widths_hash(item=nil)
         item ||= @object
         item.each do |key, _|
-          klen         = key.to_s.length
+          klen         = (@columns.nil? ? key : subkeys(key, @columns)).to_s.length
           wid          = @widths[key]
           @widths[key] = klen if !wid || wid < klen
         end
@@ -257,45 +303,80 @@ module DLDInternet
 
       def obj_width(obj)
         obj.each do |key, val|
-          set_width(key, val)
+          set_width(key, @columns.nil? ? val : subvalues(key, val, obj))
         end
       end
 
+      def column(text, options = {})
+        text
+      end
+
       def subcolumn(key, val, sub=nil)
-        sub ||= @columns
-        if sub[key]
-          if sub[key].is_a?(Hash)
-            vals = subvalues(key, val, sub)
-            if vals.is_a?(Array)
-              vals.flatten!
-              # vals = vals[0] if vals.size == 1
+        if @columns.nil?
+          column(val.to_s)
+        else
+          sub ||= @columns
+          if sub[key]
+            if sub[key].is_a?(Hash)
+              vals = subvalues(key, val, sub)
+              if vals.is_a?(Array)
+                vals.flatten!
+                # vals = vals[0] if vals.size == 1
+              end
+              column(vals.to_s)
+            else
+              column(val.to_s) if sub.has_key?(key)# && sub[key].nil?
             end
-            column(vals.to_s)
           else
-            column(val.to_s) if sub.has_key?(m[1]) && sub[m[1]].nil?
+            column(val.to_s)  if sub.has_key?(key) # && sub[key].nil?)
           end
-        else
-          column(val.to_s)  if sub.has_key?(key) # && sub[key].nil?)
         end
       end
 
       def subvalues(key, val, sub)
-        if sub[key].is_a?(Hash)
-          sub[key].keys.map {|k|
+        sk = sub[key]
+        if sk.is_a?(Hash)
+          sk.keys.map {|k|
             case val.class.name
-            when /^Hash/
+            when /Hash$/
               val[k]
-            when /^Array/
+            when /Array$/
               val.map {|v|
                 subvalues(k, v[k], sub[key])
               }
             end
           }
+        elsif sk.is_a?(Array)
+          sk.map {|v|
+            h = @columns.nil? ? v : @columns[key]
+            h.keys.map { |k|
+              subvalues(k, v[k], v)
+            }
+          }.flatten!
         else
           val
         end
       end
 
+      def subkeys(key, sub=nil)
+        sub ||= @columns
+        if sub && sub[key]
+          if sub[key].is_a?(Hash)
+            keys = sub[key].map { |k,v|
+              key+'.'+subkeys(k, v ? v : {})
+            }
+            if keys.is_a?(Array)
+              keys = keys.flatten
+            end
+            keys.join('.')
+          else
+            [key,subkeys(key, sub[key])].flatten if sub.has_key?(key)
+          end
+        else
+          key.to_s
+        end
+      end
+
     end
   end
 end

data/lib/dldinternet/formatters/table.rb

@@ -15,6 +15,9 @@ module DLDInternet
         super
         # @object = [@object] unless @object.is_a?(Array)
         @values  = Hashie::Mash.new
+        unless @columns.nil?
+          @object = columnize_item(@object)
+        end
       end
 
       def capture_output
@@ -22,7 +25,7 @@ module DLDInternet
         begin
           yield
         rescue Exception => e
-          previous_stdout.write $stdout.string
+          @previous_stdout.write $stdout.string
           raise e
         end
 
@@ -38,8 +41,11 @@ module DLDInternet
 
       def restore_output
         string = $stdout.string
-        $stdout = @previous_stdout
         string
+      rescue => e
+        # noop
+      ensure
+        $stdout = @previous_stdout if @previous_stdout
       end
 
       def run
@@ -64,23 +70,29 @@ module DLDInternet
       end
 
       def header_row
-        list = @object.is_a?(Array) ? @object : [@object]
+        # list = if @columns.nil?
+        #          @object.is_a?(Array) ? @object[0].keys : @object.keys
+        #        else
+        #          @columns.keys.map{ |k| subkeys(k) }
+        #        end
+        list = @object.is_a?(Array) ? @object[0].keys : @object.keys
         row color: 'light_yellow', bold: true, encoding: :ascii do
-          list[0].each do |key, _|
-            column key.to_s, width: widths[key] if (@columns.nil? || @columns.keys.include?(key))
+          list.each do |key, _|
+            column subkeys(key).to_s, width: widths[key]
           end
         end
       end
 
+      def column(text, options = {})
+        super
+        text
+      end
+
       def obj_row(idx, obj)
         row color: 'white', bold: false do
           if obj.is_a? Hash
             obj.each do |key, val|
-              if @columns.nil? || (@columns.keys.include?(key) && @columns[key].nil?)
-                column val.to_s
-              else
-                subcolumn(key, val)
-              end
+              subcolumn(key, val)
             end
           else
             column obj.to_s, width: widths[idx]
@@ -91,7 +103,7 @@ module DLDInternet
 
       def format_it(item=nil)
         if item
-          @object = item
+          @object = columnize_item(item)
           @is_a_hash = @object.is_a?(Hash)
           @widths = nil
         end

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

@@ -343,8 +343,8 @@ module DLDInternet
 
         def output(obj, fmtr=nil, header=false)
           unless obj.nil?
-            hash = obj.is_a?(Array) ? obj.map { |o| hash_it(o) } : (obj.is_a?(String) ? obj : hash_it(obj))
-            str = string_it(hash, fmtr, header)
+            it = obj.is_a?(Array) ? obj.map { |o| hash_it(o) } : (obj.is_a?(String) ? obj : hash_it(obj))
+            str = string_it(it, fmtr, header)
             write str
           end
         end

data/lib/dldinternet/thor/version.rb

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