em-systemcommand 1.2.0 → 2.0.0

data/lib/em-systemcommand/pipe.rb

@@ -17,12 +17,20 @@ module EventMachine
         @outputbuffer.string
       end
 
-      # Convenience method to create a callback that matches a regular expression
+      ##
+      # Convenience method to create a callback that matches a regular
+      # expression
       def match regexp, opt = {}, &block
-        opt = { in: :line }.merge opt
+        opt = { in: :line, match: :first }.merge opt
         (opt[:in] == :output ? receive_update_callbacks : receive_line_callbacks) << lambda do |data|
-          if m = data.match(regexp)
-            block.call m.to_a
+          matches = data.scan regexp
+          if matches.length > 0
+            case opt[:match]
+            when :first
+              block.call *matches[0]
+            when :last
+              block.call *matches[matches.length-1]
+            end
           end
         end
       end
@@ -122,6 +130,7 @@ module EventMachine
         end
       end
 
+      ##
       # Invoked when the connection is terminated. Calls
       # `unbind(@name)` on master.
       def unbind

data/lib/em-systemcommand/version.rb

@@ -1,5 +1,5 @@
 module Em
   module Systemcommand
-    VERSION = "1.2.0"
+    VERSION = "2.0.0"
   end
 end

data/spec/em-systemcommand/pipe_spec.rb

@@ -128,7 +128,7 @@ describe 'Pipe' do
       received = []
       EM.run do
         EM::SystemCommand.execute 'echo "-123-"; echo "-456-"' do |on|
-          on.stdout.match /-([0-9]+)-/, in: :line do |match, number|
+          on.stdout.match /-([0-9]+)-/, in: :line do |number|
             received << number
           end
 
@@ -144,7 +144,7 @@ describe 'Pipe' do
       received = []
       EM.run do
         EM::SystemCommand.execute %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|
+          on.stdout.match /-([0-9]+)-/, in: :output do |number|
             received << number
           end
 
@@ -155,5 +155,22 @@ describe 'Pipe' do
         end
       end
     end
+
+    it 'should match last occurence on receive_update' do
+      received = []
+      EM.run do
+        EM::SystemCommand.execute %q{ruby -e '$stdout.sync = true; print "-123-\n"; sleep 0.1; print "-456-\n"; exit 0'} do |on|
+          on.stdout.match /-([0-9]+)-/, match: :last, in: :output do |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: 1.2.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3989779150220825362
+      hash: 1829514624315752226
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3989779150220825362
+      hash: 1829514624315752226
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24