ivy4r 0.3.0 → 0.5.1

data/History.txt

@@ -1,3 +1,21 @@
+=== 0.5.1 / 2009-06-24
+
+* small improvements in rakefile (execute test for some targets)
+* publish to rubyforge "hamburg.rb"
+
+=== 0.5.0 / 2009-06-23
+
+* use ivy4r-jars to get needed jars from to separate the ruby source from the dependencies
+  and make the gem smaller.
+
+=== 0.4.0 / 2009-06-23
+
+* added rake/ivy_extension similar to buildr/ivy_extension to help use ivy4r in rake
+
+=== 0.3.0 / 2009-06-20
+
+* added ant*.jar to gem so that user does not need to have a local ant installation
+
 === 0.2.0 / 2009-06-18
 
 * added the Buildr ivy_extension to include ivy in buildr for dependency managment

data/Manifest.txt

@@ -3,9 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 bin/ivy4r
-jars/lib/ant-1.7.1.jar
-jars/lib/ant-launcher-1.7.1.jar
-jars/lib/ant-trax-1.7.1.jar
 lib/buildr/ivy_extension.rb
 lib/ivy/artifactproperty.rb
 lib/ivy/artifactreport.rb
@@ -26,6 +23,7 @@ lib/ivy/settings.rb
 lib/ivy/target.rb
 lib/ivy/targets.rb
 lib/ivy4r.rb
+lib/rake/ivy_extension.rb
 test/buildlist/p1/buildfile
 test/buildlist/p1/ivy.xml
 test/buildlist/sub/p2/buildfile

data/README.txt

@@ -1,7 +1,7 @@
 = ivy4r
 
 * http://github.com/klaas1979/ivy4r/tree/master
-* http://ivy4r.rubyforge.org/
+* http://hamburgrb.rubyforge.org/
 
 == DESCRIPTION:
 

data/Rakefile

@@ -4,12 +4,13 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'rubygems'
 require 'hoe'
 require 'ivy4r'
-
+  
 hoe = Hoe.spec 'ivy4r' do |p|
-  # self.rubyforge_name = 'ivy4rx' # if different than 'ivy4r'
+  self.rubyforge_name = 'hamburgrb'
   p.developer('Klaas Prause', 'klaas.prause@googlemail.com')
-  p.remote_rdoc_dir = '' # Release to root only one project
-  p.extra_deps = [['Antwrap', '>=0.7.0']]
+  p.remote_rdoc_dir = 'ivy4r'
+  p.extra_deps << ['Antwrap', '>=0.7.0']
+  p.extra_deps << ['ivy4r-jars', '>=1.0.0']
   File.open(File.join(File.dirname(__FILE__), 'VERSION'), 'w') do |file|
     file.puts Ivy4r::VERSION
   end
@@ -22,21 +23,9 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-# vim: syntax=ruby
+task :gemspec => :test
 
-ENV['IVY_EXT_DIR'] ||= '../Ivy'
+desc "Tests, releases and publishs docs to rubyforge"
+task :release_and_publish => [:test, :release, :publish_docs]
 
-task 'ivy:publish' do#=> ['test', 'test:plugins', 'war:clean', 'war'] do
-   raise 'ANT_HOME missing in environment!' unless ENV['ANT_HOME']
-   require 'ivy4r'
-   ivy = Ivy4r.new
-   #ivy.ant_home = ENV['ANT_HOME']
-   ext_dir = File.expand_path(ENV['IVY_EXT_DIR'])
-   ivy.project_dir = ext_dir
-   home = File.join(ext_dir,  'ivy-home')
-   ivy.lib_dir = File.join(home, 'jars')
-   ivy.property['ivy.home'] = home
-   ivy.property['ivy.status'] = 'release'
-   ivy.settings :file => File.join(ext_dir, 'ant-scripts', 'ivysettings.xml')
-   ivy.resolve :file => File.join(File.dirname(__FILE__), 'ivy.xml') #options = {:status => status, :pubrevision => revision, :artifactspattern => "#{publish_from}/[artifact].[ext]"}
-end
+# vim: syntax=ruby

data/lib/buildr/ivy_extension.rb

@@ -55,7 +55,7 @@ module Buildr
         unless @ant
           if own_file?
             @ant = ::Ivy4r.new(@project.ant('ivy'))
-            @ant.lib_dir = lib_dir
+            @ant.lib_dir = lib_dir if lib_dir
             @ant.project_dir = @extension_dir
           else
             @ant = @project.parent.ivy.ant
@@ -148,7 +148,7 @@ module Buildr
       end
 
       def lib_dir
-        @lib_dir ||= Ivy.setting('lib.dir') || "#{home}/jars"
+        @lib_dir ||= Ivy.setting('lib.dir')
       end
       
       def settings

data/lib/ivy4r.rb

@@ -1,3 +1,4 @@
+require 'ivy4r_jars'
 require 'antwrap'
 require 'ivy/targets'
 
@@ -34,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.3.0'
+  VERSION = '0.5.1'
 
   # 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.
@@ -44,14 +45,20 @@ class Ivy4r
   # Defines the directory to load ivy libs and its dependencies from
   attr_accessor :lib_dir
 
+  # Optional ant variable <tt>ivy.project.dir</tt> to add to ant environment before loading ivy
+  # defaults to the __lib_dir__
   attr_accessor :project_dir
 
   # To provide a custom __antwrap__ to use instead of default one
   attr_writer :ant
 
-  def initialize(*opts)
-    @ant = opts[0] if opts.size == 1
-    raise "To many parameters to create Ivy4r use none, or 1 to set ANT!" if opts.size > 1
+  # Initalizes ivy4r with optional ant wrapper object. Sets ant home dir and ivy lib dir
+  # to default values from __Ivy4rJars__ gem.
+  def initialize(ant = nil)
+    @ant_home = ::Ivy4rJars.ant_home_dir
+    @lib_dir = ::Ivy4rJars.lib_dir
+    @project_dir = @lib_dir
+    @ant = ant
   end
 
   # Calls the __cleancache__ ivy target with given parameters.
@@ -149,7 +156,7 @@ class Ivy4r
   # Returns the __antwrap__ instance to use for all internal calls creates a default
   # instance if no instance has been set before.
   def ant
