unix_commander 0.1.3 → 0.1.4

data/lib/unix_commander/version.rb

@@ -1,3 +1,3 @@
 module UnixCommander
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/unix_commander.rb

@@ -30,8 +30,7 @@ module UnixCommander
     # @return [String] *stdout* of the command
     def out
       return "" if @out==nil
-      return @out if @out.class==String
-      @out.read
+      @out
     end
 
     # Returns the output (stderr) of the command
@@ -39,8 +38,7 @@ module UnixCommander
     # @return [String] *stderr* of the command
     def err
       return "" if @err==nil
-      return @err if @err.class==String
-      @err.read
+      @err
     end
 
     # Return a string with the output of the command
@@ -54,6 +52,8 @@ module UnixCommander
     # @return [Runner] Returns itself
     def run
       @in, @out, @err = Open3.popen3("#{@command.cmd}")
+      @out = @out.read
+      @err = @err.read
       self
     end
 
@@ -103,20 +103,6 @@ module UnixCommander
       cmd
     end
 
-    # This is the main method of the library. Every unknown method you call on a Command object
-    # is interpreted as a unix command and its args are used as the args of the unix command.
-    # When the command already has some unix command inside, it pipes them together (|)
-    # @param [String] m name of the unix command you want to execute
-    # @param [Array] *args args for the aforementioned command
-    # @return [Command] new command with internal unix commands piped together
-    def method_missing(m, *args, &block)
-      if cmd == ""
-        Command.new("#{m} #{args.join(' ')}".strip)
-      else
-        Command.new("#{cmd} | #{m} #{args.join(' ')}".strip)
-      end
-    end
-
     # Redirects *stdout* to someplace (Using >). By default it uses destructive redirection.
     # @param [String] place to redirect the output (e.g. /dev/null)
     # @param [true,false] append if true uses append redirection (>>) it defaults to false.
@@ -167,6 +153,21 @@ module UnixCommander
     def run_ssh(_username, _password = "", _address = "127.0.0.1")
       Runner.new(self).run_ssh(_username,_password,_address)
     end
+    
+    # This is the main method of the library. Every unknown method you call on a Command object
+    # is interpreted as a unix command and its args are used as the args of the unix command.
+    # When the command already has some unix command inside, it pipes them together (|)
+    # @param [String] m name of the unix command you want to execute
+    # @param [Array] *args args for the aforementioned command
+    # @return [Command] new command with internal unix commands piped together
+    def method_missing(m, *args, &block)
+      if cmd == ""
+        Command.new("#{m} #{args.join(' ')}".strip)
+      else
+        Command.new("#{cmd} | #{m} #{args.join(' ')}".strip)
+      end
+    end
+
   end
       
 end

data/spec/runner_spec.rb

@@ -36,7 +36,19 @@ describe "Runner local" do
     out_err[0].should_not == ""
     out_err[1].should_not == ""
   end
+
+  it "can read out twice" do
+    runner = @command.run 
+    runner.out.should == %x[uname]
+    runner.out.should == %x[uname]
+  end
   
+  it "can read err twice" do
+    @command = UnixCommander::Command.new("grep abc /etc/*")
+    runner = @command.run 
+    runner.out.should_not == ""
+    runner.out.should_not == ""
+  end
 end
 
 describe "Runner ssh" do
@@ -70,4 +82,16 @@ describe "Runner ssh" do
     out_err[1].should_not == ""
   end
   
+  it "can read out twice" do
+    runner = @command.run_ssh('dev','dev')
+    runner.out.should == %x[uname]
+    runner.out.should == %x[uname]
+  end
+  
+  it "can read err twice" do
+    @command = UnixCommander::Command.new("grep abc /etc/*")
+    runner = @command.run_ssh('dev','dev')
+    runner.out.should_not == ""
+    runner.out.should_not == ""
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unix_commander
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors: