dldinternet-mixlib-thor 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aba87a8cf7a0eea1b986f0bf4e6c7acef5a29ae5
-  data.tar.gz: c3191d983e5850ef82ddc99993979dd125c90198
+  metadata.gz: e514a24e53b9e7fcb0f1fa73351a0dd13094728f
+  data.tar.gz: e84ce7160a7bb7c8f830ad1372341e44da96107f
 SHA512:
-  metadata.gz: 55068aec8c2821617239ac0e8d6ddf1f72611b142954d99e7c02b01e7ef9cd88a83ed6107cbc15cd574417a87e4e45a093da84b17e5de76af54fd4ee04e82227
-  data.tar.gz: 210afd4629473fd758d12e938a90973bd9d284b8421e4d96a321bd71db3b168bde4bbd1b261b31a5470e7df0efcdd3d6e31d225192fbdf89d4f12e6d77f234ab
+  metadata.gz: ddaf17824e3cb6444869eb9d1248e06ef4c629b910b8adbaed403249156f34654f9c5c0f5e2c219364c82160909fc5c92fb338c63449a2c9f294e44376e0eeea
+  data.tar.gz: 295010865bc6e1373a7b5f1268a38bbff5fc6066126024d8ce1874fa538de18251b90c0c44f921e1241cf3baec54d6a09b1620e280d0011b6744e3594b2825d1

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    dldinternet-mixlib-thor (0.3.0)
+    dldinternet-mixlib-thor (0.6.0)
       awesome_print
       command_line_reporter (~> 3.3, >= 3.3.6)
+      config-factory
       dldinternet-mixlib-logging (>= 0.7.0)
       hashie
       inifile
@@ -13,11 +14,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    awesome_print (1.7.0)
+    awesome_print (1.8.0)
     builder (3.2.3)
     colored (1.2)
     command_line_reporter (3.3.6)
       colored (>= 1.2)
+    config-factory (0.0.9)
     cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -29,11 +31,11 @@ GEM
       logging (~> 2.1, >= 2.1.0)
     gherkin (2.4.21)
       json (>= 1.4.6)
-    hashie (3.5.5)
+    hashie (3.5.6)
     inifile (3.0.0)
     json (2.0.3)
     little-plugger (1.1.4)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     multi_json (1.12.1)
@@ -44,7 +46,7 @@ GEM
     rubygems-tasks (0.2.4)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    thor (0.19.4)
+    thor (0.20.0)
     tins (1.13.2)
 
 PLATFORMS

data/dldinternet-mixlib-thor.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency              'hashie'                             #, '~> '
   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_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 10'

data/lib/dldinternet/formatters/awesome.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
 require 'awesome_print'
+require 'dldinternet/formatters/basic'
 
 module DLDInternet
   module Formatters
     # Awesome formatter
-    class Awesome
+    class Awesome < DLDInternet::Formatters::Basic
       attr_reader :format
       attr_reader :object
       attr_reader :title
 
-      def initialize(obj, format, title)
-        @object = obj
-        @format = format
-        @title  = title
+      def initialize(obj, format, options)
+        super
       end
 
       def format_it

data/lib/dldinternet/formatters/basic.rb

@@ -2,6 +2,8 @@
 
 require 'json'
 require 'yaml'
+require 'awesome_print'
+require 'hashie/mash'
 
 module DLDInternet
   module Formatters
@@ -10,25 +12,219 @@ module DLDInternet
       attr_reader :format
       attr_reader :object
       attr_reader :title
+      attr_reader :columns
+      attr_reader :is_a_hash
+      attr_reader :widths
+      attr_reader :options
 
-      def initialize(obj, format, title)
+      def initialize(obj, format, options)
+        @options = options
         @object = obj
         @format = format
-        @title  = title
+        @title  = options[:title] || nil
+        @is_a_hash = @object.is_a?(Hash)
+        @columns = options[:columns] || nil
+        if @columns
+          @columns = Hashie::Mash.new(Hash[@columns.split(/\s*,\s*/).map{ |c| [c, nil]}])
+          @columns.dup.map{ |h,v|
+            submap(h, v)
+          }
+        end
+      end
+
+      def header_it(item=nil)
+        item ||=
+            if @is_a_hash
+              if @columns.nil?
+                object.keys
+              else
+                @columns.keys
+              end
+            else
+              object.to_s
+            end
+
+        format_item item, true
       end
 
-      def format_it
+      def format_it(item=nil)
+        item ||=
+            if @is_a_hash
+              if @columns.nil?
+                object
+              else
+                hsh = {}
+                object.each do |key,val|
+                  hsh[key] = val  if @columns.keys.include?(key)
+                end
+                hsh
+              end
+            else
+              object
+            end
+
+        format_item item
+      end
+
+      # :reek:DuplicateMethodCall {enabled: false}
+      def widths
+        unless @widths
+          @widths = Hashie::Mash.new
+          if @is_a_hash
+            widths_hash
+          else
+            widths_array
+          end
+        end
+        @widths
+      end
+
+      # :reek:DuplicateMethodCall {enabled: false}
+      def widths=(w)
+        @widths = w
+      end
+
+      # :reek:DuplicateMethodCall {enabled: false}
+      def table_widths
+        if object.is_a?(Array) && object.size > 0 && object[0].is_a?(Hash)
+          tws = nil
+          object.each do |obj|
+            fmt = self.class.new(obj, format, options)
+            tws ||= fmt.widths
+            fmt.widths.each { |c,w|
+              if tws[c] < w
+                tws[c] = w
+              end
+            }
+          end
+          @widths = tws
+        else
+          widths
+        end
+      end
+
+      private
+
+      def format_item(item, header=false)
         case format.to_s.downcase
         when 'json'
-          JSON.pretty_generate(object)
+          JSON.pretty_generate(item)
         when 'yaml'
-          object.to_yaml
+          item.to_yaml
         when 'none'
-          object
+          item
+        else
+          if item.is_a?(Array) # header ||
+            if widths.is_a?(Hash)
+              if @columns.nil?
+                wdths = widths.map { |c,w| w }
+              else
+                wdths = widths.map { |c,w| w if @columns.include?(c) }.select{ |w| !w.nil? }
+              end
+            end
+            i = -1
+            nitm = item.map{ |c|
+              i += 1
+              w  = wdths[i]
+              sprintf("%-#{w}s", c.to_s)
+            }
+            nitm.join(" ")
+          elsif item.is_a?(Hash)
+            item.map do |key, val|
+              if @columns.nil? || (@columns.keys.include?(key) && @columns[key].nil?)
+                sprintf("%-#{widths[key]}s", val.to_s)
+              else
+                sprintf("%-#{widths[key]}s", subcolumn(key, val))
+              end
+            end
+          else
+            item.to_s
+          end
+        end
+      end
+
+      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)
+          sub[m[1]] = val
+          sub.delete(col)
         else
-          object.to_s
+          if val
+            val[col] = nil
+          else
+            sub[col] = val
+          end
         end
       end
+
+      def widths_array
+        idx = 0
+        @object.each do |val|
+          set_width(idx, val)
+          idx += 1
+        end
+      end
+
+      def widths_hash
+        @object.each do |key, _|
+          klen         = key.to_s.length
+          wid          = @widths[key]
+          @widths[key] = klen if !wid || wid < klen
+        end
+        obj_width(@object)
+      end
+
+      def set_width(idx, val)
+        vlen         = val.to_s.length
+        wid          = @widths[idx] || 0
+        @widths[idx] = vlen if wid < vlen
+      end
+
+      def obj_width(obj)
+        obj.each do |key, val|
+          set_width(key, val)
+        end
+      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
+            end
+            column(vals.to_s)
+          else
+            column(val.to_s) if sub.has_key?(m[1]) && sub[m[1]].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|
+            case val.class.name
+            when /^Hash/
+              val[k]
+            when /^Array/
+              val.map {|v|
+                subvalues(k, v[k], sub[key])
+              }
+            end
+          }
+        else
+          val
+        end
+      end
+
     end
   end
 end

data/lib/dldinternet/formatters/table.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require 'dldinternet/formatters/basic'
 require 'dldinternet/formatters/colors'
-require 'awesome_print'
 require 'command_line_reporter'
 
 module DLDInternet
@@ -11,25 +11,22 @@ module DLDInternet
     class Table < DLDInternet::Formatters::Basic
       include CommandLineReporter
 
-      attr_reader :widths
-      attr_reader :is_a_hash
-
-      def initialize(obj, format, title)
+      def initialize(obj, format, options)
         super
-        # self.formatter = ''
-        @object = [@object] unless @object.is_a?(Array)
-        @is_a_hash = @object[0].is_a?(Hash)
+        # @object = [@object] unless @object.is_a?(Array)
+        @values  = Hashie::Mash.new
       end
 
       def run
         suppress_output
 
-        header(title: @title, align: 'center') if @title
+        header(title: @title, align: 'center') if @title #&& !@title.empty?
 
         table border: true, encoding: :ascii do
           header_row
           idx = 0
-          @object.each do |obj|
+          list = @object.is_a?(Array) ? @object : [@object]
+          list.each do |obj|
             obj_row(idx, obj)
           end
         end
@@ -44,7 +41,7 @@ module DLDInternet
         if @is_a_hash
           row color: 'light_yellow', bold: true, encoding: :ascii do
             @object[0].each do |key, _|
-              column key.to_s, width: widths[key]
+              column key.to_s, width: widths[key] if (@columns.nil? || @columns.keys.include?(key))
             end
           end
         end
@@ -53,8 +50,12 @@ module DLDInternet
       def obj_row(idx, obj)
         row color: 'white', bold: false do
           if @is_a_hash
-            obj.each do |_, val|
-              column val.to_s
+            obj.each do |key, val|
+              if @columns.nil? || (@columns.keys.include?(key) && @columns[key].nil?)
+                column val.to_s
+              else
+                subcolumn(key, val)
+              end
             end
           else
             column obj.to_s, width: widths[idx]
@@ -63,50 +64,6 @@ module DLDInternet
         end
       end
 
-      # :reek:DuplicateMethodCall {enabled: false}
-      def widths
-        unless @widths
-          @widths = Hashie::Mash.new
-          if @is_a_hash
-            widths_hash
-          else
-            widths_array
-          end
-        end
-        @widths
-      end
-
-      def widths_array
-        idx = 0
-        @object.each do |val|
-          set_width(idx, val)
-          idx += 1
-        end
-      end
-
-      def widths_hash
-        @object[0].each do |key, _|
-          klen         = key.to_s.length
-          wid          = @widths[key]
-          @widths[key] = klen if !wid || wid < klen
-        end
-        @object.each do |obj|
-          obj_width(obj)
-        end
-      end
-
-      def set_width(idx, val)
-        vlen         = val.to_s.length
-        wid          = @widths[idx] || 0
-        @widths[idx] = vlen if wid < vlen
-      end
-
-      def obj_width(obj)
-        obj.each do |key, val|
-          set_width(key, val)
-        end
-      end
-
       def format_it
         run
       end

data/lib/dldinternet/thor/command.rb

@@ -56,10 +56,18 @@ module DLDInternet
       def initialize(args = [], local_options = {}, config = {})
         super(args,local_options,config)
         @log_level = :warn #|| @config[:log_level].to_sym
-        @formatter ||= ->(hsh, tit) { default_formatter(hsh, tit) }
-        @writer    ||= ->(str) { puts str }
-        @header ||= ->{}
-        @format ||= ->(res) { puts res.ai }
+        @formatter ||= ->(hsh, opts) {
+          default_formatter(hsh, opts)
+        }
+        @writer    ||= ->(str) {
+          puts str
+        }
+        @header ||= ->(res, fmtr=nil) {
+          default_header(res, fmtr)
+        }
+        @format ||= ->(res, fmtr=nil) {
+          default_format(res, nil, fmtr)
+        }
       end
 
       desc "help [COMMAND]", "Describe available commands or one specific command"

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

@@ -5,6 +5,7 @@ require 'dldinternet/formatters'
 require 'hashie/mash'
 require 'dldinternet/thor/version'
 require 'inifile'
+require 'config/factory'
 
 module DLDInternet
   module Thor
@@ -30,6 +31,76 @@ module DLDInternet
           @options[:output] ||= @options[:format]
         end
 
+        def load_inifile
+          unless File.exist?(@options[:inifile])
+            raise "#{@options[:inifile]} not found!"
+          end
+          begin
+            ini = ::IniFile.load(@options[:inifile])
+            ini['global'].each{ |key,value|
+              @options[key.to_s]=value
+              ENV[key.to_s]=value
+            }
+            def _expand(k,v,regex,rerun)
+              matches = v.match(regex)
+              if matches
+                var = matches[1]
+                if options[var]
+                  options[k]=v.gsub(/\%\(#{var}\)/,options[var]).gsub(/\%#{var}/,options[var])
+                else
+                  rerun[var] = 1
+                end
+              end
+            end
+
+            pending = nil
+            rerun = {}
+            begin
+              pending = rerun
+              rerun = {}
+              options.to_hash.each{|k,v|
+                if v.to_s.match(/\%/)
+                  _expand(k,v,%r'[^\\]\%\((\w+)\)', rerun)
+                  _expand(k,v,%r'[^\\]\%(\w+)',     rerun)
+                end
+              }
+              # Should break out the first time that we make no progress!
+            end while pending != rerun
+          rescue ::IniFile::Error => e
+            # noop
+          rescue ::Exception => e
+            @logger.error "#{e.class.name} #{e.message}"
+            raise e
+          end
+        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
+                  }
+                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
+          else
+            @logger.warn "#{options.config} not found"
+          end
+        end
+
         def parse_options
           validate_options
 
@@ -60,63 +131,20 @@ module DLDInternet
           }
           }
           @config[:log_levels] ||= LOG_LEVELS
+          @options[:log_config] = @config
           # initLogging(@config)
           @logger = getLogger(@config)
 
           if @options[:inifile]
             @options[:inifile] = File.expand_path(@options[:inifile])
-            unless File.exist?(@options[:inifile])
-              raise "#{@options[:inifile]} not found!"
-            end
-            begin
-              ini = ::IniFile.load(@options[:inifile])
-              ini['global'].each{ |key,value|
-                @options[key.to_s]=value
-                ENV[key.to_s]=value
-              }
-              def _expand(k,v,regex,rerun)
-                matches = v.match(regex)
-                if matches
-                  var = matches[1]
-                  if options[var]
-                    options[k]=v.gsub(/\%\(#{var}\)/,options[var]).gsub(/\%#{var}/,options[var])
-                  else
-                    rerun[var] = 1
-                  end
-                end
-              end
-
-              pending = nil
-              rerun = {}
-              begin
-                pending = rerun
-                rerun = {}
-                options.to_hash.each{|k,v|
-                  if v.to_s.match(/\%/)
-                    _expand(k,v,%r'[^\\]\%\((\w+)\)', rerun)
-                    _expand(k,v,%r'[^\\]\%(\w+)',     rerun)
-                  end
-                }
-                # Should break out the first time that we make no progress!
-              end while pending != rerun
-            rescue ::IniFile::Error => e
-              # noop
-            rescue ::Exception => e
-              @logger.error "#{e.class.name} #{e.message}"
-              raise e
-            end
+            load_inifile
           elsif @options[:config]
             @options[:config] = File.expand_path(@options[:config])
-            if File.exist?(@options[:config])
-              begin
-                yaml = ::YAML.load(File.read(@options[:config]))
-                yaml.each{ |key,value|
-                  @options[key.to_s.gsub(%r{[-]},'_')]=value
-                }
-              rescue ::Exception => e
-                @logger.error "#{e.class.name} #{e.message}"
-                raise e
-              end
+            if @options[:config] =~ /\.ini/i
+              @options[:inifile] = @options[:config]
+              load_inifile
+            else
+              load_config
             end
           end
           if options[:debug]
@@ -134,22 +162,33 @@ module DLDInternet
           @config[:output] || :none
         end
 
-        def default_formatter(obj, title)
-          format_helper = DLDInternet::Formatters::Basic.new(obj, notation, title)
+        def default_formatter(obj, opts=nil)
+          opts ||= Hashie::Mash.new(options.to_h)
+          format_helper = DLDInternet::Formatters::Basic.new(obj, notation, title: opts[:title], columns: opts[:columns])
           case notation.to_sym
+          when :json
+          when :yaml
           when :none
           when :basic
           when :text
             # noop
           when :awesome
-            format_helper = DLDInternet::Formatters::Awesome.new(obj, notation, title)
-          when :json
-          when :yaml
+            format_helper = DLDInternet::Formatters::Awesome.new(obj, notation, title: opts[:title], columns: opts[:columns])
           when :table
-            format_helper = DLDInternet::Formatters::Table.new(obj, notation, title)
+            format_helper = DLDInternet::Formatters::Table.new(obj, notation, title: opts[:title], columns: opts[:columns])
           else
             raise DLDInternet::Formatters::Error, "Unknown format requested: #{notation}"
           end
+          format_helper
+        end
+
+        def default_header(obj, format_helper=nil)
+          format_helper ||= default_formatter(obj)
+          format_helper.header_it
+        end
+
+        def default_format(obj, opts=nil, format_helper=nil)
+          format_helper ||= default_formatter(obj, opts || options)
           format_helper.format_it
         end
 
@@ -176,18 +215,19 @@ module DLDInternet
           end
         end
 
-        def format_it(obj, title = '')
-          formatter.call(obj, title)
+        def string_it(obj, fmtr=nil, header=false)
+          fmtr ||= @formatter.call(obj, options)
+          fmtr.send(header ? :header_it : :format_it, obj)
         end
 
         def write(obj)
           writer.call(obj)
         end
 
-        def output(obj)
+        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 = format_it(hash)
+            str = string_it(hash, fmtr, header)
             write str
           end
         end
@@ -197,30 +237,46 @@ module DLDInternet
           @logger.info @_invocations.map{ |_,v| v[0]}.join(' ') if options[:verbose]
         end
 
-        def command_out(res)
+        def command_out(res, fmtr=nil)
+          unless fmtr
+            fmtr = formatter.call(res, options)
+            fmtr.table_widths
+          end
           case options[:format]
-          when /text|none/
-            output header_line unless options[:header] === false
+          when /text|none|plain/
+            output(header_line(res, fmtr), fmtr, true) unless options[:header] === false
             case res.class.name
             when /Array/
               res.each do |obj|
-                output format_line(obj)
+                output format_line(obj, fmtr)
               end
             # when /Hash|String/
             else
-              output format_line(res)
+              output format_line(res, fmtr)
             end
           else
             output res
           end
         end
 
-        def header_line()
-          @header.call()
+        def header_line(obj, fmtr=nil)
+          if obj.is_a?(String)
+            obj
+          elsif obj.is_a?(Hash)
+            @header.call(obj, fmtr)
+          elsif obj.is_a?(Array)
+            if obj.size > 0
+              header_line(obj[0], fmtr)
+            else
+              header_line({}, fmtr)
+            end
+          else
+            raise "Cannot produce header from this object: #{obj.class.name}"
+          end
         end
 
-        def format_line(obj)
-          @format.call(obj)
+        def format_line(obj, fmtr=nil)
+          @format.call(obj, fmtr)
         end
 
         def invoke_command(command, *args) #:nodoc:

data/lib/dldinternet/thor/version.rb

@@ -1,7 +1,7 @@
 module Dldinternet
   module Mixlib
     module Thor
-      VERSION = '0.3.0'
+      VERSION = '0.6.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.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -120,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: config-factory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +190,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- atlassian-ide-plugin.xml
 - dldinternet-mixlib-thor.gemspec
 - lib/dldinternet/formatters.rb
 - lib/dldinternet/formatters/awesome.rb

data/atlassian-ide-plugin.xml

@@ -1,6 +0,0 @@
-<atlassian-ide-plugin>
-  <project-configuration id="1">
-    <servers id="2" />
-    <default-jira-server id="3">581e0341-9c55-46b3-8f0d-36fc14bcc37d</default-jira-server>
-  </project-configuration>
-</atlassian-ide-plugin>