iron_hammer 1.0.4 → 1.0.5

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

data/lib/iron_hammer/tasks/ivy.rb

@@ -1,6 +1,8 @@
 require 'iron_hammer'
 require 'iron_hammer/utils/topological_sort'
 
+CLEAN.include('Libraries/*')
+
 namespace :iron do
   namespace :ivy do
     def all_dependencies
@@ -43,7 +45,7 @@ namespace :iron do
     end
 
     desc 'Generates ivy-<project_name>.xml for all projects of the solution'
-    task :generate => :update_version do
+    task :generate do
       puts "Generating ivy files for projects"
       @anvil.projects.each do |project|
         builder = IvyBuilder.new project
@@ -51,18 +53,6 @@ namespace :iron do
       end
     end
 
-    desc 'updates version of AssemblyInfo based on build_number environment variable'
-    task :update_version do
-      @anvil.projects.each do |project|
-        old_version = project.version
-        project.version = old_version.gsub /\.\d+$/, ".#{build_number}"
-      end
-    end
-
-    def build_number
-      ENV['BUILD_NUMBER'] || '0'
-    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))

data/lib/iron_hammer/tasks/version.rb

@@ -0,0 +1,113 @@
+class ProjectVersion
+  include Comparable
+
+	attr_accessor :major
+	attr_accessor :minor
+	attr_accessor :revision
+	attr_accessor :build
+
+	def self.parse v
+		splitted = v.split '.'
+		version = ProjectVersion.new
+		version.major = splitted[0].to_i
+		version.minor = splitted[1].to_i
+		version.revision = splitted[2].to_i
+		version.build = splitted[3].to_i
+		version
+	end
+
+	def <=> other
+	  return @major <=> other.major unless @major == other.major
+	  return @minor <=> other.minor unless @minor == other.minor
+	  return @revision <=> other.revision unless @revision == other.revision
+	  return @build <=> other.build
+	end
+
+	def self.greatest_from projects
+	  greatest = parse '1.0.0.0'
+    @anvil.projects.each do |project|
+      current = parse project.version
+      greatest = current if current > greatest
+    end
+    greatest
+	end
+
+	def to_s
+		"#{@major}.#{@minor}.#{@revision}.#{@build}"
+	end
+end
+
+namespace :iron do
+	namespace :version 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
+				project.version = v.to_s
+			end
+		end
+
+		desc 'changes a reference to a dll in all csprojs to a version'
+		task :change_to, :reference, :version do |t, args|
+			Dir['*/*.csproj'].each do |arg|
+			  f = File.open(arg)
+			  working_file = f.read
+			  working_file.gsub!(/Include=(\"|\')#{args.reference}, Version=\d+\.\d+\.\d+\.\d+,/, "Include=\\1#{args.reference}, Version=#{args.version},")
+			  f = File.new(arg, "w")
+			  f.print(working_file)
+			  f.close
+			end
+		end
+
+    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}"
+      end
+    end
+
+    def build_number
+      ENV['BUILD_NUMBER'] || '0'
+    end
+
+		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
+
+				@anvil.projects.each do |project|
+				  project.version = old_version.to_s
+				end
+			end
+
+			desc 'bumps the minor version'
+			task :minor do
+			  old_version = ProjectVersion.greatest_from @anvil.projects
+			  old_version.minor += 1
+			  old_version.revision = 0
+
+				@anvil.projects.each do |project|
+				  project.version = old_version.to_s
+				end
+			end
+
+			desc 'bumps the revision version'
+			task :revision do
+			  old_version = ProjectVersion.greatest_from @anvil.projects
+			  old_version.revision += 1
+
+				@anvil.projects.each do |project|
+				  project.version = old_version.to_s
+				end
+			end
+		end
+	end
+end
+

data/lib/iron_hammer/tasks.rb

@@ -8,18 +8,24 @@ CLEAN.include("ivy*.xml")
 require 'iron_hammer/tasks/analyze'
 require 'iron_hammer/tasks/ivy'
 require 'iron_hammer/tasks/test'
+require 'iron_hammer/tasks/version'
 
 namespace :iron do
 
     @anvil = Anvil.load_from(ENV['SolutionDir'] || '.')
-    @hammer = Hammer.new(
-      (defined?(VISUAL_STUDIO_PATH) ? {:visual_studio_path => VISUAL_STUDIO_PATH} : {}).merge(
-      :configuration => ENV['Configuration']
-      ))
+
+    @options = {}
+    @options[:visual_studio_path] = VISUAL_STUDIO_PATH  if defined?(VISUAL_STUDIO_PATH)
+    @options[:dot_net_path]       = DOT_NET_PATH        if defined?(DOT_NET_PATH)
+    @options[:fxcop_path]         = FXCOP_PATH          if defined?(FXCOP_PATH)
+    @options[:configuration]      = ENV['Configuration']
+
+    @hammer = Hammer.new @options
+
     FileUtils.mkdir 'TestResults' unless (File.exists?('TestResults') && File.directory?('TestResults'))
 
     desc 'Executes the default lifecycle'
-    task :default => [:clean, "ivy:retrieve", "ivy:update_version", :build, "test:unit", "ivy:publish"]
+    task :default => [:clean, "ivy:retrieve", "version:update_build", :build, "test:unit", "ivy:publish"]
 
     desc 'Builds the solution'
     task :build => [:clean] do

data/lib/iron_hammer/utils/ivy_builder.rb

@@ -45,7 +45,7 @@ module IronHammer
         "java -jar #{@ivy_jar}
           -ivy #{ivy_file}
           -settings #{@ivy_settings}
-          -retrieve Libraries/[artifact].[ext]".gsub(/\s+/, ' ')
+          -retrieve Libraries/[artifact]-[revision].[ext]".gsub(/\s+/, ' ')
       end
 
       def publish ivy_file
@@ -67,9 +67,15 @@ module IronHammer
         doc = REXML::Document.new xml
         references = doc.get_elements(ProjectFile::REFERENCE_PATH)
         references.each do |reference|
+          artifact = artifact_for reference
+          artifact.scan(/-(.*)\.(dll|exe)/) do |version, extension|
+            includes = reference.attribute('Include').value
+            includes.gsub!(/Version=(.*?)(,|$)/, "Version=#{version}\\2")
+            reference.add_attribute('Include', includes)
+          end
           reference.elements['SpecificVersion'] = REXML::Element.new('SpecificVersion').add_text('false')
           reference.elements['HintPath'] = REXML::Element.new('HintPath').
-                add_text([relative, 'Libraries', "#{artifact_for reference}"].flatten.patheticalize)
+                add_text([relative, 'Libraries', "#{artifact}"].flatten.patheticalize)
         end
 
         FileSystem.write! :path => @project.path, :name => @project.csproj, :content => doc.to_s
@@ -83,7 +89,7 @@ module IronHammer
       def artifact_for reference
         dependency = Dependency.from_reference reference
         libraries_dir = Dir.new('Libraries')
-        libraries_dir.find {|f| f.match "^#{dependency.name}\\.(dll|exe)"}
+        libraries_dir.find {|f| f.match "^#{dependency.name}-(.*)\\.(dll|exe)"}
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -106,6 +106,7 @@ files:
 - lib/iron_hammer/tasks/analyze.rb
 - lib/iron_hammer/tasks/ivy.rb
 - lib/iron_hammer/tasks/test.rb
+- lib/iron_hammer/tasks/version.rb
 - lib/iron_hammer/utils/code_analyzers_environment.rb
 - lib/iron_hammer/utils/dot_net_environment.rb
 - lib/iron_hammer/utils/file_system.rb