rake-dotnet 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.3 / 2009-06-23
+
+* NEW: MSBuild - support for building VB.NET and WiX projects
+* NEW: AssemblyInfo - support for generating AssemblyInfo.vb into {project}/My Project/ (which I hope is the by-convention place)
+
 === 0.1.2 / 2009
 
 * NEW: NCover: Generate the full-coverage report

data/Manifest.txt

@@ -2,6 +2,6 @@ History.txt
 Manifest.txt
 README.markdown
 README.txt
-Rakefile
+Rakefile.rb
 lib/rake_dotnet.rb
 test/test_rake_dotnet.rb

data/{Rakefile → Rakefile.rb}

@@ -5,7 +5,7 @@ require 'hoe'
 require 'Pathname'
 require 'rake/clean'
 
-Hoe.new('rake-dotnet', '0.1.2') do |p|
+Hoe.new('rake-dotnet', '0.1.3') 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'
@@ -32,6 +32,7 @@ file generated_library do |f|
 	gl.close unless gl.closed?
 end
 
+desc 'Generate the concatenated library'
 task :generate_lib => generated_library
 
 task :check_manifest => generated_library

data/lib/rake_dotnet.rb

@@ -82,6 +82,7 @@ CLEAN.exclude('**/core') # core files are a Ruby/*nix thing - dotNET developers
 CLEAN.include("#{SRC_DIR}/**/obj")
 CLEAN.include("#{SRC_DIR}/**/bin")
 CLEAN.include("#{SRC_DIR}/**/AssemblyInfo.cs")
+CLEAN.include("#{SRC_DIR}/**/AssemblyInfo.vb")
 CLOBBER.include(OUT_DIR)
 
 VERBOSE = ENV['VERBOSE'] ? ENV['VERBOSE'] : false
@@ -112,14 +113,23 @@ module Rake
         end
       end
 
+      rule(/#{src_dir_regex}\/[\w\.\d]+\/My Project\/AssemblyInfo.vb/) do |r|
+	    dir = Pathname.new(r.name).dirname
+		mkdir_p dir
+        nextdoor = Pathname.new(r.name + '.template')
+        common = Pathname.new(File.join(@src_dir, 'AssemblyInfo.vb.template'))
+        if (nextdoor.exist?)
+          generate(nextdoor, r.name)
+        elsif (common.exist?)
+          generate(common, r.name)
+        end
+      end
+
       desc 'Generate the AssemblyInfo.cs file from the template closest'
       task :assembly_info do |t|
-        # for each project, invoke the rule
-        Dir.foreach(@src_dir) do |e|
-		  asm_info = File.join(@src_dir, e, 'Properties', 'AssemblyInfo.cs')
-          if is_project e
-            Rake::FileTask[asm_info].invoke
-          end
+        Pathname.new(@src_dir).entries.each do |e|
+          asm_info = asm_info_to_generate(e)
+		  Rake::FileTask[asm_info].invoke unless asm_info.nil?
         end
       end
 
@@ -136,16 +146,24 @@ module Rake
       of.open('w') { |f| f.puts content }
     end
 
-    def is_project entry
-      if (entry == '.' || entry == '..' || entry == '.svn')
-        return false
+    def asm_info_to_generate pn_entry
+      if (pn_entry == '.' || pn_entry == '..' || pn_entry == '.svn')
+        return nil
       end
-      if (entry == 'AssemblyInfo.cs.template')
-        return false
+      if (pn_entry == 'AssemblyInfo.cs.template' || pn_entry == 'AssemblyInfo.vb.template')
+        return nil
       end
-      #puts "#{entry} is directory? #{File.directory?(entry)}"
-      #return File.directory?(entry)
-      return true
+
+      proj = FileList.new("#{@src_dir}/#{pn_entry}/*.*proj").first
+      return nil if proj.nil?
+
+      proj_ext = Pathname.new(proj).extname
+      path = case proj_ext
+        when '.csproj' then File.join(@src_dir, pn_entry, 'Properties', 'AssemblyInfo.cs')
+        when '.vbproj' then File.join(@src_dir, pn_entry, 'My Project', 'AssemblyInfo.vb')
+        else nil
+      end
+      return path
     end
 
     def token_replacements
@@ -426,11 +444,13 @@ module Rake
 		attr_accessor :src_dir, :verbosity, :working_dir
 	
 		def initialize(params={})
+			#TODO: Support for arbitrary properties, not just configuration.  For example, TreatWarningsAsErrors, WarningLevel.
 			@configuration = params[:configuration] || CONFIGURATION
 			@src_dir = params[:src_dir] || SRC_DIR
 			@verbosity = params[:verbosity] || MSBUILD_VERBOSITY || 'm'
 			@working_dir = params[:working_dir] || '.'
 			@deps = params[:deps] || []
+            @buildable_projects = ['.csproj','.vbproj','.wixproj']
 			
 			yield self if block_given?
 			define
@@ -441,7 +461,7 @@ module Rake
 			rule(/#{src_dir_regex}\/[\w\.]+\/bin\/#{@configuration}\/[\w\.]+\.(?:dll|exe)/) do |r|
 				pn = Pathname.new(r.name)
 				name = pn.basename.to_s.sub('.dll', '')
-				project = File.join(@src_dir, name, name + '.csproj')
+				project = FileList.new("#{@src_dir}/#{name}/#{name}.*proj").first
 				mb = MsBuild.new(project, {:Configuration => @configuration}, ['Build'], verbosity, @working_dir)
 				mb.run
 			end
@@ -450,7 +470,7 @@ module Rake
 			rule(/#{src_dir_regex}\/[\w\.]+\/bin\/[\w\.]+\.dll/) do |r|
 				pn = Pathname.new(r.name)
 				name = pn.basename.to_s.sub('.dll', '')
-				project = File.join(@src_dir, name, name + '.csproj')
+				project = FileList.new("#{@src_dir}/#{name}/#{name}.*proj").first
 				mb = MsBuild.new(project, {:Configuration => @configuration}, ['Build'], verbosity, @working_dir)
 				mb.run
 			end
@@ -463,7 +483,7 @@ module Rake
 					pn = Pathname.new(p)
 					# TODO: Figure out which type of project we are so we can invoke the correct rule, with the correct output extension
 					dll = File.join(pn.dirname, 'bin', @configuration, pn.basename.sub(pn.extname, '.dll'))
-					Rake::FileTask[dll].invoke
+                    Rake::FileTask[dll].invoke if @buildable_projects.include?(pn.extname)
 				end
 			end
 
@@ -472,7 +492,7 @@ module Rake
 			end
 			
 			self
-		end
+        end
 		
 		def src_dir_regex
 			regexify(@src_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rake-dotnet
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter MouncePeter Mounce
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 +01:00
+date: 2009-06-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ files:
 - Manifest.txt
 - README.markdown
 - README.txt
-- Rakefile
+- Rakefile.rb
 - lib/rake_dotnet.rb
 - test/test_rake_dotnet.rb
 has_rdoc: true