jenkins_api_client 0.12.0 → 0.12.1

data/CHANGELOG.md

@@ -4,6 +4,12 @@ CHANGELOG
 upcoming
 --------
 
+v0.12.1  [25-JUN-2013]
+----------------------
+* Fixed a bug where the SSL support was not working properly with Ruby
+  1.8.7/JRuby 1.6. Credit: @brettporter (For more info:
+  https://github.com/arangamani/jenkins_api_client/pull/85)
+
 v0.12.0  [18-JUN-2013]
 ----------------------
 * Authentication is now optional as not all Jenkins instances have

data/jenkins_api_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jenkins_api_client}
-  s.version = "0.12.0"
+  s.version = "0.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kannan Manickam"]
-  s.date = %q{2013-06-19}
+  s.date = %q{2013-06-26}
   s.default_executable = %q{jenkinscli}
   s.description = %q{
 This is a simple and easy-to-use Jenkins Api client with features focused on

data/lib/jenkins_api_client/client.rb

@@ -23,6 +23,7 @@
 require 'rubygems'
 require 'json'
 require 'net/http'
+require 'net/https'
 require 'nokogiri'
 require 'base64'
 require "mixlib/shellout"
@@ -173,18 +174,26 @@ module JenkinsApi
     def make_http_request(request, follow_redirect = @follow_redirects)
       request.basic_auth @username, @password if @username
 
-      if @server_url
-        http = Net::HTTP.new(@server_uri.host, @server_uri.port)
-        http.use_ssl = true if @ssl
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @ssl
-        response = http.request(request)
+      if @server_uri
+        host = @server_uri.host
+        port = @server_uri.port
       else
-        Net::HTTP.start(
-          @server_ip, @server_port, @proxy_ip, @proxy_port, :use_ssl => @ssl
-        ) do |http|
-          response = http.request(request)
-        end
+        host = @server_ip
+        port = @server_port
+      end
+
+      if @proxy_ip
+        http = Net::HTTP::Proxy(@proxy_ip, @proxy_port).new(host, port)
+      else
+        http = Net::HTTP.new(host, port)
       end
+
+      if @ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      response = http.request(request)
       case response
         when Net::HTTPRedirection then
           # If we got a redirect request, follow it (if flag set), but don't

data/lib/jenkins_api_client/version.rb

@@ -27,7 +27,7 @@ module JenkinsApi
     # Minor version of the gem
     MINOR   = 12
     # Tiny version of the gem used for patches
-    TINY    = 0
+    TINY    = 1
     # Used for pre-releases
     PRE     = nil
     # Version String of Jenkins API Client.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Kannan Manickam
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-19 00:00:00 -07:00
+date: 2013-06-26 00:00:00 -07:00
 default_executable: jenkinscli
 dependencies: 
 - !ruby/object:Gem::Dependency