mini_aether 0.0.5-java → 0.0.6-java

data/lib/mini_aether.rb

@@ -1,4 +1,5 @@
 require 'java'
+require 'logger'
 require 'mini_aether/spec'
 
 module MiniAether
@@ -6,7 +7,45 @@ module MiniAether
 
   M2_SETTINGS = File.join(ENV['HOME'], '.m2', 'settings.xml').freeze
 
+  class LoggerConfig
+    attr_reader :level
+
+    def initialize
+      @level = 'INFO'
+    end
+
+    def level=(level)
+      @level = case level
+               when Symbol, String
+                 level.to_s.upcase
+               when Logger::FATAL, Logger::ERROR
+                 'ERROR'
+               when Logger::WARN
+                 'WARN'
+               when Logger::INFO
+                 'INFO'
+               when Logger::DEBUG
+                 'DEBUG'
+               else
+                 'INFO'
+               end
+    end
+
+    def info?
+      case @level
+      when 'INFO', 'DEBUG'
+        true
+      else
+        false
+      end
+    end
+  end
+
   class << self
+    def logger
+      @logger ||= LoggerConfig.new
+    end
+
     # Create a new ScriptingContainer (Java object interface to a
     # JRuby runtime) in SINGLETHREAD mode, and yield it to the block.
     # Ensure the runtime is terminated after the block returns.
@@ -14,6 +53,9 @@ module MiniAether
       scope = Java::OrgJrubyEmbed::LocalContextScope::SINGLETHREAD
       c = Java::OrgJrubyEmbed::ScriptingContainer.new(scope)
       begin
+        # short-lived container of mostly java calls may be a bit
+        # faster without spending time to JIT
+        c.setCompileMode Java::OrgJruby::RubyInstanceConfig::CompileMode::OFF
         yield c
       ensure
         c.terminate

data/lib/mini_aether/bootstrap.rb

@@ -1,3 +1,4 @@
+require 'mini_aether/helper'
 require 'mini_aether/spec'
 require 'mini_aether/xml_parser'
 require 'fileutils'
@@ -8,162 +9,129 @@ require 'uri'
 
 module MiniAether
   module Bootstrap
-    System = Java::JavaLang::System
-
-    # Pre-resolved dependencies of mini_aether.
-    def dependencies
-      spec = Spec.new do
-        group 'org.sonatype.aether' do
-          version '1.13.1' do
-            jar 'aether-api'
-            jar 'aether-connector-asynchttpclient'
-            jar 'aether-connector-file'
-            jar 'aether-impl'
-            jar 'aether-spi'
-            jar 'aether-util'
+    class << self
+      # Load the required jar files, downloading them if necessary.
+      #
+      # Ignores any maven config regarding repositories and attempts a
+      # direct download from repo1.maven.org using Net::HTTP.
+      def bootstrap!
+        logback = false
+        dependencies.each do |dep|
+          require ensure_dependency(dep)
+          if dep[:artifact_id] == 'logback-classic'
+            logback = true
           end
         end
+        initialize_logger if logback
+      end
 
-        jar 'com.ning:async-http-client:1.6.5'
-        jar 'org.jboss.netty:netty:3.2.5.Final'
-        jar 'org.slf4j:slf4j-api:1.6.2'
-
-        begin
-          Java::OrgSlf4jImpl::StaticLoggerBinder
-        rescue NameError
-          # use logback when no slf4j backend exists
-          jar 'ch.qos.logback:logback-core:1.0.6'
-          jar 'ch.qos.logback:logback-classic:1.0.6'
-          # add dir to classpath since it contains logback.xml
-          $CLASSPATH << File.expand_path(File.dirname(__FILE__))
-        end
+      private
 
-        group 'org.apache.maven' do
-          version '3.0.4' do
-            jar 'maven-aether-provider'
-            jar 'maven-model'
-            jar 'maven-model-builder'
-            jar 'maven-repository-metadata'
-          end
-        end
+      include Helper
 
-        group 'org.codehaus.plexus' do
-          jar 'plexus-interpolation:1.14'
-          jar 'plexus-component-annotations:1.5.5'
-          jar 'plexus-utils:2.0.6'
+      def initialize_logger
+        file = File.expand_path('../logback.xml', __FILE__)
+        context = Java::OrgSlf4j::LoggerFactory.getILoggerFactory
+        begin
+          configurator = Java::ChQosLogbackClassicJoran::JoranConfigurator.new
+          configurator.setContext(context)
+          context.reset
+          context.putProperty("level", MiniAether.logger.level)
+          configurator.doConfigure(file)
+        rescue Java::ChQosLogbackCoreJoranSpi::JoranException
+          # StatusPrinter will handle this
         end
+        Java::ChQosLogbackCoreUtil::StatusPrinter.printInCaseOfErrorsOrWarnings context
       end
 
-      spec.dependencies
-    end
-
-    # Interpolate variables like +${user.home}+ and +${env.HOME}+ from
-    # system properties and environment variables respectively.
-    def interpolate(str)
-      ret = ''
-
-      s = StringScanner.new(str)
-      pos = s.pos
+      # Pre-resolved dependencies of mini_aether.  This list includes a
+      # set of dependencies and all transient dependencies.
+      def dependencies
+        mini_aether_spec.dependencies
+      end
 
-      while s.scan_until(/\$\{[^\s}]+\}/) # match ${stuff}
-        # add the pre_match, but only starting from previous position
-        ret << str.slice(pos, (s.pos - pos - s.matched.size))
+      # @return [MiniAether::Spec] the dependencies of mini_aether itself
+      def mini_aether_spec
+        Spec.new do
+          group 'org.sonatype.aether' do
+            version '1.13.1' do
+              jar 'aether-api'
+              jar 'aether-connector-asynchttpclient'
+              jar 'aether-connector-file'
+              jar 'aether-impl'
+              jar 'aether-spi'
+              jar 'aether-util'
+            end
+          end
 
-        # interpolate
-        var = s.matched.slice(2..-2)
-        ret << case var
-               when /^env\.(.*)/
-                 ENV[$1] || ''
-               else
-                 System.getProperty(var) || ''
-               end
+          jar 'com.ning:async-http-client:1.6.5'
+          jar 'org.jboss.netty:netty:3.2.5.Final'
+          jar 'org.slf4j:slf4j-api:1.6.2'
 
-        pos = s.pos
-      end
-      ret << s.rest
-      
-      ret
-    end
+          begin
+            Java::OrgSlf4jImpl::StaticLoggerBinder
+          rescue NameError
+            # use logback when no slf4j backend exists
+            jar 'ch.qos.logback:logback-core:1.0.6'
+            jar 'ch.qos.logback:logback-classic:1.0.6'
+          end
 
-    def local_repository_path
-      default_local_repo_path =
-        File.join(System.getProperty('user.home'), '.m2', 'repository')
+          group 'org.apache.maven' do
+            version '3.0.4' do
+              jar 'maven-aether-provider'
+              jar 'maven-model'
+              jar 'maven-model-builder'
+              jar 'maven-repository-metadata'
+            end
+          end
 
-      if File.exists? M2_SETTINGS
-        xml = File.read M2_SETTINGS
-        begin
-          parser = XmlParser.new(xml)
-          parser.pull_to_path(:settings, :localRepository)
-          interpolate(parser.pull_text_until_end.strip)
-        rescue XmlParser::NotFoundError
-          default_local_repo_path
+          group 'org.codehaus.plexus' do
+            jar 'plexus-interpolation:1.14'
+            jar 'plexus-component-annotations:1.5.5'
+            jar 'plexus-utils:2.0.6'
+          end
         end
-      else
-        default_local_repo_path
       end
-    end
-
-    def ensure_dependency(dep)
-      path = jar_path(dep)
-      local_file = File.join(local_repository_path, path)
-      install(path, local_file) unless File.exists?(local_file)
-      local_file
-    end
 
-    # Load the required jar files, downloading them if necessary.
-    #
-    # Ignores any maven config regarding repositories and attempts a
-    # direct download from repo1.maven.org using Net::HTTP.
-    def bootstrap!
-      dependencies.each do |dep|
-        require ensure_dependency(dep)
+      def ensure_dependency(dep)
+        path = jar_path(dep)
+        local_file = File.join(local_repository_path, path)
+        install(path, local_file) unless File.exists?(local_file)
+        local_file
       end
-    end
 
-    def install(path, file, repo = MAVEN_CENTRAL_REPO)
-      print "installing #{File.basename(path)}... "
-      $stdout.flush
-
-      remote_base = File.dirname(path) + '/' + File.basename(path, File.extname(path))
-      local_dir = File.dirname(file)
-      local_base = File.join(local_dir, File.basename(file, File.extname(file)))
-
-      exts = [File.extname(path), '.pom', '.pom.sha1']
-      exts.each do |ext|
-        uri = URI("#{repo}/#{remote_base}#{ext}")
-        local_file = local_base + ext
-
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Get.new uri.request_uri
-          
-          http.request request do |response|
-            unless response.code == '200'
-              raise "#{response.code} #{response.message}: #{uri}"
-            end
+      def install(path, file, repo = MAVEN_CENTRAL_REPO)
+        if MiniAether.logger.info?
+          puts "[mini_aether] INFO  bootstrap installing #{File.basename(path)}"
+        end
+
+        remote_base = File.dirname(path) + '/' + File.basename(path, File.extname(path))
+        local_dir = File.dirname(file)
+        local_base = File.join(local_dir, File.basename(file, File.extname(file)))
+
+        exts = [File.extname(path), '.pom', '.pom.sha1']
+        exts.each do |ext|
+          uri = URI("#{repo}/#{remote_base}#{ext}")
+          local_file = local_base + ext
+
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            request = Net::HTTP::Get.new uri.request_uri
+            
+            http.request request do |response|
+              unless response.code == '200'
+                raise "#{response.code} #{response.message}: #{uri}"
+              end
 
-            FileUtils.mkdir_p local_dir
-            open local_file, 'w' do |io|
-              response.read_body do |chunk|
-                io.write chunk
+              FileUtils.mkdir_p local_dir
+              open local_file, 'w' do |io|
+                response.read_body do |chunk|
+                  io.write chunk
+                end
               end
             end
           end
         end
-
-        print "#{ext} "
-        $stdout.flush
       end
-      puts
-    end
-
-    def jar_path(dep)
-      group_id = dep[:group_id]
-      group_path = group_id.gsub('.', '/')
-      artifact_id = dep[:artifact_id]
-      version = dep[:version]
-
-      file_name = "#{artifact_id}-#{version}.jar"
-      "#{group_path}/#{artifact_id}/#{version}/#{file_name}"
     end
   end
 end

data/lib/mini_aether/helper.rb

@@ -0,0 +1,67 @@
+module MiniAether
+  module Helper
+    System = Java::JavaLang::System
+
+    def local_repository_path
+      default_local_repo_path =
+        File.join(System.getProperty('user.home'), '.m2', 'repository')
+
+      if File.exists? M2_SETTINGS
+        xml = File.read M2_SETTINGS
+        begin
+          parser = XmlParser.new(xml)
+          parser.pull_to_path(:settings, :localRepository)
+          interpolate(parser.pull_text_until_end.strip)
+        rescue XmlParser::NotFoundError
+          default_local_repo_path
+        end
+      else
+        default_local_repo_path
+      end
+    end
+
+    # Interpolate variables like +${user.home}+ and +${env.HOME}+ from
+    # system properties and environment variables respectively.
+    def interpolate(str)
+      ret = ''
+
+      s = StringScanner.new(str)
+      pos = s.pos
+
+      while s.scan_until(/\$\{[^\s}]+\}/) # match ${stuff}
+        # add the pre_match, but only starting from previous position
+        ret << str.slice(pos, (s.pos - pos - s.matched.size))
+
+        # interpolate
+        var = s.matched.slice(2..-2)
+        ret << case var
+               when /^env\.(.*)/
+                 ENV[$1] || ''
+               else
+                 System.getProperty(var) || ''
+               end
+
+        pos = s.pos
+      end
+      ret << s.rest
+      
+      ret
+    end
+
+    # Build a m2 repository path fragment for +dep+.  For example,
+    # coordinates of +com.example:project:1.0.1+ would result in
+    # +com/example/project/1.0.1/project-1.0.1.jar+.
+    #
+    # @param [Hash] dep a hash with keys +:group_id+, +:artifact_id+, and +:version+
+    # @return [String] a path fragment to this artifact in m2 repository format
+    def jar_path(dep)
+      group_id = dep[:group_id]
+      group_path = group_id.gsub('.', '/')
+      artifact_id = dep[:artifact_id]
+      version = dep[:version]
+
+      file_name = "#{artifact_id}-#{version}.jar"
+      "#{group_path}/#{artifact_id}/#{version}/#{file_name}"
+    end
+  end
+end

data/lib/mini_aether/resolver.rb

@@ -6,12 +6,14 @@
 
 require 'mini_aether'
 require 'mini_aether/bootstrap'
+require 'mini_aether/helper'
 
-MiniAether.extend(MiniAether::Bootstrap)
-MiniAether.bootstrap!
+MiniAether::Bootstrap.bootstrap!
 
 module MiniAether
   class Resolver
+    include Helper
+
     RepositorySystem =
       Java::OrgSonatypeAether::RepositorySystem
 
@@ -64,7 +66,7 @@ module MiniAether
       @logger = Java::OrgSlf4j::LoggerFactory.getLogger(self.class.to_s)
       @system = LOCATOR.getService(RepositorySystem.java_class)
       @session = MavenRepositorySystemSession.new
-      local_repo = LocalRepository.new(MiniAether.local_repository_path)
+      local_repo = LocalRepository.new(local_repository_path)
       local_manager = @system.newLocalRepositoryManager(local_repo)
       @session.setLocalRepositoryManager(local_manager)
     end
@@ -98,19 +100,23 @@ module MiniAether
     #
     # @return [Java::JavaUtil::List<Java::JavaIo::File>]
     def resolve(dep_hashes, repos)
-      @logger.info 'resolving dependencies ({})', dep_hashes.size
+      @logger.info 'resolving dependencies'
       collect_req = CollectRequest.new
 
       dep_hashes.each do |hash|
         dep = Dependency.new new_artifact(hash), 'compile'
         collect_req.addDependency dep
-        @logger.info 'requested {}', dep
+        @logger.debug 'requested {}', dep
       end
 
       repos.each do |uri|
         repo = RemoteRepository.new(uri.object_id.to_s, 'default', uri)
         collect_req.addRepository repo
-        @logger.info 'added repository {}', repo
+        @logger.info 'added repository {}', repo.getUrl
+        enabled = []
+        enabled << 'releases' if repo.getPolicy(false).isEnabled
+        enabled << 'snapshots' if repo.getPolicy(true).isEnabled
+        @logger.debug '{}', enabled.join('+')
       end
 
       node = @system.collectDependencies(@session, collect_req).getRoot
@@ -120,9 +126,6 @@ module MiniAether
       
       nlg = PreorderNodeListGenerator.new
       node.accept nlg
-      files = nlg.getFiles
-
-      @logger.info "resolved with #{files.size} artifacts"
 
       if @logger.isDebugEnabled
         total_size = 0
@@ -131,12 +134,17 @@ module MiniAether
           size = File.stat(artifact.file.absolute_path).size
           total_size += size
           
-          @logger.debug("%0.2fMiB %s (%s)" % [size/MiB_PER_BYTE, artifact, file.name])
+          @logger.debug("Using %0.2f %s" % [size/MiB_PER_BYTE, artifact])
+        end
+        @logger.debug('      -----')
+        @logger.debug("      %0.2f MiB total" % [total_size/MiB_PER_BYTE])
+      else
+        nlg.getArtifacts(false).each do |artifact|
+          @logger.info 'Using {}', artifact
         end
-        @logger.debug("%0.3f MiB total" % [total_size/MiB_PER_BYTE])
       end
 
-      files
+      nlg.getFiles
     end
   end
 end

data/test/mini_aether/helper_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+require 'mini_aether/helper'
+
+module MiniAether
+  class HelperTest < MiniTest::Unit::TestCase
+    class InterpolateTest < MiniTest::Unit::TestCase
+      include Helper
+
+      def test_passes_through_plain_string
+        strs = [
+                'hello',
+                '$ { nope } ',
+                'text${text',
+                'a a a a'
+               ]
+        strs.each do |str|
+          assert_equal str, interpolate(str)
+        end
+      end
+
+      def test_interpolates_env_vars
+        key = '__AETHER_INTERPOLATE_TEST__'
+        ENV[key] = 'value'
+        assert_equal 'value', interpolate("${env.#{key}}")
+        assert_equal 'aaa value', interpolate("aaa ${env.#{key}}")
+        assert_equal 'value aaa', interpolate("${env.#{key}} aaa")
+        assert_equal 'value}', interpolate("${env.#{key}}}")
+        assert_equal 'avaluea', interpolate("a${env.#{key}}a")
+
+        assert_equal 'a value a value a', interpolate("a ${env.#{key}} a ${env.#{key}} a")
+      ensure
+        ENV[key] = nil
+      end
+
+      def test_empty_string_when_no_env_var
+        assert_nil ENV['NO_SUCH_ENV_VAR']
+        assert_equal '', interpolate("${env.NO_SUCH_ENV_VAR}")
+      end
+
+      def test_interpolates_system_props
+        key = '__AETHER_INTERPOLATE_TEST__'
+        sys = Java::JavaLang::System
+        sys.setProperty(key, 'value')
+
+        assert_equal 'value', interpolate("${#{key}}")
+        assert_equal 'aaa value', interpolate("aaa ${#{key}}")
+        assert_equal 'value aaa', interpolate("${#{key}} aaa")
+        assert_equal 'value}', interpolate("${#{key}}}")
+        assert_equal 'avaluea', interpolate("a${#{key}}a")
+
+        assert_equal 'a value a value a', interpolate("a ${#{key}} a ${#{key}} a")
+      ensure
+        sys.clearProperty(key)
+      end
+
+      def test_empty_string_when_no_sys_prop
+        sys = Java::JavaLang::System
+        assert_nil sys.getProperty 'NO_SUCH_ENV_VAR'
+        assert_equal '', interpolate("${NO_SUCH_ENV_VAR}")
+      end
+    end
+  end
+end

metadata

@@ -2,27 +2,27 @@
 name: mini_aether
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.5
+  version: 0.0.6
 platform: java
 authors:
 - Patrick Mahoney
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -33,14 +33,14 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -51,14 +51,14 @@ dependencies:
   name: version
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: !binary |-
           MA==
@@ -77,10 +77,11 @@ files:
 - lib/mini_aether/resolver.rb
 - lib/mini_aether/bootstrap.rb
 - lib/mini_aether/xml_parser.rb
+- lib/mini_aether/helper.rb
 - lib/mini_aether/spec.rb
 - test/mini_aether_test.rb
 - test/test_helper.rb
-- test/mini_aether/bootstrap_test.rb
+- test/mini_aether/helper_test.rb
 - test/mini_aether/spec_test.rb
 - README.md
 - COPYING
@@ -92,7 +93,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
@@ -102,10 +103,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - !binary |-
-      Pg==
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: !binary |-
+        MA==
+      segments:
+      - 0
+      hash: 2
   none: false
 requirements: []
 rubyforge_project:

data/test/mini_aether/bootstrap_test.rb

@@ -1,67 +0,0 @@
-require 'test_helper'
-
-require 'mini_aether/bootstrap'
-
-module MiniAether
-  class BootstrapTest < MiniTest::Unit::TestCase
-    class InterpolateTest < MiniTest::Unit::TestCase
-      def setup
-        @bootstrap = Object.new
-        @bootstrap.extend(Bootstrap)
-      end
-
-      def test_passes_through_plain_string
-        strs = [
-                'hello',
-                '$ { nope } ',
-                'text${text',
-                'a a a a'
-               ]
-        strs.each do |str|
-          assert_equal str, @bootstrap.interpolate(str)
-        end
-      end
-
-      def test_interpolates_env_vars
-        key = '__AETHER_INTERPOLATE_TEST__'
-        ENV[key] = 'value'
-        assert_equal 'value', @bootstrap.interpolate("${env.#{key}}")
-        assert_equal 'aaa value', @bootstrap.interpolate("aaa ${env.#{key}}")
-        assert_equal 'value aaa', @bootstrap.interpolate("${env.#{key}} aaa")
-        assert_equal 'value}', @bootstrap.interpolate("${env.#{key}}}")
-        assert_equal 'avaluea', @bootstrap.interpolate("a${env.#{key}}a")
-
-        assert_equal 'a value a value a', @bootstrap.interpolate("a ${env.#{key}} a ${env.#{key}} a")
-      ensure
-        ENV[key] = nil
-      end
-
-      def test_empty_string_when_no_env_var
-        assert_nil ENV['NO_SUCH_ENV_VAR']
-        assert_equal '', @bootstrap.interpolate("${env.NO_SUCH_ENV_VAR}")
-      end
-
-      def test_interpolates_system_props
-        key = '__AETHER_INTERPOLATE_TEST__'
-        sys = Java::JavaLang::System
-        sys.setProperty(key, 'value')
-
-        assert_equal 'value', @bootstrap.interpolate("${#{key}}")
-        assert_equal 'aaa value', @bootstrap.interpolate("aaa ${#{key}}")
-        assert_equal 'value aaa', @bootstrap.interpolate("${#{key}} aaa")
-        assert_equal 'value}', @bootstrap.interpolate("${#{key}}}")
-        assert_equal 'avaluea', @bootstrap.interpolate("a${#{key}}a")
-
-        assert_equal 'a value a value a', @bootstrap.interpolate("a ${#{key}} a ${#{key}} a")
-      ensure
-        sys.clearProperty(key)
-      end
-
-      def test_empty_string_when_no_sys_prop
-        sys = Java::JavaLang::System
-        assert_nil sys.getProperty 'NO_SUCH_ENV_VAR'
-        assert_equal '', @bootstrap.interpolate("${NO_SUCH_ENV_VAR}")
-      end
-    end
-  end
-end