pipe-run 0.2.1 → 0.3.0

data/Gemfile

@@ -1,12 +1,10 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "depq", ">= 0.4"
-#   gem "hash-utils", ">= 0.7.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.5.2"
 end

data/Gemfile.lock

@@ -2,8 +2,8 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
@@ -12,5 +12,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  bundler (>= 1.0.0)
+  jeweler (>= 1.5.2)

data/Rakefile

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'rubygems'
 require 'bundler'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -8,15 +9,16 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
+require 'rake'
 require 'jeweler'
+
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "pipe-run"
   gem.homepage = "https://github.com/martinkozak/pipe-run"
   gem.license = "MIT"
-  gem.summary = 'Runs command and returns its standard output in one call. Both synchronous and asynchronous (with eventmachine) running is supported.'
+  gem.summary = 'Executes shell command and returns its outputs in single call. Both synchronous and asynchronous (with EventMachine) executing is supported.'
   gem.email = "martinkozak@martinkozak.net"
   gem.authors = ["Martin Kozák"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
@@ -25,13 +27,3 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "qrpc #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/em-pipe-run.rb

@@ -21,7 +21,11 @@ class Pipe
         ##
         # Holds pipe output buffer.
         #
+        # @returns [String] buffer content
+        # @since 0.3.0
+        #
         
+        attr_accessor :buffer
         @buffer
         
         ##
@@ -61,11 +65,11 @@ class Pipe
     end
     
     ##
-    # Runs the command and returns its standard output.
-    # Blocking.
+    # Runs the command and yields its standard output.
     #
     # @param [String] command command for run
     # @param [Proc] block callback for giving back the results
+    # @yield [String] command standard output
     # @since 0.2.0
     #
 
@@ -73,5 +77,47 @@ class Pipe
         pipe = File.popen(command, "r")
         EM::attach(pipe, Receiver, block)
     end
-    
+
+    ##
+    # Runs the command and yields both its standard output
+    # and error output.
+    #
+    # @param [String] command command for run
+    # @param [Proc] block callback for giving back the results
+    # @yield [String] command standard output
+    # @yield [String] command erroroutput
+    # @since 0.3.0
+    #
+
+    def self.run_nonblock2(command, &block)
+        begin
+            stdin, stdout, stderr = Open3.popen3(command)
+        rescue NameError
+            require "open3"
+            retry
+        end
+        
+        outval = nil
+        errval = nil
+        
+        yielder = Proc::new do
+            if (not outval.nil?) and (not errval.nil?)
+                yield outval, errval
+            end 
+        end
+                
+        outcall = Proc::new do |_outval|
+             outval = _outval
+             yielder.call()
+        end
+        
+        errcall = Proc::new do |_errval|
+             errval = _errval
+             yielder.call()
+        end
+        
+        EM::attach(stdout, Receiver, outcall)
+        EM::attach(stderr, Receiver, errcall)
+    end
+
 end

data/lib/pipe-run.rb

@@ -11,20 +11,22 @@ class Pipe
     # Runs the command and returns its standard output.
     #
     # If block is given, treat call as non-blocking. In that case, 
-    # +em-pipe-run+ file must be loaded.
+    # loads +em-pipe-run+ and expects EventMachine loaded.
     #
     # @param [String] command command for run
     # @param [Proc] block block for giving back the results
+    # @yield [String] command output
     # @return [String] command output
     #
 
     def self.run(command, &block)
         if not block.nil?
-            if not self.respond_to? :run_nonblock
+            begin
+                return self.run_nonblock(command, &block)
+            rescue NoMethodError
                 require "em-pipe-run"
+                retry
             end
-            
-            return self.run_nonblock(command, &block)
         end
         
         ###
@@ -37,4 +39,45 @@ class Pipe
         return result
     end
     
+    ##
+    # Runs the command and returns both standard output 
+    # and error output.
+    #
+    # If block is given, treat call as non-blocking. In that case, 
+    # loads +em-pipe-run+ and expects EventMachine loaded.
+    #
+    # @param [String] command command for run
+    # @param [Proc] block block for giving back the results
+    # @return [Array] command output and error output
+    # @since 0.3.0
+    #
+
+    def self.run2(command, &block)
+        if not block.nil?
+            begin
+                return self.run_nonblock2(command, &block)
+            rescue NoMethodError
+                require "em-pipe-run"
+                retry
+            end
+        end
+        
+        ###
+        
+        begin
+            stdin, stdout, stderr = Open3.popen3(command)
+        rescue NameError
+            require "open3"
+            retry
+        end
+        
+        stdin.close()
+        outvalue = stdout.read
+        stdout.close()
+        errvalue = stderr.read
+        stderr.close()
+        
+        return [outvalue, errvalue]
+    end
+    
 end

data/pipe-run.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pipe-run}
-  s.version = "0.2.1"
+  s.name = "pipe-run"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Martin Kozák"]
-  s.date = %q{2011-03-09}
-  s.email = %q{martinkozak@martinkozak.net}
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2011-11-08"
+  s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -25,27 +25,28 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/em-pipe-run.rb",
     "lib/pipe-run.rb",
-    "pipe-run.gemspec"
+    "pipe-run.gemspec",
+    "test.rb"
   ]
-  s.homepage = %q{https://github.com/martinkozak/pipe-run}
+  s.homepage = "https://github.com/martinkozak/pipe-run"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
-  s.summary = %q{Runs command and returns its standard output in one call. Both synchronous and asynchronous (with eventmachine) running is supported.}
+  s.rubygems_version = "1.8.11"
+  s.summary = "Executes shell command and returns its outputs in single call. Both synchronous and asynchronous (with EventMachine) executing is supported."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
     else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     end
   else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
   end
 end
 

data/test.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby
+# encoding: utf-8
+# (c) 2011 Martin Kozák (martinkozak@martinkozak.net)
+
+$:.push("./lib")
+$:.unshift("./lib")
+
+require "eventmachine"
+require "pipe-run"
+require "em-pipe-run"
+
+
+EM::run do
+    p Pipe::run("date")
+    p Pipe::run2("date")
+    
+    Pipe::run("date") do |out|
+        p out
+    end
+    
+    Pipe::run2("date") do |*args|
+        p args
+    end
+    
+    p "x"
+end

metadata

@@ -1,50 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pipe-run
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.1
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-09 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20057480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20057480
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &20056740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *20056740
 description: 
 email: martinkozak@martinkozak.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -55,36 +51,34 @@ files:
 - lib/em-pipe-run.rb
 - lib/pipe-run.rb
 - pipe-run.gemspec
-has_rdoc: true
+- test.rb
 homepage: https://github.com/martinkozak/pipe-run
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 247694265029296000
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3085388963954565430
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Runs command and returns its standard output in one call. Both synchronous and asynchronous (with eventmachine) running is supported.
+summary: Executes shell command and returns its outputs in single call. Both synchronous
+  and asynchronous (with EventMachine) executing is supported.
 test_files: []
-