daikon 0.5.7 → 0.5.8

data/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 
 gem "daemons",             "~> 1.1.0"
 gem "json_pure",           "~> 1.4.6"
-gem "net-http-persistent", "~> 1.4.1"
 gem "redis",               "~> 2.1.1"
 
 group :development do

data/Gemfile.lock

@@ -26,7 +26,6 @@ GEM
     json_pure (1.4.6)
     mocha (0.9.8)
       rake
-    net-http-persistent (1.4.1)
     rake (0.8.7)
     redis (2.1.1)
     rspec (2.1.0)
@@ -52,7 +51,6 @@ DEPENDENCIES
   daemons (~> 1.1.0)
   jeweler
   json_pure (~> 1.4.6)
-  net-http-persistent (~> 1.4.1)
   redis (~> 2.1.1)
   rspec
   timecop

data/daikon.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daikon}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
@@ -66,7 +66,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.6"])
-      s.add_runtime_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
       s.add_runtime_dependency(%q<redis>, ["~> 2.1.1"])
       s.add_development_dependency(%q<bourne>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
@@ -77,7 +76,6 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<daemons>, ["~> 1.1.0"])
       s.add_dependency(%q<json_pure>, ["~> 1.4.6"])
-      s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
       s.add_dependency(%q<redis>, ["~> 2.1.1"])
       s.add_dependency(%q<bourne>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
@@ -89,7 +87,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<daemons>, ["~> 1.1.0"])
     s.add_dependency(%q<json_pure>, ["~> 1.4.6"])
-    s.add_dependency(%q<net-http-persistent>, ["~> 1.4.1"])
     s.add_dependency(%q<redis>, ["~> 2.1.1"])
     s.add_dependency(%q<bourne>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])

data/lib/daikon.rb

@@ -9,7 +9,6 @@ require 'stringio'
 require 'daemons'
 require 'json'
 require 'net/https'
-require 'net/http/persistent'
 require 'redis'
 
 __DIR__ = File.dirname(__FILE__)
@@ -26,5 +25,5 @@ require 'daikon/monitor'
 require 'daikon/redis_hacks'
 
 module Daikon
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

data/lib/daikon/client.rb

@@ -9,7 +9,6 @@ module Daikon
                   Net::HTTPBadResponse,
                   Net::HTTPHeaderSyntaxError,
                   Net::ProtocolError,
-                  Net::HTTP::Persistent::Error,
                   JSON::ParserError]
 
     attr_accessor :redis, :logger, :config, :http, :monitor
@@ -20,10 +19,13 @@ module Daikon
       self.redis   = connect
       self.monitor = Monitor.new(connect, logger)
 
-      self.http = Net::HTTP::Persistent.new
-      self.http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      self.http.use_ssl = true
-      self.http.headers['Authorization'] = config.api_key
+      server_uri = URI.parse(config.server_prefix)
+      self.http  = Net::HTTP.new(server_uri.host, server_uri.port)
+
+      if server_uri.scheme == "https"
+        self.http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        self.http.use_ssl = true
+      end
 
       log "Started Daikon v#{VERSION}"
     end
@@ -41,14 +43,15 @@ module Daikon
     end
 
     def http_request(method, url)
-      request_uri    = URI.parse("#{config.server_prefix}/#{url}")
+      uri            = URI.parse("#{config.server_prefix}/#{url}")
       request_method = Net::HTTP.const_get method.to_s.capitalize
-      request        = request_method.new request_uri.path
+      request        = request_method.new uri.request_uri
+      request.add_field 'Authorization', config.api_key
 
       yield request if block_given?
 
-      log "#{method.to_s.upcase} #{request_uri}"
-      http.request request_uri, request
+      log "#{method.to_s.upcase} #{uri.to_s}"
+      http.request request
     end
 
     def fetch_commands

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -48,37 +48,35 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-http-persistent
+  name: redis
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 1
-        - 4
         - 1
-        version: 1.4.1
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: bourne
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 1
-        - 1
-        version: 2.1.1
-  type: :runtime
+        - 0
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bourne
+  name: cucumber
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,7 +89,7 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: jeweler
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -104,7 +102,7 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -117,7 +115,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: timecop
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,7 +128,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: webmock
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,19 +140,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: webmock
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
 description: daikon, a radishapp.com client
 email: nick@quaran.to
 executables: