yap-shell-parser 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c452309759a871f7506451fd55282318434a5b25
-  data.tar.gz: 7a9aed6543577d6c8e9b5244320d02877c2502a2
+  metadata.gz: 336e650e52d979ad853d6544b7dda9f44253e8ae
+  data.tar.gz: ad9cf9b11eab65b0a75e0552082105380cbd31a4
 SHA512:
-  metadata.gz: 8219284d09acbb0537f352b33c12aaf52fbd7418b8e3c2562443547fd0d30e012035a4dfe5c981b0ec5c07c797fdd6ec875c637122f99b98cca53db1c7ece7ba
-  data.tar.gz: c962d71ed8207bd23593a12bb4e9150d370914623a755411527e19fcbbd7515e9e668d5c058c6b4a9e9e9152d08719c84f0cbe3c5792b21d31213f86cf9a3f58
+  metadata.gz: a7644b342203f0f98e5eb805756ba49735503f600ee2fc73ef820df291e1343c822bc74f035e713fae091f97d1f364fe507497a137d973ee595526c79a92e4a3
+  data.tar.gz: 6996c6b68c34daf2f9aa521650f1cb403b7ebc96c3d903512f5b4264016e934c19d2b5c32d921e24d673176f62022f6225b2286fb051fa7dbb5146f5aa78cd99

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.1

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.5
+  - 2.3.1
 cache: bundler
 script:
   - bundle exec rspec -fd spec

data/lib/yap/shell/parser.rb

@@ -31,7 +31,11 @@ module Yap
 end
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../"
-require 'treefell'
+begin
+  require 'treefell'
+rescue LoadError => ex
+  nil
+end
 require 'yap/shell/parser/lexer'
 require 'yap/shell/parser/nodes'
 require 'yap/shell/parser_impl'

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

@@ -52,8 +52,9 @@ module Yap::Shell
     HEREDOC_START          = /\A<<-?([A-z0-9]+)\s*\n/
     INTERNAL_EVAL          = /\A(?:(\!)|([0-9]+))/
     SUBGROUP               = /\A(\(|\))/
