signet 0.3.3 → 0.3.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.4
+
+* Attempts to auto-detect CA cert location
+
 # 0.3.3
 
 * Request objects no longer recreated during processing

data/Gemfile.lock

@@ -2,16 +2,25 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.8)
+    bouncy-castle-java (1.5.0146.1)
     extlib (0.9.15)
     faraday (0.7.6)
       addressable (~> 2.2)
       multipart-post (~> 1.1)
       rack (~> 1.1)
+    ffi (1.0.11-java)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
     json (1.7.3)
+    json (1.7.3-java)
     jwt (0.1.4)
       json (>= 1.2.4)
     launchy (2.1.0)
       addressable (~> 2.2.6)
+    launchy (2.1.0-java)
+      addressable (~> 2.2.6)
+      ffi (~> 1.0.9)
+      spoon (~> 0.0.1)
     multi_json (1.3.5)
     multipart-post (1.1.5)
     rack (1.4.1)
@@ -19,9 +28,11 @@ GEM
     rcov (1.0.0)
     redcarpet (2.1.1)
     rspec (1.2.9)
+    spoon (0.0.1)
     yard (0.8.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/lib/signet/oauth_1.rb

@@ -7,6 +7,8 @@ rescue LoadError
   require 'compat/securerandom'
 end
 
+require 'signet/ssl_config'
+
 module Signet #:nodoc:
   module OAuth1
     OUT_OF_BAND = 'oob'

data/lib/signet/oauth_2.rb

@@ -15,6 +15,7 @@
 require 'base64'
 require 'signet'
 require 'multi_json'
+require 'signet/ssl_config'
 
 module Signet #:nodoc:
   ##

data/lib/signet/ssl_config.rb

@@ -0,0 +1,54 @@
+if (!ENV['SSL_CERT_FILE'] || !File.exist?(ENV['SSL_CERT_FILE'])) &&
+    (!ENV['SSL_CERT_DIR'] || !File.exist?(ENV['SSL_CERT_DIR']))
+  # Attempt to copy over from other environment variables or well-known
+  # locations. But seriously, just set the environment variables!
+  common_ca_file_locations = [
+    ENV['CA_FILE'],
+    '/usr/local/lib/ssl/certs/ca-certificates.crt',
+    '/usr/local/ssl/certs/ca-certificates.crt',
+    '/usr/local/share/curl/curl-ca-bundle.crt',
+    '/usr/local/etc/openssl/cert.pem',
+    '/opt/local/lib/ssl/certs/ca-certificates.crt',
+    '/opt/local/ssl/certs/ca-certificates.crt',
+    '/opt/local/share/curl/curl-ca-bundle.crt',
+    '/opt/local/etc/openssl/cert.pem',
+    '/usr/lib/ssl/certs/ca-certificates.crt',
+    '/usr/ssl/certs/ca-certificates.crt',
+    '/usr/share/curl/curl-ca-bundle.crt',
+    '/etc/ssl/certs/ca-certificates.crt',
+    '/etc/pki/tls/cert.pem',
+    '/etc/pki/CA/cacert.pem',
+    'C:\Windows\curl-ca-bundle.crt',
+    'C:\Windows\ca-bundle.crt',
+    'C:\Windows\cacert.pem',
+    './curl-ca-bundle.crt',
+    './cacert.pem',
+    '~/.cacert.pem'
+  ]
+  common_ca_path_locations = [
+    ENV['CA_PATH'],
+    '/usr/local/lib/ssl/certs',
+    '/usr/local/ssl/certs',
+    '/opt/local/lib/ssl/certs',
+    '/opt/local/ssl/certs',
+    '/usr/lib/ssl/certs',
+    '/usr/ssl/certs',
+    '/etc/ssl/certs'
+  ]
+  ENV['SSL_CERT_FILE'] = nil
+  ENV['SSL_CERT_DIR'] = nil
+  for location in common_ca_file_locations
+    if location && File.exist?(location)
+      ENV['SSL_CERT_FILE'] = File.expand_path(location)
+      break
+    end
+  end
+  unless ENV['SSL_CERT_FILE']
+    for location in common_ca_path_locations
+      if location && File.exist?(location)
+        ENV['SSL_CERT_DIR'] = File.expand_path(location)
+        break
+      end
+    end
+  end
+end

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 3
-      TINY  = 3
+      TINY  = 4
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/spec_helper.rb

@@ -7,4 +7,5 @@ $:.unshift(lib_dir)
 $:.unshift(compat_dir)
 $:.uniq!
 
+require 'rubygems'
 require 'signet'

data/tasks/spec.rake

@@ -16,6 +16,7 @@ namespace :spec do
     end
     t.rcov_opts = [
       '--exclude', 'lib\\/compat',
+      '--exclude', 'lib\\/signet\\/ssl_config\\.rb',
       '--exclude', 'spec',
       '--exclude', '\\.rvm\\/gems',
       '--exclude', '1\\.8\\/gems',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2160769840 !ruby/object:Gem::Requirement
+  requirement: &2156909880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160769840
+  version_requirements: *2156909880
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2160769240 !ruby/object:Gem::Requirement
+  requirement: &2156909220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160769240
+  version_requirements: *2156909220
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2160768620 !ruby/object:Gem::Requirement
+  requirement: &2156908540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160768620
+  version_requirements: *2156908540
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &2160768040 !ruby/object:Gem::Requirement
+  requirement: &2156907900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2160768040
+  version_requirements: *2156907900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160767280 !ruby/object:Gem::Requirement
+  requirement: &2156907300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *2160767280
+  version_requirements: *2156907300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160766640 !ruby/object:Gem::Requirement
+  requirement: &2156906600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.11
   type: :development
   prerelease: false
-  version_requirements: *2160766640
+  version_requirements: *2156906600
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2160766000 !ruby/object:Gem::Requirement
+  requirement: &2156905940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160766000
+  version_requirements: *2156905940
 description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
 '
@@ -106,6 +106,7 @@ files:
 - lib/signet/oauth_1.rb
 - lib/signet/oauth_2/client.rb
 - lib/signet/oauth_2.rb
+- lib/signet/ssl_config.rb
 - lib/signet/version.rb
 - lib/signet.rb
 - spec/force_compat/digest/hmac.rb