scamp 0.0.2 → 0.0.3

data/README.md

@@ -16,7 +16,8 @@ Matchers are tested in order and all that satisfy the match and conditions will
 
     require 'scamp'
 
-    scamp = Scamp.new(:api_key => "YOUR API KEY", :subdomain => "yoursubdomain")
+    # Add :verbose => true to get debug output, otherwise the logger will output INFO
+    scamp = Scamp.new(:api_key => "YOUR API KEY", :subdomain => "yoursubdomain", :verbose => true)
     
     scamp.behaviour do
       # 

data/lib/scamp/channels.rb

@@ -97,7 +97,8 @@ class Scamp
       json_parser.on_parse_complete = method(:process_message)
       
       url = "https://streaming.campfirenow.com/room/#{channel_id}/live.json"
-      http = EventMachine::HttpRequest.new(url).get :head => {'authorization' => [api_key, 'X']}
+      # Timeout per https://github.com/igrigorik/em-http-request/wiki/Redirects-and-Timeouts
+      http = EventMachine::HttpRequest.new(url, :connect_timeout => 20, :inactivity_timeout => 0).get :head => {'authorization' => [api_key, 'X']}
       http.errback { logger.error "Couldn't stream channel #{channel_id} at url #{url}" }
       http.callback { logger.error "Disconnected from #{url}" }
       http.stream {|chunk| json_parser << chunk }

data/lib/scamp/version.rb

@@ -1,3 +1,3 @@
 class Scamp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/scamp.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency('eventmachine', '~> 0.12.10')
+  s.add_dependency('eventmachine', '~> 1.0.0.beta.4')
   s.add_dependency('yajl-ruby', '~> 0.8.3')
-  s.add_dependency('em-http-request', '~> 0.3.0')
+  s.add_dependency('em-http-request', '~> 1.0.0.beta.4')
 
   s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "mocha", "~> 0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scamp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-17 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70244078916620 !ruby/object:Gem::Requirement
+  requirement: &2160350540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70244078916620
+  version_requirements: *2160350540
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70244078916120 !ruby/object:Gem::Requirement
+  requirement: &2160349260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70244078916120
+  version_requirements: *2160349260
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70244078915660 !ruby/object:Gem::Requirement
+  requirement: &2160348020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0.beta.4
   type: :runtime
   prerelease: false
-  version_requirements: *70244078915660
+  version_requirements: *2160348020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244078915200 !ruby/object:Gem::Requirement
+  requirement: &2160346640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70244078915200
+  version_requirements: *2160346640
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2160345740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: *2160345740
 description: Eventmachine based Campfire bot framework
 email:
 - will@willj.net