ivy4r 0.9.6 → 0.9.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.9.7 / 2009-12-10
+
+* Fixed missing files in gem.
+
 === 0.9.6 / 2009-12-09
 
 * Support for JRuby access to underlying java objects of ivy. Require 'ivy4r_java_extensions'

data/Manifest.txt

@@ -13,6 +13,7 @@ lib/ivy/cleancache.rb
 lib/ivy/configure.rb
 lib/ivy/findrevision.rb
 lib/ivy/info.rb
+lib/ivy/java/all_version_matcher.rb
 lib/ivy/listmodules.rb
 lib/ivy/makepom.rb
 lib/ivy/publish.rb
@@ -23,6 +24,7 @@ lib/ivy/settings.rb
 lib/ivy/target.rb
 lib/ivy/targets.rb
 lib/ivy4r.rb
+lib/ivy4r_java_extensions.rb
 lib/rake/ivy_extension.rb
 test/buildlist/p1/buildfile
 test/buildlist/p1/ivy.xml

data/lib/ivy/java/all_version_matcher.rb

@@ -0,0 +1,31 @@
+module Ivy
+  # Matcher that accepts all versions of the same module as a match, i.e.
+  # only checking that the module is the same.
+  class IvyAllVersionMatcher
+    include Java::OrgApacheIvyPluginsVersion::VersionMatcher
+
+    def is_dynamic(askedMrid)
+      false
+    end
+
+    def accept(askedMrid, foundMrid)
+      true
+    end
+
+    def need_module_descriptor(askedMrid, foundMrid)
+      false
+    end
+
+    def accept(askedMrid, foundMD)
+      true
+    end
+
+    def compare(askedMrid, foundMrid, staticComparator)
+      0
+    end
+
+    def getName
+      self.class
+    end
+  end
+end

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 
   # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
   # and the default provided ant version 1.7.1 should not be used.

data/lib/ivy4r_java_extensions.rb

@@ -0,0 +1,42 @@
+# basic stuff
+require 'ivy4r'
+
+# java extensions
+Dir[Ivy4rJars.lib_dir + "/*.jar"].each {|jar| require jar}
+require 'ivy/java/all_version_matcher'
+
+class Ivy4r
+  # Returns the ivy instance for underlying ant project with the current ivy settings.
+  def ivy_instance
+    unless @ivy_instance
+      variable_container = Java::OrgApacheIvyAnt::IvyAntVariableContainer.new(ant.project)
+      settings_file = find_settings_file(variable_container) unless settings_file
+      raise "no settings file set and no default settings found, cannot create ivy instance" unless settings_file
+      raise "settings file does not exist: #{settings_file}" unless File.exists? settings_file
+
+      settings = Java::OrgApacheIvyCoreSettings::IvySettings.new(variable_container)
+      settings.base_dir = ant.project.base_dir
+      @ivy_instance = Java::OrgApacheIvy::Ivy.new_instance(settings)
+      @ivy_instance.configure(Java::JavaIo::File.new(settings_file))
+    end
+
+    @ivy_instance
+  end
+
+  # Returns the ant references, note that this are java objects.
+  def ant_references
+    ant.project.references
+  end
+
+  private
+  def find_settings_file(variable_container)
+    settings_file_name = variable_container.get_variable("ivy.conf.file") || variable_container.get_variable("ivy.settings.file")
+    setting_locations = [
+      File.join(ant.project.base_dir.absolute_path, settings_file_name),
+      File.join(ant.project.base_dir.absolute_path, 'ivyconf.xml'),
+      settings_file_name,
+      'ivyconf.xml'
+    ]
+    setting_locations.find {|path| File.exists? path }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2009-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
   - lib/ivy/configure.rb
   - lib/ivy/findrevision.rb
   - lib/ivy/info.rb
+  - lib/ivy/java/all_version_matcher.rb
   - lib/ivy/listmodules.rb
   - lib/ivy/makepom.rb
   - lib/ivy/publish.rb
@@ -95,6 +96,7 @@ files:
   - lib/ivy/target.rb
   - lib/ivy/targets.rb
   - lib/ivy4r.rb
+  - lib/ivy4r_java_extensions.rb
   - lib/rake/ivy_extension.rb
   - test/buildlist/p1/buildfile
   - test/buildlist/p1/ivy.xml