jbundler 0.2.0 → 0.2.1

data/Build.md

@@ -12,7 +12,7 @@ to build the (extension) jar for the lib directory (prepare the jar before packa
 
 this also runs all the test over a couple of jruy version each in 1.8 and 1.9 mode. so these tests take some time. in skip the tests when building the gem use:
 
-```rmvn prepare-package --Dmaven.test.skip```
+```rmvn prepare-package -DskipTests```
 
 to build the gem in **target/jbundler-0.0.1.gem**
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jbundler (0.2.0)
+    jbundler (0.2.1)
       ruby-maven (= 3.0.4.0.29.0)
 
 GEM
@@ -18,10 +18,11 @@ GEM
     gherkin (2.9.3-java)
       json (>= 1.4.6)
     json (1.7.3-java)
-    maven-tools (0.29.0)
+    maven-tools (0.29.3)
     minitest (2.10.1)
+    rake (0.9.2.2)
     ruby-maven (3.0.4.0.29.0)
-      maven-tools (= 0.29.0)
+      maven-tools (~> 0.29.1)
       thor (~> 0.14.6)
     term-ansicolor (1.0.7)
     thor (0.14.6)
@@ -33,3 +34,5 @@ DEPENDENCIES
   cucumber (~> 1.1.9)
   jbundler!
   minitest (~> 2.10.0)
+  rake (= 0.9.2.2)
+  thor (> 0.14.0, < 0.16.0)

data/Readme.md

@@ -1,8 +1,8 @@
-# jbundler #
+# jbundler [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.png)](http://travis-ci.org/mkristian/jbundler) #
 
 * the DSL mimics the one from bundler
 * you can use maven like version declaration or rubygems/bundler like version ranges
-* it locks down the versions like bundler inside "Mvnfile.lock"
+* it locks down the versions like bundler inside "Jarfile.lock"
 * you can declare jar dependency within a rubygems using the requirements directive of the gem specification. jbundler will include those jar dependencies into its classpath
 * on the first run everything get resolved, any further run just the setup of classpath is done (without any maven involved)
 * it integrates nicely with bundler when Bundler.require is used
@@ -37,13 +37,24 @@ update of single artifacts is not possible.
 
 since the version resolution happens in two steps - first the gems then the jars/poms - it is possible in case of failure of the second one there could be another set of versions for the gems which would then succeed the jars/poms resolution. but there is plenty of possible ways to improve this (maven could resolve the gems as well, etc)
 
-**Mvnfile** is **not** a DSL, i.e. it is not ruby though it could use a ruby DSL to read the data (any contribution welcome).
+**Jarfile** is **not** a DSL, i.e. it is not ruby though it could use a ruby DSL to read the data (any contribution welcome).
 
+jbundler does not obey the **$HOME/.m2/settings.xml** from maven where you usually declare proxies, mirrors, etc.
+
+## adding a maven repository ##
+
+the maven central is default repostory and is always there. adding another repository use following decalration
+
+    repository :first, "http://example.com/repo"
+    source 'second', "http://example.org/repo"
+    source "http://example.org/repo/3"
+	
+	
 ## jar/pom dependencies ##
 
 a pom dependency is not associated with a jar file but has dependencies to other poms or jars. 
 
-dependencies can be declared either in **Mvnfile**
+dependencies can be declared either in **Jarfile**
 
     jar 'org.slf4j:slf4j-simple', '> 1.6.2', '< 1.7.0'
     jar 'org.sonatype.aether:aether-api', '1.13'
@@ -79,9 +90,9 @@ the *not* version **!3.4.5** can not be mapped properly to a maven version range
 
 ## update ##
 
-update of a single artifact is not possible (yet). but to update the whole set of artifacts just delete the lockfile *Mvnfile.lock*
+update of a single artifact is not possible (yet). but to update the whole set of artifacts just delete the lockfile *Jarfile.lock*
 
-if jbundler sees that **Gemfile.lock** or **Mvnfile** is newer then the **.jbundler/classpath.rb** file then jbundler tries to gracefully upgrade towards the changes. the is a maven-like behaviour and once there are command line tools for jbundler they can behave like bundler.
+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. the is a maven-like behaviour and once there are command line tools for jbundler they can behave like bundler.
 
 ## meta-fu ##
 

data/bin/jbundler

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+
+if ARGV[0] == 'help'
+
+  require 'jbundler/cli'
+
+  JBundler::Cli.start
+
+else
+
+  load Gem.bin_path('bundler', 'bundle')
+
+  ARGV << 'install' if ARGV.size == 0
+  require 'jbundler/cli'
+
+  JBundler::Cli.start
+
+end

data/lib/jbundler/aether.rb

@@ -50,6 +50,10 @@ module JBundler
       @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') ||
@@ -74,7 +78,7 @@ 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 ?"
+          raise "jbundler.jar is missing - maybe you need to build it first ? try\n$ rmvn prepare-package -Dmaven.test.skip\n"
         end
       end
       java_import 'jbundler.Aether'

data/lib/jbundler/cli.rb

@@ -0,0 +1,49 @@
+require 'thor'
+module JBundler
+  class Cli < Thor
+    no_tasks do
+      def mvn
+        @mvn ||= Maven::RubyMaven.new
+      end
+    end
+    
+    desc 'install', "first `bundle install` is called and then the jar dependencies will be installed. for more details see `bundle help install`, jbundler will ignore all options. the install command is also the default when no command is given."
+    def install
+      require 'jbundler'
+      puts 'Your jbundle is complete! Use `jbundle show` to see where the bundled jars are installed.'
+    end
+
+    desc 'update', "first `bundle update` is called and if there are no options then the jar dependencies will be updated. for more details see `bundle help update`."
+    def update
+      if ARGV.size == 1
+        require 'java'
+        require 'jbundler/aether'
+        config = JBundler::AetherConfig.new
+        FileUtils.rm_f(config.jarfile + '.lock')
+        
+        require 'jbundler'
+        puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
+      end
+    end
+
+    desc 'show', "first `bundle show` is called and if there are no options then the jar dependencies will be displayed. for more details see `bundle help show`."
+    def show
+      if ARGV.size == 1
+        require 'java' 
+        require 'jbundler/aether'
+        require 'jbundler/classpath_file'
+        config = JBundler::AetherConfig.new
+        classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')#config.classpath_file)
+        if classpath_file.exists?
+          classpath_file.require_classpath
+          puts "JBundler classpath:"
+          JBUNDLER_CLASSPATH.each do |path|
+            puts "  * #{path}"
+          end
+        else
+          puts "JBundler classpath is not installed."
+        end
+      end
+    end
+  end
+end

data/lib/jbundler/cli.rb~

@@ -0,0 +1,5 @@
+class JBundler::Cli
+
+
+
+end

data/lib/jbundler.rb

@@ -9,7 +9,7 @@ jarfile = Maven::Tools::Jarfile.new(config.jarfile)
 if config.skip
   warn "skip jbundler setup"
 else
-  classpath_file = JBundler::ClasspathFile.new('.jbundler/classpath.rb')
+  classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
   gemfile_lock = JBundler::GemfileLock.new(jarfile, config.gemfile + '.lock')
 
   if classpath_file.needs_update?(jarfile, gemfile_lock)

metadata

@@ -1,119 +1,128 @@
 --- !ruby/object:Gem::Specification 
 name: jbundler
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
-- Kristian Meier
+  - Kristian Meier
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-08-03 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 
-        hash: 331
-        segments: 
-        - 3
-        - 0
-        - 4
-        - 0
-        - 29
-        - 0
-        version: 3.0.4.0.29.0
-  type: :runtime
-  version_requirements: *id001
+  - !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.0.29.0
+    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
 description: |
   using embedded maven to add jar support to bundler and add bundler like handling of version ranges to maven
 
 email: 
-- m.kristian@web.de
-executables: []
-
+  - m.kristian@web.de
+executables: 
+  - jbundler
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- lib/jbundler.rb
-- lib/jbundler.rb~
-- lib/jbundler/maven_gemify3.rb~
-- lib/jbundler/pom.rb
-- lib/jbundler/pom.rb~
-- lib/jbundler/mavenfile.rb~
-- lib/jbundler/maven_version.rb~
-- lib/jbundler/classpath_file.rb
-- lib/jbundler/aether.rb
-- lib/jbundler/gemfile_lock.rb~
-- lib/jbundler/gemfile_lock.rb
-- lib/jbundler/classpath_file.rb~
-- lib/jbundler/aether.rb~
-- lib/jbundler/maven_util.rb~
-- lib/jbundler/maven.rb~
-- lib/jbundler.jar
-- spec/maven_util_spec.rb~
-- spec/mavenfile_spec.rb~
-- spec/pom_spec.rb~
-- spec/classpath_file_spec.rb~
-- spec/aether_spec.rb~
-- spec/classpath_file_spec.rb
-- spec/setup.rb
-- spec/pom_spec.rb
-- spec/aether_spec.rb
-- spec/setup.rb~
-- MIT-LICENSE
-- Build.md
-- Readme.md
-- Gemfile
-- Gemfile.lock
-- Gemfile.lock-
-homepage: 
+  - bin/jbundler
+  - lib/jbundler.rb
+  - lib/jbundler.rb~
+  - lib/jbundler.jar
+  - lib/jbundler/cli.rb~
+  - lib/jbundler/maven_gemify3.rb~
+  - lib/jbundler/pom.rb
+  - lib/jbundler/pom.rb~
+  - lib/jbundler/mavenfile.rb~
+  - lib/jbundler/cli.rb
+  - lib/jbundler/maven_version.rb~
+  - lib/jbundler/classpath_file.rb
+  - lib/jbundler/aether.rb
+  - lib/jbundler/gemfile_lock.rb~
+  - lib/jbundler/gemfile_lock.rb
+  - lib/jbundler/classpath_file.rb~
+  - lib/jbundler/aether.rb~
+  - lib/jbundler/maven_util.rb~
+  - lib/jbundler/maven.rb~
+  - spec/maven_util_spec.rb~
+  - spec/mavenfile_spec.rb~
+  - spec/pom_spec.rb~
+  - spec/classpath_file_spec.rb~
+  - spec/aether_spec.rb~
+  - spec/classpath_file_spec.rb
+  - spec/setup.rb
+  - spec/pom_spec.rb
+  - spec/aether_spec.rb
+  - spec/setup.rb~
+  - MIT-LICENSE
+  - Build.md
+  - Readme.md
+  - Test.md
+  - Gemfile
+  - Gemfile.lock
+homepage: https://github.com/mkristian/jbundler
 licenses: []
 
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: bundler support for maven or/and maven support for bundler
 test_files: 
-- spec/classpath_file_spec.rb
-- spec/pom_spec.rb
-- spec/aether_spec.rb
+  - spec/classpath_file_spec.rb
+  - spec/pom_spec.rb
+  - spec/aether_spec.rb

data/Gemfile.lock-

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jbundler (0.2.0)
-      ruby-maven (= 3.0.4.0.29.0)
-
-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-java)
-      json (>= 1.4.6)
-    json (1.7.3-java)
-    minitest (2.10.1)
-    ruby-maven (3.0.4.0.29.0)
-      thor (~> 0.14.6)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  cucumber (~> 1.1.9)
-  jbundler!
-  minitest (~> 2.10.0)