jstd-runner 0.0.6 → 0.0.7

data/jstd-runner.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "selenium-webdriver", ">= 0.1.4"
   s.add_dependency "eventmachine", "0.12.10"
+  s.add_dependency "em-proxy"
   s.add_dependency "mail", "~> 2.4"
   s.add_dependency "daemons", "1.1.0"
 

data/lib/jstd-runner.rb

@@ -17,6 +17,7 @@ require "daemons"
 require "socket"
 require "mail"
 require "fileutils"
+require 'em-proxy'
 
 require "jstd-runner/cli"
 require "jstd-runner/monitorable"

data/lib/jstd-runner/cli.rb

@@ -43,6 +43,14 @@ module JstdRunner
         op.on("-r", "--restart hour:minute") do |hour_minute|
           runner.options[:restart_at] = hour_minute
         end
+
+        op.on('-t', '--traffic-log PATH') do |path|
+          runner.options[:traffic_log] = path
+        end
+
+        op.on('-j', '--jar PATH') do |path|
+          runner.options[:jar] = path
+        end
       }.parse!(args)
     end
 

data/lib/jstd-runner/runner.rb

@@ -7,15 +7,18 @@ module JstdRunner
       :monitor_interval => 10,
       :browser          => :firefox,
       :daemonize        => false,
-      :restart_at       => nil
+      :restart_at       => nil,
+      :traffic_log      => nil,
+      :jar              => nil
     }
 
     attr_reader :options
 
     def initialize
-      @options = DEFAULT_OPTIONS.dup
-      @shutting_down = @clean_shutdown = false
+      @options           = DEFAULT_OPTIONS.dup
+      @shutting_down     = @clean_shutdown = false
       @server_restarting = @browser_restarting = false
+      @server_port       = @options[:port]
     end
 
     def run
@@ -83,6 +86,11 @@ module JstdRunner
     end
 
     def start_server
+      if options[:traffic_log]
+        @server_port += 1
+        start_proxy
+      end
+
       server.start
       server.monitor(options[:monitor_interval]) {
         server.restart
@@ -104,6 +112,29 @@ module JstdRunner
       }
     end
 
+    def start_proxy
+      path = options[:traffic_log]
+      FileUtils.mkdir_p File.dirname(path)
+
+      Log.info "starting proxy, logging to #{path}"
+
+      log = File.open(path, 'a')
+      server_port = @server_port
+
+      EventMachine::start_server("0.0.0.0", options[:port], EventMachine::ProxyServer::Connection, {}) do |conn|
+        conn.server :srv, {:host => "127.0.0.1", :port => server_port}
+
+        # modify / process request stream
+        conn.on_data do |data|
+          binding.pry
+          log.puts [Time.now, conn.peer].inspect
+          log.write data
+
+          data
+        end
+      end
+    end
+
     def capture_browser
       Log.info "capturing #{browser.inspect}"
       browser.capture(server.host, server.port)
@@ -145,7 +176,7 @@ module JstdRunner
     end
 
     def server
-      @server ||= Server.new(options[:port])
+      @server ||= Server.new(@server_port, options[:jar])
     end
 
     def browser

data/lib/jstd-runner/server.rb

@@ -13,14 +13,15 @@ module JstdRunner
 
     attr_reader :host, :port
 
-    def initialize(port)
+    def initialize(port, jar = nil)
       @host       = "127.0.0.1"
       @port       = Integer(port)
       @restarting = false
+      @jar        = jar || JAR
     end
 
     def start
-      Log.info "starting JsTestDriver"
+      Log.info "starting JsTestDriver from #{@jar}"
 
       if immediate_poller.connected?
         raise StartupError, "JsTestDriver already running on #{@host}:#{@port}"
@@ -36,7 +37,7 @@ module JstdRunner
 
     def restart
       @restarting = true
-      Log.info "restaring server"
+      Log.info "restarting server"
       stop rescue nil
       @process = nil
       start
@@ -60,7 +61,7 @@ module JstdRunner
 
     def process
       @process ||= (
-        proc = ChildProcess.new("java", "-jar", JAR, "--port", @port.to_s)
+        proc = ChildProcess.new("java", "-jar", @jar, "--port", @port.to_s)
         proc.io.inherit! if $DEBUG
 
         proc

data/lib/jstd-runner/version.rb

@@ -1,3 +1,3 @@
 module JstdRunner
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,127 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jstd-runner
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
   name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 12
-        - 10
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.12.10
+- !ruby/object:Gem::Dependency
+  name: em-proxy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 4
-        version: "2.4"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Runs a JsTestDriver server + browsers with some built-in monitoring
-email: 
+email:
 - jari.bakken@gmail.com
-executables: 
+executables:
 - jstd-runner
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -148,37 +157,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/jarib/jstd-runner
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: JsTestDriver wrapper
 test_files: []
-
 has_rdoc: