nexus 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1c2323675c17ca433009c88d2a26aa01b1846e1
-  data.tar.gz: 46970225772cc8e915be276896057307caa02ae8
+  metadata.gz: b9afe169e757af4c376e9127b7880a1b8e427ffc
+  data.tar.gz: ec412e696190f225462c3ab626cd9eaf53f23c8e
 SHA512:
-  metadata.gz: 06b148374732475db9985b821d2e9ff61c3c4760cf9da0f887cfec656456ebac74521b9c8581b900033726fcc566c5447a00bc12458227bfa8611183c36935dd
-  data.tar.gz: d2d813112d009ffe9946f380b000f4cc44fdda405461261739a8d71bd435e0c6c81631be5907de461055babafd157e2ca3243d564b8f1a6f16c291aecdaeecff
+  metadata.gz: 5faef784a2e11d149e20f731fe6d6ae302ae13471957cb22a81b66b528683c567dc5ca4adad5dc59eb05eb1516429412ad7fb78e99b0c9d061f69ee1c98b8fee
+  data.tar.gz: 655818bb467f597bb8ea5665c023cfeb15c8196d44e05e30e196b7b3f3ccf78341e3a6020e20f1adce25639d4199153153060d76bba86a957b7e88484334c8ad

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_command_test.rb']
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
 

data/lib/commands/abstract_command.rb

@@ -1,6 +1,7 @@
 require 'rubygems/local_remote_options'
 require 'net/http'
 require 'base64'
+require 'nexus/config'
 
 class Gem::AbstractCommand < Gem::Command
   include Gem::LocalRemoteOptions
@@ -8,18 +9,29 @@ class Gem::AbstractCommand < Gem::Command
   def initialize( name, summary )
     super
    
-    add_option('-c', '--nexus-clear',
-               'Clears the nexus config') do |value, options|
-      options[:nexus_clear] = value
+    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 )
+
+    add_option( '--nexus-config FILE',
+                'File location of nexus config' ) do |value, options|
+      options[ :nexus_config ] = File.expand_path( value )
+    end
+
+    add_option( '--repo KEY',
+                'pick the config under that key' ) do |value, options|
+      options[ :nexus_repo ] = value
+    end
+
+    add_option( '--secrets FILE',
+                'use and store secrets in the given instead of local config file. file location will be stored in the local config file.' ) do |value, options|
+      options[ :nexus_secrets ] = File.expand_path( value )
     end
   end
 
   def url
-    url = config[:url]
+    url = config[ :url ]
     # no leading slash
     url.sub!(/\/$/,'') if url
     url
@@ -30,9 +42,13 @@ class Gem::AbstractCommand < Gem::Command
 
     url = ask("URL: ")
 
-    store_config(:url, url)
+    if URI.parse( "#{url}" ).host != nil
+      config[ :url ] = url
 
-    say "The Nexus URL has been stored in ~/.gem/nexus"
+      say 'The Nexus URL has been stored in ~/.gem/nexus'
+    else
+      raise 'no URL given'
+    end
   end
 
   def setup
@@ -49,35 +65,28 @@ class Gem::AbstractCommand < Gem::Command
     # mimic strict_encode64 which is not there on ruby1.8
     token = "#{username}:#{password}"
     if token != ':'
-      store_config(:authorization, 
-                   "Basic #{Base64.encode64(username + ':' + password).gsub(/\s+/, '')}")
+      config[ :authorization ] =
+        "Basic #{Base64.encode64(username + ':' + password).gsub(/\s+/, '')}"
     else
-      store_config(:authorization, nil )
+      config[ :authorization ] = nil
     end
 
     say "Your Nexus credentials has been stored in ~/.gem/nexus"
   end
 
-  def config_path
-    options[:nexus_config] || File.join( Gem.user_home, '.gem', 'nexus' )
+  def this_config
+    Nexus::Config.new( options[ :nexus_repo ],
+                       options[ :nexus_config ],
+                       options[ :nexus_secrets ] )
   end
-
+  private :this_config
+  
   def config
-    @config ||= Gem.configuration.load_file(config_path)
+    @config ||= this_config
   end
 
   def authorization
-    config[:authorization]
-  end
-
-  def store_config(key, value)
-    config.merge!(key => value)
-    dirname = File.dirname(config_path)
-    Dir.mkdir(dirname) unless File.exists?(dirname)
-
-    File.open(config_path, 'w') do |f|
-      f.write config.to_yaml
-    end
+    config[ :authorization ]
   end
 
   def make_request(method, path)
@@ -122,7 +131,7 @@ class Gem::AbstractCommand < Gem::Command
         warn 'no authorization'
       end
  
-      warn "use proxy at #{http.proxy_address}" if http.proxy_address
+      warn "use proxy at #{http.proxy_address}:#{http.proxy_port}" if http.proxy_address
     end
 
     http.request(request)

data/lib/nexus/config.rb

@@ -0,0 +1,110 @@
+require 'rubygems/local_remote_options'
+require 'net/http'
+require 'base64'
+
+module Nexus
+  class Config
+
+    class File
+      def initialize( file, repo )
+        if file.is_a?( String )
+          @file = file
+
+          if file && ::File.exists?( file )
+            @all = YAML.load( ::File.read( file ) )
+          end
+        elsif file
+          @file = file.instance_variable_get( '@file'.to_sym )
+          @all = file.instance_variable_get( '@all'.to_sym )
+        end
+        @all ||= {}
+
+        @data = ( @all[ repo ] ||= {} ) if repo
+        @data ||= @all
+      end
+
+      def key?( key )
+        @data.key? key
+      end
+
+      def []( key )
+        @data[ key ]
+      end
+
+      def []=( key, value )
+        if value
+          @data[ key ] = value
+        else
+          @data.delete( key )
+        end
+      end
+      
+      def store
+        if @file
+          dirname = ::File.dirname( @file )
+          Dir.mkdir( dirname ) unless ::File.exists?( dirname )
+          new = !::File.exists?( @file )
+
+          ::File.open( @file, 'w') do |f|
+            f.write @all.to_yaml
+          end
+          if new
+            ::File.chmod( 0100600, @file ) rescue nil
+          end
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def self.default_file
+      ::File.join( Gem.user_home, '.gem', 'nexus' )
+    end
+
+    def initialize( repo = nil, config = nil, secrets = nil )
+      config ||= self.class.default_file
+      conf = File.new( config, nil )
+      if secrets
+        conf[ :secrets ] = secrets
+        conf.store
+      end
+      @conf = File.new( conf, repo )
+      @secr = File.new( secrets || conf[ :secrets ], repo )
+    end
+
+    def key?( key )
+      @conf.key?( key ) || @secr.key?( key )
+    end
+
+    def []( key )
+      if key == :authorization && @conf[ key ]
+        copy_authorization
+      end
+      @conf[ key ] || @secr[ key ]
+    end
+
+    def copy_authorization
+      @secr[ :authorization ] = @conf[ :authorization ]
+      if @secr.store
+        @conf[ :authorization ] = nil
+        @conf.store
+      end
+    end
+    private :copy_authorization
+
+    def []=( key, value )
+      stored = false
+      if key == :authorization
+        @secr[ key ] = value
+        stored = @secr.store
+      end
+
+      unless stored
+        @conf[ key ] = value
+        @conf.store
+      end
+    end
+
+  end
+end

data/lib/nexus/version.rb

@@ -1,3 +1,3 @@
 module Nexus
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/test/abstract_command_test.rb

@@ -71,6 +71,9 @@ class AbstractCommandTest < CommandTest
     end
 
     should "always return stored authorization and url" do
+      config_path = File.join( 'pkg', 'configsomething')
+      FileUtils.rm_f( config_path )
+      @command.options[ :nexus_config ] = config_path
       @command.config[ :url ] = 'something'
       @command.config[ :authorization ] = 'something'
       stub(@command).options { {:nexus_clear => true} }
@@ -100,7 +103,55 @@ class AbstractCommandTest < CommandTest
         assert_equal @proxy_class, @command.proxy_class
       end
     end
-    
+
+    context 'separeted config per repo key' do
+      should 'store the config on per key' do
+        config_path = File.join( 'pkg', 'configrepo')
+        FileUtils.rm_f( config_path )
+        @command.options[ :nexus_config ] = config_path
+        @command.options[ :nexus_repo ] = :first
+        @command.config[ :some ] = :thing
+        @command.options[ :nexus_repo ] = :second
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        @command.config[ :some ] = :otherthing
+        @command.options[ :nexus_repo ] = nil
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        @command.config[ :some ] = :nothing
+
+        assert_equal( Gem.configuration.load_file(config_path),
+                      { :first=>{:some=>:thing}, 
+                        :second=>{:some=>:otherthing},
+                        :some=>:nothing } )
+      end
+
+      should 'use only the config for the given key' do
+        config_path = File.join( 'pkg', 'configrepo')
+        FileUtils.rm_f( config_path )
+        @command.options[ :nexus_config ] = config_path
+        @command.options[ :nexus_repo ] = :first
+        @command.config[ :some ] = :thing
+        @command.options[ :nexus_repo ] = :second
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        assert_nil( @command.config[ :some ] )
+        @command.config[ :some ] = :otherthing
+        @command.options[ :nexus_repo ] = nil
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        assert_nil( @command.config[ :some ] )
+        @command.config[ :some ] = :nothing
+
+        @command.options[ :nexus_repo ] = :first
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        assert_equal( @command.config[ :some ], :thing )
+        @command.options[ :nexus_repo ] = :second
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        assert_equal( @command.config[ :some ], :otherthing )
+        @command.options[ :nexus_repo ] = nil
+        @command.send :instance_variable_set, '@config'.to_sym, nil
+        assert_equal( @command.config[ :some ], :nothing )
+      end
+
+    end
+
     context "clear username + password" do
 
       should "clear stored authorization" do
@@ -109,7 +160,7 @@ class AbstractCommandTest < CommandTest
         stub(@command).say
         stub(@command).ask { nil }
         stub(@command).ask_for_password { nil }
-        @command.config[ :authorization ] = 'something'
+        @command.config[ :authorization ] = 'some authentication'
 
         @command.sign_in
         assert_nil @command.authorization
@@ -125,44 +176,50 @@ class AbstractCommandTest < CommandTest
         stub(@command).say
         stub(@command).ask { @username }
         stub(@command).ask_for_password { @password }
-        stub(@command).store_config { {:authorization => @key} }
+        stub(@command).options { {:nexus_config => File.join( 'pkg', 
+                                                              'configsign') } }
+        @command.config[ :authorization ] = @key
       end
       
       should "ask for username and password" do
         @command.sign_in
         assert_received(@command) { |command| command.ask("Username: ") }
         assert_received(@command) { |command| command.ask_for_password("Password: ") }
-        assert_received(@command) { |command| command.store_config(:authorization, "Basic dXNlcm5hbWU6cGFzc3dvcmQgMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODk=") }
+        assert_equal( @command.config[ :authorization ], 
+                      "Basic dXNlcm5hbWU6cGFzc3dvcmQgMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODk=" )
       end
 
       should "say that we signed in" do
         @command.sign_in
         assert_received(@command) { |command| command.say("Enter your Nexus credentials") }
         assert_received(@command) { |command| command.say("Your Nexus credentials has been stored in ~/.gem/nexus") }
-        assert_received(@command) { |command| command.store_config(:authorization, "Basic dXNlcm5hbWU6cGFzc3dvcmQgMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODk=") }
+        assert_equal( @command.config[ :authorization ], 
+                      "Basic dXNlcm5hbWU6cGFzc3dvcmQgMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODk=" )
       end
     end
 
     context "configure nexus url" do
       setup do
-        @url = "url"
-
+        @url = "http://url"
+ 
         stub(@command).say
         stub(@command).ask { @url }
-        stub(@command).store_config { {:url => @url} }
+        stub(@command).options { {:nexus_config => File.join( 'pkg', 
+                                                              'configurl') } }
+        @command.config[ :url ] = @url
       end
 
       should "ask for nexus url" do
         @command.configure_url
         assert_received(@command) { |command| command.ask("URL: ") }
-        assert_received(@command) { |command| command.store_config(:url, "url") }
+        assert_equal( @command.config[ :url ], "http://url" )
       end
 
       should "say that we configured the url" do
         @command.configure_url
         assert_received(@command) { |command| command.say("Enter the URL of the rubygems repository on a Nexus server") }
         assert_received(@command) { |command| command.say("The Nexus URL has been stored in ~/.gem/nexus") }
-        assert_received(@command) { |command| command.store_config(:url, "url") }
+        assert_equal( @command.config[ :url ], "http://url" )
       end
     end
   end

data/test/config_test.rb

@@ -0,0 +1,164 @@
+require 'minitest/autorun'
+require 'shoulda'
+require 'fileutils'
+
+class ConfigTest < ::MiniTest::Unit::TestCase
+  include ShouldaContextLoadable 
+  
+  context 'file' do
+
+    should 'store key/values with repo' do
+      file = File.join( 'pkg', 'cfg' )
+      FileUtils.rm_f file
+      f = Nexus::Config::File.new( file, 'first' )
+      f[ 'asd' ] = 'dsa'
+      assert_equal( f.store, true )
+      ff = Nexus::Config::File.new( file, 'first' )
+      assert_equal( ff[ 'asd' ], 'dsa' )
+      ff = Nexus::Config::File.new( file, nil )
+      assert_equal( ff[ 'asd' ], nil )
+    end
+
+    should 'store key/values without repo' do
+      file = File.join( 'pkg', 'cfg' )
+      FileUtils.rm_f file
+      f = Nexus::Config::File.new( file, nil )
+      f[ 'asd' ] = 'dsa'
+      assert_equal( f.store, true )
+      ff = Nexus::Config::File.new( file, nil )
+      assert_equal( ff[ 'asd' ], 'dsa' )
+      ff = Nexus::Config::File.new( file, 'first' )
+      assert_equal( ff[ 'asd' ], nil )
+    end
+
+    should 'not store anything' do
+      f = Nexus::Config::File.new( nil, nil )
+      f[ 'asd' ] = 'dsa'
+      assert_equal( f.store, false )
+      ff = Nexus::Config::File.new( nil, 'first' )
+      f[ 'asd' ] = 'dsa'
+      assert_equal( f.store, false )
+    end
+  end
+
+  context 'config' do
+
+    should 'not use secrets file' do
+      file = File.join( 'pkg', 'cfg' )
+      FileUtils.rm_f file
+      c = Nexus::Config.new( :second, file, nil )
+      c[ 'asd' ] = 'dsa'
+      assert_equal c.key?( 'asd' ), true
+      
+      cc = Nexus::Config::File.new( file, :second )
+      assert_equal cc.key?( 'asd' ), true
+      assert_equal cc[ 'asd' ], 'dsa'
+    
+      cc = Nexus::Config::File.new( file, nil )
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ 'asd' ], nil
+
+      cc = Nexus::Config::File.new( file, 'third' )
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ 'asd' ], nil
+
+      cc = Nexus::Config.new( :second, file, nil )
+      assert_equal cc.key?( 'asd' ), true
+      assert_equal cc[ 'asd' ], 'dsa'
+
+      cc = Nexus::Config.new( nil, file, nil )
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ 'asd' ], nil
+
+      cc = Nexus::Config.new( 'third', file, nil )
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ 'asd' ], nil
+    end
+
+    should 'use secrets file' do
+      file = File.join( 'pkg', 'cfgstub' )
+      sfile = File.join( 'pkg', 'cfgsecrets' )
+      FileUtils.rm_f file
+      FileUtils.rm_f sfile
+      c = Nexus::Config.new( :second, file, sfile )
+      c[ 'asd' ] = 'dsa'
+      c[ :authorization ] = 'BASIC asddsa'
+
+      assert_equal c.key?( :secrets ), false
+      assert_equal c.key?( 'asd' ), true
+      assert_equal c.key?( :authorization ), true
+      
+      cc = Nexus::Config::File.new( file, :second )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), true
+      assert_equal cc[ 'asd' ], 'dsa'
+    
+      cc = Nexus::Config::File.new( file, nil )
+      assert_equal cc.key?( :secrets ), true
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ :secrets ], sfile
+
+      cc = Nexus::Config::File.new( file, 'third' )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), false
+
+      cc = Nexus::Config.new( :second, file, nil )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), true
+      assert_equal cc.key?( 'asd' ), true
+      assert_equal cc[ 'asd' ], 'dsa'
+      assert_equal cc[ :authorization ], 'BASIC asddsa'
+
+      cc = Nexus::Config.new( nil, file, nil )
+      assert_equal cc.key?( :secrets ), true
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ :secrets ], sfile
+
+      cc = Nexus::Config.new( 'third', file, nil )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), false
+    end
+
+    should 'copy authorization when starting to use secrets file' do
+      file = File.join( 'pkg', 'cfgstub' )
+      sfile = File.join( 'pkg', 'cfgsecrets' )
+      FileUtils.rm_f file
+      FileUtils.rm_f sfile
+      c = Nexus::Config.new( nil, file, nil )
+      c[ 'asd' ] = 'dsa'
+      c[ :authorization ] = 'BASIC asddsa'
+
+      assert_equal c.key?( 'asd' ), true
+      assert_equal c.key?( :authorization ), true
+      
+      c = Nexus::Config.new( nil, file, sfile )
+      assert_equal c.key?( :secrets ), true
+      assert_equal c.key?( 'asd' ), true
+      assert_equal c.key?( :authorization ), true
+      assert_equal c[ :authorization ], 'BASIC asddsa'
+      assert_equal c[ :secrets ], sfile
+      
+      cc = Nexus::Config::File.new( sfile, nil )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), true
+      assert_equal cc.key?( 'asd' ), false
+      assert_equal cc[ :authorization ], 'BASIC asddsa'
+
+      cc = Nexus::Config::File.new( file, nil )
+      assert_equal cc.key?( :secrets ), true
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), true
+      assert_equal cc[ :secrets ], sfile
+
+      cc = Nexus::Config::File.new( file, 'third' )
+      assert_equal cc.key?( :secrets ), false
+      assert_equal cc.key?( :authorization ), false
+      assert_equal cc.key?( 'asd' ), false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Quaranto
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,11 +74,17 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.16'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.16'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -111,11 +117,13 @@ files:
 - lib/bundler/rubygems_mirror.rb
 - lib/bundler/monkey_patch.rb
 - lib/nexus/version.rb
+- lib/nexus/config.rb
 - lib/commands/abstract_command.rb
 - lib/commands/nexus.rb
 - test/command_helper.rb
 - test/nexus_command_test.rb
 - test/abstract_command_test.rb
+- test/config_test.rb
 homepage: https://github.com/sonatype/nexus-ruby-support/tree/master/nexus-gem
 licenses:
 - MIT-LICENSE
@@ -123,10 +131,10 @@ metadata: {}
 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\
-  \ fork with mirror support. \n                       just add a mirror with:\n\n\
-  \    bundle config mirror.http://rubygems.org http://localhost:8081/nexus/content/repositories/rubygems.org\n\
-  \n                       and use 'nbundle' instead of 'bundle'\n\n========================================================================\n\
-  \n"
+  \ fork with mirror support. for bundler before 1.5.0\n                       \n\
+  add a mirror with:\n\n    bundle config mirror.http://rubygems.org http://localhost:8081/nexus/content/repositories/rubygems.org\n\
+  \nfor bundler before 1.5.0 use 'nbundle' instead of 'bundle' to use the mirror\n\
+  \n========================================================================\n\n"
 rdoc_options: []
 require_paths:
 - lib