kronk 1.8.5 → 1.8.6

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 1.8.6 / 2012-04-23
+
+* Enhancements:
+
+  * Split out path logic into the ruby-path gem.
+
+* Bugfixes:
+
+  * Support file uploads with Player.
+
+  * Allow using files in the Suite Player.
+
 === 1.8.5 / 2012-03-26
 
 * Bugfixes:

data/Manifest.txt

@@ -7,7 +7,6 @@ bin/kronk
 lib/kronk.rb
 lib/kronk/cmd.rb
 lib/kronk/constants.rb
-lib/kronk/core_ext.rb
 lib/kronk/data_string.rb
 lib/kronk/diff.rb
 lib/kronk/diff/ascii_format.rb
@@ -15,10 +14,6 @@ lib/kronk/diff/color_format.rb
 lib/kronk/diff/output.rb
 lib/kronk/http.rb
 lib/kronk/buffered_io.rb
-lib/kronk/path.rb
-lib/kronk/path/matcher.rb
-lib/kronk/path/match.rb
-lib/kronk/path/transaction.rb
 lib/kronk/player.rb
 lib/kronk/player/benchmark.rb
 lib/kronk/player/input_reader.rb
@@ -48,19 +43,14 @@ test/mocks/cookies.yml
 test/mocks/get_request.txt
 test/test_assertions.rb
 test/test_cmd.rb
-test/test_core_ext.rb
 test/test_data_string.rb
 test/test_diff.rb
 test/test_helper.rb
 test/test_helper_methods.rb
 test/test_input_reader.rb
 test/test_kronk.rb
-test/test_path.rb
-test/test_path_match.rb
-test/test_path_matcher.rb
 test/test_player.rb
 test/test_request.rb
 test/test_request_parser.rb
 test/test_response.rb
-test/test_transaction.rb
 test/test_xml_parser.rb

data/README.rdoc

@@ -1,10 +1,15 @@
 = Kronk
 
-* https://github.com/yaksnrainbows/kronk
+* http://kronk.me
 
 == DESCRIPTION:
 
-Kronk runs diffs against data from live and cached http responses.
+Kronk is a command line swiss-army-knife for HTTP services.
+
+With Kronk, you easily parse and segregate data, run diffs between
+the parsed data from different queries, and easily replay logs and loadtest
+your HTTP applications.
+
 Kronk was made possible by the sponsoring of AT&T Interactive.
 
 == FEATURES:

data/Rakefile

@@ -24,6 +24,7 @@ Hoe.spec 'kronk' do
 
   self.extra_deps << ['json',      '~>1.5']
   self.extra_deps << ['cookiejar', '~>0.3.0']
+  self.extra_deps << ['ruby-path', '~>1.0.0']
 
   self.extra_dev_deps << ['plist',    '~>3.1.0']
   self.extra_dev_deps << ['nokogiri', '~>1.4']

data/lib/kronk.rb

@@ -2,6 +2,7 @@ require 'rubygems' if RUBY_VERSION =~ /1.8/
 
 require 'json'
 require 'cookiejar'
+require 'path'
 
 require 'thread'
 require 'stringio'
@@ -12,7 +13,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.8.5'
+  VERSION = '1.8.6'
 
   require 'kronk/constants'
   require 'kronk/queue_runner'
@@ -23,10 +24,6 @@ class Kronk
   require 'kronk/player/tsv'
   require 'kronk/player/request_parser'
   require 'kronk/player/input_reader'
-  require 'kronk/path'
-  require 'kronk/path/match'
-  require 'kronk/path/matcher'
-  require 'kronk/path/transaction'
   require 'kronk/data_string'
   require 'kronk/diff/ascii_format'
   require 'kronk/diff/color_format'

data/lib/kronk/cmd.rb

@@ -51,7 +51,7 @@ class Kronk
                     resp.body
                   end
 
-      $stdout.puts "\nHTTP Response is in $http_response"
+      $stdout.puts "\nKronk Response is in $http_response"
       $stdout.puts "Response data is in $response\n\n"
 
       IRB.start
@@ -474,7 +474,7 @@ Parse and run diffs against data from live and cached http responses.
 
         opt.on('-T', '--upload-file FILE', String,
                'Transfer file in HTTP body') do |file|
-          options[:data] = File.open(file, 'rb')
+          options[:file] = file
           options[:http_method] ||= 'PUT'
         end
 
@@ -569,7 +569,7 @@ Parse and run diffs against data from live and cached http responses.
 
 
     ##
-    # Determine the cmd-given path's action and Kronk::Path representation.
+    # Determine the cmd-given path's action and Path representation.
 
     def self.process_path path
       case path

data/lib/kronk/data_string.rb

@@ -96,7 +96,7 @@ class Kronk
 
       else
         super ""
-        data    = Kronk::Path.pathed(data) if Kronk.config[:render_paths]
+        data    = Path.pathed(data) if Kronk.config[:render_paths]
         @data   = data
         block ||= Kronk.config[:render_lang].to_s == 'ruby' ? TO_RUBY : TO_JSON
       end

data/lib/kronk/diff/output.rb

