iron_hammer 0.3.8 → 0.3.9

data/Rakefile

@@ -12,7 +12,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              = '0.3.8'
+  self.version              = '0.3.9'
 end
 
 require 'newgem/tasks'

data/lib/iron_hammer.rb

@@ -23,6 +23,7 @@ require 'iron_hammer/package'
 require 'iron_hammer/projects/asp_net_mvc_project'
 require 'iron_hammer/projects/asp_net_project'
 require 'iron_hammer/projects/dependency'
+require 'iron_hammer/projects/dependency_project'
 require 'iron_hammer/projects/dll_project'
 require 'iron_hammer/projects/generic_project'
 require 'iron_hammer/projects/project_file'
@@ -42,3 +43,4 @@ include IronHammer::Projects
 include IronHammer::Solutions
 include IronHammer::Utils
 include IronHammer::Deliverables
+

data/lib/iron_hammer/projects/dependency_project.rb

@@ -0,0 +1,31 @@
+require 'iron_hammer/projects/dll_project'
+
+module IronHammer
+  module Projects
+    class DependencyProject < DllProject
+
+      def initialize params
+          super(params)
+          @binaries_path = params[:binaries_path]
+          @version = params[:version] || '1.0.0.0'
+      end
+
+      def dependencies
+        []
+      end
+
+      def assembly_name
+        name
+      end
+
+      def version
+        @version
+      end
+
+      def path_to_binaries
+        @binaries_path
+      end
+    end unless defined? DependencyProject
+  end
+end
+

data/lib/iron_hammer/projects/generic_project.rb

@@ -6,48 +6,57 @@ module IronHammer
       attr_accessor :name
       attr_accessor :path
       attr_accessor :csproj
-      
+
       def initialize params={}
-        @name = params[:name] || 
+        @name = params[:name] ||
           raise(ArgumentError.new 'must provide a project name')
         @path = params[:path] || @name
         @csproj = params[:csproj] || "#{@name}.csproj"
       end
-      
+
       def path_to_binaries params={}
         ''
       end
 
+      def version
+        '1.0.0.0'
+      end
+
       def deliverables params={}
         []
       end
-      
+
+      def assembly_name
+        @assembly_name ||= file.assembly_name
+      end
+
       def dependencies
         @dependencies ||= file.dependencies
       end
-      
+
       def package params={}
         package_root(params)
         Package.new :root => package_root, :deliverables => deliverables(params)
       end
-      
+
       protected
       def package_root params={}
         root = params[:root] || params[:target] || params[:package_root] || IronHammer::Defaults::DELIVERY_DIRECTORY
       end
-      
+
       def run_configuration params={}
         configuration = params[:configuration]
         config = (configuration && !configuration.empty? && configuration) || IronHammer::Defaults::CONFIGURATION_RUN
       end
-      
+
       def file
         @file ||= ProjectFile.load_from path_to_csproj
       end
-      
+
       def path_to_csproj
         return File.join @path, @csproj
       end
     end unless defined? GenericProject
   end
 end
+

data/lib/iron_hammer/projects/project_file.rb

@@ -11,44 +11,49 @@ module IronHammer
   module Projects
     class ProjectFile
       attr_accessor :path
-      
+
       GUID_EVALUATION_ORDER = [AspNetMvcProject, AspNetProject, TestProject]
       GUID_PATH = '//Project/PropertyGroup/ProjectTypeGuids'
+      ASSEMBLY_NAME_PATH = '//Project/PropertyGroup/AssemblyName'
       REFERENCE_PATH = '//Reference[not(starts_with(@Include, "System"))]'
-      
+
       def self.load_from *path
         ProjectFile.new path
       end
-      
+
       def type
         @type ||= ((GUID_EVALUATION_ORDER.inject(false) do |result, current|
           result || (guids.include?(ProjectTypes::guid_for(current)) && current)
         end) || DllProject)
       end
 
+      def assembly_name
+        @assembly_name ||= doc.elements[ASSEMBLY_NAME_PATH].text
+      end
+
       def dependencies
         references.collect { |reference| Dependency.from_reference reference }
       end
-      
+
     private
       def references
         doc && doc.get_elements(REFERENCE_PATH)
       end
-    
+
       def doc
         @doc ||= REXML::Document.new xml
       end
-      
+
       def xml
         @xml ||= IronHammer::Utils::FileSystem::read_file(*@path)
       end
-    
+
       def guids
         return @guids if @guids
         return @guids = [] unless (elem = doc && doc.elements[GUID_PATH]) && elem.text
         @guids = elem.text.split(';').collect { |e| e.upcase }
       end
-      
+
       def initialize *path
         @path = path
       end

data/lib/iron_hammer/projects/test_project.rb

@@ -8,21 +8,24 @@ module IronHammer
       attr_accessor :dll
       attr_accessor :name
       attr_accessor :path
-        
-      def initialize params
-        @name   = params[:name]     || "#{ params[:project] || params[:solution] }.Tests"
+
+      def initialize params = {}
+        params[:name] ||= "#{ params[:project] || params[:solution] }.Tests"
+        @name   = params[:name]
         @dll    = "#{ params[:dll]  || @name}.dll"
         @config = params[:config]   || IronHammer::Defaults::TEST_CONFIG
         @path   = params[:path]
+        super(params)
       end
 
       def container configuration
         [@name, 'bin', configuration, @dll].patheticalize
       end
-      
+
       def results_file
         ['TestResults', 'TestResults.trx'].patheticalize
       end
     end unless defined? TestProject
   end
 end
+

data/lib/iron_hammer/tasks.rb

@@ -3,6 +3,7 @@ require 'rake/clean'
 require 'iron_hammer'
 
 CLEAN.include("TestResults/**")
+CLEAN.include("ivy*.xml")
 
 namespace :iron do
     task :initialize do
@@ -24,9 +25,30 @@ namespace :iron do
     end
 
     namespace :ivy do
-      desc 'Generates ivy-<project_name>.xml for all dll projects of the solution'
+      desc 'Publish project dependencies into ivy repository'
+      task :setup do
+        @anvil = Anvil.load_from '.'
+        @anvil.projects.each do |project|
+          project.dependencies.each do |dependency|
+            dependency_project = DependencyProject.new(
+                :name => dependency.name,
+                :binaries_path => ENV['binaries_path'],
+                :version => dependency.version)
+
+            puts "Dependency #{dependency.name}"
+
+            builder = IvyBuilder.new dependency_project
+
+            builder.write_to "ivy-#{dependency.name}.xml"
+
+            sh builder.publish "ivy-#{dependency.name}.xml"
+          end
+        end
+      end
+
+      desc 'Generates ivy-<project_name>.xml for all projects of the solution'
       task :generate => [:initialize] do
-        @anvil.dll_projects.each do |project|
+        @anvil.projects.each do |project|
           builder = IvyBuilder.new project
           builder.write_to "ivy-#{project.name}.xml"
         end
@@ -34,7 +56,7 @@ namespace :iron do
 
       desc 'Retrieves all project dependencies from ivy repository and modify project csproj to reference them'
       task :retrieve => [:generate] do
-        @anvil.dll_projects.each do |project|
+        @anvil.projects.each do |project|
           xml = "ivy-#{project.name}.xml"
           builder = IvyBuilder.new project
 
@@ -44,7 +66,7 @@ namespace :iron do
         end
       end
 
-      desc 'Publish project assemblies to ivy repository'
+      desc 'Publish project assemblies to ivy repository (only dll projects)'
       task :publish => [:generate] do
         @anvil.dll_projects.each do |project|
           xml = "ivy-#{project.name}.xml"

data/lib/iron_hammer/utils/ivy_builder.rb

@@ -15,13 +15,11 @@ module IronHammer
       def to_s
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.tag! 'ivy-module', :version => '2.0' do
-          xml.info :organisation => @organisation, :module => @project.name
+          name = @project.assembly_name
+          xml.info :organisation => @organisation, :module => name
           xml.publications do
-            @project.binaries.each do |binary|
-              extension = binary.actual_name.split(/\./).last
-              name = binary.actual_name.gsub(/\.[^\.]+$/, '')
-              xml.artifact :name => name, :type => extension
-            end
+            extension = 'dll'
+            xml.artifact :name => name, :type => extension
           end if @project.is_a? DllProject
 
           xml.dependencies do
@@ -45,7 +43,7 @@ module IronHammer
           -settings #{@ivy_settings}
           -publish default
           -publishpattern #{@project.path_to_binaries}/[artifact].[ext]
-          -revision 1.0.0.0
+          -revision #{@project.version}
           -overwrite true".gsub(/\s+/, ' ')
       end
 
@@ -60,16 +58,20 @@ module IronHammer
         references.each do |reference|
           reference.elements['SpecificVersion'] = REXML::Element.new('SpecificVersion').add_text('false')
           reference.elements['HintPath'] = REXML::Element.new('HintPath').
-                add_text("..\\Libraries\\#{artifact_for reference}")
+                add_text([relative, 'Libraries', "#{artifact_for reference}"].flatten.patheticalize)
         end
 
         FileSystem.write! :path => @project.path, :name => @project.csproj, :content => doc.to_s
       end
 
+      def relative
+        ['..'] * @project.path.split(/\/|\\/).size
+      end
+
       private
       def artifact_for reference
         dependency = Dependency.from_reference reference
-        libraries_dir = Dir.new(File.join(@project.path, '..', 'Libraries'))
+        libraries_dir = Dir.new('Libraries')
         libraries_dir.find {|f| f.match "#{dependency.name}\\.(dll|exe)"}
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -02:00
+date: 2010-02-02 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ files:
 - lib/iron_hammer/projects/asp_net_project.rb
 - lib/iron_hammer/projects/dll_project.rb
 - lib/iron_hammer/projects/dependency.rb
+- lib/iron_hammer/projects/dependency_project.rb
 - lib/iron_hammer/projects/generic_project.rb
 - lib/iron_hammer/projects/project_file.rb
 - lib/iron_hammer/projects/project_types.rb