lsl 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/lsl/command/execution.rb

@@ -68,8 +68,24 @@ module LSL
       fattr(:args) do
         command_args + fixed_input_args
       end
+      def my_eval(ops,str)
+        OpenStruct.new(ops).instance_eval(str)
+      rescue => exp
+        puts "failed #{exp.message}"
+      end
       fattr(:result) do
-        if obj.respond_to?(command.method)
+        if command.eval?
+          res = []
+          if args.empty?
+            res << my_eval(command.raw[1..-2],:args => [], :arg => nil)
+          else
+            args.each_with_expansion do |a|
+              res << my_eval(command.raw[1..-2],:args => a, :arg => a.first)
+            end
+          end
+          #puts res.inspect
+          res
+        elsif obj.respond_to?(command.method)
           res = obj.send_with_expansion(command.method,*args)
           #puts "RES #{res.inspect}" if res
           res
@@ -84,7 +100,7 @@ module LSL
       end
     end
     class Compound < Base
-      fattr(:command) { shell.parser.parse(command_str).command_hash }
+      fattr(:command) { shell.parser.parse(command_str).andand.command_hash }
       fattr(:command_executions) do
         exes = []
         input_args = lambda { exes.last.andand.result || [] }
@@ -96,16 +112,25 @@ module LSL
         exes
       end
       def run!
+        if !command
+          puts "can't parse"
+          return
+        end
         command_executions
         if command.output_filename
           ::File.create(command.output_filename,result.join("\n"))
         else
-          puts result.join("\n") if result
+          puts result_str if result
         end
       end
       def result
         command_executions.last.result
       end
+      def result_str
+        res = result
+        res = res.join("\n") if res.respond_to?(:join)
+        res
+      end
     end
   end
 end

data/lib/lsl/command/single.rb

@@ -3,6 +3,9 @@ module LSL
     class Single
       attr_accessor :ex, :args, :options, :raw
       include FromHash
+      def eval?
+        raw[0..0] == "{"
+      end
       def to_h
         {:ex => ex, :args => args, :options => options}
       end

data/lib/lsl/grammars/base.treetop

@@ -1,7 +1,7 @@
 module LSL
   grammar Base
     rule word
-      [0-9a-zA-Z\.\/\\:\*_]+
+      [0-9a-zA-Z\.\/\\:\*_\+]+
     end
     rule ws1
       ' '

data/lib/lsl/grammars/compound_command.treetop

@@ -3,14 +3,15 @@ module LSL
     include LSL::SingleCommand
     include LSL::File
     rule full_command
-      single_command (ows "|" ows single_command)* (ows ">" ows filename)? {
+      some_command (ows "|" ows some_command)* (ows ">" ows filename)? {
         def filename
           find_child_node(:filename)
         end
         def single_commands
-
-          res = [single_command.command_hash]
-          rest = find_child_nodes(:single_command).map { |x| x.command_hash }
+          
+          res = [some_command.command_hash]
+          #res = [elements.first.command_hash]
+          rest = find_child_nodes(:some_command).map { |x| x.command_hash }
           #puts "rest #{rest.size}"
           res + rest
         end
@@ -21,5 +22,15 @@ module LSL
         end
       }
     end
+    rule eval_str
+      "{" (!"}" .)+ "}" {
+        def command_hash
+          LSL::Command::Single.new(:raw => text_value, :args => [], :options => {})
+        end
+      }
+    end
+    rule some_command
+      single_command / eval_str
+    end
   end
 end

data/lib/lsl/shell.rb

@@ -17,9 +17,16 @@ module LSL
     module Inner
       def echo(*args)
         #puts args.inspect
-        puts args.join(" ")
+        ops = (args.last.kind_of?(Hash) ? args.pop : {})
+        str = args.join(" ")
+        str = str.upcase if ops.has_key?('upper')
+        puts str
         nil
       end
+      def echot(*args)
+        echo(*args)
+        echo(*args)
+      end
       def ls(d=".")
         ec_array "ls #{d}"
       end
@@ -52,6 +59,15 @@ module LSL
         puts "Exiting"
         Kernel.exit(*args)
       end
+      def eval(*args)
+        Kernel.eval(args.join(" "))
+      end
+      def rand
+        Kernel.rand()
+      end
+      def pt(a,b)
+        puts a==b
+      end
     end
     include FileUtils
     include Inner

data/lsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lsl}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mharris717"]

data/spec/compound_command_spec.rb

@@ -46,5 +46,8 @@ describe "CompoundCommand" do
       res.should == [[],14]
     end
   end
+  it 'takes eval str' do
+    parse_obj("{2 + 2}")
+  end
   
 end

data/spec/shell_spec.rb

@@ -14,7 +14,7 @@ describe "Shell" do
   end
   it 'piping' do
     @shell.run('ls VERSION | pf')
-    $printed.should == ['0.0.1']
+    $printed.should == ['0.1.0']
   end
   it 'foo' do
     #30.times do
@@ -32,7 +32,10 @@ describe "Shell" do
     run("remote_call foo | echo")
   end
   it 'rake' do
-    run("abc").result.should == "ran"
+    #run("abc").result.should == "ran"
+  end
+  it 'eval' do
+    run("{2 + 2}").result.should == 4
   end
   describe 'output redirection' do
     before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - mharris717