httperfrb 0.3.8 → 0.3.10

data/Gemfile

@@ -1,4 +1,5 @@
-source :rubygems
+source "https://rubygems.org"
+gemspec
 gem 'open4'
 group :development do
   gem 'rspec'

data/README.md

@@ -1,137 +1 @@
-HTTPerf.rb
-==========
-
-### [Documentation](http://rubyops.github.com/httperfrb/doc/) | [Coverage](http://rubyops.github.com/httperfrb/coverage/) | [RSpec Out](https://github.com/rubyops/httperfrb/blob/master/RSPECOUT.md)
-
-Simple Ruby interface for httperf.
-
-## Installing 'httperf'
-
-Requires httperf, of course...
-
-#### Mac
-
-    sudo port install httperf
-
-#### Debian / Ubuntu
-
-    sudo apt-get install httperf
-
-#### Redhat / CentOS
-
-    sudo yum install httperf
-    
-#### My 'httperf'
-
-See: [httperf-0.9.1 with individual connection times](http://www.rubyops.net/2012/08/13/httperf-0_9_1_with_individual_connection_times).
-
-## Install
-
-    gem install httperfrb
-
-## Usage - HTTPerf
-
-Some basic usage examples.
-
-    require 'httperf'
-    perf = HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" )
-    puts perf.run
-
-    perf.update_option("uri", "/foo/bar")
-    thread = perf.fork
-    while((thread.alive?))
-      sleep 0.01
-      print "#"
-    end
-    unless perf.fork_err.nil?
-      puts perf.fork_out
-    end
-
-### With HTTPerf::Parser
-
-    require 'httperf'
-    perf = HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" )
-    puts perf.parse = true
-    puts perf.run
-
-    # or directly
-
-    puts HTTPerf::Parser.parse( HTTPerf.new( "server" => "host", "port" => 8080, "uri" => "/foo" ).run )
-
-## Useage - HTTPerf::Parser
-
-    require 'httperf/parser' 
-     
-    # read result from a file, for example   
-    puts HTTPerf::Parser.parse( File.open("httperf.out", "r").read )
-    
-    # or verbose output
-    puts HTTPerf::Parser.parse( File.open("httperf_verbose.out", "r").read, true )
-    
-#### From the command line:
-
-Something I've been playing around with, it's more of hack really. But it works well for seralizing output to YAML or JSON:
-
-##### To JSON file:
-
-    httperf --num-conns=10 --verbose | ruby -e 'require "httperf/parser"; require "json"; puts HTTPerf::Parser.parse(ARGF.read).to_json' > httperf.json
-
-##### To YAML file:
-
-    httperf --num-conns=10 --verbose | ruby -e 'require "httperf/parser"; require "yaml"; puts HTTPerf::Parser.parse(ARGF.read).to_yaml' > httperf.yml
-
-
-
-##### Parser Keys: 
-
-    :command
-    :max_connect_burst_length
-    :total_connections
-    :total_requests
-    :total_replies
-    :total_test_duration
-    :connection_rate_per_sec
-    :connection_rate_ms_conn
-    :connection_time_min
-    :connection_time_avg
-    :connection_time_max
-    :connection_time_median
-    :connection_time_stddev
-    :connection_time_connect
-    :connection_length
-    :request_rate_per_sec
-    :request_rate_ms_request
-    :request_size
-    :reply_rate_min
-    :reply_rate_avg
-    :reply_rate_max
-    :reply_rate_stddev
-    :reply_rate_samples
-    :reply_time_response
-    :reply_time_transfer
-    :reply_size_header
-    :reply_size_content
-    :reply_size_footer
-    :reply_size_total
-    :reply_status_1xx
-    :reply_status_2xx
-    :reply_status_3xx
-    :reply_status_4xx
-    :reply_status_5xx
-    :cpu_time_user_sec
-    :cpu_time_system_sec
-    :cpu_time_user_pct
-    :cpu_time_system_pct
-    :cpu_time_total_pct
-    :net_io_kb_sec
-    :net_io_bps
-    :errors_total
-    :errors_client_timeout
-    :errors_socket_timeout
-    :errors_conn_refused
-    :errors_conn_reset
-    :errors_fd_unavail
-    :errors_addr_unavail
-    :errors_ftab_full
-    :errors_other
-  
+## See: [www.rubyops.net/gems/httperfrb](http://www.rubyops.net/gems/httperfrb)

data/lib/httperf.rb

@@ -3,7 +3,7 @@ $:.unshift File.dirname(__FILE__)
 require 'httperf/parser'
 require 'httperf/version'
 
-autoload :Open3, 'open3'
+autoload :PTY,   'pty'
 autoload :Open4, 'open4'
 
 begin
@@ -14,11 +14,12 @@ end
 class HTTPerf
 
   # @return [Boolean] parse flag
-  attr_accessor :parse
+  attr_accessor :parse, :tee
 
   # availbe instance methods
   @fork_out, @fork_err = ''
   @fork_thr, @options, @command = nil
+  @tee = false
 
   # initialize with (optional):
   # - options: see below for options
@@ -66,40 +67,13 @@ class HTTPerf
   #   -  wset
   def initialize options={}, path=nil
     self.parse = options.delete("parse")
-    if options.has_key?("command")
-      command = options.delete("command")
-      raise "Option command must not be passed with other options" unless options.empty?
+    self.tee   = options.delete("tee")
+    options    = parse_command_option(options) if options.has_key?("command")
 
-      valid_command = !!(command.match(/([a-z\/]*)httperf /))
-      raise "Invalid httperf command" unless valid_command
+    validate_options(options)
+    set_command_from_path(path) unless @command
 
-      command.gsub!("--hog", "--hog=true")
-      command.gsub!("--verbose", "--verbose=true")
-
-      cli_options = command.split(" --")
-      path = cli_options.delete_at(0)
-      path = nil unless path.start_with?("/")
-
-      cli_options.each do |clio|
-        kvp = clio.split("=")
-        kvp = clio.split(" ") unless kvp.size == 2
-        raise "Error parsing command params" unless kvp.size == 2
-        options[kvp.first] = kvp.last
-      end
-    end
-
-    options.each_key do |k|
-      raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
-    end
-    @options = params.merge(options)
-    if path.nil?
-      @command = %x{ which httperf }.chomp
-      raise "httperf not found" unless @command =~ /httperf/
-    else
-      path = path.chomp
-      @command = (path =~ /httperf$/ ? path : File.join(path, "httperf"))
-      raise "#{@command} not found" unless %x{ test -x "#{@command}" && echo "true" }.chomp == "true"
-    end
+    @options   = params.merge(options)
   end
 
   # update a given option
@@ -111,21 +85,26 @@ class HTTPerf
   #  return errors if any, otherwise return
   #  results
   def run
-    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
-      if @parse
-        return Parser.parse(out.join)
-      else
-        return out.join
+    out = ""
+
+    begin
+      PTY.spawn(command) do |stdout, stdin, pid|
+        begin
+          stdout.each do |line|
+            out << line.strip+"\n"
+            print line if @tee
+          end
+        rescue Errno::EIO
+          #Errno:EIO error probably just means that the process has finished giving output
+        end
       end
-    else
-      return err.join
+    rescue PTY::ChildExited
+      # The child process has exited.
+    end
+
+    if $?.exitstatus == 0
+      return Parser.parse(out) if @parse
+      return out
     end
   end
 
@@ -214,5 +193,53 @@ class HTTPerf
     }
   end
 
+  def parse_command_option options
+    command = options.delete("command")
+    raise "Option command must not be passed with other options" unless options.empty?
+
+    raise "Invalid httperf command" unless !!(command.match(/([a-z\/]*)httperf /))
+
+    command.gsub!("--hog", "--hog=true")
+    command.gsub!("--verbose", "--verbose=true")
+
+    cli_options(command).each { |clio| options.merge!(split_cli_option(clio)) }
+
+    options
+  end
+
+  def cli_options command
+    opts = command.split(" --")
+    set_command_from_path(opts.delete_at(0))
+    opts
+  end
+
+  def set_command_from_path(path)
+    if path && path.start_with?("/")
+      path = path.chomp
+      @command = (path =~ /httperf$/ ? path : File.join(path, "httperf"))
+      raise "#{@command} not found" unless %x{ test -x "#{@command}" && echo "true" }.chomp == "true"
+    else
+      set_command_without_path
+    end
+  end
+
+  def set_command_without_path
+    @command = %x{ which httperf }.chomp
+    raise "httperf not found" unless @command =~ /httperf/
+  end
+
+  def split_cli_option(clio)
+    kvp = clio.split("=")
+    kvp = clio.split(" ") unless kvp.size == 2
+    raise "Error parsing command params" unless kvp.size == 2
+    return { kvp.first => kvp.last }
+  end
+
+  def validate_options options
+    options.each_key do |k|
+      raise "'#{k}' is an invalid httperf param" unless params.keys.include?(k)
+    end
+  end
+
 end
 

data/lib/httperf/version.rb

@@ -1,4 +1,4 @@
 class HTTPerf
-  VERSION = "0.3.8"
+  VERSION = "0.3.10"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httperfrb
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -88,7 +88,7 @@ files:
 - README.md
 - HISTORY.md
 - Gemfile
-homepage: http://github.com/rubyops/httperfrb
+homepage: http://www.rubyops.net/gems/httperfrb
 licenses: []
 post_install_message: 
 rdoc_options: []