iron_hammer 1.0.7 → 1.0.8

data/Rakefile

@@ -14,7 +14,7 @@ $hoe = Hoe.spec 'iron_hammer' do
   self.rubyforge_name       = self.name
   self.extra_deps           = [['rubyzip2','>= 2.0.1'],
                                ['builder', '>= 2.1.2']]
-  self.version              = '1.0.7'
+  self.version              = '1.0.8'
 end
 
 require 'newgem/tasks'

data/lib/iron_hammer/projects/dependency.rb

@@ -4,11 +4,13 @@ module IronHammer
       attr_accessor :name
       attr_accessor :version
       attr_accessor :extension
+      attr_accessor :specific
 
       def initialize params = {}
         @name = params[:name] || raise(ArgumentError.new('you must specify a name'))
         @version = params[:version]
         @extension = params[:extension] || 'dll'
+        @specific = params[:specific] || false
       end
 
       def == other
@@ -26,7 +28,9 @@ module IronHammer
         version = match[1] if match
         raise "Cannot parse version on include: #{includes}" unless version
         extension = get_extension reference
-        Dependency.new :name => name, :version => version, :extension => extension
+        specific_el = reference.elements['SpecificVersion']
+        specific = (specific_el && specific_el.text == 'true') || false
+        Dependency.new :name => name, :version => version, :extension => extension, :specific => specific
       end
 
       def self.from_project project

data/lib/iron_hammer/tasks/ivy.rb

@@ -66,6 +66,7 @@ namespace :iron do
 
         builder.modify_csproj
       end
+      IvyBuilder.rename_artifacts
     end
 
     desc 'Publishes project assemblies to ivy repository (only dll projects)'

data/lib/iron_hammer/utils/ivy_builder.rb

@@ -38,7 +38,8 @@ module IronHammer
 
           xml.dependencies do
             dependencies.each do |dependency|
-              rev = dependency.version.gsub VERSION_PATTERN, VERSION_REPLACE[@config.retrieve_version]
+              rev = dependency.version
+              rev = rev.gsub VERSION_PATTERN, VERSION_REPLACE[@config.retrieve_version] unless dependency.specific
               xml.dependency :org => @config.organisation, :name => dependency.name, :rev => rev do
                 xml.artifact :type => dependency.extension, :name => dependency.name
               end
@@ -51,7 +52,7 @@ module IronHammer
         "java -jar #{@config.ivy_jar}
           -ivy #{ivy_file}
           -settings #{@config.ivy_settings}
-          -retrieve Libraries/[revision]/[artifact].[ext]".gsub(/\s+/, ' ')
+          -retrieve Libraries/[artifact]-[revision].[ext]".gsub(/\s+/, ' ')
       end
 
       def publish ivy_file
@@ -74,19 +75,29 @@ module IronHammer
         references = doc.get_elements(ProjectFile::REFERENCE_PATH)
         references.each do |reference|
           artifact = artifact_for reference
-          artifact.scan(/Libraries\/(.*)\/(.*)/) do |version, extension|
+          artifact.scan(/Libraries\/(.*)-([\d\.]*)\.(.*)/) do |name, version, extension|
             includes = reference.attribute('Include').value
             includes.gsub!(/Version=(.*?)(,|$)/, "Version=#{version}\\2")
             reference.add_attribute('Include', includes)
+
+            artifact = "Libraries\\#{name}.#{extension}"
           end
           reference.elements['SpecificVersion'] = REXML::Element.new('SpecificVersion').add_text('false')
           reference.elements['HintPath'] = REXML::Element.new('HintPath').
-                add_text([relative, "#{artifact.gsub(/\//, '\\')}"].flatten.patheticalize)
+                add_text([relative, "#{artifact}"].flatten.patheticalize)
         end
 
         FileSystem.write! :path => @project.path, :name => @project.csproj, :content => doc.to_s
       end
 
+      def self.rename_artifacts
+        Dir["Libraries/*.{dll,exe}"].each do |file|
+          file.scan(/Libraries\/(.*)-([\d\.]*)\.(.*)/) do |name, version, extension|
+              FileUtils.mv(file, "Libraries\\#{name}.#{extension}")
+          end
+        end
+      end
+
       def relative
         ['..'] * @project.path.split(/\/|\\/).size
       end
@@ -94,7 +105,10 @@ module IronHammer
       private
       def artifact_for reference
         dependency = Dependency.from_reference reference
-        Dir["Libraries/**/#{dependency.name}.{dll,exe}"].last
+        pattern = "Libraries/#{dependency.name}-*.{dll,exe}"
+        files = Dir[pattern]
+        raise "No file found with name like: #{pattern}" if files.empty?
+        files.last
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -02:00
+date: 2010-02-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency