cl 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8887728de74e5c76602f7aacb96b7681f89186b8f9688c9a2fe5dc239a921dbe
-  data.tar.gz: a7105d685d6965d82179c9f7b329d185016dd808b4468a0aa17d7f6f61fbfb25
+  metadata.gz: 7f989a757e92bffbfc45652517bbec98cc8cdd09b9aa6809e4822c807de4c3cd
+  data.tar.gz: e315d830caf5e61f236d962d83d25c4a3e45c04e6672189a8358ad04c7007e2c
 SHA512:
-  metadata.gz: 774ddb21196dd996ed6a627e24eb67a01f0f9a4b44dbf1c04326ff1840c5c999dd4b738bdfd3e1d9d6a874cdb7f6edad8df21c2d0431755b724e47ef74e38ff8
-  data.tar.gz: baa6e4fc6ca95b7d34763422a1d25efbffad810173f8c79cc981c375a45c75c0542e9db1104cb5caa1d966aa2d7c3b3dba63f6073ed2dd8daec86466275e2a88
+  metadata.gz: d9ad4c4d902a66dbe56581053ca7babeca533a65af31d22ff815f17f9f2a386fa238fe9686af776a0df510d7cd1a6696fd32b3fc3061d9cda00f22130bcb520a
+  data.tar.gz: 4554e81d0a53997506257670514195e1df150c8d8fe51e35bb956e40e7216d211139ae98403d9c25d05fbc66feff35eaec31471252e78a5555ff88aa2644f947

data/NOTES.md

@@ -2,4 +2,6 @@
 - add conditional required: ->(opts) { opts[:key].nil? }
 
 
+- refactor Help::Cmd and Table so that everything goes into one big table
+
 - wrap long lines in help output

data/lib/cl/args.rb

@@ -13,8 +13,8 @@ class Cl
       self.args << arg
     end
 
-    def apply(cmd, args)
-      return args unless self.args.any?
+    def apply(cmd, args, opts)
+      return args if self.args.empty? || opts[:help]
       args = grouped(args)
       validate(args)
       args.map { |(arg, value)| arg.set(cmd, value) }.flatten(1)

data/lib/cl/cmd.rb

@@ -25,7 +25,7 @@ class Cl
       def parse(ctx, args)
         opts = Parser.new(self.opts, args).opts unless self == Help
         opts = merge(ctx.config[registry_key], opts) if ctx.config[registry_key]
-        [args, opts]
+        [args, opts || {}]
       end
 
       def abstract
@@ -81,8 +81,8 @@ class Cl
     def initialize(ctx, args)
       args, opts = self.class.parse(ctx, args)
       @ctx = ctx
-      @opts = self.class.opts.apply(self, self.opts.merge(opts || {}))
-      @args = @opts[:help] ? args : self.class.args.apply(self, args)
+      @opts = self.class.opts.apply(self, self.opts.merge(opts))
+      @args = self.class.args.apply(self, args, opts)
     end
 
     def opts

data/lib/cl/help/cmd.rb

@@ -92,7 +92,7 @@ class Cl
         opts = opts.join(', ')
         opts = "(#{opts})" if obj.description && !opts.empty?
         opts = [obj.description, opts]
-        opts.compact.join(' ')
+        opts.compact.map(&:strip).join(' ')
       end
 
       def format_opt(opt)

data/lib/cl/help/table.rb

@@ -1,6 +1,8 @@
 class Cl
   class Help
     class Table
+      include Wrap
+
       attr_reader :data, :padding
 
       def initialize(data)
@@ -22,7 +24,14 @@ class Cl
       end
 
       def cells(row)
-        row.map.with_index { |cell, ix| cell.to_s.ljust(widths[ix]) }
+        row.map.with_index do |cell, ix|
+          indent(wrap(cell.to_s), widths[ix - 1]).ljust(widths[ix])
+        end
+      end
+
+      def indent(str, width)
+        return str if str.empty? || !width
+        [str.lines[0], *str.lines[1..-1].map { |str| ' ' * (width + 1) + str }].join.rstrip
       end
 
       def width

data/lib/cl/helper.rb

@@ -16,5 +16,14 @@ class Cl
     end
   end
 
-  extend Merge, Regex
+  module Wrap
+    def wrap(str, opts = {})
+      width = opts[:width] || 80
+      str.lines.map do |line|
+        line.size > width ? line.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n").strip : line
+      end.join("\n")
+    end
+  end
+
+  extend Merge, Regex, Wrap
 end

data/lib/cl/opts.rb

@@ -15,10 +15,11 @@ class Cl
     end
 
     def apply(cmd, opts)
+      return opts if opts[:help]
       opts = with_defaults(cmd, opts)
       opts = downcase(opts)
       opts = cast(opts)
-      validate(cmd, opts) unless opts[:help]
+      validate(cmd, opts)
       opts
     end
 

data/lib/cl/version.rb

@@ -1,3 +1,3 @@
 class Cl
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sven Fuchs