iron_hammer 1.0.8 → 1.0.9

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

data/bin/bump

@@ -2,8 +2,13 @@
 
 require 'rubygems'
 require 'rake'
+require 'iron_hammer/configuration'
 
-folder = ENV['IRON_HAMMER_HOME'] || File.join(ENV['USERPROFILE'], '.IronHammer')
 
-sh "rake -f \"#{folder}\\rakefile.rb\" iron:version:bump:#{ARGV.join ' '}"
+sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" iron:version:bump:#{ARGV.join ' '}" unless ARGV.empty?
+
+if ARGV.empty?
+  puts "You must specify a target. Available targets (remove iron:version:bump prefix):"
+  sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" -T iron:version:bump"
+end
 

data/bin/iron

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rake'
+require 'iron_hammer/configuration'
+
+
+sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" iron:#{target}" unless ARGV.empty?
+
+if ARGV.empty?
+  puts "You must specify a target. Available targets (remove iron: prefix):"
+  sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" -T iron"
+end
+

data/bin/ivy

@@ -2,44 +2,13 @@
 
 require 'rubygems'
 require 'rake'
+require 'iron_hammer/configuration'
 
-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"
+sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" iron:ivy:#{ARGV.join ' '}" unless ARGV.empty?
 
-  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
+if ARGV.empty?
+  puts "You must specify a target. Available targets (remove iron:ivy: prefix):"
+  sh "rake -f \"#{IronHammer::Configuration.home}\\rakefile.rb\" -T iron:ivy"
 end
 
-sh "rake -f \"#{folder}\\rakefile.rb\" iron:ivy:#{ARGV.join ' '}"
-

data/lib/iron_hammer/configuration.rb

@@ -0,0 +1,65 @@
+
+module IronHammer
+  module Configuration
+
+    def self.home
+      return ENV['IRON_HAMMER_HOME'] if ENV['IRON_HAMMER_HOME']
+      @home = File.join(ENV['USERPROFILE'], '.IronHammer')
+      print_message
+      generate_config
+
+      @home
+    end
+
+    private
+    def self.generate_config
+      FileUtils.mkpath @home
+
+      sh "setx IRON_HAMMER_HOME \"#{@home}\""
+
+      File.open(File.join(@home, 'rakefile.rb'), 'w') do |f|
+        f.write default_rakefile_rb
+      end
+
+      File.open(File.join(@home, 'ivysettings.xml'), 'w') do |f|
+        f.write default_ivysettings
+      end
+    end
+
+    def self.print_message
+      puts "IRON_HAMMER_HOME environment variable not found! Generating default config on #{@home}"
+      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 #{@home}\\ivy.jar"
+      puts "You can also edit #{@home}\\rakefile.rb and change any settings you want"
+    end
+
+    def self.default_rakefile_rb
+      <<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
+
+    def self.default_ivysettings
+      <<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
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iron_hammer
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors: 
 - Mozair Alves do Carmo Junior
@@ -70,6 +70,7 @@ email:
 executables: 
 - ivy
 - bump
+- iron
 extensions: []
 
 extra_rdoc_files: 
@@ -80,8 +81,10 @@ files:
 - Rakefile
 - bin/ivy
 - bin/bump
+- bin/iron
 - lib/iron_hammer.rb
 - lib/iron_hammer/anvil.rb
+- lib/iron_hammer/configuration.rb
 - lib/iron_hammer/default_binaries_behavior.rb
 - lib/iron_hammer/default_configuration_behavior.rb
 - lib/iron_hammer/default_deliverables_behavior.rb