ivy-resolver 0.0.1 → 0.1

data/README.md

@@ -0,0 +1,41 @@
+Usage
+=====
+
+1\. Create a file called `Jarfile` in the root of your project. One example based on the [Ivy Quick Start](http://ant.apache.org/ivy/history/latest-milestone/tutorial/start.html) guide.
+
+```ruby
+project 'org.apache', 'hello-ivy', '0.0.1'
+
+source 'http://repo1.maven.org/maven2'
+
+jar 'commons-lang', 'commons-lang', '2.0'
+jar 'commons-cli', 'commons-cli', '2.0'
+```
+
+2\. Add `ivy-resolver` to your `Gemfile`
+
+```ruby
+gem 'ivy-resolver'
+```
+
+3\. Load the JARs at init / runtime
+
+```ruby
+Ivy::Resolver.require
+```
+
+
+Changelog
+=========
+
+    0.1
+	- Fixed to work with ibilio repositories, so transitive dependencies will work.
+
+	0.0.1
+	- Initial version
+
+
+Bugs
+====
+
+None known at the moment.

data/ivy-resolver.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "jars"]
+  s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", '~> 2.8.0'

data/lib/ivy-resolver.rb

@@ -1,6 +1,6 @@
 # Released under the MIT license. See the MIT-LICENSE file for details
 
 require "ivy/resolver/version"
-require "ivy-#{Ivy::Resolver::IVY_VERSION}.jar"
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'jars', "ivy-#{Ivy::Resolver::IVY_VERSION}.jar"))
 
 require "ivy/resolver"

data/lib/ivy/resolver.rb

@@ -101,6 +101,7 @@ module Ivy
         :output_report => false,
         :refresh => false,
         :use_cache_only => false,
+        :transitive => true,
         :validate => false
       }.merge(opts).inject(ResolveOptions.new) do |resolve_options, (option, value)|
         resolve_options.send :"set_#{option}", value

data/lib/ivy/resolver/dsl.rb

@@ -2,6 +2,7 @@
 
 class Ivy::Resolver
   class DSL
+    java_import Java::org.apache.ivy.plugins.resolver.IBiblioResolver
     java_import Java::org.apache.ivy.plugins.resolver.URLResolver
     java_import Java::org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor
     java_import Java::org.apache.ivy.core.module.id.ModuleRevisionId
@@ -18,11 +19,15 @@ class Ivy::Resolver
 
     def source(url, opts={})
       opts = default_source_opts(url).merge(opts)
+      tidy_opts opts
 
-      URLResolver.new.tap do |resolver|
+      klass = decide_resolver_type opts
+
+      klass.new.tap do |resolver|
         resolver.m2compatible = opts[:maven]
         resolver.name = opts[:name]
-        resolver.add_artifact_pattern opts[:pattern]
+        resolver.add_artifact_pattern opts[:pattern] if opts[:pattern]
+        resolver.root = url if resolver.respond_to? :root=
 
         yield resolver if block_given?
 
@@ -66,5 +71,13 @@ class Ivy::Resolver
         :configurations => ['*']
       }
     end
+
+    def tidy_opts(opts)
+      opts.delete :pattern if opts[:maven]
+    end
+
+    def decide_resolver_type(opts)
+      opts[:maven] ? IBiblioResolver : URLResolver
+    end
   end
 end

data/lib/ivy/resolver/version.rb

@@ -2,7 +2,7 @@
 
 module Ivy
   class Resolver
-    VERSION = "0.0.1"
+    VERSION = "0.1"
     IVY_VERSION = "2.2.0"
   end
 end

data/spec/ivy_resolver_spec.rb

@@ -12,6 +12,9 @@ describe Ivy::Resolver do
     @artifact_path = spec_files_path 'org/example/test/0.0.1'
     @artifact = "#{@name}-#{@revision}.jar"
     %x[cd #{@artifact_path}; rm -f #{@artifact}; javac *.java; zip #{@artifact} *.class]
+    @transitive_path = spec_files_path 'org/example/test2/0.0.1'
+    @transitive_artifact = "test2-#{@revision}.jar"
+    %x[cd #{@transitive_path}; rm -f #{@transitive_artifact}; javac *.java; zip #{@transitive_artifact} *.class]
   end
 
   it 'can be instantiated' do
@@ -84,6 +87,12 @@ describe Ivy::Resolver do
       result.first.require
       Java::IvyResolverTestClass.new.test_value.should be_a String
     end
+
+    it 'includes a transitive dependency' do
+      result = subject.resolve
+      result.each(&:require)
+      Java::TransitiveDependencyTestClass.new.test_value.should be_a String
+    end
   end
 
   context 'with a jruby project' do
@@ -108,5 +117,10 @@ describe Ivy::Resolver do
       Ivy::Resolver.require
       Java::IvyResolverTestClass.new.test_value.should be_a String
     end
+
+    it 'also requires the transitive artifact' do
+      Ivy::Resolver.require
+      Java::TransitiveDependencyTestClass.new.test_value.should be_a String
+    end
   end
 end

data/spec_files/org/example/test/0.0.1/test-0.0.1.pom

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>0.0.1</modelVersion>
+	<groupId>org.example</groupId>
+	<artifactId>test</artifactId>
+	<version>0.0.1</version>
+	<name>Test Artifact</name>
+	<description>
+		A test artifact
+	</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.example</groupId>
+			<artifactId>test2</artifactId>
+			<version>0.0.1</version>
+			<type>jar</type>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
+</project>

data/spec_files/org/example/test2/0.0.1/TransitiveDependencyTestClass.java

@@ -0,0 +1,8 @@
+class TransitiveDependencyTestClass {
+	public TransitiveDependencyTestClass() {
+	}
+
+	public String getTestValue() {
+		return "A transitive string";
+	}
+}

data/spec_files/org/example/test2/0.0.1/test2-0.0.1.pom

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>0.0.1</modelVersion>
+	<groupId>org.example</groupId>
+	<artifactId>test2</artifactId>
+	<version>0.0.1</version>
+	<name>Transitive Artifact</name>
+	<description>
+		A transitive artifact
+	</description>
+</project>

metadata

@@ -1,54 +1,68 @@
 --- !ruby/object:Gem::Specification 
 name: ivy-resolver
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
-  version: 0.0.1
+  segments: 
+  - 0
+  - 1
+  version: "0.1"
 platform: ruby
 authors: 
-  - Shaun Mangelsdorf
+- Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 2.8.0
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
+  type: :development
+  version_requirements: *id001
 description: Provides a Bundler-like interface to resolve JARs with Ivy
 email: 
-  - s.mangelsdorf@gmail.com
+- s.mangelsdorf@gmail.com
 executables: []
 
 extensions: 
-  - jars/Rakefile
+- jars/Rakefile
 extra_rdoc_files: []
 
 files: 
-  - .gitignore
-  - Gemfile
-  - MIT-LICENSE
-  - Rakefile
-  - ivy-resolver.gemspec
-  - jars/Rakefile
-  - lib/ivy-resolver.rb
-  - lib/ivy/resolver.rb
-  - lib/ivy/resolver/artifact.rb
-  - lib/ivy/resolver/dsl.rb
-  - lib/ivy/resolver/version.rb
-  - spec/ivy_resolver_spec.rb
-  - spec/spec_helper.rb
-  - spec_files/Jarfile
-  - spec_files/org/example/test/0.0.1/.gitignore
-  - spec_files/org/example/test/0.0.1/IvyResolverTestClass.java
+- .gitignore
+- Gemfile
+- MIT-LICENSE
+- README.md
+- Rakefile
+- ivy-resolver.gemspec
+- jars/Rakefile
+- lib/ivy-resolver.rb
+- lib/ivy/resolver.rb
+- lib/ivy/resolver/artifact.rb
+- lib/ivy/resolver/dsl.rb
+- lib/ivy/resolver/version.rb
+- spec/ivy_resolver_spec.rb
+- spec/spec_helper.rb
+- spec_files/Jarfile
+- spec_files/org/example/test/0.0.1/.gitignore
+- spec_files/org/example/test/0.0.1/IvyResolverTestClass.java
+- spec_files/org/example/test/0.0.1/test-0.0.1.pom
+- spec_files/org/example/test2/0.0.1/TransitiveDependencyTestClass.class
+- spec_files/org/example/test2/0.0.1/TransitiveDependencyTestClass.java
+- spec_files/org/example/test2/0.0.1/test2-0.0.1.pom
 homepage: ""
 licenses: []
 
@@ -56,24 +70,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
-  - jars
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: ivy-resolver
-rubygems_version: 1.8.9
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Resolve JAR files using Ivy under the covers