ftw 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDc2MTQ2MWMwNTk2YWFkYjRlNWM1OWJmZjVjM2RkZmQyNGIzYzBjZQ==
-  data.tar.gz: !binary |-
-    MTcxOWNjZWM5MGQ5OWU4ODY1MmU2MDQ4YmEzNTgwMTI1Mjk3NDRlYg==
+SHA1:
+  metadata.gz: 5a801849ec09f08f8610e1ce8553dfe7d890c818
+  data.tar.gz: 112a9f22c9403582ca7c56b856a8516d1f6aca81
 SHA512:
-  metadata.gz: !binary |-
-    ZGM5N2UwZjlhZTIzMWZhMjZmOTlkMmE2NDY4MTczNTMwMThlZjY3MGZjNzc4
-    MTAyNDY3YTJhOTZiNDQwNDc1NjA5MmI2YmVhN2ExNzFlYTE5OWUwODVmZGIy
-    MzE1ZjQwZDQzOWE0NDQ5ZGUyZjhlNzg2YWJjNDY0YTU5N2Y1MWE=
-  data.tar.gz: !binary |-
-    NDllOTg3NjU1OGVhN2ZmMjhjOGNlYzg3OGY1MDdmYzhmYTU0MGZlODllMjcx
-    ZTkzMTRjZWQ3ZGUxMDFiZGU4NTc5N2I0MDk1ZjIzMWZmNDJiYjBmOGMyZjg0
-    NmFjZmYwNjk5ZjI4ODZhNzIwNDVkNGY1MmZhYzNjMDQ2Njk2YTQ=
+  metadata.gz: 9d00c8697d9a3d0323acbddf0ce6de86908e7d08f5a56752d0550200d4e01a3b337fd8fceba7f02308605783aa413bd1b151bbbd4af8feb6fcc6802cd444581f
+  data.tar.gz: 3a5dbe0064a876cd42b3be592fd5eedb9249cd5ce7acb1df696874575c00416de6256b78277600ef07d3aaf4eb12ca1d1d3d761ce7767d09b233bdcd31388d22

data/lib/ftw/agent.rb

@@ -63,14 +63,26 @@ class FTW::Agent
 
     configuration[REDIRECTION_LIMIT] = 20
 
+    need_ssl_ca_certs = true
+
     @certificate_store = OpenSSL::X509::Store.new
     if File.readable?(OpenSSL::X509::DEFAULT_CERT_FILE)
       @logger.debug("Adding default certificate file",
                     :path => OpenSSL::X509::DEFAULT_CERT_FILE)
-      @certificate_store.add_file(OpenSSL::X509::DEFAULT_CERT_FILE)
-    else
+      begin
+        @certificate_store.add_file(OpenSSL::X509::DEFAULT_CERT_FILE)
+        need_ssl_ca_certs = false
+      rescue OpenSSL::X509::StoreError => e
+        # Work around jruby#1055 "Duplicate extensions not allowed"
+        @logger.warn("Failure loading #{OpenSSL::X509::DEFAULT_CERT_FILE}. " \
+                     "Will try another cacert source.")
+      end
+    end
+
+    if need_ssl_ca_certs
       # Use some better defaults from http://curl.haxx.se/docs/caextract.html
-      @logger.info("Using upstream ssl certs, possibly untrusty.")
+      # Can we trust curl's CA list? Global ssl trust is a tragic joke, anyway :\
+      @logger.info("Using upstream ssl ca certs from curl. Possibly untrustworthy.")
       default_ca = File.join(File.dirname(__FILE__), "cacert.pem")
 
       # JRUBY-6870 - strip 'jar:' prefix if it is present.

data/lib/ftw/version.rb

@@ -3,5 +3,5 @@ require "ftw/namespace"
 # :nodoc:
 module FTW
   # The version of this library
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ftw
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: '0'
 description: For The Web. Trying to build a solid and sane API for client and server
@@ -88,41 +88,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rack/handler/ftw.rb
-- lib/ftw/dns.rb
-- lib/ftw/dns/dns.rb
-- lib/ftw/dns/hash.rb
-- lib/ftw/agent.rb
 - lib/ftw/agent/configuration.rb
-- lib/ftw/singleton.rb
-- lib/ftw/websocket.rb
+- lib/ftw/agent.rb
+- lib/ftw/cacert.pem
 - lib/ftw/connection.rb
+- lib/ftw/cookies.rb
+- lib/ftw/crlf.rb
+- lib/ftw/dns/dns.rb
+- lib/ftw/dns/hash.rb
+- lib/ftw/dns.rb
 - lib/ftw/http/headers.rb
 - lib/ftw/http/message.rb
+- lib/ftw/namespace.rb
+- lib/ftw/pool.rb
 - lib/ftw/poolable.rb
-- lib/ftw/server.rb
-- lib/ftw/response.rb
 - lib/ftw/protocol.rb
-- lib/ftw/cacert.pem
-- lib/ftw/version.rb
-- lib/ftw/namespace.rb
 - lib/ftw/request.rb
-- lib/ftw/crlf.rb
-- lib/ftw/pool.rb
+- lib/ftw/response.rb
+- lib/ftw/server.rb
+- lib/ftw/singleton.rb
+- lib/ftw/version.rb
 - lib/ftw/webserver.rb
-- lib/ftw/websocket/writer.rb
-- lib/ftw/websocket/rack.rb
-- lib/ftw/websocket/parser.rb
 - lib/ftw/websocket/constants.rb
-- lib/ftw/cookies.rb
+- lib/ftw/websocket/parser.rb
+- lib/ftw/websocket/rack.rb
+- lib/ftw/websocket/writer.rb
+- lib/ftw/websocket.rb
 - lib/ftw.rb
-- test/testing.rb
+- lib/rack/handler/ftw.rb
 - test/all.rb
-- test/ftw/singleton.rb
+- test/docs.rb
+- test/ftw/crlf.rb
 - test/ftw/http/dns.rb
 - test/ftw/http/headers.rb
-- test/ftw/crlf.rb
-- test/docs.rb
+- test/ftw/singleton.rb
+- test/testing.rb
 - README.md
 homepage: http://github.com/jordansissel/ruby-ftw
 licenses:
@@ -135,19 +135,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: For The Web. Trying to build a solid and sane API for client and server web
   stuff. Client and Server operations for HTTP, WebSockets, SPDY, etc.
 test_files: []
+has_rdoc: