iron_hammer 1.0.5 → 1.0.6

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

data/lib/iron_hammer/tasks/ivy.rb

@@ -34,7 +34,7 @@ namespace :iron do
 
             puts "Dependency #{dependency.name}"
 
-            builder = IvyBuilder.new dependency_project
+            builder = IvyConfiguration.builder_for dependency_project
 
             builder.write_to "ivy-#{dependency.name}.xml"
 
@@ -48,21 +48,21 @@ namespace :iron do
     task :generate do
       puts "Generating ivy files for projects"
       @anvil.projects.each do |project|
-        builder = IvyBuilder.new project
+        builder = IvyConfiguration.builder_for project
         builder.write_to "ivy-#{project.name}.xml"
       end
     end
 
     desc 'Retrieves all project dependencies from ivy repository and modify project csproj to reference them'
     task :retrieve do
-      builder = IvyBuilder.new(SolutionProject.new(@anvil.solution.name, all_dependencies))
+      builder = IvyConfiguration.builder_for(SolutionProject.new(@anvil.solution.name, all_dependencies))
       xml = "ivy-#{@anvil.solution.name}.xml"
       builder.write_to xml
 
       sh builder.retrieve xml
 
       @anvil.projects.each do |project|
-        builder = IvyBuilder.new project
+        builder = IvyConfiguration.builder_for project
 
         builder.modify_csproj
       end
@@ -72,7 +72,7 @@ namespace :iron do
     task :publish => [:generate] do
       @anvil.dll_projects.topological_sort.each do |project|
         xml = "ivy-#{project.name}.xml"
-        builder = IvyBuilder.new project
+        builder = IvyConfiguration.builder_for project
 
         FileSystem.write! :name => xml, :path => '.',
           :content => builder.generate_xml(project.dependencies_with_projects @anvil.projects)

data/lib/iron_hammer/tasks/version.rb

@@ -25,7 +25,7 @@ class ProjectVersion
 
 	def self.greatest_from projects
 	  greatest = parse '1.0.0.0'
-    @anvil.projects.each do |project|
+    projects.each do |project|
       current = parse project.version
       greatest = current if current > greatest
     end
@@ -42,10 +42,10 @@ namespace :iron do
 		desc 'back to 1.0.0.*'
 		task :reset do
 			@anvil.projects.each do |project|
-				old_version = ProjectVersion.parse project.version
-				old_version.major = 1
-				old_version.minor = 0
-				old_version.revision = 0
+				new_version = ProjectVersion.parse project.version
+				new_version.major = 1
+				new_version.minor = 0
+				new_version.revision = 0
 				project.version = v.to_s
 			end
 		end
@@ -65,8 +65,8 @@ namespace :iron do
     desc 'updates version of AssemblyInfo based on BUILD_NUMBER environment variable'
     task :update_build do
       @anvil.projects.each do |project|
-        old_version = project.version
-        project.version = old_version.gsub /\.\d+$/, ".#{build_number}"
+        new_version = project.version
+        project.version = new_version.gsub /\.\d+$/, ".#{build_number}"
       end
     end
 
@@ -77,34 +77,41 @@ namespace :iron do
 		namespace :bump do
 			desc 'bumps the major version'
 			task :major do
-			  old_version = ProjectVersion.greatest_from @anvil.projects
-			  old_version.major += 1
-			  old_version.minor = 0
-			  old_version.revision = 0
+			  new_version = ProjectVersion.greatest_from @anvil.projects
+			  new_version.major += 1
+			  new_version.minor = 0
+			  new_version.revision = 0
 
 				@anvil.projects.each do |project|
-				  project.version = old_version.to_s
+				  change_version project, new_version
 				end
 			end
 
+			def change_version project, version
+			  from = project.version
+			  to = version.to_s
+			  puts "Changing version of #{project.name} from #{from} to #{to}"
+			  project.version = version.to_s
+			end
+
 			desc 'bumps the minor version'
 			task :minor do
-			  old_version = ProjectVersion.greatest_from @anvil.projects
-			  old_version.minor += 1
-			  old_version.revision = 0
+			  new_version = ProjectVersion.greatest_from @anvil.projects
+			  new_version.minor += 1
+			  new_version.revision = 0
 
 				@anvil.projects.each do |project|
-				  project.version = old_version.to_s
+				  change_version project, new_version
 				end
 			end
 
 			desc 'bumps the revision version'
 			task :revision do
-			  old_version = ProjectVersion.greatest_from @anvil.projects
-			  old_version.revision += 1
+			  new_version = ProjectVersion.greatest_from @anvil.projects
+			  new_version.revision += 1
 
 				@anvil.projects.each do |project|
-				  project.version = old_version.to_s
+				  change_version project, new_version
 				end
 			end
 		end

data/lib/iron_hammer/utils/ivy_builder.rb

@@ -4,12 +4,18 @@ require 'rexml/document'
 module IronHammer
   module Utils
     class IvyBuilder
-
-      def initialize project
-        @project = project
-        @organisation = defined?(ORGANISATION)? ORGANISATION : 'org'
-        @ivy_jar = defined?(IVY_JAR)? IVY_JAR : 'ivy.jar'
-        @ivy_settings = defined?(IVY_SETTINGS)? IVY_SETTINGS : 'ivysettings.xml'
+      VERSION_PATTERN = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
+      VERSION_REPLACE = {
+        'latest' => '+',
+        'latest.major' => '+',
+        'latest.minor' => '\\1.+',
+        'latest.revision' => '\\1.\\2.+',
+        'latest.build' => '\\1.\\2.\\3.+',
+        'specific' => '\\1.\\2.\\3.\\4'
+      }
+      def initialize params={}
+        @project = params[:project] || raise('You must specify a project')
+        @config = params[:config] || raise('You must specify a config')
       end
 
       def to_s
@@ -20,7 +26,7 @@ module IronHammer
         xml = Builder::XmlMarkup.new(:indent => 2)
         xml.tag! 'ivy-module', :version => '2.0' do
           name = @project.assembly_name
-          xml.info :organisation => @organisation, :module => name
+          xml.info :organisation => @config.organisation, :module => name
           xml.publications do
             @project.artifacts.each do |artifact|
               names = artifact.split '.'
@@ -32,8 +38,8 @@ module IronHammer
 
           xml.dependencies do
             dependencies.each do |dependency|
-              rev = dependency.version.gsub /\.\d+$/, '.+'
-              xml.dependency :org => @organisation, :name => dependency.name, :rev => rev do
+              rev = dependency.version.gsub VERSION_PATTERN, VERSION_REPLACE[@config.retrieve_version]
+              xml.dependency :org => @config.organisation, :name => dependency.name, :rev => rev do
                 xml.artifact :type => dependency.extension, :name => dependency.name
               end
             end
@@ -42,16 +48,16 @@ module IronHammer
       end
 
       def retrieve ivy_file
-        "java -jar #{@ivy_jar}
+        "java -jar #{@config.ivy_jar}
           -ivy #{ivy_file}
-          -settings #{@ivy_settings}
+          -settings #{@config.ivy_settings}
           -retrieve Libraries/[artifact]-[revision].[ext]".gsub(/\s+/, ' ')
       end
 
       def publish ivy_file
-        "java -jar #{@ivy_jar}
+        "java -jar #{@config.ivy_jar}
           -ivy #{ivy_file}
-          -settings #{@ivy_settings}
+          -settings #{@config.ivy_settings}
           -publish default
           -publishpattern #{@project.path_to_binaries}/[artifact].[ext]
           -revision #{@project.version}

data/lib/iron_hammer/utils/ivy_configuration.rb

@@ -0,0 +1,32 @@
+
+module IronHammer
+  module Utils
+    class IvyConfiguration
+      attr_accessor :organisation
+      attr_accessor :ivy_jar
+      attr_accessor :ivy_settings
+      attr_accessor :retrieve_version
+
+
+
+      def self.builder_for project
+        IvyBuilder.new :config => instance, :project => project
+      end
+
+
+      def self.instance
+        @@instance ||= IvyConfiguration.new
+      end
+
+      private
+      def initialize
+        @organisation = defined?(ORGANISATION)? ORGANISATION : 'org'
+        @ivy_jar = defined?(IVY_JAR)? IVY_JAR : 'ivy.jar'
+        @ivy_settings = defined?(IVY_SETTINGS)? IVY_SETTINGS : 'ivysettings.xml'
+        @retrieve_version = ENV['retrieve_version'] || 'latest.build'
+      end
+
+    end unless defined? IvyConfiguration
+  end
+end
+

data/lib/iron_hammer.rb

@@ -40,6 +40,7 @@ require 'iron_hammer/utils/code_analyzers_environment'
 require 'iron_hammer/utils/dot_net_environment'
 require 'iron_hammer/utils/file_system'
 require 'iron_hammer/utils/ivy_builder'
+require 'iron_hammer/utils/ivy_configuration'
 require 'iron_hammer/utils/windows'
 require 'iron_hammer/utils/zipper'
 require 'iron_hammer/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -111,6 +111,7 @@ files:
 - lib/iron_hammer/utils/dot_net_environment.rb
 - lib/iron_hammer/utils/file_system.rb
 - lib/iron_hammer/utils/ivy_builder.rb
+- lib/iron_hammer/utils/ivy_configuration.rb
 - lib/iron_hammer/utils/topological_sort.rb
 - lib/iron_hammer/utils/windows.rb
 - lib/iron_hammer/utils/zipper.rb