yap-shell-parser 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b2657fa735f9d2e2c946e120f9c5aad74919824
-  data.tar.gz: 7eeb54709d154f1a5c19919cc2757a9da3ba15ef
+  metadata.gz: c452309759a871f7506451fd55282318434a5b25
+  data.tar.gz: 7a9aed6543577d6c8e9b5244320d02877c2502a2
 SHA512:
-  metadata.gz: 97abaa67b6f96ed4622b79c63699ed8232c2f276102e4093596979973d00228e3d62bbf9fd14fe880b174181c4f021fd25c818dd57790e80237377a7633ee55e
-  data.tar.gz: 3fea542b32d29319b14f854f31c91761ee8a0dec21563b6f78c62323e276db50404e7a0ee6fdff11e08f5b806700723e9e6a727f35e9ad1e73e6cf43c1afede8
+  metadata.gz: 8219284d09acbb0537f352b33c12aaf52fbd7418b8e3c2562443547fd0d30e012035a4dfe5c981b0ec5c07c797fdd6ec875c637122f99b98cca53db1c7ece7ba
+  data.tar.gz: c962d71ed8207bd23593a12bb4e9150d370914623a755411527e19fcbbd7515e9e668d5c058c6b4a9e9e9152d08719c84f0cbe3c5792b21d31213f86cf9a3f58

data/lib/yap/shell/parser/lexer.rb

@@ -67,7 +67,7 @@ module Yap::Shell
 
     LINE_CONTINUATION = /.*\\\Z/
 
-    SPLIT_BLOCK_PARAMS_RGX = /\s*,\s*|\s*/
+    SPLIT_BLOCK_PARAMS_RGX = /\s*,\s*/
 
     # Loop over the given input and yield command substitutions. This yields
     # an object that responds to #str, and #position.
@@ -168,10 +168,7 @@ module Yap::Shell
       if md=@chunk.match(BLOCK_BEGIN)
         @looking_for_args = false
         token :BlockBegin, md[1]
-        if md[2]
-          params = md[2].split(SPLIT_BLOCK_PARAMS_RGX)
-          token :BlockParams, params
-        end
+        block_params_token(md[2])
         md[0].length
       elsif md=@chunk.match(BLOCK_END)
         @looking_for_args = false
@@ -182,6 +179,13 @@ module Yap::Shell
       end
     end
 
+    def block_params_token(string)
+      if string
+        params = string.split(SPLIT_BLOCK_PARAMS_RGX).map(&:strip)
+        token :BlockParams, params
+      end
+    end
+
     def comment_token
       if md=@chunk.match(COMMENT)
         token :Comment, md[0]
@@ -208,8 +212,7 @@ module Yap::Shell
         start, stop = md[2].to_i, md[3].to_i
         token :Range, (start..stop)
         token :BlockBegin, '{'
-        params = md[4].split(SPLIT_BLOCK_PARAMS_RGX)
-        token :BlockParams, params
+        block_params_token(md[4])
         @tokens_to_add_when_done << [:BlockEnd, '}']
         md[0].length
 
@@ -224,8 +227,7 @@ module Yap::Shell
         start, stop = 1, md[2].to_i
         token :Range, (start..stop)
         token :BlockBegin, '{'
-        params = md[4].split(SPLIT_BLOCK_PARAMS_RGX)
-        token :BlockParams, params
+        block_params_token(md[4])
         @tokens_to_add_when_done << [:BlockEnd, '}']
         md[0].length
 

data/lib/yap/shell/parser/version.rb

@@ -3,7 +3,7 @@ require 'yap/shell/parser'
 module Yap
   module Shell
     module Parser
-      VERSION = "0.6.1"
+      VERSION = "0.6.2"
     end
   end
 end

data/spec/yap/shell/lexer_spec.rb

@@ -97,31 +97,31 @@ describe Yap::Shell::Parser::Lexer do
     end
 
     describe "can take block params" do
-      describe "ls { |a| this_is_a_block }" do
+      describe "ls { |param1| this_is_a_block }" do
         it { should eq [
           t(:Command, "ls", lineno:0),
           t(:BlockBegin, '{', lineno: 0),
-          t(:BlockParams, ['a'], lineno: 0),
+          t(:BlockParams, ['param1'], lineno: 0),
           t(:Command, "this_is_a_block", lineno:0),
           t(:BlockEnd, '}', lineno: 0)
         ]}
       end
 
-      describe "ls { |a,b| this_is_a_block }" do
+      describe "ls { |param1,b| this_is_a_block }" do
         it { should eq [
           t(:Command, "ls", lineno:0),
           t(:BlockBegin, '{', lineno: 0),
-          t(:BlockParams, ['a', 'b'], lineno: 0),
+          t(:BlockParams, ['param1', 'b'], lineno: 0),
           t(:Command, "this_is_a_block", lineno:0),
           t(:BlockEnd, '}', lineno: 0)
         ]}
       end
 
-      describe "ls { |a,  b,  c| this_is_a_block }" do
+      describe "ls { |a1,  b2,  c3| this_is_a_block }" do
         it { should eq [
           t(:Command, "ls", lineno:0),
           t(:BlockBegin, '{', lineno: 0),
-          t(:BlockParams, ['a', 'b', 'c'], lineno: 0),
+          t(:BlockParams, ['a1', 'b2', 'c3'], lineno: 0),
           t(:Command, "this_is_a_block", lineno:0),
           t(:BlockEnd, '}', lineno: 0)
         ]}

data/spec/yap/shell/parser_spec.rb

@@ -66,4 +66,5 @@ describe Yap::Shell::Parser do
   it { is_expected.to fail_parsing "ls ()" }
   it { is_expected.to parse("echo 'hi'")}
   it { is_expected.to parse("ls > foo.txt")}
+  it { is_expected.to parse("ls * { |file1, file2, file3| echo $file1 $file2 $file3 }")}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell-parser
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treefell