rbsh 0.0.1 → 0.0.2

data/example/test.rbsh

@@ -0,0 +1,4 @@
+#!/usr/bin/env rbsh
+echo("test1")
+cat("/etc/hosts").grep("localhost")
+echo("test2")

data/lib/rbsh/cli.rb

@@ -18,9 +18,11 @@ class Rbsh::CLI
     if    @opts.has_key? :v
       puts Rbsh::VERSION
     elsif @opts.has_key? :e
-      puts @shell.load_script!(@opts[:e])
+      puts @shell.load_script!(@opts[:e]).run!.to_s
     else
       script_file = ARGV[0]
+      script = File.open(script_file).read
+      puts @shell.load_script!(script).run!.to_s
     end
   end
 

data/lib/rbsh/pipeline.rb

@@ -7,36 +7,41 @@ class Rbsh::Pipeline < BasicObject
     _push(name, *args)
   end
 
-  def to_ary
+  def run!
     commands = _queue.map do |c|
       [ c[:command], *c[:args] ].compact.map(&:to_s)
     end
 
-    result = []
+    result = Result.new
     ::Open3.pipeline_rw(*commands) do |stdin, stdout, wait_threads|
       stdin.close
-      result = stdout.readlines
+      lines = stdout.readlines
+      lines = ["\n"] if lines.size == 0
+      result.set(lines)
     end
-    result << "\n" if result == []
     result
   end
 
-  def to_s
-    result = to_ary
-    result.join("")
-  end
-  alias inspect to_s
-  alias to_str to_s
-
-  def equal?(str)
-    to_s == str
-  end
-
   def method_missing(name, *args, &block)
     _push(name, *args)
     self
   end
 
+  class Result
+    def set(lines)
+      @lines = lines
+    end
+
+    def to_ary
+      @lines
+    end
+
+    def to_s
+      @lines.join("")
+    end
+    alias inspect to_s
+  end
+
   protected
 
   def _push(name, *args, &block)

data/lib/rbsh/shell.rb

@@ -1,43 +1,44 @@
 require "open3"
 
 class Rbsh::Shell < BasicObject
-  attr_writer :_queue
-  attr_accessor :_result
-
-  def run!
-    @_result = [] unless @_result
-    _queue.each do |pipeline|
-      @_result += pipeline.to_ary
-    end
-    to_s
+  def initialize
+    @_result = Result.new
   end
 
-  def to_ary
-    _result
-  end
-
-  def to_s
-    to_ary.join("")
+  def run!
+    @_result.append(@_pipeline.run!)
+    @_result
   end
-  alias inspect to_s
 
   def method_missing(name, *args, &block)
-    pipeline = ::Rbsh::Pipeline.new(name, *args)
-    _queue.push(pipeline)
-    pipeline
+    if @_pipeline
+      @_result.append(@_pipeline.run!)
+    end
+    @_pipeline = ::Rbsh::Pipeline.new(name, *args)
+    @_pipeline
   end
 
   def load_script!(script)
     instance_eval(script)
+    self
   end
 
-  protected
+  class Result
+    def initialize
+      @lines = []
+    end
 
-  def _queue
-    @_queue ||= []
-  end
+    def append(lines)
+      @lines += lines.to_ary
+    end
 
-  def _result
-    @_result ||= []
+    def to_ary
+      @lines
+    end
+
+    def to_s
+      @lines.join("")
+    end
+    alias inspect to_s
   end
 end

data/lib/rbsh/version.rb

@@ -1,3 +1,3 @@
 module Rbsh
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/rbsh/cli_spec.rb

@@ -9,4 +9,9 @@ describe Rbsh::CLI do
     subject { rbsh("-e" 'echo("test")') }
     it { should eq "test\n" }
   end
+
+  describe %q{rbsh -e 'echo("test1")\necho("test2")'} do
+    subject { rbsh("-e" "echo(\"test1\")\necho(\"test2\")") }
+    it { should eq "test1\ntest2\n" }
+  end
 end

data/spec/rbsh/pipeline_spec.rb

@@ -1,16 +1,16 @@
 describe Rbsh::Pipeline do
   describe "echo test" do
-    subject { Rbsh::Pipeline.new(:echo, "test").to_s }
-    it { should eq "test\n" }
+    subject { Rbsh::Pipeline.new(:echo, "test").run! }
+    its(:to_s) { should eq "test\n" }
   end
 
   describe "echo test | grep test" do
-    subject { Rbsh::Pipeline.new(:echo, "test").grep("test").to_s }
-    it { should eq "test\n" }
+    subject { Rbsh::Pipeline.new(:echo, "test").grep("test").run! }
+    its(:to_s) { should eq "test\n" }
   end
 
   describe "echo test | grep no" do
-    subject { Rbsh::Pipeline.new(:echo, "test").grep("no").to_s }
-    it { should eq "\n" }
+    subject { Rbsh::Pipeline.new(:echo, "test").grep("no").run! }
+    its(:to_s) { should eq "\n" }
   end
 end

data/spec/rbsh/shell_spec.rb

@@ -6,30 +6,36 @@ describe Rbsh::Shell do
   describe "echo test" do
     before { @shell.echo("test") }
     subject { @shell.run! }
-    it { should eq "test\n" }
+    its(:to_s) { should eq "test\n" }
   end
 
   describe "echo test | grep test" do
     before { @shell.echo("test").grep("test") }
     subject { @shell.run! }
-    it { should eq "test\n" }
+    its(:to_s) { should eq "test\n" }
   end
 
   describe "echo test | grep no" do
     before { @shell.echo("test").grep("no") }
     subject { @shell.run! }
-    it { should eq "\n" }
+    its(:to_s) { should eq "\n" }
   end
 
   describe "load_script! 'echo(\"test\")'" do
     before { @shell.load_script!('echo("test")') }
     subject { @shell.run! }
-    it { should eq "test\n" }
+    its(:to_s) { should eq "test\n" }
   end
 
   describe "echo test1; echo test2" do
     before { @shell.echo("test1"); @shell.echo("test2") }
     subject { @shell.run! }
-    it { should eq "test1\ntest2\n" }
+    its(:to_s) { should eq "test1\ntest2\n" }
+  end
+
+  describe "load_script! 'echo(\"test1\")\\necho(\"test2\")'" do
+    before { @shell.load_script!("echo(\"test1\")\necho(\"test2\")") }
+    subject { @shell.run! }
+    its(:to_s) { should eq "test1\ntest2\n" }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbsh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -74,6 +74,7 @@ files:
 - README.md
 - Rakefile
 - bin/rbsh
+- example/test.rbsh
 - lib/rbsh.rb
 - lib/rbsh/cli.rb
 - lib/rbsh/pipeline.rb
@@ -99,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1108712678994075046
+      hash: -2892255319277490126
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1108712678994075046
+      hash: -2892255319277490126
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23