-    @ant ||= ::Antwrap::AntProject.new(:ant_home => ant_home || File.expand_path(File.join(File.dirname(__FILE__), '..', 'jars')),
+    @ant ||= ::Antwrap::AntProject.new(:ant_home => ant_home,
       :name => "ivy-ant", :basedir => Dir.pwd, :declarative => true)
     init(@ant) if should_init?
     @ant

data/lib/rake/ivy_extension.rb

@@ -0,0 +1,257 @@
+require 'ivy4r'
+
+class Rake::Application
+  attr_accessor :ivy
+end
+
+module Rake
+  module Ivy
+    class IvyConfig
+
+      # The directory to load ivy jars and its dependencies from, leave __nil__ to use default
+      attr_accessor :lib_dir
+
+      # The extension directory containing ivy settings, the local repository and cache
+      attr_accessor :extension_dir
+
+      # Returns the resolve result
+      attr_reader :resolved
+
+      # Store the current rake application and initialize ivy ant wrapper
+      def initialize(application)
+        @application = application
+        @extension_dir = File.join("#{@application.original_dir}", "#{ENV['IVY_EXT_DIR']}")
+      end
+
+      # Returns the correct ant instance to use.
+      def ant
+        unless @ant
+          @ant = ::Ivy4r.new
+          @ant.lib_dir = lib_dir if lib_dir
+          @ant.project_dir = @extension_dir
+        end
+        @ant
+      end
+
+      # Returns the artifacts for given configurations as array
+      def deps(*confs)
+        configure
+        pathid = "ivy.deps." + confs.join('.')
+        ant.cachepath :conf => confs.join(','), :pathid => pathid
+      end
+
+      # Returns ivy info for configured ivy file.
+      def info
+        ant.settings :id => 'ivy.info.settingsref'
+        ant.info :file => file, :settingsRef => 'ivy.info.settingsref'
+      end
+
+      # Configures the ivy instance with additional properties and loading the settings file if it was provided
+      def configure
+        unless @configured
+          ant.property['ivy.status'] = status
+          ant.property['ivy.home'] = home
+          properties.each {|key, value| ant.property[key.to_s] = value }
+          @configured = ant.settings :file => settings if settings
+        end
+      end
+
+      # Resolves the configured file once.
+      def resolve
+        unless @resolved
+          @resolved = ant.resolve :file => file
+        end
+      end
+
+      # Creates the standard ivy dependency report
+      def report
+        ant.report :todir => report_dir
+      end
+
+      # Publishs the project as defined in ivy file if it has not been published already
+      def publish
+        unless @published
+          options = {:artifactspattern => "#{publish_from}/[artifact].[ext]"}
+          options[:pubrevision] = revision if revision
+          options[:status] = status if status
+          options = publish_options * options
+          ant.publish options
+          @published = true
+        end
+      end
+
+      def home
+        @ivy_home_dir ||= "#{@extension_dir}/ivy-home"
+      end
+
+      def settings
+        @settings ||= "#{@extension_dir}/ant-scripts/ivysettings.xml"
+      end
+
+      def file
+        @ivy_file ||= 'ivy.xml'
+      end
+
+      # Sets the revision to use for the project, this is useful for development revisions that
+      # have an appended timestamp or any other dynamic revisioning.
+      #
+      # To set a different revision this method can be used in different ways.
+      # 1. project.ivy.revision(revision) to set the revision directly
+      # 2. project.ivy.revision { |ivy| [calculate revision] } use the block for dynamic
+      #    calculation of the revision. You can access ivy4r via <tt>ivy.ant.[method]</tt>
+      def revision(*revision, &block)
+        raise "Invalid call with parameters and block!" if revision.size > 0 && block
+        if revision.empty? && block.nil?
+          if @revision_calc
+            @revision ||= @revision_calc.call(self)
+          else
+            @revision
+          end
+        elsif block.nil?
+          raise "revision value invalid #{revision.join(', ')}" unless revision.size == 1
+          @revision = revision[0]
+          self
+        else
+          @revision_calc = block
+          self
+        end
+      end
+
+      # Sets the status to use for the project, this is useful for custom status handling
+      # like integration, alpha, gold.
+      #
+      # To set a different status this method can be used in different ways.
+      # 1. project.ivy.status(status) to set the status directly
+      # 2. project.ivy.status { |ivy| [calculate status] } use the block for dynamic
+      #    calculation of the status. You can access ivy4r via <tt>ivy.ant.[method]</tt>
+      def status(*status, &block)
+        raise "Invalid call with parameters and block!" if status.size > 0 && block
+        if status.empty? && block.nil?
+          if @status_calc
+            @status ||= @status_calc.call(self)
+          else
+            @status
+          end
+        elsif status.empty? && block.nil?
+          raise "status value invalid #{status.join(', ')}" unless status.size == 1
+          @status = status[0]
+          self
+        else
+          @status_calc = block
+          self
+        end
+      end
+
+      # Sets the publish options to use for the project. The options are merged with the default
+      # options including value set via #publish_from and overwrite all of them.
+      #
+      # To set the options this method can be used in different ways.
+      # 1. project.ivy.publish_options(options) to set the options directly
+      # 2. project.ivy.publish_options { |ivy| [calculate options] } use the block for dynamic
+      #    calculation of options. You can access ivy4r via <tt>ivy.ant.[method]</tt>
+      def publish_options(*options, &block)
+        raise "Invalid call with parameters and block!" if options.size > 0 && block
+        if options.empty? && block.nil?
+          if @publish_options_calc
+            @publish_options ||= @publish_options_calc.call(self)
+          else
+            @publish_options ||= {}
+          end
+        else
+          if options.size > 0 && block.nil?
+            raise "publish options value invalid #{options.join(', ')}" unless options.size == 1
+            @publish_options = options[0]
+            self
+          else
+            @publish_options_calc = block
+            self
+          end
+        end
+      end
+
+      # Sets the additional properties for the ivy process use a Hash with the properties to set.
+      def properties(*properties)
+        if properties.empty?
+          @properties ||= {}
+        else
+          raise "properties value invalid #{properties.join(', ')}" unless properties.size == 1
+          @properties = properties[0]
+          self
+        end
+      end
+
+      # Sets the local repository for ivy files
+      def local_repository(*local_repository)
+        if local_repository.empty?
+          @local_repository ||= "#{home}/repository"
+        else
+          raise "local_repository value invalid #{local_repository.join(', ')}" unless local_repository.size == 1
+          @local_repository = local_repository[0]
+          self
+        end
+      end
+
+      # Sets the directory to publish artifacts from.
+      def publish_from(*publish_dir)
+        if publish_dir.empty?
+          @publish_from ||= @application.original_dir
+        else
+          raise "publish_from value invalid #{publish_dir.join(', ')}" unless publish_dir.size == 1
+          @publish_from = publish_dir[0]
+          self
+        end
+      end
+
+      # Sets the directory to create dependency reports in.
+      def report_dir(*report_dir)
+        if report_dir.empty?
+          @report_dir ||= @application.original_dir
+        else
+          raise "publish_from value invalid #{report_dir.join(', ')}" unless report_dir.size == 1
+          @report_dir = report_dir[0]
+          self
+        end
+      end
+    end
+
+
+    class Tasks < ::Rake::TaskLib
+      def initialize(ivy = nil, &block)
+        @ivy = ivy || Rake::Ivy::IvyConfig.new(Rake.application)
+        yield @ivy if block_given?
+        Rake.application.ivy = @ivy
+
+        define
+      end
+
+      private
+      def define
+        namespace 'ivy' do
+          task :configure do
+            Rake.application.ivy.configure
+          end
+          
+          desc 'Resolves the ivy dependencies'
+          task :resolve => "ivy:configure" do
+            Rake.application.ivy.resolve
+          end
+
+          desc 'Publish the artifacts to ivy repository'
+          task :publish => "ivy:resolve" do
+            Rake.application.ivy.publish
+          end
+
+          desc 'Creates a dependency report for the project'
+          task :report => "ivy:resolve" do
+            Rake.application.ivy.report
+          end
+
+          desc 'Clean the local Ivy cache and the local ivy repository'
+          task :clean do
+            Rake.application.ivy.ant.clean
+          end
+        end
+      end
+    end
+  end
+end

data/test/ivy/test_targets.rb

@@ -9,8 +9,6 @@ module Ivy
 
     def setup
       ivy4r = Ivy4r.new
-      ivy4r.ant_home = File.join(File.dirname(__FILE__), '..', '..', 'jars')
-      ivy4r.lib_dir = ivy4r.ant_home
       @ivy_test_xml = File.join(File.dirname(__FILE__), 'ivytest.xml')
       @info = Ivy::Info.new(ivy4r.ant)
     end

data/test/test_ivy4r.rb

@@ -11,8 +11,6 @@ module Ivy
 
     def setup
       @ivy4r = Ivy4r.new
-      @ivy4r.ant_home = File.join(File.dirname(__FILE__), '..', 'jars')
-      @ivy4r.lib_dir = @ivy4r.ant_home
       @ivy_test_xml = File.join(File.dirname(__FILE__), 'ivy', 'ivytest.xml')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 +02:00
+date: 2009-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ivy4r-jars
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -49,9 +59,6 @@ files:
 - README.txt
 - Rakefile
 - bin/ivy4r
-- jars/lib/ant-1.7.1.jar
-- jars/lib/ant-launcher-1.7.1.jar
-- jars/lib/ant-trax-1.7.1.jar
 - lib/buildr/ivy_extension.rb
 - lib/ivy/artifactproperty.rb
 - lib/ivy/artifactreport.rb
@@ -72,6 +79,7 @@ files:
 - lib/ivy/target.rb
 - lib/ivy/targets.rb
 - lib/ivy4r.rb
+- lib/rake/ivy_extension.rb
 - test/buildlist/p1/buildfile
 - test/buildlist/p1/ivy.xml
 - test/buildlist/sub/p2/buildfile
@@ -105,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: ivy4r
+rubyforge_project: hamburgrb
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2