bogo-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c776598127786a35b12a9d95a6d8453c3606aca1551b5acbb374a99606061d
-  data.tar.gz: e97a5d3ad04f9e7573f11146c46e3b24e4536dfc1c758cbf56802723275adfd4
+  metadata.gz: c3d995cac00e17670f4b08c185c248f79a5bc4da9dfd99f5cd3ee38740c37045
+  data.tar.gz: c381604451c5b15fc8d2d521ed4dee69e52b73684895f8c94827d3f30db71ca1
 SHA512:
-  metadata.gz: b651506c2871283b831264a32a8cadd8414a1dc1743b1a57fd54ba44cf7756c899752307237d4efc77f2d3d0dc86291b62a183ee43f48bd57427f472644b6e1d
-  data.tar.gz: 6a99913415692998685c3e60e803a2ac5df8dfd299f8b9e94b6dfe89c105d2beacf67339f4b1ea99a342e13d1ac603d9c66cda07d9483f295b62092443547d7f
+  metadata.gz: b27998591ca5eeef1eacb675d53232028328b11d28164eb93563c0fe37ec1464333d3ad002a13a8304e602b02e3d6eecf5a3e463ae0232f7744e780af5158293
+  data.tar.gz: 1c2faafec7efb8f6cc1f17f188b903ee2ebca11ba30ce040244e1c292cc0dc07474cf5a53d9b794cc078c4d6685a0d383282614c95b6dfdfcbc0713eed2f0350

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.1
+* Add context for option parsing (#15)
+
 # v0.3.0
 * Remove dependency on slop library (#14)
 

data/lib/bogo-cli/command.rb

@@ -31,17 +31,19 @@ module Bogo
       #
       # @return [self]
       def initialize(cli_opts, args)
-        @options = Smash.new
         @defaults = Smash.new
+        @options = Smash.new
         case cli_opts
-        when OpenStruct
+        when Bogo::Cli::Parser::OptionValues
           process_cli_options(cli_opts)
+        when Bogo::Cli::Parser::Command
+          @options = cli_opts.parse(args).first
         else
-          @options = cli_opts.to_hash.to_smash(:snake)
-          [@options, *@options.values].compact.each do |hsh|
-            next unless hsh.is_a?(Hash)
-            hsh.delete_if { |k, v| v.nil? }
-          end
+          @options = cli_opts.to_h.to_smash(:snake)
+        end
+        [@options, *@options.values].compact.each do |hsh|
+          next unless hsh.is_a?(Hash)
+          hsh.delete_if { |k, v| v.nil? }
         end
         @arguments = validate_arguments!(args)
         load_config!
@@ -193,19 +195,14 @@ module Bogo
       # @param cli_opts [Slop]
       # @return [NilClass]
       def process_cli_options(cli_opts)
-        unless cli_opts.is_a?(OpenStruct)
-          raise TypeError,
-            "Expecting `OpenStruct' but received `#{cli_opts.class}'"
-        end
         @options = Smash.new
         @defaults = Smash.new
-        cli_opts.each do |cli_opt|
-          unless cli_opt.value.nil?
-            opt_key = Bogo::Utility.snake(cli_opt.key)
-            if cli_opt.default?
-              @defaults[opt_key] = cli_opt.value
+        cli_opts.each_pair do |key, value|
+          unless value.nil?
+            if cli_opts.default?(key)
+              @defaults[key] = value
             else
-              @options[opt_key] = cli_opt.value
+              @options[key] = value
             end
           end
         end

data/lib/bogo-cli/parser.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'optparse'
 require 'ostruct'
 
@@ -8,6 +9,72 @@ module Bogo
       # @return [Symbol] represent unset value
       UNSET = :__unset__
 
+      class OptionValues
+        extend Forwardable
+
+        NONFORWARDABLE = [:is_a?, :respond_to?, :object_id, :inspect, :keys, :to_s, :[]=].freeze
+
+        Smash.public_instance_methods.each do |ifunc|
+          next if ifunc.to_s.start_with?("_") || NONFORWARDABLE.include?(ifunc)
+          def_delegator :composite, ifunc
+        end
+
+        def initialize
+          @defaults = Smash.new
+          @sets = Smash.new
+        end
+
+        def []=(key, value)
+          assign(key, value)
+        end
+
+        def assign(key, value)
+          @sets[key] = value
+          self
+        end
+
+        def set_default(key, value)
+          @defaults[key] = value
+          self
+        end
+
+        def keys
+          @sets.keys | @defaults.keys
+        end
+
+        def default?(key)
+          unless keys.include?(key)
+            raise KeyError,
+                  "Unknown option key '#{key}'"
+          end
+          !@sets.keys.include?(key)
+        end
+
+        def to_s
+          "<OptionValues: #{composite.inspect}>"
+        end
+
+        def inspect
+          "<OptionValues: #{@sets.inspect} | #{@defaults.inspect}>"
+        end
+
+        def is_a?(const)
+          super || composite.is_a?(const)
+        end
+
+        def respond_to?(method)
+          super || composite.respond_to?(method)
+        end
+
+        def composite
+          Smash.new.tap do |c|
+            keys.each do |k|
+              c[k] = @sets.fetch(k, @defaults[k])
+            end
+          end
+        end
+      end
+
       # Modified option parser to include
       # subcommand information
       class OptionParser < ::OptionParser
@@ -47,7 +114,7 @@ module Bogo
           @commands = []
           @flags = []
           @callable = nil
-          @options = OpenStruct.new
+          @options = OptionValues.new
         end
 
         # Add a new flag
@@ -118,13 +185,15 @@ module Bogo
         def parse(arguments)
           raise "Must call #generate before #parse" if
             parser.nil?
-          @options = OpenStruct.new.tap do |opts|
-            flags.each do |f|
-              next if f.default.nil?
-              opts[f.option_name] = f.default
-            end
+          flags.each do |f|
+            next if f.default.nil?
+            options.set_default(f.option_name, f.default)
+          end
+          init = OpenStruct.new
+          parser.parse!(arguments, into: init)
+          init.each_pair do |k, v|
+            options.assign(k, v)
           end
-          parser.parse!(arguments, into: options)
           [options, arguments]
         end
 

data/lib/bogo-cli/version.rb

@@ -1,6 +1,6 @@
 module Bogo
   module Cli
     # Current library version
-    VERSION = Gem::Version.new("0.3.0")
+    VERSION = Gem::Version.new("0.3.1")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2022-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo