rake-dotnet 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.1.5 / 2009-
+
+* NEW: RDNPackageTask - generate a named task per package so they can be built individually
+* NEW: SevenZip - wrapper for extracting an archive
+* CHANGE: SevenZip - wrapper is more useful ;-)
+* CHANGE: Harvesters - harvest dumps output into a config-version named directory now
+(adjusted demo-project to match)
+
 === 0.1.4 / 2009-06-23
 
 * FIX: FxCop - support for running against .exe files instead of just DLLs.  Exclude *.vshost.exe by default

data/Rakefile.rb

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.4') do |p|
+Hoe.new('rake-dotnet', '0.1.5') do |p|
   p.author = 'Peter Mounce'
   p.description = 'Making a .NET build-automation dev\'s life easier, one angle-bracket at a time'
   p.email = 'pete@neverrunwithscissors.com'

data/lib/rake_dotnet.rb

@@ -316,9 +316,10 @@ module Rake
 	class HarvestOutputTask < TaskLib
 		def initialize(params={})
 			@src_path = params[:src_path] || File.join(PRODUCT_ROOT, 'src')
-			@target_path = params[:target_path] || File.join(OUT_DIR, 'bin')
 			@deps = params[:deps] || []
 			@configuration = params[:configuration] || CONFIGURATION
+			@version = params[:version] || RDNVERSION
+			@target_path = params[:target_path] || File.join(OUT_DIR, "bin-#{@configuration}-v#{@version}")
 			@glob = params[:glob] || "#{@src_path}/*"
 			
 			yield self if block_given?
@@ -368,7 +369,9 @@ module Rake
 			@src_path = params[:src_path] || File.join(PRODUCT_ROOT, 'src')
 			@target_path = params[:target_path] || OUT_DIR
 			@deps = params[:deps] || []
-			@glob = params[:glob] || '*Site*'
+			@configuration = params[:configuration] || CONFIGURATION
+			@version = params[:version] || RDNVERSION
+			@glob = params[:glob] || "**/*.Site"
 			
 			yield self if block_given?
 			define
@@ -377,25 +380,19 @@ module Rake
 		def define
 			out_dir_regex = regexify(@target_path)
 			
-			rule(/#{out_dir_regex}\/[\w\.-_ ]*Site[\w\.-_ ]*\//) do |r|
-				web_app_name = r.name.match(/#{out_dir_regex}\/([\w\.-_ ]*Site[\w\.-_ ]*)\//)[1]
-				src = File.join(@src_path, web_app_name)
-				if (File.exist?("#{src}/.svn"))
-					svn = SvnExport.new(src, r.name)
-					svn.export
-					cp_r(File.join(src, 'bin'), r.name)
-				else
-					cp_r src, r.name
-				end
+			# config/version included
+			versioned_regex = /#{out_dir_regex}\/([\w\.-_ ]*Site)-\w+-v\d+\.\d+\.\d+\.\d+\//
+			rule(versioned_regex) do |r|
+				harvest(r.name, versioned_regex)
 			end
-			
+						
 			desc "Harvest specified web-applications (or all matching #{@src_path}/#{@glob}) to #{@target_path}"
 			task :harvest_webapps,[:web_app_list] => @target_path do |t, args|
 				list = FileList.new("#{@src_path}/#{@glob}")
 				args.with_defaults(:web_app_list => list)
 				args.web_app_list.each do |w| 
 					pn = Pathname.new(w)
-					out = File.join(@target_path, pn.basename) + '/'
+					out = File.join(@target_path, "#{pn.basename}-#{@configuration}-v#{@version}") + '/'
 					Rake::FileTask[out].invoke
 				end
 			end
@@ -406,6 +403,21 @@ module Rake
 			
 			self
 		end
+		
+		def harvest(path, regex)
+			web_app_name = path.match(regex)[1]
+			src = File.join(@src_path, web_app_name)
+			if (File.exist?("#{src}/.svn"))
+				svn = SvnExport.new(src, path)
+				svn.export
+				cp_r(File.join(src, 'bin'), path)
+			else
+				cp_r src, path
+			end
+			FileList.new("#{path}**/obj").each do |e|
+				rm_rf e if File.exist? e
+			end
+		end
 	end
 end
 
@@ -755,8 +767,8 @@ module Rake
 					end
 				end
 				snipped = pkg_root.sub(pkg + '/', '')
-				chdir pkg do
-					sz = SevenZip.new('../../'+package_file, snipped, {:sevenzip=>File.join('..','..',TOOLS_DIR, '7zip', 'x86', '7za.exe')})
+				sz = SevenZip.new(package_file)
+				chdir pkg_root do
 					sz.run_add
 				end
 			end
@@ -766,6 +778,9 @@ module Rake
 			desc "Generate zip'd packages for all package-tasks"
 			task :package => [@out_dir, pkg, pkg_root, package_file]
 			
+			desc "Generate zip'd package for #{@name}"
+			task "package_#{@name}".to_sym => [@out_dir, pkg, pkg_root, package_file]
+			
 			desc "Delete all packages"
 			task :clobber_package do
 				rm_rf pkg
@@ -787,18 +802,18 @@ end
 
 
 class SevenZip
-	def initialize(archive_name, file_names, opts={})
+	def initialize(archive_name, opts={})
 		arch = ENV['PROCESSOR_ARCHITECTURE'] || 'AMD64'
 		bin = arch == 'x86' ? '7za.exe' : '7z.exe'
-		@exe = opts[:sevenzip] || File.join(TOOLS_DIR, '7zip', arch, bin)
-		@archive_name = archive_name
-		@file_names = file_names
+		@exe = opts[:sevenzip] || File.expand_path(File.join(TOOLS_DIR, '7zip', arch, bin))
+		@archive_name = File.expand_path(archive_name)
+		@params = opts
 		
 		yield self if block_given?
 	end
 	
 	def cmd_add
-		"#{exe} a #{switches} #{archive_name} #{file_names}"
+		"#{exe} a #{archive_name} #{file_names}"
 	end
 	
 	def run_add
@@ -806,17 +821,32 @@ class SevenZip
 		sh cmd_add
 	end
 	
+	def cmd_extract
+		"#{exe} x -y #{out_dir} #{archive_name} #{file_names}"
+	end
+	
+	def run_extract
+		puts cmd_extract if VERBOSE
+		sh cmd_extract
+	end
+	
+	def out_dir
+		od = @params[:out_dir]
+		"-o#{File.expand_path(od)}" unless @params[:out_dir].nil?
+	end
+	
 	def archive_name
 		"\"#{@archive_name}\""
 	end
 	
 	def file_names
-		if @file_names.is_a? String
-			"\"#{@file_names}\""
-		elsif @file_names.is_a? Array
+		fns = @params[:file_names]
+		if fns.is_a? String
+			"\"#{fns}\""
+		elsif fns.is_a? Array
 			list = ''
-			@file_names.each do |fn|
-				list += "\"#{fn}\" "
+			fns.each do |fn|
+				list += "\"#{File.expand_path(fn)}\" "
 			end 
 			list.chop
 		end
@@ -825,10 +855,6 @@ class SevenZip
 	def exe
 		"\"#{@exe}\""
 	end
-	
-	def switches
-	
-	end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 +01:00
+date: 2009-06-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency