iron_hammer 1.0.6 → 1.0.7

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

data/bin/bump

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rake'
+
+folder = ENV['IRON_HAMMER_HOME'] || File.join(ENV['USERPROFILE'], '.IronHammer')
+
+sh "rake -f \"#{folder}\\rakefile.rb\" iron:version:bump:#{ARGV.join ' '}"
+

data/bin/ivy

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rake'
+
+folder = ENV['IRON_HAMMER_HOME'] || File.join(ENV['USERPROFILE'], '.IronHammer')
+
+unless ENV['IRON_HAMMER_HOME']
+  puts "IRON_HAMMER_HOME environment variable not found! Generating default config on #{folder}"
+  puts "You'll need to download apache ivy from http://ant.apache.org/ivy/download.cgi"
+  puts "and copy ivy-x.x.x.jar to #{folder}\\ivy.jar"
+  puts "You can also edit #{folder}\\rakefile.rb and change any settings you want"
+
+  FileUtils.mkpath folder
+  sh "setx IRON_HAMMER_HOME \"#{folder}\""
+  File.open(File.join(folder, 'rakefile.rb'), 'w') do |f|
+    f.write <<EOF
+require 'rubygems'
+
+#VISUAL_STUDIO_PATH = ENV['VISUAL_STUDIO_PATH'] || 'C:\\Program Files\\Microsoft Visual Studio 9.0\\Common7\\IDE'
+IVY_JAR = "#{ENV['IRON_HAMMER_HOME']}\\ivy.jar"
+IVY_SETTINGS = "#{ENV['IRON_HAMMER_HOME']}\\ivysettings.xml"
+#ORGANISATION = 'Your company'
+
+require 'iron_hammer/tasks'
+EOF
+  end
+  File.open(File.join(folder, 'ivysettings.xml'), 'w') do |f|
+    f.write <<EOF
+<ivysettings>
+  <settings defaultResolver="default" />
+  <caches defaultCacheDir="#{folder}/Ivy/Cache"/>
+  <resolvers>
+    <filesystem name="default">
+      <ivy pattern="#{folder}/Ivy/Repository/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+      <artifact pattern="#{folder}/Ivy/Repository/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+    </filesystem>
+  </resolvers>
+</ivysettings>
+EOF
+  end
+end
+
+sh "rake -f \"#{folder}\\rakefile.rb\" iron:ivy:#{ARGV.join ' '}"
+

data/lib/iron_hammer/utils/dot_net_environment.rb

@@ -3,8 +3,8 @@ require 'iron_hammer/utils/windows'
 module IronHammer
   module Utils
     class DotNetEnvironment
-      attr_accessor :framework_path  
-      attr_accessor :visual_studio_path  
+      attr_accessor :framework_path
+      attr_accessor :visual_studio_path
 
       def initialize params={}
         @framework_path       = params[:framework_path]     || default_framework_path
@@ -14,29 +14,30 @@ module IronHammer
       def msbuild
         [@framework_path, 'msbuild.exe'].patheticalize
       end
-      
+
       def mstest
         [@visual_studio_path, 'mstest.exe'].patheticalize
       end
-      
+
       private
       def default_framework_path
         [
-          ENV['SystemRoot'] || (IronHammer::Defaults::SYSTEM_ROOT), 
-          'Microsoft.NET', 
-          'Framework', 
+          ENV['SystemRoot'] || (IronHammer::Defaults::SYSTEM_ROOT),
+          'Microsoft.NET',
+          'Framework',
           'v3.5'
         ].patheticalize
       end
-      
+
       def default_visual_studio_path
         [
-          ENV['ProgramFiles'] || IronHammer::Defaults::PROGRAM_FILES, 
-          'Microsoft Visual Studio 2008', 
-          'Common7', 
+          ENV['ProgramFiles'] || IronHammer::Defaults::PROGRAM_FILES,
+          'Microsoft Visual Studio 9.0',
+          'Common7',
           'IDE'
         ].patheticalize
       end
     end unless defined? DotNetEnvironment
   end
 end
+

data/lib/iron_hammer/utils/ivy_builder.rb

@@ -51,7 +51,7 @@ module IronHammer
         "java -jar #{@config.ivy_jar}
           -ivy #{ivy_file}
           -settings #{@config.ivy_settings}
-          -retrieve Libraries/[artifact]-[revision].[ext]".gsub(/\s+/, ' ')
+          -retrieve Libraries/[revision]/[artifact].[ext]".gsub(/\s+/, ' ')
       end
 
       def publish ivy_file
@@ -74,14 +74,14 @@ module IronHammer
         references = doc.get_elements(ProjectFile::REFERENCE_PATH)
         references.each do |reference|
           artifact = artifact_for reference
-          artifact.scan(/-(.*)\.(dll|exe)/) do |version, extension|
+          artifact.scan(/Libraries\/(.*)\/(.*)/) 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}"].flatten.patheticalize)
+                add_text([relative, "#{artifact.gsub(/\//, '\\')}"].flatten.patheticalize)
         end
 
         FileSystem.write! :path => @project.path, :name => @project.csproj, :content => doc.to_s
@@ -94,8 +94,7 @@ module IronHammer
       private
       def artifact_for reference
         dependency = Dependency.from_reference reference
-        libraries_dir = Dir.new('Libraries')
-        libraries_dir.find {|f| f.match "^#{dependency.name}-(.*)\\.(dll|exe)"}
+        Dir["Libraries/**/#{dependency.name}.{dll,exe}"].last
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -67,8 +67,9 @@ description: "Iron Hammer gathers together three components to help automate the
 email: 
 - macskeptic@gmail.com
 - lucasmrtuner@gmail.com
-executables: []
-
+executables: 
+- ivy
+- bump
 extensions: []
 
 extra_rdoc_files: 
@@ -77,6 +78,8 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- bin/ivy
+- bin/bump
 - lib/iron_hammer.rb
 - lib/iron_hammer/anvil.rb
 - lib/iron_hammer/default_binaries_behavior.rb