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

data/lib/albacore/assemblyinfolanguages/assemblyinfoengine.rb

@@ -1,4 +1,17 @@
 class AssemblyInfoEngine
+  ENGINES = {
+    "F#" => lambda { FSharpEngine.new },
+    "C#" => lambda { CSharpEngine.new },
+    "C++.Net" => lambda { CppCliEngine.new },
+    "VB.Net" => lambda { VbNetEngine.new }
+  }
+  
+  DEFAULT = ENGINES["C#"]
+
+  def self.from_language(language)
+    (ENGINES[language] || DEFAULT).call
+  end
+
   def build_attribute(attr_name, attr_data)
     attribute = "#{@start_token}assembly: #{attr_name}("
     

data/lib/albacore/config/aspnetcompilerconfig.rb

@@ -1,6 +1,6 @@
-require 'ostruct'
-require 'albacore/config/netversion'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/config/netversion"
+require "albacore/support/openstruct"
 
 module Configuration
   module AspNetCompiler
@@ -22,7 +22,8 @@ module Configuration
     end
 
     def use(netversion)
-      netversion = :net20 if netversion == :net35 # since .net 3.5 doesn't have aspnet_compiler use .net 2.0
+      # net35 doesn't have an asp.net compiler
+      netversion = :net20 if netversion == :net35
       self.command = File.join(get_net_version(netversion), "aspnet_compiler.exe")
     end
   end

data/lib/albacore/config/assemblyinfoconfig.rb

@@ -1,5 +1,5 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module AssemblyInfo
@@ -9,12 +9,10 @@ module Configuration
       @config ||= OpenStruct.new.extend(OpenStructToHash).extend(AssemblyInfo)
     end
     
-    # this is the key: Albacore.configure( hash => hash.assemblyinfo ) 
     def assemblyinfo
       config ||= AssemblyInfo.asmconfig
       yield(config) if block_given?
       config
     end
-    
   end
 end

data/lib/albacore/config/cscconfig.rb

@@ -1,6 +1,6 @@
-require 'ostruct'
-require 'albacore/config/netversion'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/config/netversion"
+require "albacore/support/openstruct"
 
 module Configuration
   module CSC

data/lib/albacore/config/docuconfig.rb

@@ -1,23 +1,19 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module Docu
     include Albacore::Configuration
     
     def self.docuconfig
-      @docuconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(Docu)
     end
 
     def docu
-      config = Docu.docuconfig
+      config ||= Docu.docuconfig
       yield(config) if block_given?
       config
     end
-
-    def self.included(obj)
-      docuconfig.command = "Docu.exe"
-    end
   end
 end
 

data/lib/albacore/config/execconfig.rb

@@ -1,14 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module Exec
     include Albacore::Configuration
 
+    def self.execconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(Exec)
+    end
+
     def exec
-      @execconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@execconfig) if block_given?
-      @execconfig
+      config ||= Exec.execconfig
+      yield(config) if block_given?
+      config
     end
   end
 end

data/lib/albacore/config/fluentmigratorconfig.rb

@@ -0,0 +1,19 @@
+require "albacore/support/openstruct"
+
+module Configuration
+  module FluentMigrator
+    include Albacore::Configuration
+
+    def self.fluentmigratorconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(FluentMigrator)
+    end
+
+    def fluentmigrator
+      config ||= FluentMigrator.fluentmigratorconfig
+      yield(config) if block_given?
+      config
+    end
+  end
+end
+
+

data/lib/albacore/config/ilmergeconfig.rb

@@ -1,24 +1,19 @@
- require 'ostruct'
-require 'albacore/config/netversion'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/config/netversion"
+require "albacore/support/openstruct"
 
 module Configuration
   module ILMerge
     include Albacore::Configuration
     
     def self.ilmergeconfig
-      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(ILMerge)
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(ILMerge)    
     end
-    
+
     def ilmerge
       config ||= ILMerge.ilmergeconfig
       yield(config) if block_given?
       config
     end
-    
-    def use_resolver r
-      self.ilmergeconfig.resolver = r
-    end
-    
   end
 end

data/lib/albacore/config/msbuildconfig.rb

@@ -1,6 +1,6 @@
-require 'ostruct'
-require 'albacore/config/netversion'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/config/netversion"
+require "albacore/support/openstruct"
 
 module Configuration
   module MSBuild

data/lib/albacore/config/mspecconfig.rb

@@ -0,0 +1,19 @@
+require "ostruct"
+require "albacore/support/openstruct"
+
+module Configuration
+  module MSpec
+    include Albacore::Configuration
+
+    def self.mspecconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(MSpec)
+    end
+
+    def mspec
+      config ||= MSpec.mspecconfig
+      yield(config) if block_given?
+      config
+    end
+  end
+end
+

data/lib/albacore/config/mstestconfig.rb

@@ -0,0 +1,19 @@
+require "ostruct"
+require "albacore/support/openstruct"
+
+module Configuration
+  module MSTest
+    include Albacore::Configuration
+
+    def self.mstestconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(MSTest)
+    end
+
+    def mstest
+      config ||= MSTest.mstestconfig
+      yield(config) if block_given?
+      config
+    end
+  end
+end
+

data/lib/albacore/config/nantconfig.rb

@@ -1,15 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NAnt
     include Albacore::Configuration
 
+    def self.nantconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NAnt)
+    end
+
     def nant
-      @nantconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@nantconfig) if block_given?
-      @nantconfig
+      config ||= NAnt.nantconfig
+      yield(config) if block_given?
+      config
     end
   end
 end
-

data/lib/albacore/config/nchurnconfig.rb

@@ -1,14 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NChurn
     include Albacore::Configuration
 
+    def self.nchurnconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NChurn)
+    end
+
     def nchurn
-      @nchurnconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@nchurnconfig) if block_given?
-      @nchurnconfig
+      config ||= NChurn.nchurnconfig
+      yield(config) if block_given?
+      config
     end
   end
 end

data/lib/albacore/config/ncoverconsoleconfig.rb

@@ -1,14 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NCoverConsole
     include Albacore::Configuration
 
+    def self.ncoverconsoleconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NCoverConsole)
+    end
+
     def ncoverconsole
-      @ncoverconsoleconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@ncoverconsoleconfig) if block_given?
-      @ncoverconsoleconfig
+      config ||= NCoverConsole.ncoverconsoleconfig
+      yield(config) if block_given?
+      config
     end
   end
 end

data/lib/albacore/config/ncoverreportconfig.rb

@@ -1,15 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NCoverReport
     include Albacore::Configuration
 
+    def self.ncoverreportconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NCoverReport)
+    end
+
     def ncoverreport
-      @ncoverreportconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@ncoverreportconfig) if block_given?
-      @ncoverreportconfig
+      config ||= NCoverReport.ncoverreportconfig
+      yield(config) if block_given?
+      config
     end
   end
 end
-

data/lib/albacore/config/ndependconfig.rb

@@ -1,14 +1,18 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NDepend
     include Albacore::Configuration
 
+    def self.ndependconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NDepend)
+    end
+
     def ndepend
-      @ndependconfig ||= OpenStruct.new.extend(OpenStructToHash)
-      yield(@ndependconfig) if block_given?
-      @ndependconfig
+      config ||= NDepend.ndependconfig
+      yield(config) if block_given?
+      config
     end
   end
 end

data/lib/albacore/config/netversion.rb

@@ -2,23 +2,27 @@ module Configuration
   module NetVersion
     include Failure
   
+    # systemroot is the newest environment variable and windir is some legacy 
+    # thing. There's no reason one of those wouldn't exist on a real Windows
+    # platform. The final, hardcoded string is to satisfy the method calls on
+    # linux (travis-ci).
     def win_dir
-      ENV['windir'] || ENV['WINDIR'] || 'C:/Windows'
+      ENV["SYSTEMROOT"] || ENV["WINDIR"] || "C:\\Windows"
     end
    
     def get_net_version(netversion)
       case netversion
         when :net2, :net20, :net3, :net30
-          version = 'v2.0.50727'
+          version = "v2.0.50727"
         when :net35
-          version = 'v3.5'
+          version = "v3.5"
         when :net4, :net40, :net45
-          version = 'v4.0.30319'
+          version = "v4.0.30319"
         else
-          fail_with_message "The .NET Framework #{netversion} is not supported"
+          fail_with_message("The .NET Framework #{netversion} is not supported")
       end
       
-      File.join win_dir, 'Microsoft.NET', 'Framework', version
+      File.join(win_dir, "Microsoft.NET", "Framework", version)
     end
   end
 end

data/lib/albacore/config/nugetinstallconfig.rb

@@ -0,0 +1,18 @@
+require "ostruct"
+require "albacore/support/openstruct"
+
+module Configuration
+  module NuGetInstall
+    include Albacore::Configuration
+
+    def self.nugetinstallconfig
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(NuGetInstall)
+    end
+
+    def nugetinstall
+      config ||= NuGetInstall.nugetinstallconfig
+      yield(config) if block_given?
+      config
+    end
+  end
+end

data/lib/albacore/config/nugetpackconfig.rb

@@ -1,5 +1,5 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NuGetPack
@@ -14,6 +14,5 @@ module Configuration
       yield(config) if block_given?
       config
     end
-    
   end
 end

data/lib/albacore/config/nugetpushconfig.rb

@@ -1,5 +1,5 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NuGetPush
@@ -10,10 +10,9 @@ module Configuration
     end
 
     def nugetpush
-      @config ||= NuGetPush.nugetpushconfig
-      yield(@config) if block_given?
-      @config
+      config ||= NuGetPush.nugetpushconfig
+      yield(config) if block_given?
+      config
     end
-    
   end
 end

data/lib/albacore/config/nugetupdateconfig.rb

@@ -1,5 +1,5 @@
-require 'ostruct'
-require 'albacore/support/openstruct'
+require "ostruct"
+require "albacore/support/openstruct"
 
 module Configuration
   module NuGetUpdate
@@ -14,6 +14,5 @@ module Configuration
       yield(config) if block_given?
       config
     end
-    
   end
 end