-    REDIRECTION            = /\A(([12]?>&?[12]?)\s*(?![12]>)(#{ARG})?)/
-    REDIRECTION2           = /\A((&>|<)\s*(#{ARG}))/
+    REDIRECTION1           = /\A(([12]?>>)\s*(#{ARG}))/
+    REDIRECTION2            = /\A(([12]?>&?[12]?)\s*(?![12][\?]?>)(#{ARG})?)/
+    REDIRECTION3           = /\A((&>|<|&>>)\s*(#{ARG}))/
 
     NUMERIC_RANGE              = /\A\(((\d+)\.\.(\d+))\)(\.each)?/
     NUMERIC_RANGE_W_CALL       = /\A\(((\d+)\.\.(\d+))\)(\.each)?\s*:\s*/
@@ -334,14 +335,18 @@ module Yap::Shell
     end
 
     def redirection_token
-      if md=@chunk.match(REDIRECTION)
+      if md=@chunk.match(REDIRECTION1)
+        token :Redirection, md[2], attrs: { target: md[3] }
+        md[0].length
+      elsif md=@chunk.match(REDIRECTION2)
         target = nil
         target = md[3] if md[3] && md[3].length > 0
         token :Redirection, md[2], attrs: { target: target }
         md[0].length
-      elsif md=@chunk.match(REDIRECTION2)
+      elsif md=@chunk.match(REDIRECTION3)
         token :Redirection, md[2], attrs: { target: md[3] }
         md[0].length
+      elsif md=@chunk.match(REDIRECTION1)
       else
         did_not_match
       end
@@ -371,16 +376,23 @@ module Yap::Shell
         str = ''
         characters_read = 0
         prev_char = ''
+
+        escaped = false
+        quoted_by = nil
+
         loop do
           ch = @chunk[characters_read]
 
           if %w(' ").include?(ch)
-            @quoted_by = ch
+            quoted_by = ch
             result = process_string @chunk[characters_read..-1], ch
             str << result.str
             characters_read += result.consumed_length
           elsif ch == '\\'
-            # no-op
+            # We're escaping the argument if this is the first character we
+            # see. If this comes any later then we don't care
+            escaped = true if characters_read == 0
+
             characters_read += 1
           elsif prev_char != '\\' && ch =~ /[\s\|;&\(\)]/
             break
@@ -396,9 +408,8 @@ module Yap::Shell
 
         if characters_read > 0
           attrs = {}
-          if @quoted_by
-            attrs.merge!(quoted_by: @quoted_by)
-          end
+          attrs.merge!(escaped: escaped) if escaped
+          attrs.merge!(quoted_by: quoted_by) if quoted_by
           token :Argument, str, attrs: attrs
           characters_read
         else

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

@@ -24,6 +24,10 @@ module Yap::Shell
         @attrs = token.attrs
       end
 
+      def escaped?
+        @attrs[:escaped]
+      end
+
       def quoted?
         double_quoted? || single_quoted?
       end
@@ -41,7 +45,7 @@ module Yap::Shell
       end
 
       def to_s
-        "ArgumentNode(#{lvalue.inspect})"
+        "ArgumentNode(#{lvalue.inspect} escaped? #{escaped?} double_quoted? #{double_quoted?} single_quoted? #{single_quoted?})"
       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.6.2"
+      VERSION = "0.7.0"
     end
   end
 end

data/spec/yap/shell/lexer_spec.rb

@@ -589,6 +589,16 @@ describe Yap::Shell::Parser::Lexer do
         end
       end
     end
+
+    context 'escaped arguments' do
+      describe 'echo \$FOO' do
+        it { should eq [
+          t(:Command, "echo", lineno:0),
+          t(:Argument, "$FOO", lineno:0, attrs: { escaped: true })
+        ]}
+      end
+
+    end
   end
 
   context "statements" do
@@ -946,6 +956,14 @@ describe Yap::Shell::Parser::Lexer do
         ]}
       end
 
+      describe "can double up" do
+        let(:str){ "ls >> a.txt" }
+        it { should eq [
+          t(:Command, "ls", lineno: 0),
+          t(:Redirection, ">>", lineno: 0, attrs: { target: "a.txt" }),
+        ]}
+      end
+
       describe "can be the start of a command (for clearing files)" do
         describe "> a.txt" do
           it { should eq [
@@ -985,6 +1003,14 @@ describe Yap::Shell::Parser::Lexer do
           t(:Redirection, "2>", lineno: 0, attrs: { target: "bar.txt" }),
         ]}
       end
+
+      describe "can double up" do
+        let(:str){ "ls 2>> a.txt" }
+        it { should eq [
+          t(:Command, "ls", lineno: 0),
+          t(:Redirection, "2>>", lineno: 0, attrs: { target: "a.txt" }),
+        ]}
+      end
     end
 
     describe "stdout / stderr" do
@@ -1048,6 +1074,15 @@ describe Yap::Shell::Parser::Lexer do
           t(:Redirection, "1>", lineno: 0, attrs: { target: "hey.txt" })
         ]}
       end
+
+      describe "redirecting both stdout and stderr with an append: du -sh &>> hey.txt" do
+        let(:str){ "du -sh &>> hey.txt" }
+        it { should eq [
+          t(:Command, "du", lineno: 0),
+          t(:Argument, "-sh", lineno: 0),
+          t(:Redirection, "&>>", lineno: 0, attrs: { target: "hey.txt" })
+        ]}
+      end
     end
   end
 

data/spec/yap/shell/parser_spec.rb

@@ -67,4 +67,5 @@ describe Yap::Shell::Parser do
   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 }")}
+  it { is_expected.to parse('echo \\$DEBUG')}
 end

data/yap-shell-parser.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "treefell", "~> 0.2.3"
+  spec.add_dependency "term-ansicolor", "~> 1.3.0"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell-parser
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treefell
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The parser for the yap shell