ivy4r 0.10.3 → 0.10.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,7 @@
1
+ === 0.10.4 / 2010-03-30
2
+ * Changes to from version 0.9.14 working preventing a circular dependency error. Buildr.projects
3
+ is not used anymore but the ivy.publish task works as expected. See 0.9.14 for more details.
4
+
1
5
  === 0.10.3 / 2010-03-30
2
6
  * gem yank did not work so needed a new version :(
3
7
 
@@ -9,7 +9,7 @@ module Buildr
9
9
  end
10
10
 
11
11
  def user_setting(*keys)
12
- find_setting(Buildr.settings.user['ivy'], *keys)
12
+ find_setting(Buildr.settings.user['ivy'], *keys)
13
13
  end
14
14
 
15
15
  private
@@ -27,6 +27,8 @@ module Buildr
27
27
 
28
28
  attr_reader :post_resolve_task_list
29
29
 
30
+ attr_reader :project
31
+
30
32
  # Hash of all artifacts to publish with mapping from artifact name to ivy publish name
31
33
  attr_reader :publish_mappings
32
34
 
@@ -630,21 +632,23 @@ module IvyExtension
630
632
  end
631
633
 
632
634
  def add_copy_tasks_for_publish(project)
633
- if project.ivy.own_file?
634
- Buildr.projects.each do |current|
635
- current.packages.each do |pkg|
636
- target_file = current.ivy.name[pkg] || File.basename(pkg.name).gsub(/-#{project.version}/, '')
637
- taskname = current.path_to(project.ivy.publish_from, target_file)
638
- if taskname != pkg.name
639
- project.file taskname => pkg.name do
640
- verbose "Ivy copying '#{pkg.name}' to '#{taskname}' for publishing"
641
- FileUtils.mkdir File.dirname(taskname) unless File.directory?(File.dirname(taskname))
642
- FileUtils.cp pkg.name, taskname
643
- end
644
- end
645
- project.task 'ivy:publish' => taskname
635
+ ivy_project = project
636
+ until ivy_project.ivy.own_file?
637
+ ivy_project = ivy_project.parent
638
+ end
639
+
640
+ project.packages.each do |pkg|
641
+ target_file = project.ivy.name[pkg] || File.basename(pkg.name).gsub(/-#{project.version}/, '')
642
+ taskname = project.path_to(project.ivy.publish_from, target_file)
643
+ if taskname != pkg.name
644
+ project.file taskname => pkg.name do
645
+ verbose "Ivy copying '#{pkg.name}' to '#{taskname}' for publishing"
646
+ FileUtils.mkdir_p File.dirname(taskname) unless File.directory?(File.dirname(taskname))
647
+ FileUtils.cp pkg.name, taskname
646
648
  end
647
649
  end
650
+
651
+ ivy_project.task 'ivy:publish' => taskname
648
652
  end
649
653
  end
650
654
  end
@@ -36,7 +36,7 @@ is
36
36
  =end
37
37
  class Ivy4r
38
38
 
39
- VERSION = '0.10.3'
39
+ VERSION = '0.10.4'
40
40
 
41
41
  # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
42
42
  # and the default provided ant version 1.7.1 should not be used.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ivy4r
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.3
4
+ version: 0.10.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2010-03-30 00:00:00 +02:00
12
+ date: 2010-04-23 00:00:00 +02:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -52,16 +52,6 @@ dependencies:
52
52
  - !ruby/object:Gem::Version
53
53
  version: 2.0.4
54
54
  version:
55
- - !ruby/object:Gem::Dependency
56
- name: gemcutter
57
- type: :development
58
- version_requirement:
59
- version_requirements: !ruby/object:Gem::Requirement
60
- requirements:
61
- - - ">="
62
- - !ruby/object:Gem::Version
63
- version: 0.5.0
64
- version:
65
55
  - !ruby/object:Gem::Dependency
66
56
  name: hoe
67
57
  type: :development
@@ -70,7 +60,7 @@ dependencies:
70
60
  requirements:
71
61
  - - ">="
72
62
  - !ruby/object:Gem::Version
73
- version: 2.5.0
63
+ version: 2.6.0
74
64
  version:
75
65
  description: |-
76
66
  Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information).