albacore 1.0.0.rc.2 → 1.0.0.rc.3

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
 - 1.9.3
 - 2.0.0
 - jruby
-script: bundle exec rake specs:assemblyinfo specs:albacoremodel specs:attrmethods
+script: bundle exec rake specs:all
 bundler_args: --without=wiki
 notifications:
   email: false

data/Guardfile

@@ -1,9 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
-

data/README.md

@@ -1,5 +1,5 @@
 # Albacore 
-[![Build Status](https://secure.travis-ci.org/Albacore/albacore.png?branch=dev)](http://travis-ci.org/Albacore/albacore) [![Gem Version](https://badge.fury.io/rb/albacore.png)](http://badge.fury.io/rb/albacore) [![Dependency Status](https://gemnasium.com/Albacore/albacore.png)](https://gemnasium.com/Albacore/albacore) [![Code Climate](https://codeclimate.com/github/Albacore/albacore.png)](https://codeclimate.com/github/Albacore/albacore) [![Coverage Status](https://coveralls.io/repos/Albacore/albacore/badge.png)](https://coveralls.io/r/Albacore/albacore)
+[![Build Status](https://secure.travis-ci.org/Albacore/albacore.png?branch=dev)](http://travis-ci.org/Albacore/albacore) [![Gem Version](https://badge.fury.io/rb/albacore.png)](http://badge.fury.io/rb/albacore) [![Dependency Status](https://gemnasium.com/Albacore/albacore.png)](https://gemnasium.com/Albacore/albacore) [![Code Climate](https://codeclimate.com/github/Albacore/albacore.png)](https://codeclimate.com/github/Albacore/albacore) 
 
 Albacore is a professional quality suite of Rake tasks for building .NET or Mono based systems. It's like MSBuild or NAnt without all the stabby-bracket XML hell! The tasks are built using a test-first approach and all tests are included in the gem. If you're new to Ruby/Rake read the [quick start][2]. Or, browse the [detailed instructions][1] for each task in our wiki. 
 
@@ -7,10 +7,10 @@ Details about goals and releases can be found at [albacorebuild.net](http://alba
 
 ## Installation
 
-Add this line to the Gemfile where you maintain the dependencies for your build:
+Add this line to the Gemfile where you maintain the dependencies for your build (we recommend the latest RC for RubyZip 1.0 support, only remove the version spec if you know what you're doing!):
 
 ```ruby
-gem "albacore"
+gem "albacore", "~> 1.0.rc"
 ```
 
 And then execute
@@ -37,7 +37,7 @@ require "albacore"
 
 Albacore has been tested against the following versions of Ruby for Windows and Linux. Use unsupported versions at your own risk!
 
-* MRI: `1.9.3`, `2.0.0`
+* MRI: `1.9.3`, `2.0.0` (x86 only, Nokogiri does not support x64 yet)
 * JRuby: `HEAD`
 
 

data/Rakefile

@@ -1,24 +1,19 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-task :default => :"specs:all"
+task :default => ["specs:all"]
 
 namespace :specs do
-  require "rspec/core/rake_task"
-
   desc "Run all specs"
   RSpec::Core::RakeTask.new(:all)
 
-  # generate tasks for each *_spec.rb file in the root spec folder
-  exceptNCov = []
-  FileList["spec/*_spec.rb"].each do |fname|
-    spec = $1 if /spec\/(.+)_spec\.rb/ =~ fname
-    exceptNCov << spec unless /ncover|ndepend/ =~ spec
-    desc "Run the #{spec} spec"
-    RSpec::Core::RakeTask.new spec do |t|
-      t.pattern = "spec/#{spec}*_spec.rb"
+  # make a task for each *_spec.rb in spec/
+  FileList["spec/*_spec.rb"].each do |path|
+    ctx = File.basename(path, "*.rb").split("_").first
+    
+    desc "Run the #{ctx} spec"
+    RSpec::Core::RakeTask.new(ctx) do |t|
+      t.pattern = "spec/#{ctx}_spec.rb"
     end
   end
-
-  desc "Run specs:all except :ncover, :ndepend"
-  task :except_ncover => exceptNCov
 end

data/albacore.gemspec

@@ -1,31 +1,29 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "albacore/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "albacore"
-  spec.version       = Albacore::VERSION
-  spec.authors       = ["Henrik Feldt", "Anthony Mastrean"]
-  spec.email         = ["albacorebuild@gmail.com"]
-  spec.description   = %q{Albacore is a professional quality suite of Rake tasks for building .NET or Mono based systems.}
-  spec.summary       = %q{Dolphin-safe .NET and Mono rake tasks}
-  spec.homepage      = "http://albacorebuild.net"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "nokogiri", "~> 1.5"
-  spec.add_dependency "rake"
-  spec.add_dependency "rubyzip", "~> 1.0"
-
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "rspec"
-
-  spec.rubyforge_project = "albacore"
-end
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require "albacore/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "albacore"
+  spec.version       = Albacore::VERSION
+  spec.authors       = ["Henrik Feldt", "Anthony Mastrean", "Derick Bailey"]
+  spec.email         = ["albacorebuild@gmail.com"]
+  spec.description   = %q{Albacore is a professional quality suite of Rake tasks for building .NET or Mono based systems.}
+  spec.summary       = %q{Dolphin-safe .NET and Mono rake tasks}
+  spec.homepage      = "http://albacorebuild.net"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "nokogiri", "~> 1.5"
+  spec.add_dependency "rake"
+  spec.add_dependency "rubyzip", "~> 1.0"
+
+  spec.add_development_dependency "rspec"
+
+  spec.rubyforge_project = "albacore"
+end

data/lib/albacore.rb

@@ -1,22 +1,31 @@
-albacore_root = File.expand_path(File.dirname(__FILE__))
-$: << albacore_root
-$: << File.join(albacore_root, "albacore")
-$: << File.join(albacore_root, "albacore", 'support')
-$: << File.join(albacore_root, "albacore", 'config')
-
+# infrastructure
 require "albacore/version"
 require "albacore/albacoretask"
+
+require "albacore/config/config"
+require "albacore/config/netversion"
+
+require "albacore/support/attrmethods"
+require "albacore/support/createtask"
+require "albacore/support/failure"
+require "albacore/support/logging"
+require "albacore/support/openstruct"
+require "albacore/support/runcommand"
+require "albacore/support/platform"
+require "albacore/support/updateattributes"
+require "albacore/support/yamlconfig"
+
+# tasks
 require "albacore/aspnetcompiler"
 require "albacore/assemblyinfo"
 require "albacore/csc"
 require "albacore/docu"
 require "albacore/exec"
-require "albacore/fluentmigratorrunner"
+require "albacore/fluentmigrator"
 require "albacore/ilmerge"
 require "albacore/msbuild"
-require "albacore/msdeploy"
-require "albacore/mspectestrunner"
-require "albacore/mstesttestrunner"
+require "albacore/mspec"
+require "albacore/mstest"
 require "albacore/nant"
 require "albacore/nchurn"
 require "albacore/ncoverconsole"
@@ -24,17 +33,15 @@ require "albacore/ncoverreport"
 require "albacore/ndepend"
 require "albacore/nugetinstall"
 require "albacore/nugetpack"
-require "albacore/nugetpublish"
 require "albacore/nugetpush"
 require "albacore/nugetupdate"
-require "albacore/nunittestrunner"
+require "albacore/nunit"
 require "albacore/nuspec"
 require "albacore/output"
 require "albacore/plink"
-require "albacore/specflowreport"
+require "albacore/specflow"
 require "albacore/sqlcmd"
 require "albacore/unzip"
-require "albacore/vssget"
 require "albacore/xbuild"
-require "albacore/xunittestrunner"
+require "albacore/xunit"
 require "albacore/zipdirectory"

data/lib/albacore/aspnetcompiler.rb

@@ -1,58 +1,80 @@
-require 'albacore/albacoretask'
-require 'albacore/config/aspnetcompilerconfig'
-require 'albacore/support/supportlinux'
+require "albacore/albacoretask"
+require "albacore/config/aspnetcompilerconfig"
+require "albacore/support/platform"
 
 class AspNetCompiler
+  TaskName = :aspnetcompiler
+
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::AspNetCompiler
-  include SupportsLinuxEnvironment
-
-  # http://msdn.microsoft.com/en-us/library/ms164291.aspx
+  include Albacore::Support
   
-  attr_accessor  :clean,                              # Optional Boolean parameter. If this parameter is true, the precompiled application will be built clean. Any previously compiled components will be recompiled. The default value is false. This parameter corresponds to the -c switch on aspnet_compiler.exe.
-                 #:allow_partially_trusted_callers,    # Optional Boolean parameter. If this parameter is true, the strong-name assembly will allow partially trusted callers.
-                 :debug,                              # Optional Boolean parameter. If this parameter is true, debug information (.PDB file) is emitted during compilation. The default value is false. This parameter corresponds to the -d switch on aspnet_compiler.exe.
-                 :delay_sign,                         # Optional Boolean parameter. If this parameter is true, the assembly is not fully signed when created.
-                 :fixed_names,                        # Optional Boolean parameter. If this parameter is true, the compiled assemblies will be given fixed names.
-                 :force,                              # Optional Boolean parameter. If this parameter is true, the task will overwrite the target directory if it already exists. Existing contents are lost. The default value is false. This parameter corresponds to the -f switch on aspnet_compiler.exe.
-                 #:key_container,                      # Optional String parameter. Specifies a strong name key container.
-                 #:key_file,                           # Optional String parameter. Specifies the physical path to the strong name key file..
-                 #:metabase_path,                      # Optional String parameter. Specifies the full IIS metabase path of the application. This parameter cannot be combined with the VirtualPath or PhysicalPath parameters. This parameter corresponds to the -m switch on aspnet_compiler.exe.
-                 :physical_path,                      # Optional String parameter. Specifies the physical path of the application to be compiled. If this parameter is missing, the IIS metabase is used to locate the application. This parameter corresponds to the -p switch on aspnet_compiler.exe.
-                 #:target_framework_moniker,           # Optional String parameter. Specifies the TargetFrameworkMoniker indicating which .NET Framework version of aspnet_compiler.exe should be used. Only accepts .NET Framework monikers.
-                 :target_path,                        # Optional String parameter. Specifies the physical path to which the application is compiled. If not specified, the application is precompiled in-place.
-                 :updateable,                         # Optional Boolean parameter. If this parameter is true, the precompiled application will be updateable. The default value is false. This parameter corresponds to the -u switch on aspnet_compiler.exe.
-                 :virtual_path                        # Optional String parameter. The virtual path of the application to be compiled. If PhysicalPath specified, the physical path is used to locate the application. Otherwise, the IIS metabase is used, and the application is assumed to be in the default site. This parameter corresponds to the -v switch on aspnet_compiler.exe.
+  attr_reader   :clean,
+                :delay_sign,
+                :fixed_names,
+                :force,
+                :updateable,
+                :debug,
+                :no_logo
+
+  attr_accessor :physical_path, 
+                :target_path, 
+                :virtual_path
 
   def initialize
-    @clean = false
-    @debug = false
-    @delay_sign = false
-    @fixed_names = false
-    @force = false
-    @updateable = false
-    @virtual_path = '/'
+    @virtual_path = "/"
+    @command = "aspnet_compiler"
+    
     super()
-    update_attributes aspnetcompiler.to_hash
+    update_attributes(aspnetcompiler.to_hash)
   end
 
-  def execute
-    params = []
-    params << "-v #{@virtual_path}" unless @virtual_path.nil?
-    params << "-p #{format_path(@physical_path)}" unless @physical_path.nil?
-    params << "-c" if @clean
-    params << "-delaysign" if @delay_sign
-    params << "-fixednames" if @fixed_names
-    params << "-d" if @debug
-    params << "-u" if @updateable
-    params << "-f" if @force
-    params << format_path(@target_path) unless @target_path.nil?
-    
-    result = run_command "AspNetCompiler", params
-    
-    failure_message = 'AspNetCompiler Failed. See Build Log For Detail'
-    fail_with_message failure_message if !result
+  def execute    
+    result = run_command("AspNetCompiler", build_parameters)
+    fail_with_message("AspNetCompiler failed, see the build log for more details.") unless result
+  end
+
+  def build_parameters
+    p = []
+    p << "-v #{@virtual_path}" if @virtual_path
+    p << "-p #{Platform.format_path(@physical_path)}" if @physical_path
+    p << "-c" if @clean
+    p << "-delaysign" if @delay_sign
+    p << "-fixednames" if @fixed_names
+    p << "-d" if @debug
+    p << "-u" if @updateable
+    p << "-f" if @force
+    p << "-nologo" if @no_logo
+    p << Platform.format_path(@target_path) if @target_path
+    p
   end
   
+  def updateable
+    @updateable = true
+  end
+  
+  def force
+    @force = true
+  end
+  
+  def clean
+    @clean = true
+  end
+  
+  def debug
+    @debug = true
+  end
+  
+  def delay_sign
+    @delay_sign = true
+  end
+  
+  def fixed_names
+    @fixed_names = true
+  end
+
+  def no_logo
+    @no_logo = true
+  end
 end

data/lib/albacore/assemblyinfo.rb

@@ -1,125 +1,132 @@
-require 'albacore/albacoretask'
-require 'albacore/config/assemblyinfoconfig'
-require 'albacore/assemblyinfolanguages/csharpengine'
-require 'albacore/assemblyinfolanguages/vbnetengine'
-require 'albacore/assemblyinfolanguages/fsharpengine'
-require 'albacore/assemblyinfolanguages/cppcliengine'
+require "albacore/albacoretask"
+require "albacore/config/assemblyinfoconfig"
+require "albacore/assemblyinfolanguages/assemblyinfoengine"
+require "albacore/assemblyinfolanguages/cppcliengine"
+require "albacore/assemblyinfolanguages/csharpengine"
+require "albacore/assemblyinfolanguages/fsharpengine"
+require "albacore/assemblyinfolanguages/vbnetengine"
 
 class AssemblyInfo
   include Albacore::Task
   include Configuration::AssemblyInfo
   
-  attr_accessor :input_file, :output_file, :language,
-   :version, :title, :description, :custom_attributes,
-   :copyright, :com_visible, :com_guid, :company_name, :product_name,
-   :file_version, :trademark, :lang_engine, :informational_version   
+  attr_reader   :com_visible
   
-  attr_array :namespaces, :custom_data, :initial_comments
-  attr_hash :custom_attributes
+  attr_accessor :input_file, 
+                :output_file, 
+                :version, 
+                :file_version, 
+                :informational_version,
+                :title, 
+                :description, 
+                :copyright, 
+                :company_name, 
+                :product_name,
+                :trademark, 
+                :com_guid, 
+                :language,
+                :lang_engine
+  
+  attr_array    :namespaces, 
+                :custom_data, 
+                :initial_comments
+  
+  attr_hash     :custom_attributes
   
   def initialize
-    @namespaces = []
-    @custom_data = []
     super()
-    update_attributes assemblyinfo.to_hash
+    update_attributes(assemblyinfo.to_hash)
   end
 
-  def use(file)
-    @input_file = @output_file = file
-  end
-  
   def execute
-    unless check_lang_engine then
-      @lang_engine = from_language
+    unless @output_file
+      fail_with_message("assemblyinfo requires #output_file")
+      return
     end
-    write_assemblyinfo @output_file, @input_file
-  end
-  
-  def write_assemblyinfo(assemblyinfo_file, input_file)
-    valid = check_output_file assemblyinfo_file
-    return if !valid
+    
+    @lang_engine ||= AssemblyInfoEngine.from_language(@language)
+    @custom_data ||= []
+    @custom_attributes ||= {}
+    @initial_comments ||= []
+    @namespaces ||= []
+    @namespaces << "System.Reflection"
+    @namespaces << "System.Runtime.InteropServices"
+    @namespaces.uniq!
 
-    input_data = read_input_file input_file
-    asm_data = build_assembly_info_data input_data
+    @logger.info "Generating AssemblyInfo file: #{File.expand_path(@output_file)}"
 
-    @logger.info "Generating Assembly Info File At: " + File.expand_path(assemblyinfo_file)
-    File.open(assemblyinfo_file, 'w') do |f|      
-      asm_data.each do |line|
-        f.puts line
-      end
-    end
+    input = @input_file ? read_input(@input_file) : []
+    output = build(input)
+    write_output(output)
   end
 
-  def read_input_file(file)
-    data = []
-    return data if file.nil?
-
-    File.open(file, 'r') do |f|
-        f.each_line do |line|
-            data << line.strip
-        end
-    end
-
-    data
+  def com_visible
+    @com_visible = true
   end
   
-  def check_output_file(file)
-    return true if file
-    fail_with_message 'output_file cannot be nil'
-    false
-  end
-
-  def from_language
-    ({
-      "F#" => lambda { FSharpEngine.new },
-      "C#" => lambda { CSharpEngine.new },
-      "C++.Net" => lambda { CppCliEngine.new },
-      "VB.Net" => lambda { VbNetEngine.new }
-    }[@language] || lambda { CSharpEngine.new }).call
-  end
-
-  def check_lang_engine
-    !@lang_engine.nil?
-  end
-
-  def build_assembly_info_data(data)
-    # data < []
-    # requires: @lang_engine.nil? == false
-
-    if data.empty?
-        data = build_header
-    end
-
-    data = build_initial_comments + build_using_statements(data) + data
+  def build(data)
+    data = build_header if data.empty?
+    data = @initial_comments + build_using_statements(data) + data
 
     build_attribute(data, "AssemblyTitle", @title)
     build_attribute(data, "AssemblyDescription", @description)
     build_attribute(data, "AssemblyCompany", @company_name)
     build_attribute(data, "AssemblyProduct", @product_name)
-    
     build_attribute(data, "AssemblyCopyright", @copyright)
     build_attribute(data, "AssemblyTrademark", @trademark)
-    
     build_attribute(data, "ComVisible", @com_visible)
     build_attribute(data, "Guid", @com_guid)
-    
     build_attribute(data, "AssemblyVersion", @version)
     build_attribute(data, "AssemblyFileVersion", @file_version)
-    build_attribute(data, "AssemblyInformationalVersion", @informational_version)
+    build_attribute(data, "AssemblyInformationalVersion", @informational_version)    
     
     data << ""
-    if @custom_attributes != nil
+    
+    unless @custom_attributes.empty?
       build_custom_attributes(data)
       data << ""
     end
 
+    build_custom_data(data)
+
+    data.concat(build_footer)
+
+    chomp(data)
+  end
+
+  def build_attribute(data, attr_name, attr_data, allow_empty_args = false)
+    return if (!allow_empty_args and attr_data.nil?)
+    
+    attr_value = @lang_engine.build_attribute(attr_name, attr_data)
+    attr_re = @lang_engine.build_attribute_re(attr_name)
+    
+    @logger.debug "Building AssemblyInfo attribute: #{attr_value}"
+    
+    result = nil
+    data.each do |line|
+      break if result
+      result = line.sub!(attr_re, attr_value) if line
+    end
+    
+    data << attr_value if result.nil?
+  end
+  
+  def build_custom_data(data)
     @custom_data.each do |cdata| 
       data << cdata unless data.include? cdata
     end
-    
-    data.concat build_footer
+  end
+  
+  def build_using_statements(data)
+    @namespaces.map do |ns| 
+      @lang_engine.build_using_statement(ns) unless data.index { |line| line.match(ns) }
+    end
+  end
 
-    chomp data
+  def build_custom_attributes(data)
+    @custom_attributes.each do |key, value|
+      build_attribute(data, key, value, true)
+    end
   end
 
   def chomp(ary)
@@ -135,48 +142,22 @@ class AssemblyInfo
     @lang_engine.respond_to?(:after) ? [@lang_engine.after()] : []
   end
 
-  def build_attribute(data, attr_name, attr_data, allow_empty_args = false)
-    if !allow_empty_args and attr_data.nil? then return end
-    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(data)
-    @namespaces = [] if @namespaces.nil?
-    
-    @namespaces << "System.Reflection"
-    @namespaces << "System.Runtime.InteropServices"
-    @namespaces.uniq!
-    
-    ns = []
-    @namespaces.each do |n|
-      ns << @lang_engine.build_using_statement(n) unless data.index { |l| l.match n }
+  def read_input(file)
+    data = []
+    File.open(file, "r") do |f|
+      f.each_line do |line|
+        data << line.strip
+      end
     end
-    
-    ns
-  end  
 
-  def build_custom_attributes(data)
-    @custom_attributes.each do |key, value|
-      build_attribute(data, key, value, true)
-    end
+    data
   end
 
-  def build_initial_comments
-    @initial_comments = [] if @initial_comments.nil?
-    comments = []
-    @initial_comments.each do |comment|
-        # Do language specific formatting here?
-        comments << comment
+  def write_output(output)
+    File.open(@output_file, "w") do |f|
+      output.each do |line|
+        f.puts line
+      end
     end
-    comments
   end
-  
 end