benchy 0.0.1 → 0.0.2

data/lib/benchy.rb

@@ -23,7 +23,7 @@ module Benchy
     end
 
     def workers
-      @workers ||= (0...concurrency).map{|n| Worker.new(request, "worker.#{n}") }
+      @workers ||= (0..concurrency).map{|n| Worker.new(request, "worker.#{n}") }
     end
   end
 
@@ -44,7 +44,7 @@ module Benchy
         run
       }
       http.errback {
-        Benchy.logger.debug "Connection error!"
+        Benchy.logger.error "#{name}\t| Connection error!"
         halt # TODO - Make this fail the ping and try again, not halt
       }
     end
@@ -69,57 +69,71 @@ module Benchy
     # Grab an instance of an Em::Http request so we can run it somewhere.
     def em
       EventMachine::HttpRequest.new(url).send(method.downcase,
-        :head => default_headers.merge(headers),
+        :head => headers,
         :body => body,
         :connect_timeout => 9000,    # Disable
         :inactivity_timeout => 9000  # Disable
       )
     end
-
-    # Setup smart default headers to minimize the chances that a request gets rejected.
-    def default_headers
-      default_headers = {}
-      default_headers['Content-Type'] = 'application/binary-octet' if body
-      default_headers['Accepts']      = '*/*'
-      default_headers
-    end
   end
 
   # Parse out some command line goodness
   class CLI < Thor
-    desc "benchmark URL", "Run benchmarks against server"
-    method_option :body,
-      :type => :string,
-      :aliases => '-b',
-      :desc => "Request body"
-    method_option :file,
-      :type => :string,
-      :aliases => '-f',
-      :desc => "File for request body"
-    method_option :headers,
-      :type => :hash,
-      :aliases => '-h',
-      :desc => 'HTTP headers'
-    method_option :method,
-      :type => :string, 
-      :desc => "Request method",
-      :aliases => '-m',
-      :default => 'GET'
-    method_option :concurrency,
-      :type => :numeric,
-      :desc => "Concurrent requests",
-      :aliases => '-c',
-      :default => 1
-
-    def benchmark(url)
-      req = Request.new(url, options[:method], options[:headers], self.class.body(options))
-      EM.run { Dispatcher.new(req, options[:concurrency]).run }
+    %w[post put].each do |meth|
+      desc "#{meth} URL", "#{meth.upcase} to a URL"
+      method_option :body,
+        :type => :string,
+        :aliases => '-b',
+        :desc => "Request body"
+      method_option :headers,
+        :type => :hash,
+        :aliases => '-h',
+        :desc => 'Request headers',
+        :default => {
+          'Content-Type' => 'application/binary-octet',
+          'Accepts' => '*/*'
+        }
+      method_option :concurrency,
+        :type => :numeric,
+        :desc => "Concurrent requests",
+        :aliases => '-c',
+        :default => 1
+      define_method meth do |url|
+        request(url, meth, self.class.body(options))
+      end
+    end
+
+    %w[get head delete].each do |meth|
+      desc "#{meth} URL", "#{meth.upcase} to a URL"
+      method_option :headers,
+        :type => :hash,
+        :aliases => '-h',
+        :desc => 'Request headers',
+        :default => {
+          'Content-Type' => 'application/binary-octet',
+          'Accepts' => '*/*'
+        }
+      method_option :concurrency,
+        :type => :numeric,
+        :desc => "Concurrent requests",
+        :aliases => '-c',
+        :default => 1
+      define_method meth do |url|
+        request(url, meth)
+      end
     end
 
   private
-    # Normalize the request body if its a file or a text string.
+    def request(url, method=:get, body=nil)
+      req = Request.new(url, method, options[:headers], body)
+      EM.run { 
+        Dispatcher.new(req, options[:concurrency]).run
+      }
+    end
+
+    # Normalize the request body if its specified from the CLI or if its piped in from terminal
     def self.body(options)
-      options[:file] ? File.read(options[:file]) : options[:body]
+      options[:body] || (STDIN.read unless STDIN.tty?)
     end
   end
 end

data/lib/benchy/version.rb

@@ -1,5 +1,5 @@
 require 'em-http-request'
 
 module Benchy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70165834461960 !ruby/object:Gem::Requirement
+  requirement: &70157971397720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165834461960
+  version_requirements: *70157971397720
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70165834461540 !ruby/object:Gem::Requirement
+  requirement: &70157971397300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165834461540
+  version_requirements: *70157971397300
 description: A dirty-simple HTTP benchmarking application
 email:
 - brad@bradgessler.com