albacore 0.2.0.preview1 → 0.2.0.preview2

data/README.markdown

@@ -81,13 +81,18 @@ 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
 * [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
-* [Hibri Marzook](http://github.com/hibri): the PLink and NDepend tasks
-* [James Gregory](http://github.com/jagregory): the Docu 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
+* [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 Wilkins](http://github.com/markwilk): VB.NET Language Generator For The AssemblyInfo Task
 * [Mike Nichols](http://github.com/mnichols): XUnit contributions, bug reports, etc
 * [Nils Jonsson](http://github.com/njonsson): AssemblyInfo corrections, rakefile corrections
 * [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.
+* [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

data/VERSION

@@ -1 +1 @@
-0.2.0.preview1
+0.2.0.preview2

data/install_dependencies.rb

@@ -3,7 +3,7 @@ require 'rubygems/gem_runner'
 require 'rubygems/exceptions'
 
 #http://gist.github.com/236148
-required_version = Gem::Requirement.new "> 1.8.7"
+required_version = Gem::Requirement.new "> 1.8.6"
 
 unless required_version.satisfied_by? Gem.ruby_version then
   abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"

data/lib/albacore.rb

@@ -1,19 +1,8 @@
-$: << File.expand_path(File.dirname(__FILE__))
-$: << File.expand_path(File.join(File.dirname(__FILE__), "albacore"))
-$: << File.expand_path(File.join(File.dirname(__FILE__), "albacore", 'support'))
-$: << File.expand_path(File.join(File.dirname(__FILE__), "albacore", 'config'))
-$: << File.expand_path(File.join(File.dirname(__FILE__), "rake"))
-
-require 'logging'
+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')
 
 runtime_is_ironruby = (!defined?(IRONRUBY_VERSION).nil?)
-
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'albacore/*.rb')).reject{ |f|
-  f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp"))
-}.each {|f| require f }
-
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'rake/support/*.rb')).each {|f| require f }
-
-Dir.glob(File.join(File.expand_path(File.dirname(__FILE__)), 'rake/*.rb')).reject{ |f|
-  f if runtime_is_ironruby && (f.include?("ssh") || f.include?("sftp"))
-}.each {|f| require f }
+Dir.glob(File.join(albacore_root, 'albacore/*.rb')).each {|f| require f }

data/lib/albacore/albacoretask.rb

@@ -0,0 +1,43 @@
+require 'albacore/support/attrmethods'
+require 'albacore/support/failure'
+require 'albacore/support/logging'
+require 'albacore/support/yamlconfig'
+require 'albacore/support/runcommand'
+require 'albacore/support/updateattributes'
+require 'albacore/support/createtask'
+require 'albacore/config/config'
+
+module AlbacoreTask
+  include Failure
+  include Logging
+  include YAMLConfig
+  include UpdateAttributes
+
+  def self.included(mod)
+    mod.extend AttrMethods
+    self.create_rake_task mod
+    self.include_config mod, caller[0]
+  end
+
+  def self.include_config(mod, calledby)
+    dir = File.dirname(calledby)
+    configfile = File.join(dir, "config", "#{mod.name.downcase}config.rb")
+    require configfile if File.exist?(configfile)
+  end
+
+  def self.create_rake_task(mod)
+    if mod.class == Class
+      tasknames = Array.new
+
+      if mod.const_defined?("TaskName")
+        tasknames << eval("#{mod}::TaskName")
+      else
+       tasknames << mod.name.downcase
+      end
+
+      tasknames.flatten.each do |taskname|
+        Albacore.create_task taskname, mod
+      end
+    end
+  end
+end

data/lib/albacore/assemblyinfo.rb

@@ -1,26 +1,25 @@
-require 'albacore/albacoremodel'
+require 'albacore/albacoretask'
 require 'albacore/assemblyinfolanguages/csharpengine'
 require 'albacore/assemblyinfolanguages/vbnetengine'
-require 'albacore/config/assemblyinfoconfig'
 
 class AssemblyInfo
-  include AlbacoreModel
-  include Configuration::AssemblyInfo
+  include AlbacoreTask
   
   attr_accessor :version, :title, :description, :output_file, :custom_attributes
   attr_accessor :copyright, :com_visible, :com_guid, :company_name, :product_name
-  attr_accessor :file_version, :trademark, :lang_engine
+  attr_accessor :file_version, :trademark, :lang_engine, :custom_data
   
   attr_array :namespaces
   attr_hash :custom_attributes
+  attr_array :custom_data
   
   def initialize
     @namespaces = []
     super()
-    update_attributes assemblyinfo.to_hash
+    update_attributes Albacore.configuration.assemblyinfo.to_hash
   end
   
-  def write
+  def execute
     @lang_engine = CSharpEngine.new unless check_lang_engine
     write_assemblyinfo @output_file
   end
@@ -71,6 +70,10 @@ class AssemblyInfo
       asm_data << "\n"
     end
     
+    if @custom_data != nil
+      @custom_data.each{|data| asm_data << data + "\n"}
+    end
+    
     asm_data
   end
   

data/lib/albacore/config/assemblyinfoconfig.rb

@@ -3,19 +3,11 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module AssemblyInfo
-    @asmconfig = OpenStruct.new.extend(OpenStructToHash)
-    def self.asmconfig
-      @asmconfig
-    end
-
+    include Albacore::Configuration
     def assemblyinfo
-      config = AssemblyInfo.asmconfig
-      yield(config) if block_given?
-      config
+      @asmconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@asmconfig) if block_given?
+      @asmconfig
     end
   end
 end
-
-class Albacore::Configuration
-  include Configuration::AssemblyInfo
-end

data/lib/albacore/config/config.rb

@@ -1,14 +1,22 @@
 module Albacore
+  module Configuration
+    def self.included(base)
+      Albacore.configuration.extend(base) if (base.class == Module)
+    end
+  end
+
+  class ConfigData
+   	attr_accessor :yaml_config_folder, :log_level
+  end
+
   class << self
     def configure
-      @configuration ||= Configuration.new
-      yield(@configuration) if block_given?
-      @configuration
+      yield(configuration) if block_given?
+      configuration
     end
-  end
 
-  class Configuration
-   	attr_accessor :yaml_config_folder
-  	attr_accessor :log_level
- end
+    def configuration
+      @configuration ||= ConfigData.new
+    end
+  end
 end

data/lib/albacore/config/cscconfig.rb

@@ -5,10 +5,10 @@ require 'albacore/support/openstruct'
 module Configuration
   module CSC
     include Configuration::NetVersion
+    include Albacore::Configuration
 
-    @config = OpenStruct.new.extend(OpenStructToHash).extend(CSC)
     def self.cscconfig
-      @config
+      @config ||= OpenStruct.new.extend(OpenStructToHash).extend(CSC)
     end
 
     def csc
@@ -24,10 +24,5 @@ module Configuration
     def use(netversion)
       self.command = File.join(get_net_version(netversion), "csc.exe")
     end
-
   end
 end
-
-class Albacore::Configuration
-  include Configuration::CSC
-end

data/lib/albacore/config/docuconfig.rb

@@ -3,9 +3,10 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module Docu
-    @docuconfig = OpenStruct.new.extend(OpenStructToHash)
+    include Albacore::Configuration
+    
     def self.docuconfig
-      @docuconfig
+      @docuconfig ||= OpenStruct.new.extend(OpenStructToHash)
     end
 
     def docu
@@ -20,6 +21,3 @@ module Configuration
   end
 end
 
-class Albacore::Configuration
-  include Configuration::Docu
-end

data/lib/albacore/config/execconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module Exec
-    @execconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.execconfig
-      @execconfig
-    end
+    include Albacore::Configuration
 
     def exec
-      config = Exec.execconfig
-      yield(config) if block_given?
-      config
+      @execconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@execconfig) if block_given?
+      @execconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::Exec
-end

data/lib/albacore/config/msbuildconfig.rb

@@ -4,11 +4,11 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module MSBuild
+    include Albacore::Configuration
     include Configuration::NetVersion
 
-    @msbuildconfig = OpenStruct.new.extend(OpenStructToHash).extend(MSBuild)
     def self.msbuildconfig
-      @msbuildconfig
+      @msbuildconfig ||= OpenStruct.new.extend(OpenStructToHash).extend(MSBuild)
     end
 
     def msbuild
@@ -27,6 +27,3 @@ module Configuration
   end
 end
 
-class Albacore::Configuration
-  include Configuration::MSBuild
-end

data/lib/albacore/config/mspectestrunnerconfig.rb

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

data/lib/albacore/config/nantconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module NAnt
-    @nantconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.nantconfig
-      @nantconfig
-    end
+    include Albacore::Configuration
 
     def nant
-      config = NAnt.nantconfig
-      yield(config) if block_given?
-      config
+      @nantconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@nantconfig) if block_given?
+      @nantconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::NAnt
-end

data/lib/albacore/config/ncoverconsoleconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module NCoverConsole
-    @ncoverconsoleconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.ncoverconsoleconfig
-      @ncoverconsoleconfig
-    end
+    include Albacore::Configuration
 
     def ncoverconsole
-      config = NCoverConsole.ncoverconsoleconfig
-      yield(config) if block_given?
-      config
+      @ncoverconsoleconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@ncoverconsoleconfig) if block_given?
+      @ncoverconsoleconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::NCoverConsole
-end

data/lib/albacore/config/ncoverreportconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module NCoverReport
-    @ncoverreportconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.ncoverreportconfig
-      @ncoverreportconfig
-    end
+    include Albacore::Configuration
 
     def ncoverreport
-      config = NCoverReport.ncoverreportconfig
-      yield(config) if block_given?
-      config
+      @ncoverreportconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@ncoverreportconfig) if block_given?
+      @ncoverreportconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::NCoverReport
-end

data/lib/albacore/config/ndependconfig.rb

@@ -3,20 +3,13 @@ require 'albacore/support/openstruct'
 
 module Configuration
   module NDepend
-    @ndependconfig = OpenStruct.new.extend(OpenStructToHash)
-
-    def self.ndependconfig
-      @ndependconfig
-    end
+    include Albacore::Configuration
 
     def ndepend
-      config = NDepend.ndependconfig
-      yield(config) if block_given?
-      config
+      @ndependconfig ||= OpenStruct.new.extend(OpenStructToHash)
+      yield(@ndependconfig) if block_given?
+      @ndependconfig
     end
   end
 end
 
-class Albacore::Configuration
-  include Configuration::NDepend
-end

data/lib/albacore/config/netversion.rb

@@ -1,6 +1,5 @@
 module Configuration
   module NetVersion
-
     def win_dir
       @win_dir ||= ENV['windir'] || ENV['WINDIR'] || "C:/Windows"
     end
@@ -18,6 +17,5 @@ module Configuration
       end
       File.join(win_dir.dup, 'Microsoft.NET', 'Framework', version)
     end
-
   end
 end

data/lib/albacore/config/nunittestrunnerconfig.rb

@@ -0,0 +1,14 @@
+require 'albacore/support/openstruct'
+
+module Configuration
+  module NUnit
+    include Albacore::Configuration
+
+    def nunit
+      @nunitconfig ||= OpenStruct.new.extend(OpenStructToHash).extend(NUnit)
+      yield(@nunitconfig) if block_given?
+      @nunitconfig
+    end
+  end
+end
+