cmds 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d08e416bc459776d37657d008c179166f451c196
-  data.tar.gz: 4e74d4eef712368c163114a5f10871820dff7125
+  metadata.gz: 60b5fda411ade202d896d087b4104e4db35c3429
+  data.tar.gz: 4bffbff9d0590beb514ace34ab9bf5c1728b6f81
 SHA512:
-  metadata.gz: 347c9989f03c843dec1db86153e2850be3c404879dd08cd68eca284433773609d24442cb0001939f49fdc6bdac2bee531cddb31bee4cdbdb307b0f728cab6f10
-  data.tar.gz: 5e235a6b41d0956cfd3bed4c56425a70a65abbe1163ffff02d14b922c234c25100a37100977b2567d1a1e797ac5a1fde32c368a32ce8a5206dee343ce8980c81
+  metadata.gz: 0e4a2812bce9c3614664ca89da4145e1fdf01cc4db396095a964af7f9c4a95576dd1b28e209063484aea690b97b011b6e26461dbe3646dcb5907e823615def01
+  data.tar.gz: 03a78326ea5c2dbd4789513cdcd3b2bf3d94b0b9e6c6b9e3391f61f644a5c155769ea024ca2cc8074998900059719444eaa7bd671ae114c7783c1edd885cd4e7

data/lib/cmds/erb_context.rb

@@ -14,10 +14,19 @@ module Cmds
           # by returning `nil` if the value is "false-y"
           @kwds[key] if @kwds[key]
         else
-          @kwds.fetch sym
+          if @kwds.key? sym
+            @kwds[sym]
+          elsif @kwds.key? sym.to_s
+            @kwds[sym.to_s]
+          else
+            ::Kernel.raise ::KeyError.new ::NRSER.squish <<-END
+              couldn't find keys #{ sym.inspect } or #{ sym.to_s.inspect }
+              in keywords #{ @kwds.inspect }
+            END
+          end
         end
       else
-        super
+        super sym, *args, &block
       end
     end
 

data/lib/cmds/version.rb

@@ -1,3 +1,3 @@
 module Cmds
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/cmds/prepare_spec.rb

@@ -4,7 +4,6 @@ describe "Cmds.prepare" do
   it "should work with a keyword substitutions" do
     expect(
       Cmds.prepare "psql <%= opts %> <%= database %> < <%= filepath %>",
-        [],
         database: "blah",
         filepath: "/where ever/it/is.psql",
         opts: {
@@ -14,6 +13,26 @@ describe "Cmds.prepare" do
         }
     ).to eq 'psql --host=localhost --port=12345 --username=bingo\ bob blah < /where\ ever/it/is.psql'
   end
+  
+  it "should work with a keyword substitutions with String keys" do
+    expect(
+      # NOTE  since we use **kwds in #prepare which only accepts symbol keys,
+      #       have to load kwds with string keys in through Cmd.new
+      Cmds::Cmd.new(
+        "psql <%= opts %> <%= database %> < <%= filepath %>", {
+          kwds: {
+            'database' => "blah",
+            'filepath' => "/where ever/it/is.psql",
+            'opts' => {
+              username: "bingo bob",
+              host: "localhost",
+              port: 12345,
+            }
+          }
+        }
+      ).prepare
+    ).to eq 'psql --host=localhost --port=12345 --username=bingo\ bob blah < /where\ ever/it/is.psql'
+  end
 
   it "should work with positional substitutions" do
     expect(

metadata

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