rubygems_ssl-client-certs 0.0.1.pre.alpha.pre.35 → 0.0.2.pre.alpha.pre.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjkwMWM2YjI2ZDI0Y2JkNDYxZDk4OTAxNDQ3Yzg5ZjVmMjk4NzZmNg==
+    ZjI1NTFmNDE5NjU5YmE5ZDU0N2ViNmM1YjNmM2Y2OGYxOWEzNGE0Yw==
   data.tar.gz: !binary |-
-    Y2U2OTA0NjgxM2IxMTY0YmUzOGI5Njc0NzExNTcwOTdhNzRlZWI4MQ==
+    NGE3NTM2NTJmNjUxYjRjZDk5N2I1OWZlYzZkN2NlZjcxYTFjNDViOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDFmYjllNWQyNWE2YWU5Y2IzY2I3MTkzNTk0MGU4ZDQwNjM3NGVkY2M2YzQ2
-    NmZkZjBiN2FhNzAwOTczYjdiNDcxMWMzOGViZmU0ZTVlOTM3ZWQxMDllMDBh
-    ZGVhNjIwZjI1OWM5NjU1NmIyNThkZWIwY2ZkMTQ5MzUzMDc1MDA=
+    MWYyZGQ2ZDM0OTc5MTJiN2VjMjI5OTYxZGIxN2MzMGJlZmU1M2FjOTMwOTRh
+    M2RkMTU4YjIwMDQ0ZjNjMTE5MmM2ZDJhZmQxMzdlOTAzNzg0ZDMxMWFkMzI2
+    NTE0YmJmOGRiODRjMDY1ZTNkODgxMzg1Y2QxOWUxNzk5MjdhNGM=
   data.tar.gz: !binary |-
-    ZmZkZmFlODYwMTkzYmUwMDE1NGYyNzQzMzExNTBiYzk0NzMwZjUxMzM2NDg5
-    YzczMjZmMzRhODZkMjhjZTI2MmEyYjIxZmFiOGFmZWVkNDhjYzQ3YzNmYTAx
-    YTUxOGE4YzBiMGVkZWYyNTRjMzg2ZTFlNWI1ZTllYWIyN2I0ZTE=
+    NzI2NWM2ODg3ODVlNDlkZDU2MWFlZWFjMmMzZTk0NjY1Zjk3OTE0NDgxNWYw
+    ODE5M2IwODBkYTg0NzkxYTNiYTY2YTViMzk2ODg4NzRmZWFiNTI4ZmY1MDI2
+    MzVmMDMzYzU4MmE4YTU4MjQxMWY5OGE0MWEzM2Q4OTQxMmVhMDM=

data/.gitignore

@@ -3,6 +3,7 @@
 *.swp
 .bundle
 .config
+.rvmrc
 Gemfile.lock
 coverage
 InstalledFiles

data/.travis.yml

@@ -1,5 +1,8 @@
 language: ruby
 bundler_args: --no-deployment
+before_install:
+#- gem update --system 2.0.14
+- gem install 'rubygems_allow-pre-releases' 
 rvm:
 - 1.8.7
 - 1.9.3

data/lib/rubygems_plugin.rb

@@ -1,108 +1,127 @@
 require 'rubygems/remote_fetcher'
 
-class Gem::ConfigFile
+$stderr.puts "rubygems ssl client certs plugin loading"
 
-  attr_reader :ssl_client_cert
+if Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.1.0') then
 
-  attr_reader :ssl_verify_mode
+  class Gem::Version
 
-  attr_reader :ssl_ca_cert
-
-  class << self
-    unless self.method_defined? :__new__
-      alias_method :__new__, :new
-    end
-    def new(*args)
-      config = __new__(*args)
-      config.set_ssl_vars
-      return config
+    def self.correct? version
+      version.to_s =~ /\A\s*([0-9]+(?>\.[0-9a-zA-Z]+)*(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)?\s*\z/
     end
-  end
 
-  def set_ssl_vars
-    @ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
-    @ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
-    @ssl_ca_cert = ENV['BUNDLE_SSL_CA_CERT'] unless @ssl_ca_cert
-    @ssl_client_cert = @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
-    @ssl_client_cert = ENV['BUNDLE_SSL_CLIENT_CERT'] unless @ssl_client_cert
   end
 
-end
+  class Gem::ConfigFile
 
-class Gem::RemoteFetcher
+    attr_reader :ssl_client_cert
 
-  def connection_for(uri)
-    net_http_args = [uri.host, uri.port]
+    attr_reader :ssl_verify_mode
 
-    if @proxy_uri and not no_proxy?(uri.host) then
-      net_http_args += [
-        @proxy_uri.host,
-        @proxy_uri.port,
-        @proxy_uri.user,
-        @proxy_uri.password
-      ]
-    end
-
-    connection_id = [Thread.current.object_id, *net_http_args].join ':'
-    @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
-    connection = @connections[connection_id]
+    attr_reader :ssl_ca_cert
+    $stderr.puts "loading Gem::ConfigFile monkey patch"
 
-    if https?(uri) and not connection.started? then
-      configure_connection_for_https(connection)
+    class << self
+      unless self.method_defined? :__new__
+        alias_method :__new__, :new
+      end
+      def new(*args)
+        $stderr.puts "instantiating new Gem::ConfigFile with patch"
+        config = __new__(*args)
+        config.set_ssl_vars
+        return config
+      end
     end
 
-    connection.start unless connection.started?
+    def set_ssl_vars
+      $stderr.puts "Configuring SSL variables for Gem::ConfigFile"
+      @ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
+      @ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
+      @ssl_ca_cert = ENV['BUNDLE_SSL_CA_CERT'] unless @ssl_ca_cert
+      @ssl_client_cert = @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
+      @ssl_client_cert = ENV['BUNDLE_SSL_CLIENT_CERT'] unless @ssl_client_cert
+    end
 
-    connection
-  rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
-         Errno::EHOSTDOWN => e
-    raise FetchError.new(e.message, uri)
   end
 
-  def configure_connection_for_https(connection)
-    require 'net/https'
-    connection.use_ssl = true
-    connection.verify_mode =
-      Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
-    store = OpenSSL::X509::Store.new
-
-    if Gem.configuration.ssl_client_cert
-      pem = File.read(Gem.configuration.ssl_client_cert)
-      connection.cert = OpenSSL::X509::Certificate.new(pem)
-      connection.key = OpenSSL::PKey::RSA.new(pem)
-    else
-      puts "no Client Cert configured!"
+  class Gem::RemoteFetcher
+
+    def connection_for(uri)
+      net_http_args = [uri.host, uri.port]
+
+      if @proxy_uri and not no_proxy?(uri.host) then
+        net_http_args += [
+          @proxy_uri.host,
+          @proxy_uri.port,
+          @proxy_uri.user,
+          @proxy_uri.password
+        ]
+      end
+
+      connection_id = [Thread.current.object_id, *net_http_args].join ':'
+      @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
+      connection = @connections[connection_id]
+
+      if https?(uri) and not connection.started? then
+        configure_connection_for_https(connection)
+      end
+
+      connection.start unless connection.started?
+
+      connection
+    rescue defined?(OpenSSL::SSL) ? OpenSSL::SSL::SSLError : Errno::EHOSTDOWN,
+           Errno::EHOSTDOWN => e
+      raise FetchError.new(e.message, uri)
     end
 
-    if Gem.configuration.ssl_ca_cert
-      if File.directory? Gem.configuration.ssl_ca_cert
-        store.add_path Gem.configuration.ssl_ca_cert
+    def configure_connection_for_https(connection)
+      require 'net/https'
+      connection.use_ssl = true
+      connection.verify_mode =
+        Gem.configuration.ssl_verify_mode || OpenSSL::SSL::VERIFY_PEER
+      store = OpenSSL::X509::Store.new
+
+      if Gem.configuration.ssl_client_cert
+        pem = File.read(Gem.configuration.ssl_client_cert)
+        connection.cert = OpenSSL::X509::Certificate.new(pem)
+        connection.key = OpenSSL::PKey::RSA.new(pem)
+      else
+        puts "no Client Cert configured!"
+        if !Gem.configuration.respond_to?(:ssl_client_cert)
+          puts "Loaded Gem::ConfigFile does not support ssl_client_cert"
+        end
+      end
+
+      if Gem.configuration.ssl_ca_cert
+        if File.directory? Gem.configuration.ssl_ca_cert
+          store.add_path Gem.configuration.ssl_ca_cert
+        else
+          store.add_file Gem.configuration.ssl_ca_cert
+        end
       else
-        store.add_file Gem.configuration.ssl_ca_cert
+        puts "no CA Cert configured!"
+        store.set_default_paths
+        add_rubygems_trusted_certs(store)
       end
-    else
-      puts "no CA Cert configured!"
-      store.set_default_paths
-      add_rubygems_trusted_certs(store)
+      connection.cert_store = store
+    rescue LoadError => e
+      raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
+                   e.message =~ / -- openssl$/
+
+      raise Gem::Exception.new(
+              'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
     end
-    connection.cert_store = store
-  rescue LoadError => e
-    raise unless (e.respond_to?(:path) && e.path == 'openssl') ||
-                 e.message =~ / -- openssl$/
 
-    raise Gem::Exception.new(
-            'Unable to require openssl, install OpenSSL and rebuild ruby (preferred) or use non-HTTPS sources')
-  end
+    def add_rubygems_trusted_certs(store)
+      pattern = File.expand_path("./ssl_certs/*.pem", File.dirname(__FILE__))
+      Dir.glob(pattern).each do |ssl_cert_file|
+        store.add_file ssl_cert_file
+      end
+    end
 
-  def add_rubygems_trusted_certs(store)
-    pattern = File.expand_path("./ssl_certs/*.pem", File.dirname(__FILE__))
-    Dir.glob(pattern).each do |ssl_cert_file|
-      store.add_file ssl_cert_file
+    def https?(uri)
+      uri.scheme.downcase == 'https'
     end
-  end
 
-  def https?(uri)
-    uri.scheme.downcase == 'https'
   end
-
 end

data/lib/rubygems_ssl-client-certs/version.rb

@@ -1,5 +1,5 @@
 module Rubygems
   module ClientCerts
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/rubygems_ssl-client-certs.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+#  s.add_development_dependency "rubygems", ['< 2.1.0']
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-core"
   s.add_development_dependency "mime-types", '1.25' if RUBY_VERSION < "1.9"
-#  s.add_development_dependency "simplecov", '~> 0.7.1'
   s.add_development_dependency "coveralls"
 end

data/spec/gem_remote_fetcher_spec.rb

@@ -5,7 +5,7 @@ describe Gem::RemoteFetcher do
 
   def create_fetcher()
     fetcher = subject
-    fetcher
+    return fetcher
   end
 
   describe "#https?" do
@@ -20,8 +20,12 @@ describe Gem::RemoteFetcher do
     end
   end
 
-  describe "#configure_connection_for_https" do
-    
-  end
+#  describe "#configure_connection_for_https" do
+#    it "configures ssl settings on the connection" do
+#      fetcher = create_fetcher()
+#      connection =  #mock Net::HTTP object
+#      fetcher.configure_connection_for_https(connection)
+#    end
+#  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubygems_ssl-client-certs
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.alpha.pre.35
+  version: 0.0.2.pre.alpha.pre.51
 platform: ruby
 authors:
 - Aaron Moses
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake