albacore 0.2.3 → 0.2.4

data/README.markdown

@@ -80,20 +80,25 @@ Anyone can fork the main repository and submit patches, as well. And lastly, the
 Many thanks for contributions to albacore are due (in alphabetical order):
 
 * [Andreone](http://github.com/Andreone): Significant Wiki contributions, questions and contributions on the google group
+* [Andrew Vos](http://github.com/AndrewVos): Fixes and additions to SQLCmd task
 * [Ben Hall](http://github.com/benhall): Primary contributor. SSH, SFTP, ZipDirectory, Rename, YAML auto config, Wiki pages, and many other great additions
 * [Brett Veenstra](http://github.com/brettveenstra): SQLCmd options (truted connection, batch abort), etc
 * [Brian Donahue](http://github.com/briandonahue): Inspiration and initial code for the ExpandTemplates task
-* [Tobias Grimm](http://github.com/e-tobi): AssemblyInfo custom_data, working directory code refactoring, relative project paths for executables
-* [Hernan Garcia](http://github.com/hgarcia/): Specflow Report task
+* [Dotan Nahum](http://github.com/jondot): NChurn task, Output task
+* [Hernan Garcia](http://github.com/hgarcia): Specflow Report task
 * [Hibri Marzook](http://github.com/hibri): PLink (deprecated) and NDepend tasks
 * [James Gregory](http://github.com/jagregory): Docu task, zip task contributions
 * [Kevin Colyar](http://github.com/kevincolyar): Testing and updating of MSBuild to work with Cygwin
 * [Louis Salin](http://github.com/louissalin): Support for *nix path separators in CSC task
+* [Mark Boltuc](http://github.com/mboltuc): Fluent Migrator task
 * [Mark Wilkins](http://github.com/markwilk): VB.NET Language Generator For The AssemblyInfo Task
 * [Mike Nichols](http://github.com/mnichols): XUnit contributions, bug reports, etc
+* [Nathan Fisher](:http://github.com/nfisher): additions to CSC task
 * [Nils Jonsson](http://github.com/njonsson): AssemblyInfo corrections, rakefile corrections
-* [Prabir Shrestha](http://github.com/prabirshrestha): Bug fixes for xunit test runner, etc.
+* [Prabir Shrestha](http://github.com/prabirshrestha): Nupack task, bug fixes for xunit test runner, etc.
+* [Panda Wood](http://github.com/pandawood): NCover Console options and wiki edits
 * [Sean Biefeld](http://github.com/seanbiefeld): MSpecTestRunner for NCoverConsole
 * [Steven Harman](http://github.com/stevenharman): Primary contributor. Nant task, issue tickets, disucssions, and much much more.
+* [Steve Hebert](http://github.com/stevehebert): Nuspec task
 * [Steven Johnson](http://github.com/2020steve): Expand Templates (deprecated task) supplimental data, etc
-* [Panda Wood](http://github.com/pandawood): NCover Console options and wiki edits
+* [Tobias Grimm](http://github.com/e-tobi): AssemblyInfo custom_data, working directory code refactoring, relative project paths for executables

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/albacore/assemblyinfo.rb

@@ -5,7 +5,8 @@ require 'albacore/assemblyinfolanguages/vbnetengine'
 class AssemblyInfo
   include Albacore::Task
   
-  attr_accessor :version, :title, :description, :output_file, :custom_attributes
+  attr_accessor :input_file, :output_file
+  attr_accessor :version, :title, :description, :custom_attributes
   attr_accessor :copyright, :com_visible, :com_guid, :company_name, :product_name
   attr_accessor :file_version, :trademark, :lang_engine, :custom_data
   
@@ -18,22 +19,42 @@ class AssemblyInfo
     super()
     update_attributes Albacore.configuration.assemblyinfo.to_hash
   end
+
+  def use(file)
+    @input_file = @output_file = file
+  end
   
   def execute
     @lang_engine = CSharpEngine.new unless check_lang_engine
-    write_assemblyinfo @output_file
+    write_assemblyinfo @output_file, @input_file
   end
   
-  def write_assemblyinfo(assemblyinfo_file)
+  def write_assemblyinfo(assemblyinfo_file, input_file)
     valid = check_output_file assemblyinfo_file
     return if !valid
-    
-    asm_data = build_assembly_info_data
+
+    input_data = read_input_file input_file
+    asm_data = build_assembly_info_data input_data
 
     @logger.info "Generating Assembly Info File At: " + File.expand_path(assemblyinfo_file)
     File.open(assemblyinfo_file, 'w') do |f|      
-      f.write asm_data
+      asm_data.each do |line|
+        f.puts line
+      end
+    end
+  end
+
+  def read_input_file(file)
+    data = []
+    return data if file.nil?
+
+    File.open(file, 'r') do |file|
+        file.each_line do |line|
+            data << line.strip
+        end
     end
+
+    data
   end
   
   def check_output_file(file)
@@ -46,35 +67,51 @@ class AssemblyInfo
     return !@lang_engine.nil?
   end
 
-  def build_assembly_info_data
-    asm_data = build_using_statements + "\n"
-    
-    asm_data << build_attribute("AssemblyTitle", @title) if @title != nil
-    asm_data << build_attribute("AssemblyDescription", @description) if @description != nil
-    asm_data << build_attribute("AssemblyCompany", @company_name) if @company_name != nil
-    asm_data << build_attribute("AssemblyProduct", @product_name) if @product_name != nil
+  def build_assembly_info_data(data)
+    if data.empty?
+        data = build_using_statements
+    end
+
+    build_attribute(data, "AssemblyTitle", @title) if @title != nil
+    build_attribute(data, "AssemblyDescription", @description) if @description != nil
+    build_attribute(data, "AssemblyCompany", @company_name) if @company_name != nil
+    build_attribute(data, "AssemblyProduct", @product_name) if @product_name != nil
     
-    asm_data << build_attribute("AssemblyCopyright", @copyright) if @copyright != nil
-    asm_data << build_attribute("AssemblyTrademark", @trademark) if @trademark != nil
+    build_attribute(data, "AssemblyCopyright", @copyright) if @copyright != nil
+    build_attribute(data, "AssemblyTrademark", @trademark) if @trademark != nil
     
-    asm_data << build_attribute("ComVisible", @com_visible) if @com_visible != nil
-    asm_data << build_attribute("Guid", @com_guid) if @com_guid != nil
+    build_attribute(data, "ComVisible", @com_visible) if @com_visible != nil
+    build_attribute(data, "Guid", @com_guid) if @com_guid != nil
     
-    asm_data << build_attribute("AssemblyVersion", @version) if @version != nil
-    asm_data << build_attribute("AssemblyFileVersion", @file_version) if @file_version != nil
+    build_attribute(data, "AssemblyVersion", @version) if @version != nil
+    build_attribute(data, "AssemblyFileVersion", @file_version) if @file_version != nil
     
-    asm_data << "\n"
+    data << ""
     if @custom_attributes != nil
       attributes = build_custom_attributes()
-      asm_data << attributes.join
-      asm_data << "\n"
+      data += attributes
+      data << ""
     end
-    
+
     if @custom_data != nil
-      @custom_data.each{|data| asm_data << data + "\n"}
+      @custom_data.each do |cdata| 
+        data << cdata unless data.include? cdata
+      end
     end
     
-    asm_data
+    data
+  end
+
+  def build_attribute(data, attr_name, attr_data)
+    attr_value = @lang_engine.build_attribute(attr_name, attr_data)
+    attr_re = @lang_engine.build_attribute_re(attr_name)
+    result = nil
+    @logger.debug "Build Assembly Info Attribute: " + attr_value
+    data.each do |line|
+        break unless result.nil?
+        result = line.sub! attr_re, attr_value
+    end
+    data << attr_value if result.nil?
   end
   
   def build_using_statements
@@ -84,7 +121,7 @@ class AssemblyInfo
     @namespaces << "System.Runtime.InteropServices"
     @namespaces.uniq!
     
-    ns = ''
+    ns = []
     @namespaces.each do |n|
       ns << @lang_engine.build_using_statement(n)
     end
@@ -92,16 +129,10 @@ class AssemblyInfo
     ns
   end  
 
-  def build_attribute(attr_name, attr_data)
-    attribute = @lang_engine.build_attribute(attr_name, attr_data)
-    @logger.debug "Build Assembly Info Attribute: " + attribute
-    attribute 
-  end
-  
   def build_custom_attributes()
     attributes = []
     @custom_attributes.each do |key, value|
-      attributes << build_attribute(key, value)
+      attributes << @lang_engine.build_attribute(key, value)
     end
     attributes
   end

data/lib/albacore/assemblyinfolanguages/csharpengine.rb

@@ -1,14 +1,18 @@
 class CSharpEngine
+def build_attribute_re(attr_name)
+    /^\[assembly: #{attr_name}(.+)/  
+  end
+
   def build_attribute(attr_name, attr_data)
     attribute = "[assembly: #{attr_name}("
     attribute << "#{attr_data.inspect}" if attr_data != nil
-    attribute << ")]\n"
+    attribute << ")]"
     
     attribute
   end
 
   def build_using_statement(namespace)
-    "using #{namespace};\n"
+    "using #{namespace};"
   end
     
 end

data/lib/albacore/assemblyinfolanguages/vbnetengine.rb

@@ -1,14 +1,18 @@
 class VbNetEngine
+  def build_attribute_re(attr_name)
+    /^\<assembly: #{attr_name}(.+)/  
+  end
+
   def build_attribute(attr_name, attr_data)
     attribute = "<assembly: #{attr_name}("
     attribute << "#{attr_data.inspect}" if attr_data != nil
-    attribute << ")>\n"
+    attribute << ")>"
     
     attribute
   end
 
   def build_using_statement(namespace)
-    "Imports #{namespace}\n"
+    "Imports #{namespace}"
   end
     
 end

data/lib/albacore/nuspec.rb

@@ -10,7 +10,7 @@ class NuspecFile
   def render(xml) 
     depend = xml.add_element 'file', { 'src' => @src }
     
-    depend.add_attribute( 'target', @target ) if @target.to_s == 0
+    depend.add_attribute( 'target', @target ) unless @target.nil?
   end
 end
 

data/rakefile.rb

@@ -134,13 +134,14 @@ namespace :albacore do
 
   desc "Run a complete Albacore build sample"
   task :sample => ['albacore:assemblyinfo',
-                     'albacore:msbuild',
-                     'albacore:ncoverconsole',
-                     'albacore:ncoverreport',
-                     'albacore:mspec',
-                     'albacore:nunit',
-                     'albacore:xunit',
-										 'albacore:fluentmigrator']
+                   'albacore:assemblyinfo_modify',
+                   'albacore:msbuild',
+                   'albacore:ncoverconsole',
+                   'albacore:ncoverreport',
+                   'albacore:mspec',
+                   'albacore:nunit',
+                   'albacore:xunit',
+                   'albacore:fluentmigrator']
   
   desc "Run a sample MSBuild with YAML autoconfig"
   msbuild :msbuild
@@ -157,6 +158,19 @@ namespace :albacore do
     
     asm.output_file = "spec/support/AssemblyInfo/AssemblyInfo.cs"
   end
+
+  desc "Run a sample assembly info modifier"
+  assemblyinfo :assemblyinfo_modify do|asm|
+    # modify existing
+    asm.version = "0.1.2.3"
+    asm.company_name = "a test company"
+
+    # new attribute
+    asm.file_version = "4.5.6.7"
+
+    asm.input_file = "spec/support/AssemblyInfo/AssemblyInfoInput.test"
+    asm.output_file = "spec/support/AssemblyInfo/AssemblyInfoOutput.cs"
+  end
   
   desc "Run a sample NCover Console code coverage"
   ncoverconsole do |ncc|

data/spec/assemblyinfo_spec.rb

@@ -505,3 +505,37 @@ describe AssemblyInfo, "when specifying custom data" do
     @filedata.scan('// bar').length.should == 1
   end
 end
+
+describe AssemblyInfo, "when an input file is provided" do
+    before :all do
+       @tester = AssemblyInfoTester.new
+       asm = AssemblyInfo.new
+
+       asm.version = @tester.version
+       asm.file_version = @tester.file_version
+
+       asm.custom_data "// foo", "// baz"
+
+       # make it use existing file
+       @tester.use_input_file
+       
+       # Generate the same file twice.
+       @tester.build_and_read_assemblyinfo_file asm
+       @filedata = @tester.build_and_read_assemblyinfo_file asm
+    end
+    it "should contain correct version attribute" do
+       @filedata.scan(%Q|[assembly: AssemblyVersion("#{@tester.version}")]|).length.should == 1
+    end
+    it "shoud leave comment untouched" do
+       @filedata.scan(%Q|// A comment we want to see maintained|).length.should == 1
+    end
+    it "should introduce a new fileversion attribute" do
+       @filedata.scan(%Q|[assembly: AssemblyFileVersion("#{@tester.file_version}")]|).length.should == 1
+    end
+    it "should still leave custom data that's already in there intact" do
+       @filedata.scan(%Q|// foo|).length.should == 1
+    end
+    it "should add custom data that's still missing" do
+       @filedata.scan(%Q|// baz|).length.should == 1
+    end
+end

data/spec/nuspec_spec.rb

@@ -8,37 +8,70 @@ else
   require 'support\nokogiri_validator'
 end
 
-describe Nuspec, 'when creating a file with minimum requirements' do
+describe Nuspec do
   let(:working_dir) do
     wd = File.expand_path(File.join(File.dirname(__FILE__), 'support/nuspec/output')) 
     FileUtils.mkdir(wd) unless File.exist?(wd)
     wd
   end
-
   let(:nuspec_output) { File.join(working_dir, 'nuspec_test.nuspec') }
   let(:schema_file) { File.expand_path(File.join(working_dir, '../', 'nuspec.xsd')) }
 
-  let(:nuspec) do
-    nuspec = Nuspec.new
-    nuspec.id="nuspec_test"
-    nuspec.output_file = "nuspec_test.nuspec"
-    nuspec.version = "1.2.3"
-    nuspec.authors = "Author Name"
-    nuspec.description = "test_xml_document"
-    nuspec.working_directory = working_dir
-    nuspec
-  end
+  describe 'when creating a file with minimum requirements' do
+    let(:nuspec) do
+      nuspec = Nuspec.new
+      nuspec.id="nuspec_test"
+      nuspec.output_file = "nuspec_test.nuspec"
+      nuspec.version = "1.2.3"
+      nuspec.authors = "Author Name"
+      nuspec.description = "test_xml_document"
+      nuspec.working_directory = working_dir
+      nuspec
+    end
 
-  before do
-    nuspec.execute
-  end
+    before do
+      nuspec.execute
+    end
+
+    it "should produce the nuspec xml" do
+      File.exist?(nuspec_output).should be_true
+    end
 
-  it "should produce the nuspec xml" do
-    File.exist?(nuspec_output).should be_true
+    it "should produce a valid xml file" do
+      is_valid = XmlValidator.validate(nuspec_output, schema_file)
+      is_valid.should be_true
+    end
   end
 
-  it "should produce a valid xml file" do
-    is_valid = XmlValidator.validate(nuspec_output, schema_file)
-    is_valid.should be_true
+  describe "file targets" do
+    let(:dll) { File.expand_path(File.join(working_dir, '../', 'somedll.dll')) }
+
+    let(:nuspec) do
+      nuspec = Nuspec.new
+      nuspec.id="nuspec_test"
+      nuspec.output_file = "nuspec_test.nuspec"
+      nuspec.version = "1.2.3"
+      nuspec.authors = "Author Name"
+      nuspec.description = "test_xml_document"
+      nuspec.working_directory = working_dir
+      nuspec.file(dll, "lib")
+      nuspec
+    end
+
+    before do
+      nuspec.execute
+      File.open(nuspec_output, "r") do |f|
+        @filedata = f.read
+      end
+    end
+
+    it "should produce a valid nuspec file" do
+      is_valid = XmlValidator.validate(nuspec_output, schema_file)
+      is_valid.should be_true
+    end
+
+    it "should contain the file and it's target" do
+      @filedata.should include("<file src='C:/dev/albacore/spec/support/nuspec/somedll.dll' target='lib'/>")
+    end
   end
 end

data/spec/support/assemblyinfotester.rb

@@ -1,7 +1,7 @@
 require 'albacore/assemblyinfo'
 
 class AssemblyInfoTester < AssemblyInfo
-  
+ 
   attr_accessor :assemblyinfo_file
   
   def initialize(lang_engine = nil)
@@ -15,6 +15,8 @@ class AssemblyInfoTester < AssemblyInfo
     @product_name = "my product, yo."
     @file_version = "1.0.0.0"
     @trademark = "some trademark info goes here"
+
+    @input_file = nil
   end
   
   def setup_assemblyinfo_file
@@ -23,10 +25,15 @@ class AssemblyInfoTester < AssemblyInfo
     @assemblyinfo_file = File.join(File.dirname(__FILE__), "AssemblyInfo", "AssemblyInfo.test")
     File.delete @assemblyinfo_file if File.exist? @assemblyinfo_file
   end
+
+  def use_input_file
+    @input_file = File.join(File.dirname(__FILE__), "AssemblyInfo", "AssemblyInfoInput.test")
+  end
   
   def build_and_read_assemblyinfo_file(assemblyinfo)
     setup_assemblyinfo_file
 
+    assemblyinfo.input_file = @input_file unless @input_file.nil?
     assemblyinfo.output_file = @assemblyinfo_file
     assemblyinfo.execute
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Derick Bailey
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -06:00
+date: 2011-03-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency