lackie 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    lackie (0.1.0)
+    lackie (0.1.1)
+      json (~> 1.4.6)
       rack (~> 1.2.1)
       rest-client (~> 1.4.2)
 
@@ -10,6 +11,8 @@ GEM
   specs:
     builder (2.1.2)
     cgi_multipart_eof_fix (2.5.0)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
     cucumber (0.10.0)
       builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -19,10 +22,13 @@ GEM
     daemons (1.0.10)
     diff-lcs (1.1.2)
     fastthread (1.0.1)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
     gem_plugin (0.2.3)
     gherkin (2.3.3)
       json (~> 1.4.6)
     json (1.4.6)
+    json_pure (1.4.6)
     mime-types (1.16)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
@@ -30,7 +36,7 @@ GEM
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
     rack (1.2.1)
-    relevance-rcov (0.9.2.1)
+    rake (0.8.7)
     rest-client (1.4.2)
       mime-types (>= 1.16)
     rspec (2.2.0)
@@ -41,6 +47,12 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
     term-ansicolor (1.0.5)
 
 PLATFORMS
@@ -49,9 +61,10 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.7)
   cucumber (~> 0.10.0)
+  json (~> 1.4.6)
   lackie!
   mongrel (~> 1.1.5)
   rack (~> 1.2.1)
-  relevance-rcov (~> 0.9.2.1)
   rest-client (~> 1.4.2)
   rspec (~> 2.2.0)
+  selenium-webdriver (~> 0.1.2)

data/lackie.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
   s.email       = 'joshuachisholm@gmail.com'
   s.homepage    = 'http://github.com/joshski/lackie'
 
+  s.add_dependency 'json', '~> 1.4.6'
   s.add_dependency 'rack', '~> 1.2.1'
   s.add_dependency 'rest-client', '~> 1.4.2'
   
   s.add_development_dependency 'rspec', '~> 2.2.0'
   s.add_development_dependency 'cucumber', '~> 0.10.0'
   s.add_development_dependency 'mongrel', '~> 1.1.5'
-  s.add_development_dependency 'relevance-rcov', '~> 0.9.2.1'
+  #s.add_development_dependency 'relevance-rcov', '~> 0.9.2.1'
   s.add_development_dependency 'selenium-webdriver', '~> 0.1.2'
   
   s.rubygems_version  = "1.3.7"

data/lib/lackie/javascript/surrender.js

@@ -1,6 +1,7 @@
 Lackie = {
   wip: false,
   enabled: true,
+	baseUrl: "/lackie",
   
   createXMLHttpRequest: function() {
   	try { return new XMLHttpRequest(); } catch(e) {}
@@ -26,7 +27,7 @@ Lackie = {
   		  } catch(e) {}
   		}
   	}
-  	xhReq.open("GET", "/lackie/yield", true);
+  	xhReq.open("GET", Lackie.baseUrl + "/yield", true);
   	xhReq.onreadystatechange = readyStateChange;
   	xhReq.send(null);
   },
@@ -34,7 +35,7 @@ Lackie = {
   result: function(value) {
     var xhReq = Lackie.createXMLHttpRequest();
     var params = JSON.stringify(value);
-  	xhReq.open("POST", "/lackie/result", true);
+  	xhReq.open("POST", Lackie.baseUrl + "/result", true);
   	xhReq.setRequestHeader("Content-type", "application/json");
     xhReq.setRequestHeader("Content-length", params.length);
     xhReq.setRequestHeader("Connection", "close");

data/lib/lackie/poller.rb

@@ -6,9 +6,10 @@ module Lackie
       @sleeper = options.delete(:sleeper) || Kernel
     end
     
-    def await(outcome)
+    def await(outcome, options={})
       seconds_waited = 0
-      while seconds_waited <= @timeout_seconds
+      timeout_seconds = options[:timeout_seconds] || @timeout_seconds
+      while seconds_waited <= timeout_seconds
         return if yield
         @sleeper.sleep @interval_seconds
         seconds_waited += @interval_seconds

data/lib/lackie/rack/middleware.rb

@@ -4,7 +4,6 @@ module Lackie
   module Rack
     class Middleware
       def initialize(app)
-        #puts "MIDDLEWARE CREATED"
         @app = app
         @command = nil
         @result = nil

data/lib/lackie/remote_control.rb

@@ -12,9 +12,9 @@ module Lackie
       exec("Lackie.log(#{message.to_json})")
     end
     
-    def exec(command)
+    def exec(command, options={})
       send_command(command)
-      poll_for_result(command)
+      poll_for_result(command, options)
     end
     
     private
@@ -28,9 +28,9 @@ module Lackie
       end
     end
     
-    def poll_for_result(command)
+    def poll_for_result(command, options={})
       body = nil
-      @poller.await("result of command:\n#{command}") do
+      @poller.await("result of command:\n#{command}", options) do
         body = retrieve_result_body
         !body.nil?
       end

data/lib/lackie.rb

@@ -2,7 +2,7 @@ lib = File.dirname(__FILE__)
 $:.unshift(lib) unless $:.include?(lib) || $:.include?(File.expand_path(lib))
 
 module Lackie
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end
 
 require 'lackie/remote_control'

data/spec/lackie/poller_spec.rb

@@ -3,7 +3,7 @@ require 'lackie/poller'
 
 module Lackie
   describe Poller do
-    it "sleeps for a sepecified number of seconds between yields, until the block returns true" do
+    it "sleeps for a default number of seconds between yields, until the block returns true" do
       Kernel.should_receive(:sleep).with(0.666).exactly(:twice)
       return_values = [false, false, true]
       Poller.new(:interval_seconds => 0.666).await("foo") do
@@ -12,7 +12,7 @@ module Lackie
       return_values.should be_empty
     end
     
-    it "gives up after a specified number of seconds" do
+    it "gives up after a default number of seconds" do
       Kernel.stub!(:sleep)
       poller = Poller.new(:timeout_seconds => 2.5)
       lambda {
@@ -22,6 +22,17 @@ module Lackie
       }.should raise_error("Timed out after 2.5 seconds awaiting foo")
     end
     
+    it "accepts an optional, ad-hoc timeout" do
+      poller = Poller.new(:interval_seconds => 1.1, :timeout_seconds => 100)
+      Kernel.should_receive(:sleep).with(1.1).exactly(:twice)
+      begin
+        poller.await("something", :timeout_seconds => 2) {
+          false
+        }
+      rescue
+      end
+    end
+    
     it "uses a different sleeper when Kernel is not convenient" do
       sleeper = mock("sleeper")
       sleeper.should_receive(:sleep).with(0.999).exactly(:twice)

data/spec/lackie/remote_control_spec.rb

@@ -33,6 +33,16 @@ module Lackie
       responses.should be_empty
     end
     
+    it "waits for a default number of seconds" do
+      @poller.should_receive(:await).with("result of command:\nfoo", {}).and_yield
+      @rc.exec("foo")
+    end
+    
+    it "waits for an ad-hoc number of seconds" do
+      @poller.should_receive(:await).with("result of command:\nbar", :timeout_seconds => 666).and_yield
+      @rc.exec("bar", :timeout_seconds => 666)
+    end
+    
     it "deserializes json results" do
       RestClient.should_receive(:get).and_return(mock("response", :body => '{"value":666}'))
       @rc.log("oops").should == 666

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lackie
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Josh Chisholm
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +00:00
+date: 2011-01-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +49,11 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +65,11 @@ dependencies:
         - 2
         version: 1.4.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +81,11 @@ dependencies:
         - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +97,11 @@ dependencies:
         - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mongrel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,23 +113,6 @@ dependencies:
         - 5
         version: 1.1.5
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: relevance-rcov
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 1
-        version: 0.9.2.1
-  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
@@ -195,10 +194,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
-summary: lackie-0.1.1
+summary: lackie-0.1.2
 test_files: 
 - features/remote_control.feature
 - features/step_definitions/lackie_steps.rb