bogo-cli 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613e4cf3d1e1517fc29f3bc1810d440a854c7836
-  data.tar.gz: 6d1824a5e2fafac57c6a26b6946b63987b35eeca
+  metadata.gz: 733cb704c0dbee10eeecbee3b8ef8e82c240f37a
+  data.tar.gz: 7e8277e7ce4ad6d6db726580e9514ff4b2ba5921
 SHA512:
-  metadata.gz: 9558b7ef49c1756bf564247176f274361dd2d0be07be1406fbb431d12f2b7ba3b4f5ac909ab6ab8f48bff39d09538f3bc218a0c98961f2ede3002f6e7a0798db
-  data.tar.gz: 28a7958b8184a601f8302e53b79fadbf50c728bc0bb3ab280c49509522fdec72854da13e2797fb1f2cd3da3718599a37baf8201471a246467a99463ffe027f79
+  metadata.gz: bef3ad2a370a30934ee4ceb7ab598cd09b3395cfad5dc55b635ea1d33472520901d5569faf21b78e83334cfe979588ae284a6cc752716df16e60622b7f66a4bc
+  data.tar.gz: ae66cbe20d18884bf2763923147bc9d74b2134b72b4be37968b16817b80b0a810bfc50516a3c5d03768eaec1724626533552634de893462e63ada7a9d14594ea

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.26
+* Properly merge user provided options on top of defaults
+* Add helper method for determining if option is set as default
+
 ## v0.1.24
 * [fix] Remove configuration items with `nil` values
 

data/lib/bogo-cli/command.rb

@@ -11,6 +11,8 @@ module Bogo
 
       # @return [Hash] options
       attr_reader :options
+      # @return [Hash] default options
+      attr_reader :defaults
       # @return [Array] cli arguments
       attr_reader :arguments
       # @return [Ui]
@@ -20,10 +22,15 @@ module Bogo
       #
       # @return [self]
       def initialize(cli_opts, args)
-        @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?}
+        if(cli_opts.is_a?(Slop))
+          process_cli_options(cli_opts)
+        else
+          @defaults = Smash.new
+          @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
         end
         @arguments = args
         ui_args = Smash.new(
@@ -84,12 +91,21 @@ module Bogo
           end
           config_inst = config_class.new(path) if path
         end
-        new_opts = config_class.new(options)
-        @options = new_opts.to_smash
         if(config_inst)
-          merge_opts = Smash[options.to_smash.map{|k,v| [k,v] unless v.nil?}.compact]
-          merge_opts.delete(:config)
-          @options = config_inst.to_smash.deep_merge(merge_opts)
+          options.delete(:config)
+          @options = config_class.new(
+            defaults.to_smash.deep_merge(
+              config_inst.to_smash.deep_merge(
+                options.to_smash
+              )
+            )
+          ).to_smash
+        else
+          @options = config_class.new(
+            default.to_smash.deep_merge(
+              options.to_smash
+            )
+          ).to_smash
         end
         options
       end
@@ -129,6 +145,30 @@ module Bogo
         true
       end
 
+      # Process the given CLI options and isolate default values from
+      # user provided values
+      #
+      # @param cli_opts [Slop]
+      # @return [NilClass]
+      def process_cli_options(cli_opts)
+        unless(cli_opts.is_a?(Slop))
+          raise TypeError.new "Expecting type `Slop` but received type `#{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
+            else
+              @options[opt_key] = cli_opt.value
+            end
+          end
+        end
+        nil
+      end
+
     end
 
   end

data/lib/bogo-cli/setup.rb

@@ -1,6 +1,5 @@
 Signal.trap('INT'){ exit -1 }
 
-require 'slop'
 require 'bogo-cli'
 
 class Slop
@@ -11,6 +10,11 @@ class Slop
   end
   alias_method :slop_run, :run
   alias_method :run, :bogo_cli_run
+  class Option
+    def default?
+      @value.nil?
+    end
+  end
 end
 
 module Bogo

data/lib/bogo-cli/version.rb

@@ -1,6 +1,6 @@
 module Bogo
   module Cli
     # Current library version
-    VERSION = Gem::Version.new('0.1.24')
+    VERSION = Gem::Version.new('0.1.26')
   end
 end

data/lib/bogo-cli.rb

@@ -1,4 +1,5 @@
 require 'bogo'
+require 'slop'
 require 'bogo-config'
 
 module Bogo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo