updating .nuspec file from Rake, update gem versions, get rid of AssemblyInfo.cs

Author: chester89

Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'albacore'
+source 'https://rubygems.org' 
+gem 'albacore', '~>1.0.0.rc2'

Gemfile.lock

@@ -1,15 +1,19 @@
 GEM
-  remote: http://rubygems.org/
-  remote: http://gemcutter.org/
+  remote: https://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    albacore (0.2.7)
-      rubyzip (~> 0.9)
-    rake (0.9.2.2)
-    rubyzip (0.9.8)
+    albacore (1.0.0.rc.2)
+      nokogiri (~> 1.5)
+      rake
+      rubyzip (~> 1.0)
+    mini_portile (0.6.0)
+    nokogiri (1.6.2.1-x64-mingw32)
+      mini_portile (= 0.6.0)
+    rake (10.3.2)
+    rubyzip (1.1.3)
 
 PLATFORMS
-  x86-mingw32
+  x64-mingw32
 
 DEPENDENCIES
-  albacore
-  rake
+  albacore (~> 1.0.0.rc2)

RakeFile

@@ -1,7 +1,10 @@
 require 'fileutils'
+require 'rexml/document'
 require 'albacore'
 
 NH_VERSION = '4.x'
+NUSPEC_PATH = 'src/FluentNHibernate.nuspec'
+SLN_PATH = 'src/FluentNHibernate.sln'
 
 # Albacore.configure do |config|
   # config.log_level = :verbose
@@ -30,7 +33,7 @@ module Platform
 end 
 
 def get_version
-  ENV['BUILD_NUMBER'] || '1.4.0.0'
+  ENV['BUILD_NUMBER'] || '2.0.0.1'
 end
 
 task :default => ['ripple:restore', 'source:update_version', 'build:all']
@@ -87,7 +90,7 @@ namespace :source do
       WarningLevel: 0
     }
     msb.targets [:Clean, :Build]
-    msb.solution = 'src/FluentNHibernate.sln'
+    msb.solution = SLN_PATH
 	msb.verbosity = :minimal
 	msb.parameters = ["/p:TargetFrameworkVersion=v4.0"]
   end
@@ -107,7 +110,7 @@ namespace :specs do
   nunit :nunit do |nunit|
     nunit.command = 'src/packages/NUnit.2.5.7.10213/Tools/nunit-console-x86.exe'
     nunit.assemblies 'src/FluentNHibernate.Testing/bin/Release/FluentNHibernate.Testing.dll'
-	nunit.parameters = [ "/framework:net-4.0" ]
+    nunit.parameters = [ "/framework:net-4.0" ]
   end
 end
 
@@ -170,41 +173,59 @@ namespace :package do
     zip.output_path = 'dist'
   end
 
-   nuspec do |nu|
-    nu.id = 'FluentNHibernate'
-    nu.version = get_version()
-    nu.authors = 'James Gregory and contributors'
-    nu.description = 'Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.'
-    nu.title = 'Fluent NHibernate'
-    nu.language = 'en-US'
-    nu.licenseUrl = 'http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt'
-    nu.projectUrl = 'http://fluentnhibernate.org'
-    nu.dependency 'NHibernate', '4.0'
-    nu.working_directory = Dir.pwd
-    nu.output_file = 'fluentnhibernate.nuspec'
-    nu.file 'FluentNHibernate.dll', 'lib/net40'
-    nu.file 'FluentNHibernate.pdb', 'lib/net40'
-    nu.file 'FluentNHibernate.xml', 'lib/net40'
-    nu.tags = 'orm dal nhibernate conventions'
-	nu.pretty_formatting = true
+  task :nuspec do |nu|
+      puts "Updating #{NUSPEC_PATH}"
+          update_xml NUSPEC_PATH do |xml|
+              # Override the version number in the nuspec file with the one from this rake file (set above)
+              xml.root.elements["metadata/version"].text = get_version
+              
+              xml.root.elements["metadata/dependencies/dependency[@id='NHibernate']"].attributes['version'] = '4.0'
+        
+              xml.root.elements["metadata/authors"].text = "James Gregory and contributors"
+              xml.root.elements["metadata/owners"].text = "jagregory, chester89"
+              xml.root.elements["metadata/language"].text = "en-US"
+              xml.root.elements["metadata/description"].text = "Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate."
+              xml.root.elements["metadata/licenseUrl"].text = "http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt"
+              xml.root.elements["metadata/projectUrl"].text = "http://fluentnhibernate.org"
+              xml.root.elements["metadata/tags"].text = "orm dal nhibernate conventions"
+
+              xml.root.elements["files/file[contains(@src, 'bin\\Release\\FluentNHibernate.*')]"].attributes['target'] = 'lib\net40'
+          end  
   end
 
-  nugetpack do |nu|
+  nugetpack :nupack do |nu|
     nu.command = 'tools/nuget/NuGet.exe'
-    nu.nuspec = 'src/FluentNHibernate.nuspec'
+    nu.nuspec = NUSPEC_PATH
     nu.base_folder = 'Release'
     nu.output = 'dist'
   end
 
   desc 'Create nuget spec and package'
-  task :nuget => [:nugetpack]
+  task :nuget => [:nuspec, :nupack]
 
   desc 'Package everything (src, bin, docs, nuget)'
   task :all => [:source, :binaries, :docs, :nuget]
 end
 
+def update_xml(xml_path)
+    #Open up the xml file
+    xml_file = File.new(xml_path)
+    xml = REXML::Document.new xml_file
+ 
+    #Allow caller to make the changes
+    yield xml
+ 
+    xml_file.close
+         
+    #Save the changes
+    xml_file = File.open(xml_path, "w")
+    formatter = REXML::Formatters::Default.new(5)
+    formatter.write(xml, xml_file)
+    xml_file.close 
+end
+
 task :sln do
   Thread.new do
-    system "devenv src/FluentNHibernate.sln"
+    system "devenv #{SLN_PATH}"
   end
 end

src/FluentNHibernate.Testing/FluentNHibernate.Testing.csproj

@@ -7,7 +7,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F5DC3221-827E-4CB4-B61C-5F50EB4D32EA}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate.Testing</RootNamespace>
     <AssemblyName>FluentNHibernate.Testing</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

src/FluentNHibernate.Testing/Properties/AssemblyInfo.cs

@@ -1,22 +1,21 @@
-<?xml version="1.0"?>
-<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+<?xml version='1.0'?>
+<package xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <metadata xmlns='http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd'>
     <id>FluentNHibernate</id>
-    <version>1.4.0.0</version>
+    <version>2.0.0.1</version>
     <authors>James Gregory and contributors</authors>
     <owners>jagregory, chester89</owners>
-    <licenseUrl>http://github.com/jagregory/fluent-nhibernate/blob/master/LICENSE.txt</licenseUrl>
-    <projectUrl>http://github.com/jagregory/fluent-nhibernate/</projectUrl>
+    <licenseUrl>http://github.com/jagregory/fluent-nhibernate/raw/master/LICENSE.txt</licenseUrl>
+    <projectUrl>http://fluentnhibernate.org</projectUrl>
 	<dependencies>
-		<dependency id="NHibernate" version="4.0" />
+		<dependency id='NHibernate' version='4.0' />
 	</dependencies>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Fluent, XML-less, compile safe, automated, convention-based mappings for NHibernate.</description>
-    <summary>Fluent NHibernate provides a convenient way to configure NHibernate - no XML involved.</summary>
-	<tags>orm dal nhibernate conventions</tags>
+    <tags>orm dal nhibernate conventions</tags>
     <language>en-US</language>
   </metadata>
   <files>
-        <file src="..\src\FluentNHibernate\bin\Release\FluentNHibernate.*" target="lib\net40" />        
+		<file src='..\src\FluentNHibernate\bin\Release\FluentNHibernate.*' target='lib\net40' />          
   </files>
 </package>

src/FluentNHibernate.nuspec

@@ -7,7 +7,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{529145D5-6CC3-4016-89B5-826563024AF1}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FluentNHibernate</RootNamespace>
     <AssemblyName>FluentNHibernate</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>