siege_siege 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61a8221e13d4085e5cfd876ba6f39e42f9bff7d4
-  data.tar.gz: fe46819a05c8e586cddfb5be20857c25df2ef5ae
+  metadata.gz: 70866f87a2fcd4cca4caac9056972a42e7ece940
+  data.tar.gz: a0e7f3ab530526ae952e1335759cb4e782f27d0d
 SHA512:
-  metadata.gz: 08801251141e63fd9a19a5750f4ecbc6657b99ed7107b714d4b08cda3bab423fd6a781b63c3e650c094564d68cf9cc13cd3a32fc5235a1e9509aae6b43756db8
-  data.tar.gz: d295da59d3a1e9bcc6817790355947b082f27d13c22ee3b7f5d805b32d284850b3ed4f5aadd64138ea9ba1730f560e83f859a55ba4379b43e1f926da723bc538
+  metadata.gz: fdc897705ac132d4ed5d3d6139116c638e9e87d493ac870cf1ebee963b5ee37b8b48b5d88b9d07486ddfe94597a2a1939842c76ca55cb14dfb0d69ee5004ed3e
+  data.tar.gz: 73e03d95df77e5177f6b71486fc6176de42df5021b08de12787216f0722f9a201fd1f65d6cf7a3e78c6f30af8f35cd51ba39a16795972ae31eee90a3214234e7

data/lib/siege_siege.rb

@@ -1,4 +1,3 @@
-require 'siege_siege/version'
 require 'open3'
 require 'tempfile'
 require 'csv'
@@ -6,6 +5,7 @@ require 'pp'
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'siege_siege/version'
 require 'siege_siege/average_log'
 require 'siege_siege/configuration'
 require 'siege_siege/line_log'

data/lib/siege_siege/configuration.rb

@@ -66,12 +66,13 @@ module SiegeSiege
     end
 
     def rc
-      RC_MAP.inject('') do |a, (key, value)|
-        inserting = @configuration[key] || value
-        if inserting
-          a << "#{key.to_s.gsub('_', '-')} = #{inserting}\n"
-        else
+      RC_MAP.inject('') do |a, (key, default)|
+        value = @configuration[key]
+        inserting = value.nil? ? default : value
+        if inserting.nil?
           a
+        else
+          a << "#{key.to_s.gsub('_', '-')} = #{inserting}\n"
         end
       end
     end

data/lib/siege_siege/line_log.rb

@@ -1,13 +1,14 @@
 module SiegeSiege
-  class LineLog < Struct.new(:week_day, :date, :protocol, :status, :secs, :bytes, :url, :id, :date2, :siege_url)
+  class LineLog < Struct.new(:protocol, :status, :secs, :bytes, :url, :id, :date, :siege_url)
     def initialize(*)
       super
 
-      raise InvalidLine unless date2
+      raise InvalidLine unless date
 
       self.secs = secs.to_f
       self.bytes = bytes.to_i
       self.id = id.to_i
+      self.date = DateTime.parse(date)
     end
 
     def take_in_detail(url_map)

data/lib/siege_siege/result.rb

@@ -1,14 +1,19 @@
 module SiegeSiege
   class Result
+
+
     def initialize(command, urls, raw, raw_result)
       @command = command
       @raw = raw
       @raw_result = raw_result
+
+      offset = 0
       @url_map = urls.each_with_index.inject({}) do |a, (url, index)|
-        a.merge!(index => url)
+        a.merge!((index + offset) => url).tap do
+          # if the http method is POST, skip one step (why?)
+          offset += 1 if url.post?
+        end
       end
-
-      #puts raw
     end
 
     def total_result
@@ -36,7 +41,6 @@ module SiegeSiege
           .gsub(/\e.+?m/, '')
           .gsub('[', '')
           .gsub(']', '')
-          .gsub(' ', '')
           .split("\n")
           .map { |line| LineLog.new(*line.split(',')).take_in_detail(@url_map) rescue nil }
           .compact

data/lib/siege_siege/runner.rb

@@ -16,8 +16,10 @@ module SiegeSiege
           verbose: true,
           rc: @rc_file.path,
           csv: true,
-          display_id: true,
+          display_id: false,
           quiet: false,
+          follow_location: false,
+          timestamp: false,
           file: raw_configuration[:url] ? nil : @urls_file.path
         )
       ).tap do |conf|

data/lib/siege_siege/url.rb

@@ -27,8 +27,12 @@ module SiegeSiege
       end
     end
 
+    def post?
+      http_method.to_s.downcase == 'post'
+    end
+
     def to_siege_url
-      if http_method && http_method.to_s.downcase == 'post'
+      if post?
         [url, 'POST', parameter_string]
       else
         url

data/lib/siege_siege/version.rb

@@ -1,3 +1,3 @@
 module SiegeSiege
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/server.rb

@@ -12,5 +12,10 @@ WEBrick::HTTPServer.new(
   Logger: WEBrick::Log::new("/dev/null", 7)
 ).tap do |server|
   Signal.trap(:INT) { server.shutdown }
+
+  server.mount_proc('/redirect') do |req, res|
+    res.set_redirect(WEBrick::HTTPStatus::MovedPermanently, '/')
+  end
+
   server.start
 end

data/siege_siege.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", ">= 1.11"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "rspec", ">= 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siege_siege
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mmmpa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,42 +28,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: siege wrapper