yap-shell-parser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0e319c332283c42adde5fcba98b7ee4c8f8e8bb
-  data.tar.gz: 9d1e3d51c8df81d6e3a50cca393bff86f3edbaeb
+  metadata.gz: 38fe37a326babe384c9ee17b218628b096392e1c
+  data.tar.gz: 2c2eaaf1cc9522a4b6b3db7e8011f258f1c49b4a
 SHA512:
-  metadata.gz: eaaa6d7f6082dbb8915253dc41eb62295b98b7170398c6e4918396f19c3c714a2a5c968cc9e34f865fbe13c082d2e5ee688212952107a10fc6d41b1d0c6dbe97
-  data.tar.gz: 2a8f4c7efa8af4a3b14c5b275da68cd8071231afb68a653f374af6f888e9bbce6b2690e053ddc3735be0810a8f86dd4966f66a91ecf5aadf832d35228bc01f92
+  metadata.gz: 41aee65259f186af876c993a484329da3efbda47275227df23c6e8e17c2299e342f0c9c96b210b01017accc94d617389853fe1f4bda3d8c0d187d44903991d49
+  data.tar.gz: d6742e6486e4178d5e90910c06ac5e7c852bcda64a5cd08b5c8f95107c0b3e49635d60cd58c6c40a04fc02ea20bdc63d75b9cb689ee5c1cbfb8ddb1010ac4562

data/lib/yap/shell/parser.rb

@@ -1,8 +1,14 @@
+require 'racc/parser'
+
 module Yap
   module Shell
     module Parser
-      def self.new
-        Yap::Shell::ParserImpl.new
+      class ParseError < ::StandardError ; end
+
+      def self.parse(input)
+        Yap::Shell::ParserImpl.new.parse(input)
+      rescue Racc::ParseError => ex
+        raise ParseError, "Message: #{ex.message}\nInput: #{input}"
       end
     end
   end

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

@@ -199,25 +199,32 @@ module Yap::Shell
     def argument_token
       if @looking_for_args
         str = ''
-        i = 0
+        characters_read = 0
+        prev_char = ''
         loop do
-          ch = @chunk[i]
+          ch = @chunk[characters_read]
           if %w(' ").include?(ch)
-            result = process_string @chunk[i..-1], ch
+            result = process_string @chunk[characters_read..-1], ch
             str << result.str
-            i += result.consumed_length
-          elsif ch =~ /[\s\|;&\)]/
+            characters_read += result.consumed_length
+          elsif prev_char != '\\' && ch =~ /[\s\|;&\)]/
             break
           else
             str << ch
-            i += 1
+            characters_read += 1
           end
 
-          break if i >= @chunk.length
+          break if characters_read >= @chunk.length
+
+          prev_char = ch
         end
 
-        token :Argument, str
-        i
+        if characters_read > 0
+          token :Argument, str
+          characters_read
+        else
+          nil
+        end
       end
     end
 

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

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

data/spec/yap/shell/lexer_spec.rb

@@ -116,6 +116,14 @@ describe Yap::Shell::Parser::Lexer do
       ]}
     end
 
+    describe "commands with a escaped args: ls some\ dir" do
+      let(:str){ 'ls some\ dir' }
+      it { should eq [
+        t(:Command, "ls", lineno:0),
+        t(:Argument, 'some\ dir', lineno:0)
+      ]}
+    end
+
     describe "can contain asterisks: ls foo* b*r" do
       let(:str){ "ls foo* b*r" }
       it { should eq [

data/spec/yap/shell/parser_spec.rb

@@ -3,18 +3,22 @@ require 'yap/shell/parser'
 require 'pry'
 
 describe Yap::Shell::Parser do
-  subject(:parser){ Yap::Shell::Parser.new }
+  subject(:parser){ Yap::Shell::Parser }
 
   def self.it_parses(str)
     context "#{str.inspect}" do
       it "parses" do
-        expect do
-          begin
-            parser.parse(str)
-          # rescue => ex
-            # raise "Parser error:\n\t#{str}\n\n#{ex.message}\n#{ex.backtrace.join("\n")}"
-          end
-        end.to_not raise_error
+        expect { parser.parse(str) }.to_not raise_error
+      end
+    end
+  end
+
+  def self.it_errors(str)
+    context "#{str.inspect}" do
+      it "raises a Yap::Shell::Parser::ParseError" do
+        expect {
+          parser.parse(str)
+        }.to raise_error(Yap::Shell::Parser::ParseError)
       end
     end
   end
@@ -49,9 +53,11 @@ describe Yap::Shell::Parser do
   it_parses "FOO=abc bar=2314 car=14ab ls -l"
   it_parses "FOO=abc BAR='hello world' ls -l ; CAR=f echo foo && say hi"
   it_parses "`git cbranch`"
-  it_parses "`git cbranch`.bak"  # TODO THIS NEEDS TO MAYBE NOT WORK?
+  it_parses "`git cbranch`.bak"
   it_parses "echo `echo hi`"
   it_parses "echo `echo hi` foo"
   it_parses "`hi``bye` `what`"
   it_parses "echo && `what` && where is `that`thing | `you know`"
+
+  it_errors "ls ()"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: The parser for the yap shell
@@ -121,4 +121,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/yap/shell/lexer_spec.rb
 - spec/yap/shell/parser_spec.rb
-has_rdoc: