jbundler 0.3.2 → 0.4.1

data/Gemfile

@@ -1,10 +1,4 @@
 source :rubygems
 gemspec
 
-# needed for local setup
-#gem 'maven-tools', :path => '../jruby-maven-plugins/ruby-tools/src/main/gem/maven-tools'
-
-group :test do
-  gem 'minitest', '~> 2.10.0'
-  gem 'cucumber', '~> 1.1.9'
-end
+gem 'jruby-openssl', '0.8.2', :platform => 'jruby'

data/Gemfile.lock

@@ -1,42 +1,45 @@
 PATH
   remote: .
   specs:
-    jbundler (0.3.2)
-      ruby-maven (= 3.0.4.1)
+    jbundler (0.4.1)
+      maven-tools (~> 0.32.1)
+      ruby-maven (~> 3.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.1.4)
+    copyright-header (1.0.7)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    diff-lcs (1.1.3)
-    gherkin (2.9.3)
-      json (>= 1.4.6)
+    diff-lcs (1.2.0)
     gherkin (2.9.3-java)
       json (>= 1.4.6)
-    json (1.7.5)
-    json (1.7.5-java)
-    maven-tools (0.29.3)
-    minitest (2.10.1)
-    rake (0.9.2.2)
-    ruby-maven (3.0.4.1)
-      maven-tools (~> 0.29.1)
+    jruby-openssl (0.8.2)
+      bouncy-castle-java (>= 1.5.0146.1)
+    json (1.7.6-java)
+    maven-tools (0.32.1)
+    minitest (4.5.0)
+    rake (10.0.3)
+    ruby-maven (3.0.4.1.3)
+      maven-tools (~> 0.32.1)
       thor (>= 0.14.6, < 2.0)
     term-ansicolor (1.0.7)
     thor (0.15.4)
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
+  copyright-header (~> 1.0.7)
   cucumber (~> 1.1.9)
   jbundler!
-  minitest (~> 2.10.0)
-  rake (= 0.9.2.2)
+  jruby-openssl (= 0.8.2)
+  minitest (~> 4.3)
+  rake (~> 10.0.3)
   thor (> 0.14.0, < 0.16.0)

data/Gemfile.lock~

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    jbundler (0.3.2)
+      ruby-maven (= 3.0.4.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (1.1.9)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.9.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.9.3)
+      json (>= 1.4.6)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
+    json (1.7.5)
+    json (1.7.5-java)
+    maven-tools (0.29.3)
+    minitest (2.10.1)
+    rake (0.9.2.2)
+    ruby-maven (3.0.4.1)
+      maven-tools (~> 0.29.1)
+      thor (>= 0.14.6, < 2.0)
+    term-ansicolor (1.0.7)
+    thor (0.15.4)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  cucumber (~> 1.1.9)
+  jbundler!
+  minitest (~> 2.10.0)
+  rake (= 0.9.2.2)
+  thor (> 0.14.0, < 0.16.0)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Kristian Meier
+Copyright (c) 2013 Christian Meier
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Readme.md

@@ -1,4 +1,6 @@
-# jbundler [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.png)](http://travis-ci.org/mkristian/jbundler) #
+# jbundler 
+
+* [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.png)](http://travis-ci.org/mkristian/jbundler) #
 
 manage jar dependencies similar than **bundler** manages gem dependencies.
 
@@ -77,8 +79,6 @@ will offer the same `jar`/`jars` method than you have inside the console.
 
 ## example ##
 
-**please first build the jar file for the jbundler gem, see [Build](https://github.com/mkristian/jbundler/wiki/Build).** 
-
 *src/example/my_project* has a Gemfile which uses a gem which depends on jar dependency. see *src/example/gem_with_jar/gem_with_jar.gemspec* how the jar gets declared.
 
 execute *src/example/my_project/info.rb* to see it in action:
@@ -103,6 +103,25 @@ update of a single artifact is not possible (yet). but to update the whole set o
 
 if jbundler sees that **Gemfile.lock** or **Jarfile** is newer then the **.jbundler/classpath.rb** file then jbundler tries to gracefully upgrade towards the changes.
 
-## meta-fu ##
+# special thanks #
+
+the whole project actually started with a controversial discussion on a [pull request on bundler](https://github.com/carlhuda/bundler/pull/1683). this very same pull request were the starting point of that project here. probably by now there is no much left of the original code but many thanks to [ANithian](https://github.com/ANithian) for given the seed of that project.
+
+License
+-------
+
+Almost all code is under the MIT license but the java class (AetherSettings.java)[https://github.com/mkristian/jbundler/blob/master/src/main/java/jbundler/AetherSettings.java] which was derived from EPL licensed code.
+
+Contributing
+------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+meta-fu
+-------
 
-bug-reports and pull request are most welcome.
+enjoy :) 

data/bin/jbundle

@@ -17,8 +17,35 @@ else
     include JBundler::Lazy
   end
 
+  require 'jbundler/config'
+  config = JBundler::Config.new
   begin
-    load Gem.bin_path('bundler', 'bundle') 
+    require 'yaml'
+    bundle_config = YAML.load_file( File.join( ENV['HOME'], 
+                                               '.bundle', 
+                                               'config' ) )
+    mirrors = bundle_config.select { |k,v| nil != (k =~ /BUNDLE_MIRROR__/) }
+    if config.rubygems_mirror || mirrors.size > 0
+      mirrors.each do |k,v| 
+        ENV[ k ] = v
+      end
+      if config.rubygems_mirror
+        ENV['BUNDLE_MIRROR__HTTP://RUBYGEMS.ORG'] = config.rubygems_mirror
+        ENV['BUNDLE_MIRROR__HTTPS://RUBYGEMS.ORG'] = config.rubygems_mirror
+      end
+
+      begin
+        load Gem.bin_path('nexus', 'nbundle') 
+      rescue Gem::GemNotFoundException
+        warn ''
+        warn 'to use a rubygems mirror you need to install the nexus gem'
+        warn '    $ gem install nexus'
+        warn ''
+        warn 'rubygems mirror ignored !'
+      end
+    else
+      load Gem.bin_path('bundler', 'bundle') 
+    end
   rescue Exception
     if ARGV[0] == 'console'
       ARGV.shift

data/lib/jbundler/aether.rb

@@ -1,67 +1,28 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'yaml'
 require 'jbundler/config'
 
 module JBundler
 
-  # allow yaml config in $HOME/.jbundlerrc and $PWD/.jbundlerrc
-  class AetherConfig
-
-    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip
-
-    def initialize
-      file = '.jbundlerrc'
-      homefile = File.join(ENV['HOME'], file)
-      home_config = YAML.load_file(homefile) if File.exists?(homefile)
-      pwd_config = YAML.load_file(file) if File.exists?(file)
-      @config = (home_config || {}).merge(pwd_config || {})
-    end
-
-    if defined? JRUBY_VERSION
-      def jbundler_env(key)
-        ENV[key.upcase.gsub(/./, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
-      end
-    else
-      def jbundler_env(key)
-        ENV[key.upcase.gsub(/./, '_')] || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
-      end
-    end
-    private :jbundler_env
-
-    def skip
-      skip = jbundler_env('JBUNDLE_SKIP')
-      # defaults to false
-      @skip ||= skip && skip != 'false'
-    end
-
-    def verbose
-      verbose = jbundler_env('JBUNDLE_VERBOSE')
-      # defaults to false
-      @verbose ||= verbose && verbose != 'false'
-    end
-
-    def jarfile
-      if File.exists?('Mvnfile')
-        warn "'Mvnfile' name is deprecated, please use 'Jarfile' instead"
-        @jarfile = 'Mvnfile'
-      end
-      @jarfile ||= jbundler_env('JBUNDLE_JARFILE') || 'Jarfile'
-    end
-
-    def gemfile
-      @gemfile ||= jbundler_env('BUNDLE_GEMFILE') || 'Gemfile'
-    end
-
-    def classpath_file
-      '.jbundler/classpath.rb'
-    end
-
-    def local_repository
-      # use maven default local repo as default
-      @local_maven_repository ||= (jbundler_env('JBUNDLE_LOCAL_REPOSITORY') ||
-                                   File.join( ENV['HOME'], ".m2", "repository"))
-    end
-  end
-
   class AetherRuby
 
     def self.setup_classloader
@@ -79,17 +40,25 @@ module JBundler
           java_import 'jbundler.Aether'
         rescue NameError
           # assume this happens only when working on the git clone
-          raise "jbundler.jar is missing - maybe you need to build it first ? try\n$ rmvn prepare-package -Dmaven.test.skip\n"
+          raise "jbundler.jar is missing - maybe you need to build it first ? use\n$ rmvn prepare-package -Dmaven.test.skip\n"
         end
       end
       java_import 'jbundler.Aether'
     end
 
-    def initialize(config = Config.new, offline = false)
+    def initialize( config = Config.new )
       unless defined? Aether
         self.class.setup_classloader
       end
-      @aether = Aether.new(config.local_repository, config.verbose, offline)
+      @aether = Aether.new( config.verbose )
+      @aether.add_proxy( config.proxy ) if config.proxy
+      @aether.add_mirror( config.mirror ) if config.mirror
+      @aether.offline = config.offline
+      @aether.user_settings = config.settings if config.settings
+      @aether.local_repository = config.local_repository if config.local_repository
+    rescue NativeException => e
+      e.cause.print_stack_trace
+      raise e
     end
 
     def add_artifact(coordinate, extension = nil)
@@ -108,6 +77,9 @@ module JBundler
 
     def resolve
       @aether.resolve unless artifacts.empty?
+    rescue NativeException => e
+      e.cause.print_stack_trace
+      raise e
     end
 
     def classpath 
@@ -140,7 +112,10 @@ module JBundler
 
     def install(coordinate, file)
       @aether.install(coordinate, file)
+    rescue NativeException => e
+      e.cause.print_stack_trace
+      raise e
     end
     
   end
-end
+end

data/lib/jbundler/classpath_file.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 module JBundler
 
   class ClasspathFile
@@ -19,7 +39,7 @@ module JBundler
     end
 
     def needs_update?(jarfile, gemfile_lock)
-      (jarfile.exists? || gemfile_lock.exists?) && (!exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.exists? && (gemfile_lock.mtime > mtime)))
+      (jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock?) && (!exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.exists? && (gemfile_lock.mtime > mtime)))
     end
 
     def generate(classpath_array)
@@ -36,4 +56,4 @@ module JBundler
     end
     
   end
-end
+end

data/lib/jbundler/cli.rb

@@ -1,9 +1,29 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'thor'
 module JBundler
   class Cli < Thor
     no_tasks do
       def mvn
-        @mvn ||= Maven::RubyMaven.new
+        @mvn ||= Maven::Ruby::Maven.new
       end
 
       def do_show
@@ -13,7 +33,7 @@ module JBundler
         config = JBundler::Config.new
         classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
         if classpath_file.exists?
-          classpath_file.require_classpath
+          classpath_file.require_classpath unless defined? JBUNDLER_CLASSPATH
           puts "JBundler classpath:"
           JBUNDLER_CLASSPATH.each do |path|
             puts "  * #{path}"
@@ -46,6 +66,7 @@ module JBundler
         
         require 'jbundler'
         do_show
+        puts ''
         puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
       end
     end
@@ -57,4 +78,4 @@ module JBundler
      end
     end
   end
-end
+end

data/lib/jbundler/config.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'yaml'
 
 module JBundler
@@ -5,7 +25,7 @@ module JBundler
   # allow yaml config in $HOME/.jbundlerrc and $PWD/.jbundlerrc
   class Config
 
-    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip
+    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip, :settings, :offline
 
     def initialize
       file = '.jbundlerrc'
@@ -17,11 +37,11 @@ module JBundler
 
     if defined? JRUBY_VERSION
       def jbundler_env(key)
-        ENV[key.upcase.gsub(/./, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+        ENV[key.upcase.gsub(/[.]/, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || @config[key.downcase.sub(/^j?bundler/, '').sub(/[.]/, '_')]
       end
     else
       def jbundler_env(key)
-        ENV[key.upcase.gsub(/./, '_')] || @config[key.downcase.sub(/^j?bundler/, '').sub(/./, '_')]
+        ENV[key.upcase.gsub(/[.]/, '_')] || @config[key.downcase.sub(/^j?bundler/, '').sub(/[.]/, '_')]
       end
     end
     private :jbundler_env
@@ -64,8 +84,34 @@ module JBundler
 
     def local_repository
       # use maven default local repo as default
-      @local_maven_repository ||= (jbundler_env('JBUNDLE_LOCAL_REPOSITORY') ||
-                                   File.join( ENV['HOME'], ".m2", "repository"))
+      @local_maven_repository ||= jbundler_env('JBUNDLE_LOCAL_REPOSITORY')
+    end
+
+    def settings
+      @settings ||= jbundler_env('JBUNDLE_SETTINGS')
+    end
+
+    def offline
+      @offline ||= jbundler_env('JBUNDLE_OFFLINE')
+      @offline == 'true' || @offline == true
+    end
+
+    def proxy
+      @proxy ||= jbundler_env('JBUNDLE_PROXY')
+    end
+
+    def mirror
+      @mirror ||= jbundler_env('JBUNDLE_MIRROR')
+      # nce to have no leading slash
+      @mirror.sub!( /\/$/, '' ) if @mirror
+      @mirror
+    end
+
+    def rubygems_mirror
+      @rubygems_mirror ||= jbundler_env('BUNDLE_RUBYGEMS_MIRROR')
+      # here a leading slash is needed !!
+      @rubygems_mirror.sub!( /([^\/])$/ , "\\1/" ) if @rubygems_mirror
+      @rubygems_mirror
     end
   end
-end
+end

data/lib/jbundler/gemfile_lock.rb

@@ -1,5 +1,26 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'rubygems'
 require 'jbundler/pom'
+require 'bundler'
 
 module JBundler
 
@@ -41,4 +62,4 @@ module JBundler
     end
   end
   
-end
+end

data/lib/jbundler/lazy.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'jbundler/aether'
 require 'maven/tools/coordinate'
 module JBundler
@@ -79,4 +99,4 @@ module JBundler
         end
     end
   end
-end
+end

data/lib/jbundler/pom.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'fileutils'
 require 'tempfile'
 require 'maven/tools/coordinate'
@@ -73,7 +93,17 @@ module JBundler
       
       deps.each do |line|
         if coord = to_coordinate(line)
-          group_id, artifact_id, extension, version = coord.split(/:/)
+          coords = coord.split(/:/)
+          group_id = coords[0]
+          artifact_id = coords[1]
+          extension = coords[2]
+          classifier = nil
+          if coords.size == 4
+            version = coords[3]
+          else
+            classifier = coords[3]
+            version = coords[4]
+          end
 
           xmlStreamWriter.writeStartElement("dependency".to_java)
           writeElement(xmlStreamWriter,"groupId", group_id)
@@ -81,6 +111,7 @@ module JBundler
           writeElement(xmlStreamWriter,"version", version)
           
           writeElement(xmlStreamWriter,"type", extension) if extension != 'jar'
+          writeElement(xmlStreamWriter,"classifier", classifier) if classifier
           xmlStreamWriter.writeEndElement #dependency
         end
       end
@@ -94,4 +125,4 @@ module JBundler
     end
     
   end
-end
+end

data/lib/jbundler.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 Kristian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'maven/tools/jarfile'
 require 'jbundler/classpath_file'
 require 'jbundler/gemfile_lock'
@@ -36,4 +56,4 @@ else
     end
   end
 
-end
+end

data/spec/pom_spec.rb

@@ -22,4 +22,10 @@ describe JBundler::Pom do
     pom.coordinate.must_equal "ruby.bundler:second:jar:1"
   end
 
+  it 'should respect classifiers' do
+    pom = JBundler::Pom.new("third", "1", ["jar \"org.jruby:jruby-core\", '~>1.7.0'", "pom \"f:g:jdk15\", \">1.2\", \"<=2.0\""])
+    File.read(pom.file).must_equal "<?xml version=\"1.0\" ?><project><modelVersion>4.0.0</modelVersion><groupId>ruby.bundler</groupId><artifactId>third</artifactId><version>1</version><dependencies><dependency><groupId>org.jruby</groupId><artifactId>jruby-core</artifactId><version>[1.7.0,1.7.99999]</version></dependency><dependency><groupId>f</groupId><artifactId>g</artifactId><version>(1.2,2.0]</version><type>pom</type><classifier>jdk15</classifier></dependency></dependencies></project>"
+    pom.coordinate.must_equal "ruby.bundler:third:jar:1"
+  end
+
 end

metadata

@@ -1,117 +1,194 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jbundler
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.4.1
 platform: ruby
-authors: 
-  - Kristian Meier
-autorequire: 
+authors:
+- Kristian Meier
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-10-11 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: ruby-maven
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.0.4.1
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.9.2.2
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: thor
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - <
-          - !ruby/object:Gem::Version 
-            version: 0.16.0
-        - - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.14.0
-    type: :development
-    version_requirements: *id003
+date: 2013-01-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: maven-tools
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.32.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.32.1
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+    - - !binary |-
+        Pg==
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+    - - !binary |-
+        Pg==
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: minitest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: copyright-header
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+    none: false
+  prerelease: false
+  type: :development
 description: |
   managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
-
-email: 
-  - m.kristian@web.de
-executables: 
-  - jbundle
+email:
+- m.kristian@web.de
+executables:
+- jbundle
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - bin/jbundle
-  - lib/rubygems_plugin.rb~
-  - lib/jbundler.rb
-  - lib/jars.rb~
-  - lib/jbundler.jar
-  - lib/commands/install_with_jars.rb~
-  - lib/commands/abstract_command.rb~
-  - lib/commands/push.rb~
-  - lib/commands/nexus.rb~
-  - lib/jbundler/pom.rb
-  - lib/jbundler/cli.rb
-  - lib/jbundler/config.rb
-  - lib/jbundler/classpath_file.rb
-  - lib/jbundler/aether.rb
-  - lib/jbundler/gemfile_lock.rb
-  - lib/jbundler/lazy.rb
-  - spec/classpath_file_spec.rb
-  - spec/setup.rb
-  - spec/pom_spec.rb
-  - spec/aether_spec.rb
-  - MIT-LICENSE
-  - Readme.md
-  - Gemfile
-  - Gemfile.lock
+files:
+- bin/jbundle
+- lib/jbundler.rb
+- lib/jbundler.jar
+- lib/jbundler/pom.rb
+- lib/jbundler/cli.rb
+- lib/jbundler/config.rb
+- lib/jbundler/classpath_file.rb
+- lib/jbundler/aether.rb
+- lib/jbundler/gemfile_lock.rb
+- lib/jbundler/lazy.rb
+- spec/classpath_file_spec.rb
+- spec/setup.rb
+- spec/pom_spec.rb
+- spec/aether_spec.rb
+- MIT-LICENSE
+- Readme.md
+- Gemfile.lock~
+- Gemfile
+- Gemfile.lock
 homepage: https://github.com/mkristian/jbundler
-licenses: []
-
-post_install_message: 
+licenses:
+- MIT
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: managing jar dependencies
-test_files: 
-  - spec/classpath_file_spec.rb
-  - spec/pom_spec.rb
-  - spec/aether_spec.rb
+test_files:
+- spec/classpath_file_spec.rb
+- spec/pom_spec.rb
+- spec/aether_spec.rb

data/lib/commands/abstract_command.rb~

@@ -1,113 +0,0 @@
-require 'rubygems/local_remote_options'
-
-class Gem::AbstractCommand < Gem::Command
-  include Gem::LocalRemoteOptions
-
-  def gemcutter_url
-    ENV['GEMCUTTER_URL'] || 'https://gemcutter.org'
-  end
-
-  def setup
-    use_proxy! if http_proxy
-    sign_in unless api_key
-  end
-
-  def sign_in
-    say "Enter your Gemcutter credentials. Don't have an account yet? Create one at http://gemcutter.org/sign_up"
-
-    email = ask("Email: ")
-    password = ask_for_password("Password: ")
-
-    response = make_request(:get, "api_key") do |request|
-      request.basic_auth email, password
-    end
-
-    case response
-    when Net::HTTPSuccess
-      self.api_key = response.body
-      say "Signed in. Your api key has been stored in ~/.gem/credentials"
-    else
-      say response.body
-      terminate_interaction
-    end
-  end
-
-  def credentials_path
-    File.join(Gem.user_home, '.gem', 'credentials')
-  end
-
-  def api_key
-    Gem.configuration.load_file(credentials_path)[:rubygems_api_key]
-  end
-
-  def api_key=(api_key)
-    config = Gem.configuration.load_file(credentials_path).merge(:rubygems_api_key => api_key)
-
-    dirname = File.dirname(credentials_path)
-    Dir.mkdir(dirname) unless File.exists?(dirname)
-
-    File.open(credentials_path, 'w') do |f|
-      f.write config.to_yaml
-    end
-
-    @rubygems_api_key = api_key
-  end
-
-  def make_request(method, path)
-    require 'net/http'
-    require 'net/https'
-
-    url = URI.parse("#{gemcutter_url}/api/v1/#{path}")
-
-    http = proxy_class.new(url.host, url.port)
-
-    if url.scheme == 'https'
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.use_ssl = true
-    end
-
-    request_method =
-      case method
-      when :get
-        proxy_class::Get
-      when :post
-        proxy_class::Post
-      when :put
-        proxy_class::Put
-      when :delete
-        proxy_class::Delete
-      else
-        raise ArgumentError
-      end
-
-    request = request_method.new(url.path)
-    request.add_field "User-Agent", "Gemcutter/0.2.0"
-
-    yield request if block_given?
-    http.request(request)
-  end
-
-  def use_proxy!
-    proxy_uri = http_proxy
-    @proxy_class = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
-  end
-
-  def proxy_class
-    @proxy_class || Net::HTTP
-  end
-
-  # @return [URI, nil] the HTTP-proxy as a URI if set; +nil+ otherwise
-  def http_proxy
-    proxy = Gem.configuration[:http_proxy] || ENV['http_proxy'] || ENV['HTTP_PROXY']
-    return nil if proxy.nil? || proxy == :no_proxy
-    URI.parse(proxy)
-  end
-
-  def ask_for_password(message)
-    system "stty -echo"
-    password = ask(message)
-    system "stty echo"
-    ui.say("\n")
-    password
-  end
-end

data/lib/commands/install_with_jars.rb~

@@ -1,22 +0,0 @@
-require 'rubygems/commands/install_command'
-class Gem::Commands::InstallCommand
-
-  unless respond_to? :execute_without_jars
-    alias :execute_without_jars :execute
-    def execute
-      begin
-        execute_without_jars
-      rescue Gem::SystemExitException => e
-        if e.exit_code == 0
-          puts "DO SOMETHING HERE WITH JARS"
-        end
-        raise e
-      end
-    end
-    alias :_s_a_y_ :say
-    def say( arg )
-      puts arg.sub( /.*\ /, '')
-      _s_a_y_( arg )
-    end
-  end
-end

data/lib/commands/nexus.rb~

@@ -1,38 +0,0 @@
-class Gem::Commands::PushCommand < Gem::AbstractCommand
-
-  def description
-    'Push a gem up to Nexus server'
-  end
-
-  def arguments
-    "GEM       built gem to push up"
-  end
-
-  def usage
-    "#{program_name} GEM"
-  end
-
-  def initialize
-    super 'push', description
-    add_proxy_option
-  end
-
-  def execute
-    setup
-    send_gem
-  end
-
-  def send_gem
-    say "Pushing gem to Nexus..."
-
-    path = get_one_gem_name
-    response = make_request(:post, "gems") do |request|
-      request.body = Gem.read_binary(path)
-      request.add_field("Content-Length", request.body.size)
-      request.add_field("Content-Type", "application/octet-stream")
-      request.add_field("Authorization", api_key)
-    end
-
-    say response.body
-  end
-end

data/lib/commands/push.rb~

@@ -1,38 +0,0 @@
-class Gem::Commands::PushCommand < Gem::AbstractCommand
-
-  def description
-    'Push a gem up to Gemcutter'
-  end
-
-  def arguments
-    "GEM       built gem to push up"
-  end
-
-  def usage
-    "#{program_name} GEM"
-  end
-
-  def initialize
-    super 'push', description
-    add_proxy_option
-  end
-
-  def execute
-    setup
-    send_gem
-  end
-
-  def send_gem
-    say "Pushing gem to Gemcutter..."
-
-    path = get_one_gem_name
-    response = make_request(:post, "gems") do |request|
-      request.body = Gem.read_binary(path)
-      request.add_field("Content-Length", request.body.size)
-      request.add_field("Content-Type", "application/octet-stream")
-      request.add_field("Authorization", api_key)
-    end
-
-    say response.body
-  end
-end

data/lib/jars.rb~

@@ -1,3 +0,0 @@
-class Kernel
-
-end

data/lib/rubygems_plugin.rb~

@@ -1,6 +0,0 @@
-require 'rubygems/command_manager'
-require 'commands/abstract_command'
-
-require "commands/nexus"
-Gem::CommandManager.instance.register_command :nexus
-