siege_siege 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5132d5648931cb1f5c1fca9dd34de1eadbeb04d6
-  data.tar.gz: 40e8d21f5127dfbee7b5e8aeca7a0687aba4b6f2
+  metadata.gz: 61a8221e13d4085e5cfd876ba6f39e42f9bff7d4
+  data.tar.gz: fe46819a05c8e586cddfb5be20857c25df2ef5ae
 SHA512:
-  metadata.gz: b73732098ff9da13441255b7a3d1e460f651c2d01420bbb4dab6fe56e49b2f6b5dedb995e4d7585986ddf984637d3230dd133ee8c531798b375424f3f58a5073
-  data.tar.gz: 94d18ad5ec1f91f00fcddc8e808ca4cdd4cf609161970c17d87c51f8a3de02f8d9c8f300de45e3e0fd035e603c971c8bd460eabc67488e70cfeff27aa8c43bf9
+  metadata.gz: 08801251141e63fd9a19a5750f4ecbc6657b99ed7107b714d4b08cda3bab423fd6a781b63c3e650c094564d68cf9cc13cd3a32fc5235a1e9509aae6b43756db8
+  data.tar.gz: d295da59d3a1e9bcc6817790355947b082f27d13c22ee3b7f5d805b32d284850b3ed4f5aadd64138ea9ba1730f560e83f859a55ba4379b43e1f926da723bc538

data/README.md

@@ -1,41 +1,22 @@
 # SiegeSiege
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/siege_siege`. To experiment with that code, run `bin/console` for an interactive prompt.
+SiegeSiege is siege wrapper.
 
-TODO: Delete this and the text above, and describe your gem
+## SIEGE
 
-## Installation
+```
+$ siege -V
+SIEGE 3.1.4
+```
 
-Add this line to your application's Gemfile:
+## Installation
 
 ```ruby
 gem 'siege_siege'
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install siege_siege
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/siege_siege.
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+then
 
+```bash
+$ bundle install
+```

data/lib/siege_siege/average_log.rb

@@ -0,0 +1,5 @@
+module SiegeSiege
+  class AverageLog < Struct.new(:id, :url, :count, :secs, :siege_url)
+
+  end
+end

data/lib/siege_siege/configuration.rb

@@ -0,0 +1,97 @@
+module SiegeSiege
+  class Configuration
+    OPTION_MAP = {
+      verbose: 'v',
+      concurrent: 'c',
+      internet: 'i',
+      time: 't',
+      reps: 'r',
+      log: 'l',
+      mark: 'm',
+      delay: 'd',
+      header: 'H',
+      user_agent: 'A',
+      content_type: 'T',
+      rc: 'R',
+      file: 'f',
+      url: ''
+    }
+
+    RC_MAP = {
+      verbose: true,
+      quiet: false,
+      gmethod: 'HEAD',
+      csv: false,
+      timestamp: true,
+      fullurl: true,
+      display_id: true,
+      limit: 255,
+      show_logfile: true,
+      logging: true,
+      logfile: nil,
+      protocol: 'HTTP/1.1',
+      chunked: true,
+      cache: false,
+      timeout: 2000,
+      expire_session: false,
+      cookies: false,
+      failures: 1024,
+      benchmark: true,
+      accept_encoding: 'gzip',
+      url_escaping: true,
+      spinner: false,
+      login: nil,
+      login_url: nil,
+      ftp_login: nil,
+      unique: true,
+      ssl_cert: nil,
+      ssl_key: nil,
+      ssl_timeout: nil,
+      ssl_ciphers: nil,
+      proxy_host: nil,
+      proxy_port: nil,
+      proxy_login: nil,
+      follow_location: true,
+      zero_data_ok: true
+    }
+
+    def initialize(configuration)
+      @configuration = configuration
+    end
+
+    def urls
+      Array(@configuration[:urls]).map { |url|
+        (URL === url ? url : URL.new(url))
+      }
+    end
+
+    def rc
+      RC_MAP.inject('') do |a, (key, value)|
+        inserting = @configuration[key] || value
+        if inserting
+          a << "#{key.to_s.gsub('_', '-')} = #{inserting}\n"
+        else
+          a
+        end
+      end
+    end
+
+    def options
+      OPTION_MAP.inject([]) { |a, (key, value)|
+        inserting = @configuration[key]
+        case
+          when TrueClass === inserting
+            a << "-#{value}"
+          when FalseClass === inserting
+            a
+          when inserting && key == :time
+            a << "-#{value} #{@configuration[key]}s"
+          when inserting
+            a << "-#{value} #{@configuration[key]}"
+          else
+            a
+        end
+      }.join(' ')
+    end
+  end
+end

data/lib/siege_siege/line_log.rb

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

data/lib/siege_siege/result.rb

@@ -0,0 +1,55 @@
+module SiegeSiege
+  class Result
+    def initialize(command, urls, raw, raw_result)
+      @command = command
+      @raw = raw
+      @raw_result = raw_result
+      @url_map = urls.each_with_index.inject({}) do |a, (url, index)|
+        a.merge!(index => url)
+      end
+
+      #puts raw
+    end
+
+    def total_result
+      {
+        command: @command
+      }.merge!(
+        @raw_result.split("\n").inject({}) { |a, line|
+          if line.include?('unable to create log file')
+            a
+          elsif re = line.match(/(.+?):[^0-9]*([0-9\.]+) ?(.*)/)
+            a.merge!(re[1].gsub(' ', '_').underscore.to_sym => {
+              value: re[2].to_f,
+              unit: re[3].to_s
+            })
+          else
+            a
+          end
+        }
+      )
+    end
+
+    def raw_log
+      @stored_logs ||= begin
+        @raw
+          .gsub(/\e.+?m/, '')
+          .gsub('[', '')
+          .gsub(']', '')
+          .gsub(' ', '')
+          .split("\n")
+          .map { |line| LineLog.new(*line.split(',')).take_in_detail(@url_map) rescue nil }
+          .compact
+      end
+    end
+
+    def average_log
+      @stored_average_log ||= raw_log.group_by { |line| line.id }.map { |id, group|
+        count = group.size
+        average = (group.inject(0) { |a, log| a + log.secs } / count).round(3)
+        head = group.first
+        AverageLog.new(id, head.url, count, average, head.siege_url)
+      }
+    end
+  end
+end

data/lib/siege_siege/runner.rb

@@ -0,0 +1,70 @@
+module SiegeSiege
+  class Runner
+    attr_accessor :conf, :urls
+
+    def initialize(raw_configuration = {})
+      @rc_file = Tempfile.open
+      @urls_file = Tempfile.open
+      @command = nil
+
+      Configuration.new(
+        {
+          concurrent: 1,
+          time: 10,
+          reps: 1
+        }.merge!(raw_configuration).merge!(
+          verbose: true,
+          rc: @rc_file.path,
+          csv: true,
+          display_id: true,
+          quiet: false,
+          file: raw_configuration[:url] ? nil : @urls_file.path
+        )
+      ).tap do |conf|
+        File.write(@rc_file, conf.rc)
+        File.write(@urls_file, conf.urls.map(&:to_siege_url).join("\n"))
+        @command = "siege #{conf.options}"
+        @urls = conf.urls
+      end
+    end
+
+    def run
+      puts "\e[32m#{@command}\e[0m"
+      _, stdout, stderr = Open3.popen3(@command)
+
+      indicate
+
+      out = stdout.read
+      err = stderr.read
+
+      indicate_end
+
+      Result.new(@command, @urls, out, err)
+    ensure
+      indicate_end
+    end
+
+
+    private
+
+    def indicate
+      @indicator = Thread.start do
+        chars = %w[| / - \\]
+        i = 0
+        loop do
+          print "\e[31m#{chars[i % chars.length]}\e[0m"
+          sleep 0.1
+          i += 1
+          print "\b"
+        end
+      end
+    end
+
+    def indicate_end
+      return unless @indicator
+      Thread.kill(@indicator)
+      print "\b"
+      @indicator = nil
+    end
+  end
+end

data/lib/siege_siege/url.rb

@@ -0,0 +1,42 @@
+module SiegeSiege
+  class URL
+    attr_reader :url, :http_method, :parameter
+
+    def initialize(url, http_method = nil, parameter = nil)
+
+      splat = url.split(' ')
+
+      if splat.size > 1
+        @url = splat[0]
+        @http_method = splat[1].downcase.to_sym
+        @parameter = splat[2]
+      else
+        @url = url
+      end
+
+      @http_method ||= http_method || :get
+      @parameter ||= parameter || {}
+    end
+
+    def parameter_string
+      case parameter
+        when Hash
+          parameter.to_param
+        else
+          parameter
+      end
+    end
+
+    def to_siege_url
+      if http_method && http_method.to_s.downcase == 'post'
+        [url, 'POST', parameter_string]
+      else
+        url
+      end
+    end
+
+    class RequireURL < StandardError
+
+    end
+  end
+end

data/lib/siege_siege/version.rb

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

data/lib/siege_siege.rb

@@ -6,205 +6,15 @@ require 'pp'
 require 'active_support'
 require 'active_support/core_ext'
 
+require 'siege_siege/average_log'
+require 'siege_siege/configuration'
+require 'siege_siege/line_log'
+require 'siege_siege/result'
+require 'siege_siege/runner'
+require 'siege_siege/url'
 
 module SiegeSiege
-  class Runner
-    attr_accessor :conf, :urls
-
-    def initialize(raw_configuration = {})
-      @conf = Tempfile.open
-      @urls = Tempfile.open
-      @command = nil
-
-      Configuration.new(
-        {
-          concurrent: 1,
-          time: 10,
-          reps: 1
-        }.merge!(raw_configuration).merge!(
-          verbose: true,
-          rc: @conf.path,
-          csv: true,
-          display_id: true,
-          quiet: false,
-          file: raw_configuration[:url] ? nil : @urls.path
-        )
-      ).tap do |conf|
-        File.write(@conf, conf.rc)
-        File.write(@urls, conf.urls)
-        @command = "siege #{conf.options}"
-      end
-      puts @command
-    end
-
-    def run
-      _, stdout, stderr = Open3.popen3(@command)
-      Result.new(stdout.read, stderr.read)
-    end
-  end
-
-  class URL < Struct.new(:url, :method, :parameter)
-    def initialize(*)
-      super
-
-      raise RequireURL unless url
-
-      self.method ||= :get
-      self.parameter ||= {}
-    end
-
-    def to_siege_url
-      if method && method.to_s.downcase == 'post'
-        [url, 'POST', parameter.to_param]
-      else
-        url
-      end
-    end
-
-    class RequireURL < StandardError
-
-    end
-  end
-
-  class Result
-    def initialize(raw, raw_result)
-      @raw = raw
-      puts @raw_result = raw_result
-    end
-
-    def raw_log
-      @stored_logs ||= begin
-        @raw
-          .gsub(/\e.+?m/, '')
-          .gsub('[', '')
-          .gsub(']', '')
-          .gsub(' ', '')
-          .split("\n").map { |line| LineLog.new(*line.split(',')) rescue nil }
-          .compact
-      end
-    end
-
-    def average_log
-      @stored_average_log ||= raw_log.group_by { |line| line.id }.map { |id, group|
-        count = group.size
-        average = (group.inject(0) { |a, log| a + log.secs } / count).round(3)
-        head = group.first
-        AverageLog.new(id, head.url, count, average)
-      }
-    end
-  end
-
-  class AverageLog < Struct.new(:id, :url, :count, :secs)
-
-  end
-
-  class LineLog < Struct.new(:week_day, :date, :protocol, :status, :secs, :bytes, :url, :id, :date2)
-    def initialize(*)
-      super
-
-      raise InvalidLine unless date2
-
-      self.secs = secs.to_f
-      self.bytes = bytes.to_i
-      self.id = id.to_i
-    end
-
-    class InvalidLine < StandardError
-
-    end
-  end
-
-  class Configuration
-    OPTION_MAP = {
-      verbose: 'v',
-      concurrent: 'c',
-      internet: 'i',
-      time: 't',
-      reps: 'r',
-      log: 'l',
-      mark: 'm',
-      delay: 'd',
-      header: 'H',
-      user_agent: 'A',
-      content_type: 'T',
-      rc: 'R',
-      file: 'f',
-      url: ''
-    }
-
-    RC_MAP = {
-      verbose: true,
-      quiet: false,
-      gmethod: 'HEAD',
-      csv: false,
-      timestamp: true,
-      fullurl: true,
-      display_id: true,
-      limit: 255,
-      show_logfile: true,
-      logging: true,
-      logfile: nil,
-      protocol: 'HTTP/1.1',
-      chunked: true,
-      cache: false,
-      timeout: 2000,
-      expire_session: false,
-      cookies: false,
-      failures: 1024,
-      benchmark: true,
-      accept_encoding: 'gzip',
-      url_escaping: true,
-      spinner: false,
-      login: nil,
-      login_url: nil,
-      ftp_login: nil,
-      unique: true,
-      ssl_cert: nil,
-      ssl_key: nil,
-      ssl_timeout: nil,
-      ssl_ciphers: nil,
-      proxy_host: nil,
-      proxy_port: nil,
-      proxy_login: nil,
-      follow_location: true,
-      zero_data_ok: true
-    }
-
-    def initialize(configuration)
-      @configuration = configuration
-    end
-
-    def urls
-      Array(@configuration[:urls]).map { |url|
-        (URL === url ? url : URL.new(url)).to_siege_url
-      }.join("\n")
-    end
-
-    def rc
-      RC_MAP.inject('') do |a, (key, value)|
-        inserting = @configuration[key] || value
-        if inserting
-          a << "#{key.to_s.gsub('_', '-')} = #{inserting}\n"
-        else
-          a
-        end
-      end
-    end
-
-    def options
-      OPTION_MAP.inject([]) { |a, (key, value)|
-        inserting = @configuration[key]
-        case
-          when TrueClass === inserting, FalseClass === inserting
-            a << "-#{value}"
-          when inserting && key == :time
-            a << "-#{value} #{@configuration[key]}s"
-          when inserting
-            a << "-#{value} #{@configuration[key]}"
-          else
-            a
-        end
-      }.join(' ')
-    end
+  def self.run(*args)
+    Runner.new(*args).run
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siege_siege
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mmmpa
@@ -79,10 +79,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - lib/siege_siege.rb
-- lib/siege_siege/siege.rb
+- lib/siege_siege/average_log.rb
+- lib/siege_siege/configuration.rb
+- lib/siege_siege/line_log.rb
+- lib/siege_siege/result.rb
+- lib/siege_siege/runner.rb
+- lib/siege_siege/url.rb
 - lib/siege_siege/version.rb
 - server.rb
 - siege_siege.gemspec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "siege_siege"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/siege_siege/siege.rb

@@ -1,51 +0,0 @@
-module SiegeSiege
-  class Siege
-    CONFIGURATIONS = %w(
-      verbose
-      quiet
-      gmethod
-      csv
-      timestamp
-      fullurl
-      display-id
-      limit
-      show-logfile
-      logging
-      logfile
-      protocol
-      chunked
-      cache
-      connection
-      concurrent
-      time
-      reps
-      file
-      url
-      delay
-      timeout
-      expire-session
-      cookies
-      failures
-      internet
-      benchmark
-      user-agent
-      accept-encoding
-      url-escaping
-      spinner
-      login
-      login-url
-      ftp-login
-      unique
-      ssl-cert
-      ssl-key
-      ssl-timeout
-      ssl-ciphers
-      proxy-host
-      proxy-port
-      proxy-login
-      follow-location
-      zero-data-ok
-    )
-
-  end
-end