iron_hammer 1.0.1 → 1.0.2

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.1'
+  self.version              = '1.0.2'
 end
 
 require 'newgem/tasks'

data/lib/iron_hammer/anvil.rb

@@ -20,29 +20,38 @@ module IronHammer
       ) unless entries.nil? || entries.empty?
     end
 
-    def projects 
+    def projects
       @projects ||= (@solution.file.projects.collect do |p|
         ProjectFile.load_from(root_path = @solution.path, project_path = p[:path], csproj = p[:csproj]).type.new(p)
       end)
     end
-    
+
     def dll_projects
       @dll_projects ||= projects.select {|p| p.is_a? DllProject}
     end
-    
+
     def test_projects
       @test_projects ||= projects.select {|p| p.is_a? TestProject}
     end
-    
+
+    def integration_test_projects
+      test_projects.select {|p| p.name.include? 'Integration'}
+    end
+
+    def unit_test_projects
+      test_projects - integration_test_projects
+    end
+
     def load_projects_from_solution #deprecated!
       Kernel::warn '[DEPRECATION] `load_projects_from_solution` is deprecated and now it is a no-op. ' +
         'Please, just use `projects` instead - they will be loaded in a lazy fashion ;)'
     end
 
-  private    
+  private
     def initialize params={}
       @solution = params[:solution]
       @projects = params[:projects]
     end
   end unless defined? Anvil
 end
+

data/lib/iron_hammer/default_binaries_behavior.rb

@@ -3,16 +3,21 @@ require 'iron_hammer/deliverables/deliverable'
 module IronHammer
   module DefaultBinariesBehavior
     BIN_PATTERN = '*.{dll,exe}'
-    
+
     def binaries params={}
       path = path_to_binaries(params)
       Dir[File.join(path, BIN_PATTERN)].collect do |file|
         IronHammer::Deliverables::Deliverable.new(
-          :path_on_package => '', 
-          :actual_path => path, 
+          :path_on_package => '',
+          :actual_path => path,
           :actual_name => file.split('/').last
         )
       end
     end
+
+    def binary_types
+      ['dll', 'exe']
+    end
   end unless defined? DefaultBinariesBehavior
 end
+

data/lib/iron_hammer/projects/dependency.rb

@@ -22,8 +22,9 @@ module IronHammer
       def self.from_reference reference
         includes = reference.attribute(:Include).value
         name = includes.split(', ')[0]
-        match = includes.match /Version=(.+?),/
+        match = includes.match /Version=(.+?)(,|$)/
         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
       end

data/lib/iron_hammer/projects/dependency_project.rb

@@ -8,6 +8,7 @@ module IronHammer
           super(params)
           @binaries_path = params[:binaries_path]
           @version = params[:version] || '1.0.0.0'
+          @extension = params[:extension] || 'dll'
       end
 
       def dependencies
@@ -18,6 +19,10 @@ module IronHammer
         name
       end
 
+      def binary_types
+        [@extension]
+      end
+
       def version
         @version
       end

data/lib/iron_hammer/tasks.rb

@@ -24,16 +24,24 @@ namespace :iron do
     end
 
     namespace :test do
+
       desc 'Runs the unit tests'
       task :unit => [:build] do
-        command = @hammer.test *@anvil.test_projects
-        puts "There are no tests to run" unless command
+        command = @hammer.test *@anvil.unit_test_projects
+        puts "There are no unit tests to run" unless command
+        sh command if command
+      end
+
+      desc 'Runs the integration tests'
+      task :integration => [:build] do
+        command = @hammer.test *@anvil.integration_test_projects
+        puts "There are no integration tests to run" unless command
         sh command if command
       end
     end
 
     namespace :analyze do
-      desc 'Analyze the code using fxcop'
+      desc 'Analyzes the code using fxcop'
       task :fxcop do
         sh @hammer.analyze *@anvil.projects do |ok, response|
           puts response
@@ -42,28 +50,35 @@ namespace :iron do
     end
 
     namespace :ivy do
-      desc 'Publish project dependencies into ivy repository'
+      desc 'Publishes project dependencies into ivy repository'
       task :setup, [:binaries_path] do |t, args|
+        all_dependencies = []
         @anvil.projects.each do |project|
           project.dependencies.each do |dependency|
+            all_dependencies << dependency unless all_dependencies.include? dependency
+          end
+        end
 
-            sh "java -jar #{IVY_JAR} -settings #{IVY_SETTINGS} -dependency #{ORGANISATION} #{dependency.name} #{dependency.version}" do |ok, res|
-              if !ok
-                dependency_project = DependencyProject.new(
-                :name => dependency.name,
-                :binaries_path => args.binaries_path,
-                :version => dependency.version)
+        files = Dir.new(args.binaries_path).entries
+        candidates = all_dependencies.select {|x| files.include? "#{x.name}.#{x.extension}"}
 
-                puts "Dependency #{dependency.name}"
+        candidates.each do |dependency|
+          sh "java -jar #{IVY_JAR} -settings #{IVY_SETTINGS} -dependency #{ORGANISATION} #{dependency.name} #{dependency.version}" do |ok, res|
+            unless res.exitstatus == 0
+              dependency_project = DependencyProject.new(
+              :name => dependency.name,
+              :binaries_path => args.binaries_path,
+              :version => dependency.version,
+              :extension => dependency.extension)
 
-                builder = IvyBuilder.new dependency_project
+              puts "Dependency #{dependency.name}"
 
-                builder.write_to "ivy-#{dependency.name}.xml"
+              builder = IvyBuilder.new dependency_project
 
-                sh builder.publish "ivy-#{dependency.name}.xml"
-              end
-            end
+              builder.write_to "ivy-#{dependency.name}.xml"
 
+              sh builder.publish "ivy-#{dependency.name}.xml"
+            end
           end
         end
       end
@@ -101,7 +116,7 @@ namespace :iron do
         end
       end
 
-      desc 'Publish project assemblies to ivy repository (only dll projects)'
+      desc 'Publishes 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

@@ -18,8 +18,9 @@ module IronHammer
           name = @project.assembly_name
           xml.info :organisation => @organisation, :module => name
           xml.publications do
-            xml.artifact :name => name, :type => 'dll'
-            xml.artifact :name => name, :type => 'exe'
+            @project.binary_types.each do |btype|
+              xml.artifact :name => name, :type => btype
+            end
           end if @project.is_a? DllProject
 
           xml.dependencies do

metadata

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