lucie-cmd 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7aebb97d2f156d55f4c1509d220ad0967f40134
-  data.tar.gz: 0de77f3b26b949963d677741fa6c98f56718bc2b
+  metadata.gz: 6bcbc57fe509cfa7ca24494812a5af89113184f3
+  data.tar.gz: e2dc4c4c25c467287773478a09414d105b881a77
 SHA512:
-  metadata.gz: a67a5a96aead041d89da42ae0923addf0fa6fcc9dc4d31a45e7ccaad00b49bdf5e7550ff3c125b14c27e5daa039422002f242af6f9cc352c268837e80eaccc37
-  data.tar.gz: dd193a542a6f520e140016972d851d710ee63ce3d224b33a846e1f7f066f4c4f850305fe13150755de5c6e4ed69dd9aa928e86f906e12fad7ad5887315baa882
+  metadata.gz: 0ff3b5da9dce13233b9f803bd20fc1b2a2ee230d78b4077b0c1edee29afb399a28e15395cf20eb48ff735545861ba9e6748a921a716ecf87c39ae00297c27660
+  data.tar.gz: 7ab81b5d27644870d8a6deadc80a36b5e0042c30734e50de89caa3286a5fd6cd6262e1fa92d309c63e47b6cd89969ed091d6851f69454fb77cc1f63a50a00ec3

data/lib/lucie-cmd/commands.rb

@@ -7,7 +7,8 @@ module Lucie
 
     def sh(*args)
       @commands_helper ||= CommandsHelper.new
-      @commands_helper.sh(*args)
+      status = @commands_helper.sh(*args)
+      status.to_i == 0
     end
 
     def cd(*args)
@@ -23,6 +24,11 @@ module Lucie
       @commands_helper.status
     end
 
+    def on(opts = [])
+      @commands_helper ||= CommandsHelper.new
+      @commands_helper.on(Array(opts))
+    end
+
   private
 
     class CommandsHelper
@@ -31,25 +37,44 @@ module Lucie
       def initialize
         @stderr = $stderr
         @pwd = Dir.pwd
+        @opts = []
       end
 
       def sh(*args)
         command = args.join(" ")
-        @pid, @stdin, @stdout, @stderr = Open4::popen4("cd \"#{pwd}\" && #{command}")
-        @ignored, @status = Process::waitpid2 @pid
+
+        if @opts.include? :show_command
+          puts "$ #{command}"
+        end
+
+        @status = Open4::popen4("cd \"#{pwd}\" && #{command}") do |pid, stdin, stdout, stderr|
+          @stdin, @stderr, @pid = stdin, stderr, pid
+          @output = ""
+          if !stdout.eof()
+            new_content = stdout.read
+            if @opts.include? :live_input
+              print new_content
+            end
+            @output << new_content
+          end
+        end
       end
 
       def output
-        @stdout.read
+        @output
       end
 
       def status
-        @status.to_i % 255
+        @status.exitstatus.to_i % 255
       end
 
       def pwd=(val)
         @pwd = File.expand_path(val, @pwd)
       end
+
+      def on(opts = [])
+        @opts = @opts | opts
+      end
     end
   end
 end

data/test/functional/sh_test.rb

@@ -46,4 +46,28 @@ class ShTest < MiniTest::Spec
     th2.join
   end
 
+  it "should return true if response status of the command was 0" do
+    assert_equal true, sh("true")
+  end
+
+  it "should return false if the response status of the command was not 0" do
+    assert_equal false, sh("false")
+  end
+
+  it "should be able to put the output realtime" do
+    on :live_input
+    out, err = capture_io do
+      sh "echo test"
+    end
+    assert_equal "test\n", out
+  end
+
+  it "should be able to show the command" do
+    on :show_command
+    out, err = capture_io do
+      sh "echo test"
+    end
+    assert_equal "$ echo test\n", out
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucie-cmd
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Nucc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Library part of Lucie framework. Use this gem with Lucie if you want to run