lock_jar 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0feaafb9dec0247045b0a9fc3f93d2f5c436f4
-  data.tar.gz: 92bcdb938a888a3e1b257ea55f249fd42b45d701
+  metadata.gz: 4b41c3d8273b939aac806212cb513231814b9e8d
+  data.tar.gz: be972001b5e6b24e10e51d2118befbc683fe02ad
 SHA512:
-  metadata.gz: 99432144f9aaf70cdc09f3022700fcb50462e38906fbca63a700662caf85578c11df5eff17e2bb67b6b17e679a42040d51f4470d2266ffe50e4fc13535afd676
-  data.tar.gz: 8fb7bfbd937b66c069d90f58ae15508e49aca8f056fc45411ddae5afd92c96aa6cfc8d43fb945cd8b6c2d4158f03807b262ffcb48c33e1d38b4d57ed878dd797
+  metadata.gz: 4c0316ff7f5de2b1be1d3ad31a627d658e511f93092cb2b06cb0b7d9d388a18116417bdba1588d175589b0204ffc1c4d52bbfec6cf35768d3a6f6251885cb780
+  data.tar.gz: d84ba953c5da074528dc2bae16634715db45622a0e98d5f7470beeb4db8fbe3f996c8c7e0ef847b79769e13ce7b3e553ec6dcc426a99e2541d63d3da4cd5a50e

data/Gemfile

@@ -11,5 +11,4 @@ end
 group :development do
   gem 'pry'
   gem 'yard'
-  gem 'rubocop', '~> 0.36.0'
 end

data/README.md

@@ -7,7 +7,7 @@ LockJar manages Java Jars for Ruby. Powered by [Naether](https://github.com/mguy
  create a frankenstein of Bundler and Maven. A Jarfile ([example](https://github.com/mguymon/lock_jar/blob/master/spec/support/Jarfile)) is used to generate a Jarfile.lock that contains all the resolved jar dependencies. The Jarfile.lock can be used to populate the classpath.
 
 LockJar can:
-* Be used directly in MRI 1.9.3, 2.0, 2.1 and JRuby 1.6, 1.7
+* Be used directly in MRI 2.x and JRuby 1.7, 9.0
 * From the [command line](https://github.com/mguymon/lock_jar/blob/master/README.md#command-line)
 * [Triggered from a Gem install](https://github.com/mguymon/lock_jar/blob/master/README.md#gem-integration)
 * [Integrated into Buildr](https://github.com/mguymon/lock_jar/blob/master/README.md#buildr-integration)
@@ -271,6 +271,17 @@ As part of the load process for the Gem (an entry file that is required, etc) us
 
 See also [loading Jars into a custom ClassLoader](https://github.com/mguymon/lock_jar/wiki/ClassLoader).
 
+## Authentication
+
+LockJar supports authentication to repository by passing in credentials from a `.lockjar` file. The YAML file contains a username and passwords per repository, for example:
+
+    repositories:
+      'https://some.fancy.doman/maven':
+        username: 'user1'
+        password: 'the_pass'
+
+The order of precedence for locating the `.lockjar` file is the `ENV['LOCKJAR_CONFIG']`, current working directory, and last the user's home directory.
+
 ## Buildr Integration
 
 LockJar integrates with [Buildr](http://buildr.apache.org/) using an [Addon](https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/buildr.rb). This allows the Jarfile to be defined directly into a _buildfile_. A global LockJar definition can be set and is inherited to all projects. Each project may have its own LockJar definition. A lock file is generated per project based on the project name.

data/lib/lock_jar.rb

@@ -14,6 +14,7 @@
 # the License.
 
 require 'yaml'
+require 'lock_jar/config'
 require 'lock_jar/resolver'
 require 'lock_jar/runtime'
 require 'lock_jar/version'

data/lib/lock_jar/config.rb

@@ -0,0 +1,41 @@
+require 'yaml'
+
+module LockJar
+  # Global configuration for LockJar
+  class Config
+    CONFIG_ENV = 'LOCKJAR_CONFIG'.freeze
+    DEFAULT_FILENAME = '.lockjar'.freeze
+
+    attr_reader :repositories
+
+    class << self
+      # Load .lockjar YAML config file from ENV['LOCKJAR_CONFIG'], current_dir, or
+      # home dir.
+      def load_config_file
+        local_config_paths =
+          [Dir.pwd, Dir.home]
+          .map { |path| File.join(path, DEFAULT_FILENAME) }
+
+        config_path =
+          ([ENV[CONFIG_ENV]] + local_config_paths)
+          .compact
+          .find { |path| File.exist? path }
+
+        new(YAML.load_file(config_path)) if config_path
+      end
+    end
+
+    #
+    # {
+    #   'repositories' => {
+    #     ':url' => {
+    #       'username' => ''
+    #       'password' => ''
+    #     }
+    #   }
+    # }
+    def initialize(config)
+      @repositories = config['repositories'] || {}
+    end
+  end
+end

data/lib/lock_jar/resolver.rb

@@ -21,9 +21,10 @@ require 'fileutils'
 module LockJar
   #
   class Resolver
-    attr_reader :opts, :naether
+    attr_reader :config, :opts, :naether
 
-    def initialize(opts = {})
+    def initialize(config, opts = {})
+      @config = config || LockJar::Config.new({})
       @opts = opts
       local_repo = opts[:local_repo] || Naether::Bootstrap.default_local_repo
 
@@ -31,7 +32,6 @@ module LockJar
       Naether::Bootstrap.bootstrap_local_repo(local_repo, opts)
 
       # Bootstrapping naether will create an instance from downloaded jars.
-      # If jars exist locally already, create manually
       @naether = Naether.create
       @naether.local_repo_path = local_repo if local_repo
       @naether.clear_remote_repositories if opts[:offline]
@@ -46,7 +46,10 @@ module LockJar
     end
 
     def add_remote_repository(repo)
-      @naether.add_remote_repository(repo)
+      repo_config = config.repositories[repo] || {}
+      username = repo_config['username']
+      password = repo_config['password']
+      @naether.add_remote_repository(repo, username, password)
     end
 
     def resolve(dependencies, download_artifacts = true)

data/lib/lock_jar/runtime.rb

@@ -15,6 +15,7 @@
 
 require 'yaml'
 require 'singleton'
+require 'lock_jar/config'
 require 'lock_jar/resolver'
 require 'lock_jar/registry'
 require 'lock_jar/domain/dsl'
@@ -33,9 +34,10 @@ module LockJar
     include List
     include Install
 
-    attr_reader :current_resolver
+    attr_reader :current_resolver, :config
 
     def initialize
+      @config = Config.load_config_file
       @current_resolver = nil
     end
 
@@ -59,7 +61,7 @@ module LockJar
       end
 
       if @current_resolver.nil? || opts != @current_resolver.opts
-        @current_resolver = LockJar::Resolver.new(opts)
+        @current_resolver = LockJar::Resolver.new(config, opts)
       end
 
       @current_resolver

data/lib/lock_jar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module LockJar
   # still the version
-  VERSION = '0.15.1'.freeze
+  VERSION = '0.15.2'.freeze
 end

data/lock_jar.gemspec

@@ -26,5 +26,6 @@ classpath'
   s.add_dependency('naether', ['~> 0.15.0'])
   s.add_dependency('thor', ['>= 0.18.1'])
   s.add_development_dependency('rspec', '~> 2.14.1')
+  s.add_development_dependency('rubocop', '~> 0.35.0')
   s.add_development_dependency('rake')
 end

data/spec/fixtures/lock_jar_config.yml

@@ -0,0 +1,4 @@
+repositories:
+  'https://some.fancy.doman/maven':
+    username: 'user1'
+    password: 'the_pass'

data/spec/lock_jar/config_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe LockJar::Config do
+  describe '.load_config_file' do
+    let(:test_config_file) { File.join('spec', 'fixtures', 'lock_jar_config.yml') }
+    let(:temp_config_file) { File.join(TEMP_DIR, described_class::DEFAULT_FILENAME) }
+    let(:config) { described_class.load_config_file }
+    let(:expected_repo_config) do
+      {
+        'https://some.fancy.doman/maven' => {
+          'username' => 'user1',
+          'password' => 'the_pass'
+        }
+      }
+    end
+
+    before do
+      FileUtils.cp(test_config_file, temp_config_file)
+    end
+
+    context 'using current dir config' do
+      before do
+        allow(Dir).to receive(:pwd).and_return(TEMP_DIR)
+      end
+
+      it 'should have a repository config' do
+        expect(config.repositories).to eq(expected_repo_config)
+      end
+    end
+
+    context 'using home dir config' do
+      before do
+        allow(Dir).to receive(:home).and_return(TEMP_DIR)
+      end
+
+      it 'should have a repository config' do
+        expect(config.repositories).to eq(expected_repo_config)
+      end
+    end
+
+    context 'using ENV path to config' do
+      before do
+        ENV[described_class::CONFIG_ENV] = temp_config_file
+      end
+
+      it 'should have a repository config' do
+        expect(config.repositories).to eq(expected_repo_config)
+      end
+    end
+  end
+end

data/spec/lock_jar/resolver_spec.rb

@@ -4,12 +4,26 @@ require 'fileutils'
 require 'naether'
 
 describe LockJar::Resolver do
-  before(:each) do
+  subject { described_class.new(config, local_repo: "#{TEMP_DIR}/test-repo") }
+
+  before do
     FileUtils.mkdir_p("#{TEMP_DIR}/test-repo")
-    @resolver = LockJar::Resolver.new(local_repo: "#{TEMP_DIR}/test-repo")
+  end
+
+  let(:config) do
+    LockJar::Config.new(
+      'repositories' => {
+        'https://test/repo' => {
+          'username' => 'user1',
+          'password' => 'pass1'
+        }
+      }
+    )
   end
 
   it 'should bootstrap naether' do
+    subject
+
     deps = Naether::Bootstrap.check_local_repo_for_deps("#{TEMP_DIR}/test-repo")
     deps[:missing].should eql([])
     deps[:exists].each do |dep|
@@ -17,9 +31,39 @@ describe LockJar::Resolver do
     end
   end
 
-  it 'should return local paths for notations' do
-    expect(@resolver.to_local_paths(['org.testng:testng:jar:6.9.10'])).to(
-      eql([File.expand_path("#{TEMP_DIR}/test-repo/org/testng/testng/6.9.10/testng-6.9.10.jar")])
-    )
+  describe '#to_local_paths' do
+    it 'should return local paths for notations' do
+      expect(subject.to_local_paths(['org.testng:testng:jar:6.9.10'])).to(
+        eql([File.expand_path("#{TEMP_DIR}/test-repo/org/testng/testng/6.9.10/testng-6.9.10.jar")])
+      )
+    end
+  end
+
+  describe '#add_remote_repository' do
+    let(:remote_repos) do
+      subject.naether.remote_repositories.map do |repo|
+        {
+          url: repo.url
+        }.tap do |hash|
+          if repo.authentication
+            hash[:username] = repo.authentication.username
+            hash[:password] = repo.authentication.password
+          end
+        end
+      end
+    end
+
+    let(:expected_remote_repos) do
+      [
+        { url: 'http://repo1.maven.org/maven2/' },
+        { url: 'https://test/repo', username: 'user1', password: 'pass1' }
+      ]
+    end
+
+    it 'should use repo config for auth' do
+      subject.add_remote_repository('https://test/repo')
+
+      expect(remote_repos).to eq(expected_remote_repos)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Michael Guymon
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - lib/lock_jar/bundler.rb
 - lib/lock_jar/class_loader.rb
 - lib/lock_jar/cli.rb
+- lib/lock_jar/config.rb
 - lib/lock_jar/domain/artifact.rb
 - lib/lock_jar/domain/dsl.rb
 - lib/lock_jar/domain/dsl_merger.rb
@@ -119,10 +134,12 @@ files:
 - spec/fixtures/jarfile_gem/jarfile_gem.gemspec
 - spec/fixtures/jarfile_gem/lib/jarfile_gem.rb
 - spec/fixtures/jarfile_gem/lib/jarfile_gem/version.rb
+- spec/fixtures/lock_jar_config.yml
 - spec/fixtures/naether-0.13.0.jar
 - spec/lock_jar/bundler_spec.rb
 - spec/lock_jar/class_loader_spec.rb
 - spec/lock_jar/cli_spec.rb
+- spec/lock_jar/config_spec.rb
 - spec/lock_jar/domain/dsl_merger_spec.rb
 - spec/lock_jar/domain/dsl_spec.rb
 - spec/lock_jar/domain/gem_dsl_spec.rb
@@ -167,10 +184,12 @@ test_files:
 - spec/fixtures/jarfile_gem/jarfile_gem.gemspec
 - spec/fixtures/jarfile_gem/lib/jarfile_gem.rb
 - spec/fixtures/jarfile_gem/lib/jarfile_gem/version.rb
+- spec/fixtures/lock_jar_config.yml
 - spec/fixtures/naether-0.13.0.jar
 - spec/lock_jar/bundler_spec.rb
 - spec/lock_jar/class_loader_spec.rb
 - spec/lock_jar/cli_spec.rb
+- spec/lock_jar/config_spec.rb
 - spec/lock_jar/domain/dsl_merger_spec.rb
 - spec/lock_jar/domain/dsl_spec.rb
 - spec/lock_jar/domain/gem_dsl_spec.rb