cmds 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319129e56b13805451ef585ce44e9aef1029df19
-  data.tar.gz: dab4a172aa3f8dcee5f7d73b86b797cccd3e51c6
+  metadata.gz: d4dd9eb9dad554191cff2d860c105b44339cdcae
+  data.tar.gz: f89fe5555622db117c1b94abf50307f9758bb062
 SHA512:
-  metadata.gz: 321c3539eb6b193c3226426aeedeb4cd61088335c20bc247193f7c1b89bd45a9cf20e9f2da88826dd8627dfa15a67632a07e4770107990c01d43a8b9a475d738
-  data.tar.gz: 8ac9702dda8dca0f53e1f1f80a64c73ac246d4763d23227ecb3605f82d81a1a74208f64dc83bc97b22990fa6cb572419239abc301af8d4e28f45ae9a3f220544
+  metadata.gz: cac624f99ca246ac0f13c101c8f2066110eed0af071ae159e9d6f41bb82dfaa2534c42c4f4636d4c37d77fadfea90edd546025d1975270eaecab676730b2bc6c
+  data.tar.gz: f5fd451da65e260f12bfa4b54b47aef1942e79bcc4c346b330e672133687f55cf702bbd2298ae2c9ca851f7f51ece6293bd5bfc99ba0fe32f2d641fdbbc893f9

data/lib/cmds/util.rb

@@ -65,27 +65,27 @@ module Cmds
     template
       .gsub(
         # %s => <%= arg %>
-        /(?<=\A|[[:space:]])\%s(?=\Z|[[:space:]])/,
+        /(?<=\A|\=|[[:space:]])\%s(?=\Z|[[:space:]])/,
         '<%= arg %>'
       )
       .gsub(
-        # %%s => %s (escpaing)
+        # %%s => %s (escaping)
         /(?<=\A|[[:space:]])(\%+)\%s(?=\Z|[[:space:]])/,
         '\1s'
       )
       .gsub(
         # %{key} => <%= key %>, %{key?} => <%= key? %>
-        /(?<=\A|[[:space:]])\%\{([a-zA-Z_]+\??)\}(?=\Z|[[:space:]])/,
+        /(?<=\A|\=|[[:space:]])\%\{([a-zA-Z_]+\??)\}(?=\Z|[[:space:]])/,
         '<%= \1 %>'
       )
       .gsub(
-        # %%{key} => %{key}, %%{key?} => %{key?} (escpaing)
+        # %%{key} => %{key}, %%{key?} => %{key?} (escaping)
         /(?<=\A|[[:space:]])(\%+)\%\{([a-zA-Z_]+\??)\}(?=\Z|[[:space:]])/,
         '\1{\2}\3'
       )
       .gsub(
         # %<key>s => <%= key %>, %<key?>s => <%= key? %>
-        /(?<=\A|[[:space:]])\%\<([a-zA-Z_]+\??)\>s(?=\Z|[[:space:]])/,
+        /(?<=\A|\=|[[:space:]])\%\<([a-zA-Z_]+\??)\>s(?=\Z|[[:space:]])/,
         '<%= \1 %>'
       )
       .gsub(

data/lib/cmds/version.rb

@@ -1,3 +1,3 @@
 module Cmds
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/cmds/prepare_spec.rb

@@ -166,5 +166,37 @@ describe "Cmds.prepare" do
         Cmds.prepare "./test/echo_cmd.rb %<key>s", key: "hello world!"
       ).to eq './test/echo_cmd.rb hello\ world\!'
     end
+    
+    context "% proceeded by =" do
+      it "handles %s" do
+        expect(
+          Cmds.prepare "X=%s ./test/echo_cmd.rb", "hello world!"
+        ).to eq 'X=hello\ world\! ./test/echo_cmd.rb'
+        
+        expect(
+          Cmds.prepare "./test/echo_cmd.rb --x=%s", "hello world!"
+        ).to eq './test/echo_cmd.rb --x=hello\ world\!'
+      end
+      
+      it "handles %{key}" do
+        expect(
+          Cmds.prepare "X=%{key} ./test/echo_cmd.rb", key: "hello world!"
+        ).to eq 'X=hello\ world\! ./test/echo_cmd.rb'
+        
+        expect(
+          Cmds.prepare "./test/echo_cmd.rb --x=%<key>s", key: "hello world!"
+        ).to eq './test/echo_cmd.rb --x=hello\ world\!'
+      end
+      
+      it "handles %<key>s" do
+        expect(
+          Cmds.prepare "X=%<key>s ./test/echo_cmd.rb", key: "hello world!"
+        ).to eq 'X=hello\ world\! ./test/echo_cmd.rb'
+        
+        expect(
+          Cmds.prepare "./test/echo_cmd.rb --x=%<key>s", key: "hello world!"
+        ).to eq './test/echo_cmd.rb --x=hello\ world\!'
+      end
+    end # % proceeded by =
   end # shortcuts
 end # ::sub

data/spec/cmds/replace_shortcuts_spec.rb

@@ -115,4 +115,29 @@ describe 'Cmds::replace_shortcuts' do
       ["50%savings!"]             => "50%savings!",
     }
   end
+  
+  context "% proceeded by =" do
+    it "should do %s substitution when proceeded by an =" do
+      expect_map meth, {
+        ["X=%s"]          => "X=<%= arg %>",
+        ["hey there=%s"]  => "hey there=<%= arg %>",
+      }
+    end
+    
+    
+    it "should do %{key} substitution when proceeded by an =" do
+      expect_map meth, {
+        ["X=%{key}"]      => "X=<%= key %>",
+        ["hey there=%{key}"]  => "hey there=<%= key %>",
+      }
+    end
+    
+    
+    it "should do %<key>s substitution when proceeded by an =" do
+      expect_map meth, {
+        ["X=%<key>s"]          => "X=<%= key %>",
+        ["hey there=%<key>s"]  => "hey there=<%= key %>",
+      }
+    end
+  end # % proceeded by =
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmds
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nrser