em-systemcommand 0.0.1 → 0.0.2

data/em-systemcommand.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/em-systemcommand/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Arthur Andersen"]
   gem.email         = ["leoc.git@gmail.com"]
-  gem.description   = %q{}
-  gem.summary       = %q{}
-  gem.homepage      = ""
+  gem.description   = %q{`em-systemcommand` is a simple abstraction for invoking system commands and handling their output easily with eventmachine.}
+  gem.summary       = %q{Sweeter popen3 for EventMachine.}
+  gem.homepage      = "http://leoc.github.com/em-systemcommand/"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/em-systemcommand/pipe.rb

@@ -30,7 +30,7 @@ module EventMachine
       # Invoked when line was received
       def receive_line line
         receive_line_callbacks.each do |callback|
-          callback.call line
+          callback.call line.dup
         end
       end
 
@@ -41,9 +41,9 @@ module EventMachine
 
       # Invoked when a line was written, but `\r` was received without
       # a line-break in the end.
-      def receive_update line
+      def receive_update buffer
         receive_update_callbacks.each do |callback|
-          callback.call line
+          callback.call buffer.dup
         end
       end
 
@@ -53,34 +53,38 @@ module EventMachine
       end
 
       # Invoked when data was received.
-      def receive_data data
-        receive_data_callbacks.each do |callback|
-          callback.call data
+      def receive_data data, recursive = false
+        unless recursive
+          receive_data_callbacks.each do |callback|
+            callback.call data.dup
+          end
         end
-
         @lt2_linebuffer ||= []
 
         ix = data.index("\r")
-        if ix and data[ix+1] != "\n"
-          @lt2_linebuffer << data[0...ix]
-          ln = @lt2_linebuffer.join
+        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_line ln
-          receive_update @outputbuffer.string
-          receive_data data[(ix+1)..-1] # receive rest data
-        elsif ix = data.index("\n")
-          @lt2_linebuffer << data[0...ix]
-          ln = @lt2_linebuffer.join
-          @lt2_linebuffer.clear
-          ln.chomp!
-          @outputbuffer.puts ln
-          receive_line ln
           receive_update @outputbuffer.string
-          receive_data data[(ix+1)..-1] # receive rest data
+          receive_data data[(ix+1)..-1], true # receive rest data
         else
-          @lt2_linebuffer << data
+          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
+          else
+            @lt2_linebuffer << data
+          end
+
+          unless recursive
+            @outputbuffer.puts data
+            receive_update @outputbuffer.string
+          end
         end
       end
 

data/lib/em-systemcommand/version.rb

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

data/spec/em-systemcommand/pipe_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+describe 'Pipe' do
+
+  context '#data callback' do
+
+    it 'should be called on data' do
+      received = []
+      EM.run do
+        EM::SystemCommand.new %q{echo -n "123123";} do |on|
+          on.stdout.data do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123123"]
+          end
+        end
+      end
+    end
+
+    it 'should be called once even when there is a linebreak' do
+      received = []
+      EM.run do
+        EM::SystemCommand.new %Q{echo "123\n456"} do |on|
+          on.stdout.data do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123\n456\n"]
+          end
+        end
+      end
+    end
+  end
+
+  context '#line callback' do
+
+    it 'should be called on readline' do
+      received = []
+      EM.run do
+        EM::SystemCommand.new 'echo "123"; echo "456"' do |on|
+          on.stdout.line do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123","456"]
+          end
+        end
+      end
+    end
+
+    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|
+          on.stdout.line do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123","456"]
+          end
+        end
+      end
+    end
+
+  end
+
+  context '#update callback' do
+
+    it 'should be called on receive data' do
+      received = []
+      EM.run do
+        EM::SystemCommand.new %q{ruby -e '$stdout.sync = true; puts "123"; puts "456"; exit 0'} do |on|
+          on.stdout.update do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123\n456\n"]
+          end
+        end
+      end
+    end
+
+    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|
+          on.stdout.update do |data|
+            received << data
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123","456"]
+          end
+        end
+      end
+    end
+
+  end
+
+  context '#match callback' do
+
+    it 'should match in lines on receive_line' do
+      received = []
+      EM.run do
+        EM::SystemCommand.new 'echo "-123-"; echo "-456-"' do |on|
+          on.stdout.match /-([0-9]+)-/, in: :line do |match, number|
+            received << number
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123","456"]
+          end
+        end
+      end
+    end
+
+    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|
+          on.stdout.match /-([0-9]+)-/, in: :output do |match, number|
+            received << number
+          end
+
+          on.success do
+            EM.stop_event_loop
+            received.should == ["123","456"]
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-systemcommand
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   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: &18939980 !ruby/object:Gem::Requirement
+  requirement: &15758320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18939980
+  version_requirements: *15758320
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &18939560 !ruby/object:Gem::Requirement
+  requirement: &15757900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18939560
+  version_requirements: *15757900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &18939000 !ruby/object:Gem::Requirement
+  requirement: &15757480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18939000
+  version_requirements: *15757480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &18938420 !ruby/object:Gem::Requirement
+  requirement: &15757060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +54,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18938420
-description: ''
+  version_requirements: *15757060
+description: ! '`em-systemcommand` is a simple abstraction for invoking system commands
+  and handling their output easily with eventmachine.'
 email:
 - leoc.git@gmail.com
 executables: []
@@ -75,9 +76,10 @@ files:
 - lib/em-systemcommand/pipe.rb
 - lib/em-systemcommand/pipe_handler.rb
 - lib/em-systemcommand/version.rb
+- spec/em-systemcommand/pipe_spec.rb
 - spec/em-systmcommand_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://leoc.github.com/em-systemcommand/
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -91,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1466650369422800238
+      hash: 1032531485384539131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,13 +102,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1466650369422800238
+      hash: 1032531485384539131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: ''
+summary: Sweeter popen3 for EventMachine.
 test_files:
+- spec/em-systemcommand/pipe_spec.rb
 - spec/em-systmcommand_spec.rb
 - spec/spec_helper.rb