httperfrb 0.0.2 → 0.1.0

data/Gemfile

@@ -1,4 +1,5 @@
 source :rubygems
+gem 'open4'
 
 group :development do
   gem 'yard'

data/HISTORY.md

@@ -1,10 +1,20 @@
 HTTPerf.rb
 ==========
 
+### 0.1.0
+
+* refactored #run to run system commands in a cleaner fashion
+* added #fork to run in a thread
+* added #fork_out to return the output from the last #fork
+* added #fork_err to return the error from the last #fork
+
+
 ### 0.0.2
 
 * fix a few critical bugs with params - 0.0.1 is bad
 
+
 ### 0.0.1
 
 * Initial release.
+

data/README.md

@@ -1,29 +1,37 @@
 HTTPERF.rb
 ==========
 
+### [Documentation](http://rubyops.github.com/httperfrb/doc/) | [Coverage](http://rubyops.github.com/httperfrb/coverage/) 
+
 Simple Ruby interface for httperf.
 
-Requires httperf, of course...
+#### Note
+
+This currently needs a lot of work to be production ready. It's done more in a scripting style then a true solid application style. 
+
+
 
 ### Installing 'httperf'
 
-#### Mac
+Requires httperf, of course...
+
+##### Mac
 
     sudo port install httperf
 
-#### Debian / Ubuntu
+##### Debian / Ubuntu
 
     sudo apt-get install httperf
 
-#### Redhat / CentOS
+##### Redhat / CentOS
 
     sudo yum install httperf
 
-### Install
+#### Install
 
     gem install httperfrb
 
-### Usage
+#### Usage
 
     require 'httperf'
     perf = HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" )

data/lib/httperf.rb

@@ -1,10 +1,12 @@
 # @author Joshua Mervine <joshua@mervine.net>
+require 'open4'
 class HTTPerf
   # gem version
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 
   # availbe instance methods
-  @options, @command = nil
+  @fork_out, @fork_err = ''
+  @fork_thr, @options, @command = nil
 
   # initialize with (optional):
   # - options: see below for options
@@ -52,7 +54,7 @@ class HTTPerf
   #   -  wset
   def initialize options={}, path=nil
     options.each_key do |k|
-      raise "#{k} is an invalid httperf param" unless params.keys.include?(k)
+      raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
     end
     @options = params.merge(options)  
     if path.nil?
@@ -70,15 +72,46 @@ class HTTPerf
     @options[opt] = val
   end
 
-  # run httperf 
+  # run httperf and wait for it to finish
+  #  return errors if any, otherwise return
+  #  results
   def run 
-    return %x{ #{@command} #{options} }
+    status, out, err = nil
+    Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+      pid = wait_thr.pid
+      out = stdout.readlines
+      err = stderr.readlines
+      status = wait_thr.value
+    end
+    if status == 0
+      return out.join("\n")
+    else
+      return err.join("\n")
+    end
+  end
+
+  # run httperf, fork and return thread
+  def fork
+    raise "httperf fork currently running" if @fork_thr && @fork_thr.alive?
+    @fork_out, @fork_err = ''
+    @fork_thr = Open4::bg command, :stdin => nil, :stdout => @fork_out, :stderr => @fork_err
+    @fork_thr
+  end
+
+  # return results of last fork
+  def fork_out
+    @fork_out
+  end
+
+  # return errors from last fork
+  def fork_err
+    @fork_err
   end
 
   # print httperf command to be run
   # - for debugging and testing
-  def pretend
-    return %x{ echo "#{@command} #{options}" }
+  def command 
+    return "#{@command} #{options}"
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000Z
+date: 2012-07-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13560160 !ruby/object:Gem::Requirement
+  requirement: &23863840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13560160
+  version_requirements: *23863840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13559120 !ruby/object:Gem::Requirement
+  requirement: &23863300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13559120
+  version_requirements: *23863300
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13558220 !ruby/object:Gem::Requirement
+  requirement: &23862580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13558220
+  version_requirements: *23862580
 description: Simple interface for calling httperf via ruby.
 email:
 - joshua@mervine.net
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -759597460562503080
+      hash: -2900852867171754939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: