nexus 0.2.5 → 1.0.0

data/Rakefile

@@ -1,10 +1,18 @@
+#-*- mode: ruby -*-
+
 require 'rake'
 require 'rake/testtask'
+require 'rubygems/package_task'
+
+task :default => [ :test, :package ]
 
-task :default => [:test]
+Gem::PackageTask.new( Gem::Specification.load( 'nexus.gemspec' ) ) do
+end
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_command_test.rb']
   t.verbose = true
 end
+
+# vim: syntax=Ruby

data/lib/commands/abstract_command.rb

@@ -1,4 +1,5 @@
 require 'rubygems/local_remote_options'
+require 'net/http'
 require 'base64'
 
 class Gem::AbstractCommand < Gem::Command
@@ -37,8 +38,8 @@ class Gem::AbstractCommand < Gem::Command
   end
 
   def setup
-    use_proxy! if http_proxy
     configure_url unless url
+    use_proxy!( url ) if http_proxy( url )
     sign_in unless authorization
   end
 
@@ -112,8 +113,8 @@ class Gem::AbstractCommand < Gem::Command
     http.request(request)
   end
 
-  def use_proxy!
-    proxy_uri = http_proxy
+  def use_proxy!( url )
+    proxy_uri = http_proxy( url )
     @proxy_class = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
   end
 
@@ -122,10 +123,17 @@ class Gem::AbstractCommand < Gem::Command
   end
 
   # @return [URI, nil] the HTTP-proxy as a URI if set; +nil+ otherwise
-  def http_proxy
-    proxy = Gem.configuration[:http_proxy] || ENV['http_proxy'] || ENV['HTTP_PROXY']
+  def http_proxy( url )
+    uri = URI.parse( url ) rescue nil
+    return nil if uri.nil?
+    if no_proxy = ENV[ 'no_proxy' ] || ENV[ 'NO_PROXY' ]
+      # does not look on ip-adress ranges
+      return nil if no_proxy.split( /, */ ).member?( uri.host )
+    end
+    key = uri.scheme == 'http' ? 'http_proxy' : 'https_proxy'
+    proxy = Gem.configuration[ :http_proxy ] || ENV[ key ] || ENV[ key.upcase ]
     return nil if proxy.nil? || proxy == :no_proxy
-    URI.parse(proxy)
+    URI.parse( proxy )
   end
 
   def ask_for_password(message)

data/lib/nexus/version.rb

@@ -0,0 +1,3 @@
+module Nexus
+  VERSION = '1.0.0'
+end

data/test/abstract_command_test.rb

@@ -14,6 +14,7 @@ class Gem::Commands::FakeCommand < Gem::AbstractCommand
 end
 
 class AbstractCommandTest < CommandTest
+
   context "with an fake command" do
     setup do
       @command = Gem::Commands::FakeCommand.new
@@ -25,26 +26,26 @@ class AbstractCommandTest < CommandTest
     context "parsing the proxy" do
       should "return nil if no proxy is set" do
         stub_config(:http_proxy => nil)
-        assert_equal nil, @command.http_proxy
+        assert_equal nil, @command.http_proxy( nil )
       end
 
       should "return nil if the proxy is set to :no_proxy" do
         stub_config(:http_proxy => :no_proxy)
-        assert_equal nil, @command.http_proxy
+        assert_equal nil, @command.http_proxy( 'asd' )
       end
 
       should "return a proxy as a URI if set" do
         stub_config( :http_proxy => 'http://proxy.example.org:9192' )
-        assert_equal 'proxy.example.org', @command.http_proxy.host
-        assert_equal 9192, @command.http_proxy.port
+        assert_equal 'proxy.example.org', @command.http_proxy( 'http://asd' ).host
+        assert_equal 9192, @command.http_proxy( 'http://asd' ).port
       end
 
       should "return a proxy as a URI if set by environment variable" do
         ENV['http_proxy'] = "http://jack:duck@192.168.1.100:9092"
-        assert_equal "192.168.1.100", @command.http_proxy.host
-        assert_equal 9092, @command.http_proxy.port
-        assert_equal "jack", @command.http_proxy.user
-        assert_equal "duck", @command.http_proxy.password
+        assert_equal "192.168.1.100", @command.http_proxy( 'http://asd' ).host
+        assert_equal 9092, @command.http_proxy( 'http://asd' ).port
+        assert_equal "jack", @command.http_proxy( 'http://asd' ).user
+        assert_equal "duck", @command.http_proxy( 'http://asd' ).password
       end
     end
 
@@ -82,7 +83,7 @@ class AbstractCommandTest < CommandTest
         stub_config( :http_proxy => "http://gilbert:sekret@proxy.example.org:8081" )
         @proxy_class = Object.new
         mock(Net::HTTP).Proxy('proxy.example.org', 8081, 'gilbert', 'sekret') { @proxy_class }
-        @command.use_proxy!
+        @command.use_proxy!( 'http://asd' )
       end
 
       should "replace Net::HTTP with a proxy version" do

data/test/command_helper.rb

@@ -1,7 +1,16 @@
-require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'shoulda'
+
+# for some reasons the refute_predicate is missing when executing
+# via jruby-1.7.4
+module ActiveSupport
+  class TestCase < ::MiniTest::Unit::TestCase
+    def refute_predicate
+    end
+  end
+end
+
 require 'active_support'
 require 'active_support/test_case'
 require 'webmock'
@@ -19,8 +28,8 @@ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
 require "rubygems_plugin"
 
 class CommandTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
   include WebMock::API
+  include ShouldaContextLoadable 
 
   def teardown
     WebMock.reset!

data/test/nexus_command_test.rb

@@ -52,8 +52,7 @@ class NexusCommandTest < CommandTest
                          :body => @gem_binary,
                          :headers => {
                            'Authorization' => 'key', 
-                           'Content-Type' => 'application/octet-stream', 
-                           'User-Agent'=>'Ruby'
+                           'Content-Type' => 'application/octet-stream'
                          })
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 1.0.0
   prerelease:
 platform: ruby
 authors:
@@ -10,21 +10,37 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.1'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '10.1'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0.0.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0.0.0
     none: false
   prerelease: false
   type: :development
@@ -32,15 +48,15 @@ dependencies:
   name: shoulda
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
     none: false
   prerelease: false
   type: :development
@@ -48,15 +64,13 @@ dependencies:
   name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - !binary |-
-        PA==
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - !binary |-
-        PA==
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
     none: false
@@ -66,15 +80,15 @@ dependencies:
   name: webmock
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '1.8'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '1.8'
     none: false
   prerelease: false
   type: :development
@@ -82,17 +96,15 @@ dependencies:
   name: rr
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '1.1'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '1.1'
     none: false
   prerelease: false
   type: :development
@@ -111,13 +123,15 @@ files:
 - lib/rubygems_plugin.rb
 - lib/bundler/rubygems_mirror.rb
 - lib/bundler/monkey_patch.rb
-- lib/commands/nexus.rb
+- lib/nexus/version.rb
 - lib/commands/abstract_command.rb
+- lib/commands/nexus.rb
 - test/command_helper.rb
-- test/abstract_command_test.rb
 - test/nexus_command_test.rb
+- test/abstract_command_test.rb
 homepage: https://github.com/sonatype/nexus-ruby-support/tree/master/nexus-gem
-licenses: []
+licenses:
+- MIT-LICENSE
 post_install_message: "\n========================================================================\n\
   \n           Thanks for installing Nexus gem! You can now run:\n\n    gem nexus\
   \          publish your gems onto Nexus server\n\n    nbundle            a bundler\
@@ -130,22 +144,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: Commands to interact with nexus server
+summary: Gem Command to interact with Nexus server
 test_files: []