@@ -55,11 +55,11 @@ class Kronk::Diff
 
 
       ##
-      # Create a Kronk::Path String from an Array. Used when the meta data
+      # Create a Path String from an Array. Used when the meta data
       # given for either side of the diff is an Array.
 
       def ary_to_path ary
-        "#{Kronk::Path::DCH}#{Kronk::Path.join ary}"
+        "#{Path::DCH}#{Path.join ary}"
       end
 
 

data/lib/kronk/player.rb

@@ -58,6 +58,7 @@ class Kronk
       on(:interrupt){
         interrupt and return if respond_to?(:interrupt)
         complete if respond_to?(:complete)
+        kill
         exit 2
       }
       on(:start){

data/lib/kronk/player/benchmark.rb

@@ -68,6 +68,7 @@ class Kronk
         uri.query = nil
         uri = "#{req.http_method} #{uri.to_s}"
 
+        # TODO: Keep the number in @paths to 10.
         @paths[uri] ||= [0, 0]
         pcount = @paths[uri][1] + 1
         @paths[uri][0] = (@paths[uri][0] * @paths[uri][1] + time) / pcount

data/lib/kronk/player/suite.rb

@@ -112,15 +112,18 @@ class Kronk
 
       non_error_count = @results.length - error_count
 
-      avg_time = non_error_count > 0 ? total_time / non_error_count  : "n/a"
-      avg_qps  = non_error_count > 0 ? non_error_count / player_time : "n/a"
+      avg_time = non_error_count > 0 ?
+                  ((total_time / non_error_count)* 1000).round(3)  : "n/a "
+
+      avg_qps  = non_error_count > 0 ?
+                  (non_error_count / player_time).round(3) : "n/a"
 
       $stderr.puts err_buffer unless err_buffer.empty?
       $stdout.puts "\n#{@results.length} cases, " +
                    "#{failure_count} failures, #{error_count} errors"
 
-      $stdout.puts "Avg Time: #{(avg_time * 1000).round 3}ms"
-      $stdout.puts "Avg QPS:  #{avg_qps.round 3}"
+      $stdout.puts "Avg Time: #{avg_time}ms"
+      $stdout.puts "Avg QPS:  #{avg_qps}"
 
       return bad_count == 0
     end
@@ -130,13 +133,8 @@ class Kronk
 
 
     def resp_text kronk
-      http_method = kronk.response.request ?
-                    kronk.response.request.http_method :
-                    "(FILE)"
-
       <<-STR
-  Request: #{kronk.response.code} - #{http_method} \
-#{kronk.response.uri}
+  Request: #{req_text kronk.response}
   Options: #{kronk.options.inspect}
       STR
     end
@@ -144,12 +142,8 @@ class Kronk
 
     def diff_text kronk
       output = <<-STR
-  Request: #{kronk.responses[0].code} - \
-#{kronk.responses[0].request.http_method} \
-#{kronk.responses[0].uri}
-           #{kronk.responses[1].code} - \
-#{kronk.responses[0].request.http_method} \
-#{kronk.responses[1].uri}
+  Request: #{req_text kronk.responses[0]}
+           #{req_text kronk.responses[1]}
   Options: #{kronk.options.inspect}
   Diffs: #{kronk.diff.count}
       STR
@@ -158,6 +152,16 @@ class Kronk
     end
 
 
+    def req_text resp
+      if resp.headless?
+        "(FILE) #{resp.uri}"
+      else
+        http_method = resp.request ? resp.request.http_method : "(FILE)"
+        "#{resp.code} - #{http_method} #{resp.uri}"
+      end
+    end
+
+
     def error_text err, kronk=nil
       str = "  #{err.class}: #{err.message}"
 

data/lib/kronk/request.rb

@@ -212,6 +212,7 @@ class Kronk
     # Build an http request to the given uri and return a Response instance.
     # Supports the following options:
     # :data:: Hash/String - the data to pass to the http request body
+    # :file:: String - the path to a file to upload; overrides :data
     # :form:: Hash/String - similar to :data but sets content-type header
     # :query:: Hash/String - the data to append to the http request path
     # :user_agent:: String - user agent string or alias; defaults to 'kronk'
@@ -247,8 +248,14 @@ class Kronk
       @proxy = opts[:proxy] || {}
       @proxy = {:host => @proxy} unless Hash === @proxy
 
-      self.body      = opts[:data] if opts[:data]
-      self.form_data = opts[:form] if opts[:form]
+
+      if opts[:file]
+        self.body = File.open(opts[:file], 'rb')
+      elsif opts[:form]
+        self.form_data = opts[:form]
+      elsif opts[:data]
+        self.body = opts[:data]
+      end
 
       self.user_agent ||= opts[:user_agent]
 

data/lib/kronk/response.rb

@@ -551,7 +551,7 @@ class Kronk
     #     trans.delete "foo/0", "bar/1"
     #   end
     #
-    # See Kronk::Path::Transaction for supported transform actions.
+    # See Path::Transaction for supported transform actions.
 
     def data opts={}
       data = nil
@@ -590,7 +590,7 @@ class Kronk
     # :keep_indicies:: Boolean - indicies of modified arrays display as hashes.
     # :show_headers:: Boolean/String/Array - defines which headers to include
     #
-    # If block is given, yields a Kronk::Path::Transaction instance to make
+    # If block is given, yields a Path::Transaction instance to make
     # transformations on the data. See Kronk::Response#data
 
     def stringify opts={}, &block

data/lib/kronk/test/assertions.rb

@@ -12,7 +12,7 @@ class Kronk
         msg ||= "No data found at #{path.inspect} for #{data.inspect}"
         found = false
 
-        Kronk::Path.find path, data do |d,k,p|
+        Path.find path, data do |d,k,p|
           found = true
           break
         end
@@ -29,7 +29,7 @@ class Kronk
         msg ||= "Data found at #{path.inspect} for #{data.inspect}"
         found = false
 
-        Kronk::Path.find path, data do |d,k,p|
+        Path.find path, data do |d,k,p|
           found = true
           break
         end
@@ -47,7 +47,7 @@ class Kronk
         last_data = nil
         found     = false
 
-        Kronk::Path.find path, data do |d,k,p|
+        Path.find path, data do |d,k,p|
           found     = true
           last_data = d[k]
           break if d[k] == match
@@ -68,7 +68,7 @@ class Kronk
       def assert_data_at_not_equal data, path, match, msg=nil
         last_data = nil
 
-        Kronk::Path.find path, data do |d,k,p|
+        Path.find path, data do |d,k,p|
           last_data = d[k]
           break if d[k] == match
         end

data/test/test_helper.rb

@@ -123,7 +123,7 @@ IRB = Module.new
 def with_irb_mock
   mock_require "irb"
 
-  $stdout.expects(:puts).with "\nHTTP Response is in $http_response"
+  $stdout.expects(:puts).with "\nKronk Response is in $http_response"
   $stdout.expects(:puts).with "Response data is in $response\n\n"
   ::IRB.expects :start
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kronk
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,6 +43,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: ruby-path
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,8 +138,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
-description: ! 'Kronk runs diffs against data from live and cached http responses.
+        version: '3.0'
+description: ! 'Kronk is a command line swiss-army-knife for HTTP services.
+
+
+  With Kronk, you easily parse and segregate data, run diffs between
+
+  the parsed data from different queries, and easily replay logs and loadtest
+
+  your HTTP applications.
+
 
   Kronk was made possible by the sponsoring of AT&T Interactive.'
 email:
@@ -116,8 +156,8 @@ executables:
 - kronk
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
 - History.rdoc
+- Manifest.txt
 - README.rdoc
 - TODO.rdoc
 files:
@@ -130,7 +170,6 @@ files:
 - lib/kronk.rb
 - lib/kronk/cmd.rb
 - lib/kronk/constants.rb
-- lib/kronk/core_ext.rb
 - lib/kronk/data_string.rb
 - lib/kronk/diff.rb
 - lib/kronk/diff/ascii_format.rb
@@ -138,10 +177,6 @@ files:
 - lib/kronk/diff/output.rb
 - lib/kronk/http.rb
 - lib/kronk/buffered_io.rb
-- lib/kronk/path.rb
-- lib/kronk/path/matcher.rb
-- lib/kronk/path/match.rb
-- lib/kronk/path/transaction.rb
 - lib/kronk/player.rb
 - lib/kronk/player/benchmark.rb
 - lib/kronk/player/input_reader.rb
@@ -171,25 +206,20 @@ files:
 - test/mocks/get_request.txt
 - test/test_assertions.rb
 - test/test_cmd.rb
-- test/test_core_ext.rb
 - test/test_data_string.rb
 - test/test_diff.rb
 - test/test_helper.rb
 - test/test_helper_methods.rb
 - test/test_input_reader.rb
 - test/test_kronk.rb
-- test/test_path.rb
-- test/test_path_match.rb
-- test/test_path_matcher.rb
 - test/test_player.rb
 - test/test_request.rb
 - test/test_request_parser.rb
 - test/test_response.rb
-- test/test_transaction.rb
 - test/test_xml_parser.rb
 - TODO.rdoc
 - .gemtest
-homepage: https://github.com/yaksnrainbows/kronk
+homepage: http://kronk.me
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -203,9 +233,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2890085585821855848
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,26 +241,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kronk
-rubygems_version: 1.8.19
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
-summary: Kronk runs diffs against data from live and cached http responses
+summary: Kronk is a command line swiss-army-knife for HTTP services
 test_files:
 - test/test_assertions.rb
 - test/test_cmd.rb
-- test/test_core_ext.rb
 - test/test_data_string.rb
 - test/test_diff.rb
 - test/test_helper.rb
 - test/test_helper_methods.rb
 - test/test_input_reader.rb
 - test/test_kronk.rb
-- test/test_path.rb
-- test/test_path_match.rb
-- test/test_path_matcher.rb
 - test/test_player.rb
 - test/test_request.rb
 - test/test_request_parser.rb
 - test/test_response.rb
-- test/test_transaction.rb
 - test/test_xml_parser.rb