nexus 0.1.0 → 0.2.0

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'bundler/setup'
 
 task :default => [:test]
 

data/lib/commands/abstract_command.rb

@@ -9,11 +9,26 @@ require 'base64'
 class Gem::AbstractCommand < Gem::Command
   include Gem::LocalRemoteOptions
 
+  def initialize( name, summary )
+    super
+   
+    add_option('-c', '--nexus-clear',
+               'Clears the nexus config') do |value, options|
+      options[:nexus_clear] = value
+    end
+    add_option('--nexus-config FILE',
+               'File location of nexus config') do |value, options|
+      options[:nexus_config] = File.expand_path( value )
+    end
+  end
+
   def url
-    url = config[:url]
-    # no leadng slash
-    url.sub!(/\/$/,'') if url
-    url
+    unless options[:nexus_clear]
+      url = config[:url]
+      # no leadng slash
+      url.sub!(/\/$/,'') if url
+      url
+    end
   end
 
   def configure_url
@@ -44,7 +59,7 @@ class Gem::AbstractCommand < Gem::Command
   end
 
   def config_path
-    File.join(Gem.user_home, '.gem', 'nexus')
+    options[:nexus_config] || File.join( Gem.user_home, '.gem', 'nexus' )
   end
 
   def config
@@ -52,7 +67,7 @@ class Gem::AbstractCommand < Gem::Command
   end
 
   def authorization
-    config[:authorization]
+    config[:authorization] unless options[:nexus_clear]
   end
 
   def store_config(key, value)
@@ -69,9 +84,9 @@ class Gem::AbstractCommand < Gem::Command
     require 'net/http'
     require 'net/https'
 
-    url = URI.parse("#{self.url}/#{path}")
+    url = URI.parse( "#{self.url}/#{path}" )
 
-    http = proxy_class.new(url.host, url.port)
+    http = proxy_class.new( url.host, url.port )
 
     if url.scheme == 'https'
       http.use_ssl = true
@@ -91,8 +106,8 @@ class Gem::AbstractCommand < Gem::Command
         raise ArgumentError
       end
 
-    request = request_method.new(url.path)
-    request.add_field "User-Agent", "Nexus Gem Command"
+    request = request_method.new( url.path )
+    request.add_field "User-Agent", "Ruby" unless RUBY_VERSION =~ /^1.9/
 
     yield request if block_given?
     http.request(request)

data/lib/commands/nexus.rb

@@ -1,11 +1,11 @@
 class Gem::Commands::NexusCommand < Gem::AbstractCommand
 
   def description
-    'Push a gem up to Nexus server'
+    'Upload a gem up to Nexus server'
   end
 
   def arguments
-    "GEM       built gem to push up"
+    "GEM       built gem to upload"
   end
 
   def usage
@@ -13,7 +13,7 @@ class Gem::Commands::NexusCommand < Gem::AbstractCommand
   end
 
   def initialize
-    super 'push', description
+    super 'nexus', description
     add_proxy_option
   end
 
@@ -23,7 +23,7 @@ class Gem::Commands::NexusCommand < Gem::AbstractCommand
   end
 
   def send_gem
-    say "Pushing gem to Nexus..."
+    say "Uploading gem to Nexus..."
 
     path = get_one_gem_name
 

data/test/abstract_command_test.rb

@@ -34,7 +34,7 @@ class AbstractCommandTest < CommandTest
       end
 
       should "return a proxy as a URI if set" do
-        stub_config(:http_proxy => 'http://proxy.example.org:9192')
+        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
       end
@@ -58,6 +58,15 @@ class AbstractCommandTest < CommandTest
       assert_received(@command) { |command| command.sign_in }
     end
 
+    should "sign in if --clear-config is set" do
+      stub(@command).sign_in
+      stub(@command).configure_url
+      stub(@command).options { {:nexus_clear => true} }
+      @command.setup
+      assert_received(@command) { |command| command.sign_in }
+      assert_received(@command) { |command| command.configure_url }
+    end
+
     should "not sign in nor configure if authorizaton and url exists" do
       stub(@command).authorization { "1234567890" }
       stub(@command).url { "abc" }
@@ -70,7 +79,7 @@ class AbstractCommandTest < CommandTest
 
     context "using the proxy" do
       setup do
-        stub_config(:http_proxy => "http://gilbert:sekret@proxy.example.org:8081")
+        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!

data/test/command_helper.rb

@@ -28,9 +28,9 @@ class CommandTest < ActiveSupport::TestCase
 end
 
 def stub_config(config)
-#  file = Gem::ConfigFile.new({})
-#xs  config.each { |key, value| file[key] = value }
-#  stub(:config).configuration { config }
+  file = Gem::ConfigFile.new({})
+  config.each { |key, value| file[key] = value }
+  stub(Gem).configuration { config }
 end
 
 def assert_said(command, what)

data/test/nexus_command_test.rb

@@ -39,7 +39,7 @@ class NexusCommandTest < CommandTest
       end
 
       should "say push was successful" do
-        assert_received(@command) { |command| command.say("Pushing gem to Nexus...") }
+        assert_received(@command) { |command| command.say("Uploading gem to Nexus...") }
         # due to webmock there is no status message
         assert_received(@command) { |command| command.say("") }
       end
@@ -49,13 +49,12 @@ class NexusCommandTest < CommandTest
         assert_requested(:post, @url,
                          :times => 1)
         assert_requested(:post, @url,
+                         :body => @gem_binary,
                          :headers => {
                            'Authorization' => 'key', 
                            'Content-Type' => 'application/octet-stream', 
-                           'User-Agent'=>'Nexus Gem Command'
+                           'User-Agent'=>'Ruby'
                          })
-        #assert_requested(:post, @url,
-        #                 :headers => {'Content-Length' => @gem_binary.size.to_s})
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: nexus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
   - Nick Quaranto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 Z
+date: 2012-09-11 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: always_verify_ssl_certificates