em-systemcommand 0.0.2 → 0.0.3

data/lib/em-systemcommand/pipe.rb

@@ -59,31 +59,50 @@ module EventMachine
             callback.call data.dup
           end
         end
-        @lt2_linebuffer ||= []
-
-        ix = data.index("\r")
-        if ix && data[ix+1] != "\n"
-          ln = (@lt2_linebuffer << data[0...ix]).join
-          @lt2_linebuffer.clear
-          receive_line ln
-          @outputbuffer.print ln
-          @outputbuffer.pos -= ln.length
-          receive_update @outputbuffer.string
-          receive_data data[(ix+1)..-1], true # receive rest data
-        else
-          if ix = data.index("\n")
-            ln = (@lt2_linebuffer << data[0...ix]).join
-            @lt2_linebuffer.clear
-            ln.chomp!
-            receive_line ln
-            receive_data data[(ix+1)..-1], true # receive rest data
+        @linebuffer ||= []
+        @cr_offset    = 0
+
+        parse_crlf data
+
+        receive_update @outputbuffer.string unless recursive
+      end
+
+      def parse_cr data, ix
+        ln = (@linebuffer << data[0...ix]).join
+        @linebuffer.clear
+        receive_line ln
+        @outputbuffer.print ln
+        @outputbuffer.pos = @cr_offset
+        parse_crlf data[(ix+1)..-1] # receive rest data
+      end
+
+      def parse_lf data, ix
+        ln = (@linebuffer << data[0...ix]).join
+        @linebuffer.clear
+        ln.chomp!
+        receive_line ln
+        @outputbuffer.print ln
+        @outputbuffer.pos = @outputbuffer.length
+        @outputbuffer.puts
+        @cr_offset = @outputbuffer.pos
+        parse_crlf data[(ix+1)..-1] # receive rest data
+      end
+
+      def parse_crlf data
+        if ilf = data.index("\n")
+          # if we find a LF and that LF is after a CR we first handle
+          # the CR
+          if icr = data.index("\r") and ilf != (icr+1) and icr < ilf
+            parse_cr data, icr
           else
-            @lt2_linebuffer << data
+            parse_lf data, ilf
           end
-
-          unless recursive
-            @outputbuffer.puts data
-            receive_update @outputbuffer.string
+        else
+          if icr = data.index("\r")
+            parse_cr data, icr
+          else
+            @linebuffer << data
+            @outputbuffer.print data
           end
         end
       end

data/lib/em-systemcommand/version.rb

@@ -1,5 +1,5 @@
 module Em
   module Systemcommand
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/em-systemcommand.rb

@@ -45,9 +45,9 @@ module EventMachine
       pipes.delete name
       if pipes.empty?
         if status.exitstatus == 0
-          succeed
+          succeed self
         else
-          fail status
+          fail self
         end
       end
     end

data/spec/em-systemcommand/pipe_spec.rb

@@ -2,6 +2,19 @@ require 'spec_helper'
 
 describe 'Pipe' do
 
+  context '#receive_data' do
+    it 'should correctly do a carriage return in the output buffer' do
+      EM.run do
+        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "12345\r"; puts "321"; print "123"; print "\r3210"; exit 0;'} do |on|
+          on.success do |process|
+            EM.stop_event_loop
+            process.stdout.output.should == "32145\n3210"
+          end
+        end
+      end
+    end
+  end
+
   context '#data callback' do
 
     it 'should be called on data' do
@@ -58,7 +71,7 @@ describe 'Pipe' do
     it 'should be called on carriage return' do
       received = []
       EM.run do
-        EM::SystemCommand.new "echo -n \"123\r\"; echo -n \"456\r\"" do |on|
+        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "123\r"; print "456\r"; exit 0;'} do |on|
           on.stdout.line do |data|
             received << data
           end
@@ -94,7 +107,7 @@ describe 'Pipe' do
     it 'should be called on carriage return'do
       received = []
       EM.run do
-        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "123\r"; print "456\r"; exit 0;'} do |on|
+        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "123\r"; sleep 0.1; print "456\r"; exit 0;'} do |on|
           on.stdout.update do |data|
             received << data
           end
@@ -130,7 +143,7 @@ describe 'Pipe' do
     it 'should match in output buffer on receive_update' do
       received = []
       EM.run do
-        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "-123-\r"; print "-456-\r"; exit 0'} do |on|
+        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; print "-123-\r"; sleep 0.1; print "-456-\r"; exit 0'} do |on|
           on.stdout.match /-([0-9]+)-/, in: :output do |match, number|
             received << number
           end

data/spec/em-systmcommand_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe EM::SystemCommand do
 
-  it 'should take a success callback' do
+  it 'should call a success callback when process succeeds' do
     called = false
     EM.run do
-      EM::SystemCommand.new 'echo "123"; exit 0;' do |on|
+      EM::SystemCommand.new 'exit 0;' do |on|
         on.success do |ps|
           called = true
         end
@@ -17,7 +17,18 @@ describe EM::SystemCommand do
     end
   end
 
-  it 'should take a failure callback' do
+  it 'should take a success callback with process as parameter' do
+    EM.run do
+      EM::SystemCommand.new 'exit 0;' do |on|
+        on.success do |ps|
+          EM.stop_event_loop
+          ps.should be_a EM::SystemCommand
+        end
+      end
+    end
+  end
+
+  it 'should call a failure callback when process fails' do
     called = false
     EM.run do
       EM::SystemCommand.new 'echo "123"; exit 1;' do |on|
@@ -32,6 +43,17 @@ describe EM::SystemCommand do
     end
   end
 
+  it 'should take a failure callback with process as parameter' do
+    EM.run do
+      EM::SystemCommand.new 'exit 1;' do |on|
+        on.failure do |ps|
+          EM.stop_event_loop
+          ps.should be_a EM::SystemCommand
+        end
+      end
+    end
+  end
+
   it 'should have stdin pipe' do
     EM.run do
       ps = EM::SystemCommand.new 'echo "123"; exit 1;'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-systemcommand
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15758320 !ruby/object:Gem::Requirement
+  requirement: &17785880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15758320
+  version_requirements: *17785880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &15757900 !ruby/object:Gem::Requirement
+  requirement: &17785460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15757900
+  version_requirements: *17785460
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &15757480 !ruby/object:Gem::Requirement
+  requirement: &17785040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15757480
+  version_requirements: *17785040
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &15757060 !ruby/object:Gem::Requirement
+  requirement: &17784620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15757060
+  version_requirements: *17784620
 description: ! '`em-systemcommand` is a simple abstraction for invoking system commands
   and handling their output easily with eventmachine.'
 email:
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1032531485384539131
+      hash: -941213243736516933
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1032531485384539131
+      hash: -941213243736516933
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17