manticore 0.5.5-java → 0.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111c250ba25bbaa0452c9bee6bd1ad09b589a007
-  data.tar.gz: a6dac53321a576076f418e47729a90bdfd85504e
+  metadata.gz: aaec2b636e38b91767b212d83f2519c7e52ed085
+  data.tar.gz: 83eda4139c8cad24ccff8f9c022d5b4a8a9e7778
 SHA512:
-  metadata.gz: e20565e5b7a754d475c894eca5a4d718fcea9848e47dea4bb836747fd12cf166486faf4d0604a9eb72addf319833f0c8a54bec45e5c099315b361e5cda251695
-  data.tar.gz: 7ef91033ae1aff1dffea2ba44816e0665d76c951267a4832f5175cb25b732fece0a656a39c13dc09ac5c847fe3e7a6b129dd35d2370d6365981d060f42c4fe6f
+  metadata.gz: 9e60fe0524842aaba68b508587ef4928db16c11fbbfcdd5b29c2453d1175e6edd79322ec4068c18e921eea3f7e021d5a5a9b523e46ad12aeed5e7668c6920b1d
+  data.tar.gz: 90c45bbc808cfeeac2b79685eed88162092fe8a73c81ca928f9c81309b10897a02c0ec2e88866ab1ef97baeeb884df85a595e48916c6d63cc2c925307cc4a2bc

data/CHANGELOG.md

@@ -1,6 +1,13 @@
-## v0.5
+## v0.6
+
+### v0.6.1 (pending)
+
+### v0.6.0
 
-### v0.5.6 (pending)
+* Dependent jars are now vendored, but managed with jar-dependencies. This solves issues installing manticore on platforms that have out-of-date root certs, and simplifies the install process.
+* Fixed timeout behaviors (#48 - thanks @hobodave)
+
+## v0.5
 
 ### v0.5.5
 

data/README.md

@@ -8,7 +8,7 @@ Manticore is a fast, robust HTTP client built on the Apache HTTPClient libraries
 
 Add this line to your application's Gemfile:
 
-    gem 'manticore'
+    gem 'manticore', platform: :jruby
 
 And then execute:
 

data/Rakefile

@@ -8,9 +8,9 @@ end
 task :default => [:generate_certs, :spec]
 
 # Download and vendor the jars needed
-require 'jar_installer'
+require 'jars/installer'
 task :install_jars do
-  Jars::JarInstaller.new.send :do_install, true, true
+  Jars::Installer.vendor_jars!
 end
 
 ## Build the Manticore extensions into a jar. You may need to install_jars first

data/lib/faraday/adapter/manticore.rb

@@ -56,8 +56,8 @@ module Faraday
         opts[:body] = body if body
 
         if req = env[:request]
-          opts[:request_timeout] = opts[:connect_timeout] = opts[:socket_timeout] = req[:timeout] if req.key?(:timeout)
-          opts[:connect_timeout] = opts[:socket_timeout] = req[:open_timeout] if req.key?(:open_timeout)
+          opts[:request_timeout] = opts[:socket_timeout] = opts[:connect_timeout] = req[:timeout] if req.key?(:timeout)
+          opts[:connect_timeout] = req[:open_timeout] if req.key?(:open_timeout)
           if prx = req[:proxy]
             opts[:proxy] = {
               :url      => prx[:uri].to_s,

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.5.5"
+  VERSION = "0.6.0"
 end

data/lib/manticore_jars.rb

@@ -1,8 +1,8 @@
 # this is a generated file, to avoid over-writing it just delete this comment
 require 'jar_dependencies'
 
-require_jar( 'org.apache.httpcomponents', 'httpcore', '4.4.1' )
-require_jar( 'commons-codec', 'commons-codec', '1.9' )
 require_jar( 'commons-logging', 'commons-logging', '1.2' )
-require_jar( 'org.apache.httpcomponents', 'httpmime', '4.5' )
-require_jar( 'org.apache.httpcomponents', 'httpclient', '4.5' )
+require_jar( 'org.apache.httpcomponents', 'httpmime', '4.5.2' )
+require_jar( 'commons-codec', 'commons-codec', '1.10' )
+require_jar( 'org.apache.httpcomponents', 'httpclient', '4.5.2' )
+require_jar( 'org.apache.httpcomponents', 'httpcore', '4.4.4' )

data/manticore.gemspec

@@ -27,9 +27,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'ruby-maven', '~> 3.3'
+  spec.add_development_dependency "jar-dependencies"
 
-  spec.add_runtime_dependency "jar-dependencies"
-  spec.requirements << "jar org.apache.httpcomponents:httpclient, 4.5"
-  spec.requirements << "jar org.apache.httpcomponents:httpmime, 4.5"
+  spec.requirements << "jar org.apache.httpcomponents:httpclient, '~> 4.5.0'"
+  spec.requirements << "jar org.apache.httpcomponents:httpmime,   '~> 4.5.0'"
+  spec.requirements << "jar commons-logging:commons-logging,      '~> 1.2'"
+  spec.requirements << "jar commons-codec:commons-codec,          '~> 1.9'"
+  spec.requirements << "jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  name: ruby-maven
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -60,7 +46,7 @@ dependencies:
         version: '0'
   name: jar-dependencies
   prerelease: false
-  type: :runtime
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -85,6 +71,8 @@ files:
 - ext/manticore/org/manticore/HttpGetWithEntity.java
 - ext/manticore/org/manticore/Manticore.java
 - gem-public_cert.pem
+- lib/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+- lib/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
 - lib/faraday/adapter/manticore.rb
 - lib/manticore.rb
 - lib/manticore/client.rb
@@ -96,6 +84,9 @@ files:
 - lib/manticore/stubbed_response.rb
 - lib/manticore/version.rb
 - lib/manticore_jars.rb
+- lib/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar
+- lib/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar
+- lib/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2.jar
 - lib/org/manticore/manticore-ext.jar
 - manticore.gemspec
 - spec/manticore/client_proxy_spec.rb
@@ -125,8 +116,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar org.apache.httpcomponents:httpclient, 4.5
-- jar org.apache.httpcomponents:httpmime, 4.5
+- jar org.apache.httpcomponents:httpclient, '~> 4.5.0'
+- jar org.apache.httpcomponents:httpmime,   '~> 4.5.0'
+- jar commons-logging:commons-logging,      '~> 1.2'
+- jar commons-codec:commons-codec,          '~> 1.9'
+- jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: