naether 0.13.8 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c037cdec7803dbf78021ed5bf38f64bd829748
-  data.tar.gz: d2de25e2ea21a13253d444eb2389be2c8ccf3be0
+  metadata.gz: d2ad6d62db5306141a5d0f1e4dd48ed98baaefa6
+  data.tar.gz: c27debdda22817dc0120390b06dbd96bb795ef18
 SHA512:
-  metadata.gz: 715eccbb21bec67e8d51b68ced6ea8e15898c4e097fef3a3b2ea5a09ef068c41f69147950c34d38af3b5b87f5c66adf4ba674a1947d3c1274c0eccf68a795da7
-  data.tar.gz: 173f0d347e7758bcb98a4dd9a12cb94726c52794f80173e0a19ff857a480120ce80ed2da968b35bcc2bd393aabc893b28183d3aa5c2dcf10c7c8e42f1853f5c5
+  metadata.gz: 8703cd80aace1d1bf7aece60e0e320095549388c4da134845f6bad7eb871ac5e92ad4074f4ba637b1e139eb0dba3bc74e7d9c59d24fb2e5a6f51e8f309f8df03
+  data.tar.gz: bd1a090d6860b1dbf2af7f67c48e72d5f427dfb12a3e3257f7f4bcbfbdfa6b43d5f021257e353d0b094ebed4d65fa4317aa823383f2dea01c1792257c1dc6d73

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
 
+gem 'httpclient'
+
 platform = $platform || RUBY_PLATFORM[/java/] || 'ruby'
  if platform != 'java'
   gem 'rjb', '~> 1.4.0'

data/Gemfile.lock

@@ -19,6 +19,7 @@ GEM
       oauth2
     hashie (3.3.2)
     highline (1.6.21)
+    httpclient (2.6.0.1)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -67,6 +68,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  httpclient
   jeweler (~> 2.0.0)
   kramdown
   rjb (~> 1.4.0)

data/README.md

@@ -18,6 +18,12 @@ JRuby is natively supported. Vanilla Ruby uses [Rjb](http://rjb.rubyforge.org) t
     gem install naether
     
 The jar dependencies for Naether will automatically be downloaded when the gem installs.
+    
+#### Custom Maven Repo
+
+You can override the default Maven Repo used to download jar dependencies by setting the _NAETHER_MIRROR_ environment variable.
+
+    NAETHER_MIRROR=http://my.local.repo/m2 gem install naether
 
 ### Java
 

data/VERSION

@@ -1 +1 @@
-0.13.8
+0.14.0

data/lib/naether/bootstrap.rb

@@ -4,27 +4,35 @@ require "#{File.dirname(__FILE__)}/configuration"
 require 'yaml'
 require 'open-uri'
 require 'fileutils'
+require 'httpclient'
 
 module Naether
-  
+
   #
   # Helper for bootstrapping Naether
   #
   # @author Michael Guymon
   #
   class Bootstrap
-    
+
     @@dependencies = nil
-    
+
     class << self
-      
+
       # Default local repo of ENV['M2_REPO'] or ~/.m2/repository
       #
       # @return [String]
       def default_local_repo
         ENV['M2_REPO'] || File.expand_path('~/.m2/repository')
       end
-      
+
+      # Maven URL to fetch jars from, ENV['NAETHER_MIRROR'] or
+      #
+      # @return [String]
+      def maven_url
+        ENV['NAETHER_MIRROR'] || 'http://repo1.maven.org/maven2'
+      end
+
       # Write bootstrap dependencies to yaml file
       def write_dependencies( dest = 'jar_dependencies.yml' )
         deps = {};
@@ -33,32 +41,32 @@ module Naether
         else
           bootstrap = Rjb::import('com.tobedevoured.naether.Bootstrap')
           deps[:dependencies] = bootstrap.dependencies.toArray().map{ |dep| dep.toString() }
-        end  
-        
+        end
+
         File.open( dest, 'w' ) do |out|
           YAML.dump( deps, out )
         end
       end
-      
+
       # List of Java dependencies for Naether from yaml dependency file. Caches
       # result after first run.
-      # 
+      #
       # @param [String] dep_file path, defaults to Naether::Configuration.dependencies_yml
       # @return [List]
       def dependencies( dep_file=nil )
-        
+
         if @@dependencies
           return @@dependencies
         end
-        
+
         if dep_file.nil?
           dep_file = Naether::Configuration.dependencies_yml
         end
-        
-        dep = YAML.load_file( dep_file )  
+
+        dep = YAML.load_file( dep_file )
         @@dependencies = dep[:dependencies]
       end
-      
+
 
       #
       # Bootstrap the local repo by downloading Naether's dependencies
@@ -67,26 +75,22 @@ module Naether
       #
       def bootstrap_local_repo(local_repo = nil, opts = {} )
         local_repo = local_repo || default_local_repo
-        
+
         opts[:local_repo] = local_repo
-        
+
         temp_naether_dir = File.join( local_repo, ".naether" )
-        
-        
+
         deps = download_dependencies( temp_naether_dir, opts )
-        
+
         jars = (deps[:exists] + deps[:downloaded]).map {|jar| jar.values.first }
-          
+
         jars = Naether::Java.internal_load_paths( jars )
-        
+
         if ( deps[:downloaded].size > 0)
           install_dependencies_to_local_repo( deps[:downloaded], jars, opts )
         end
-        
-        #raise Naether::Java.internal_loaded_paths.inspect
-        
       end
-      
+
       #
       # Download Naether dependencies
       #
@@ -94,112 +98,119 @@ module Naether
       # @param [Hash] opts
       # @return [Hash] with status of missing, downloaded, exists dependencies
       def download_dependencies( dest, opts = {} )
-         
+
         if !File.exists? dest
           FileUtils.mkdir_p( dest )
         end
-        
+
         deps = {}
-          
+
         if opts[:deps]
-          deps[:missing] = opts[:deps] 
+          deps[:missing] = opts[:deps]
         else
           deps = check_local_repo_for_deps( opts[:local_repo], opts )
         end
-        
+
         deps[:downloaded] = []
-          
+
         if deps[:missing].size > 0
-            
+          http_client = HTTPClient.new
+
           deps[:missing].each do |dep|
             notation = dep.split(":")
             group = notation[0].gsub("\.", File::SEPARATOR)
             artifact = notation[1]
             type = notation[2]
             version = notation[3]
-            
+
             jar = "#{artifact}-#{version}.#{type}"
-            
+
             maven_path = "#{dest}#{File::SEPARATOR}#{jar}"
-            
+
             if !File.exists? maven_path
-              maven_mirror = "http://repo1.maven.org/maven2/#{group}/#{artifact}/#{version}/#{jar}"
-              
-              open(maven_path, 'wb') do |io|
-                io.print open(maven_mirror).read
+              maven_jar_url = "#{maven_url}/#{group}/#{artifact}/#{version}/#{jar}"
+
+              data = http_client.get(maven_jar_url)
+
+              if data.ok?
+                open(maven_path, 'wb') do |io|
+                  io.print data.content
+                end
+              else
+                raise "Failed to download #{maven_jar_url}"
               end
-              
+
               deps[:downloaded] << { dep => maven_path }
             else
               deps[:downloaded] << { dep => maven_path }
             end
           end
         end
-        
+
         deps
       end
-      
+
       #
       # Check local_repo for Naether dependencies
-      # 
+      #
       # @param [String] local_repo
       # @param [Hash] opts
       # @return [Hash] with status of missing, downloaded, exists dependencies
       def check_local_repo_for_deps(local_repo = nil, opts = {} )
-        
+
         local_repo = local_repo || default_local_repo
         local_repo = File.expand_path(local_repo)
-        
+
         #puts "Checking #{local_repo} for jars to bootstrap Naether"
-        
+
         deps = {:exists => [], :missing => [], :downloaded => [] }
-        
+
         dependencies( opts[:dep_yaml] ).each do |dep|
           notation = dep.split(":")
           group = notation[0].gsub("\.", File::SEPARATOR)
           artifact = notation[1].gsub("\.", File::SEPARATOR)
           type = notation[2]
           version = notation[3]
-          
+
           jar = "#{artifact}-#{version}.#{type}"
-          
+
           maven_path = "#{local_repo}#{File::SEPARATOR}#{group}#{File::SEPARATOR}#{artifact}#{File::SEPARATOR}#{version}#{File::SEPARATOR}#{jar}"
-          
+
           if File.exists? maven_path
             deps[:exists] << { dep => maven_path }
           else
             deps[:missing] << dep
           end
-          
-        end  
+
+        end
         deps
       end
-      
+
       #
       # Install Naether Dependencies to local_repo
-      # 
-      # @param [Array<String>] install_jars 
+      #
+      # @param [Array<String>] install_jars
       # @param [Array<String>] naether_jars to bootstrap Naether. These may overlap with install_jars.
       # @param [Hash] opts
       # @return [Naether]
       #
       def install_dependencies_to_local_repo( install_jars, naether_jars, opts = {}  )
-          
+
         require "#{File.dirname(__FILE__)}/../naether"
-        
+
         @naether = Naether.create_from_jars( naether_jars )
-        
+
         if opts[:local_repo]
           @naether.local_repo_path = opts[:local_repo]
         end
-        
+
         install_jars.each do |dep|
           notation, path = dep.to_a.first
           @naether.install( notation, nil, path )
         end
-        
+
         @naether
       end
     end
   end
-end
+end

data/naether.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: naether 0.13.8 ruby lib
+# stub: naether 0.14.0 ruby lib
 # stub: Rakefile
 
 Gem::Specification.new do |s|
   s.name = "naether"
-  s.version = "0.13.8"
+  s.version = "0.14.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Michael Guymon"]
-  s.date = "2015-01-13"
+  s.date = "2015-02-13"
   s.description = "Java dependency resolver using Maven's Aether"
   s.email = "michael@tobedevoured.com"
   s.extensions = ["Rakefile"]
@@ -27,8 +27,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "core-0.13.7.jar",
-    "core-0.13.8.jar",
+    "core-0.14.0.jar",
     "jar_dependencies.yml",
     "lib/naether.rb",
     "lib/naether/bootstrap.rb",
@@ -52,12 +51,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<rjb>, ["~> 1.4.0"])
       s.add_development_dependency(%q<rspec>, ["> 2.9.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<kramdown>, [">= 0"])
     else
+      s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<rjb>, ["~> 1.4.0"])
       s.add_dependency(%q<rspec>, ["> 2.9.0"])
       s.add_dependency(%q<jeweler>, ["~> 2.0.0"])
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<kramdown>, [">= 0"])
     end
   else
+    s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<rjb>, ["~> 1.4.0"])
     s.add_dependency(%q<rspec>, ["> 2.9.0"])
     s.add_dependency(%q<jeweler>, ["~> 2.0.0"])

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: naether
 version: !ruby/object:Gem::Version
-  version: 0.13.8
+  version: 0.14.0
 platform: ruby
 authors:
 - Michael Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rjb
   requirement: !ruby/object:Gem::Requirement
@@ -95,8 +109,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- core-0.13.7.jar
-- core-0.13.8.jar
+- core-0.14.0.jar
 - jar_dependencies.yml
 - lib/naether.rb
 - lib/naether/bootstrap.rb