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

data/lib/albacore/nugetpack.rb

@@ -1,54 +1,50 @@
-require 'albacore/albacoretask'
-require 'albacore/config/nugetpackconfig'
-require 'albacore/support/supportlinux'
+require "albacore/albacoretask"
+require "albacore/config/nugetpackconfig"
 
 class NuGetPack
+  TaskName = :nugetpack
+
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::NuGetPack
-  include SupportsLinuxEnvironment
   
-  attr_accessor  :nuspec,
-                 :output,
-                 :base_folder,
-                 :command,
-                 :symbols
+  attr_reader   :symbols
+  
+  attr_accessor :nuspec,
+                :output_directory,
+                :base_path
+
+  attr_hash     :properties
 
-  attr_hash :properties
+  def initialize()
+    @command = "nuget"
 
-  def initialize(command = "NuGet.exe") # users might have put the NuGet.exe in path
     super()
-    update_attributes nugetpack.to_hash
-    @command = command
+    update_attributes(nugetpack.to_hash)
   end
 
-  def execute
-  
-    fail_with_message 'nuspec must be specified.' if @nuspec.nil?
+  def execute  
+    unless @nuspec
+      fail_with_message("nugetpack requires #nuspec" )
+      return
+    end
     
-    params = []
-    params << "pack"
-    params << "-Symbols" if @symbols
-    params << "#{nuspec}"
-    params << "-BasePath #{base_folder}" unless @base_folder.nil?
-    params << "-OutputDirectory #{output}" unless @output.nil?
-    params << build_properties unless @properties.nil? || @properties.empty?
+    result = run_command("nugetpack", build_parameters)
+    fail_with_message("NuGet Pack failed, see the build log for more details.") unless result
+  end
 
-    merged_params = params.join(' ')
-    
-    @logger.debug "Build NuGet pack Command Line: #{merged_params}"
-    result = run_command "NuGet", merged_params
-    
-    failure_message = 'NuGet Failed. See Build Log For Detail'
-    fail_with_message failure_message if !result
+  def build_parameters
+    p = []
+    p << "pack"
+    p << "-Symbols" if @symbols
+    p << "\"#{@nuspec}\""
+    p << "-BasePath \"#{@base_path}\"" if @base_path
+    p << "-OutputDirectory \"#{@output_directory}\"" if @output_directory
+    p << "-Properties #{@properties.map { |key, value| "#{key}=\"#{value}\"" }.join(";")}" if @properties
+    p
   end
   
-  def build_properties
-    option_text = []
-    @properties.each do |key, value|
-      option_text << "#{key}=\"#{value}\""
-    end
-    '-Properties ' + option_text.join(";")
+  def symbols
+    @symbols = true
   end
-  
 end

data/lib/albacore/nugetpush.rb

@@ -1,46 +1,40 @@
-require 'albacore/albacoretask'
-require 'albacore/config/nugetpushconfig'
-require 'albacore/support/supportlinux'
+require "albacore/albacoretask"
+require "albacore/config/nugetpushconfig"
 
 class NuGetPush
+  TaskName = :nugetpush
+
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::NuGetPush
-  include SupportsLinuxEnvironment
   
-  attr_accessor  :package,
-                 :apikey,
-                 :create_only,
-                 :source,
-                 :command
+  attr_accessor :package,
+                :api_key,
+                :source
 
-  def initialize(command = "NuGet.exe") # users might have put the NuGet.exe in path
+  def initialize()
+    @command = "nuget"
+    
     super()
-    @create_only = false
-    update_attributes nugetpush.to_hash
-    @command = command
+    update_attributes(nugetpush.to_hash)
   end
 
   def execute
-  
-    fail_with_message 'package must be specified.' if @package.nil?
-    # don't validate @apikey as required, coz it might have been set in the config file using 'SetApiKey'
-    
-    params = []
-    params << "push"
-    params << "\"#{@package}\""
-    params << "#{@apikey}" if @apikey
-    params << "-CreateOnly" if @create_only
-    params << "-Source #{source}" unless @source.nil?
-    
-    merged_params = params.join(' ')
-    
-    @logger.debug "Build NuGet push Command Line: #{merged_params}"
+    unless @package
+      fail_with_message("nugetinstall requires #package")
+      return
+    end
 
-    result = run_command "NuGet", merged_params
-    
-    failure_message = 'NuGet push Failed. See Build Log For Details'
-    fail_with_message failure_message if !result
+    result = run_command("nugetpush", build_parameters)
+    fail_with_message("NuGet Push failed, see the build log for more details.") unless result
   end
   
+  def build_parameters
+    p = []
+    p << "push"
+    p << "\"#{@package}\""
+    p << "#{@api_key}" if @api_key
+    p << "-Source #{source}" if @source
+    p
+  end
 end

data/lib/albacore/nugetupdate.rb

@@ -1,51 +1,50 @@
-require 'albacore/albacoretask'
-require 'albacore/config/nugetupdateconfig'
-require 'albacore/support/supportlinux'
+require "albacore/albacoretask"
+require "albacore/config/nugetupdateconfig"
 
 class NuGetUpdate
+  TaskName = :nugetupdate
+
   include Albacore::Task
   include Albacore::RunCommand
   include Configuration::NuGetUpdate
-  include SupportsLinuxEnvironment
+  
+  attr_reader   :safe
   
   attr_accessor :input_file,
-                :repository_path,
-                :safe
+                :repository_path
   
   attr_array    :source,
                 :id
 
-  def initialize(command = "NuGet.exe") # users might have put the NuGet.exe in path
+  def initialize()
+    @command = "nuget"
+    
     super()
-    update_attributes nugetupdate.to_hash
-    @command = command
+    update_attributes(nugetupdate.to_hash)
   end
 
   def execute
-    params = get_command_parameters
-    
-    @logger.debug "Build NuGet Update Command Line: #{params}"
-    result = run_command "NuGet", params
+    unless @input_file
+      fail_with_message("nugetupdate requires #input_file")
+      return
+    end
     
-    fail_with_message 'NuGet Update Failed. See Build Log For Detail' unless result
+    result = run_command("nugetupdate", build_parameters)
+    fail_with_message("NuGet Update failed, see the build log for more details.") unless result
   end
   
-  def get_command_parameters
-    fail_with_message 'An input file must be specified (packages.config|solution).' if self.input_file.nil?
-    
-    params = []
-    params << "update"
-    params << "#{self.input_file}"
-    params << "-Source #{get_array_parameter(self.source)}" unless self.source.nil?
-    params << "-Id #{get_array_parameter(self.id)}" unless self.id.nil?
-    params << "-RepositoryPath #{self.repository_path}" unless self.repository_path.nil?
-    params << "-Safe" if self.safe
-    
-    merged_params = params.join(' ')
+  def build_parameters
+    p = []
+    p << "update"
+    p << "\"#{@input_file}\""
+    p << "-Source \"#{@source.join(";")}\"" if @source
+    p << "-Id \"#{@id.join(";")}\"" if @id
+    p << "-RepositoryPath #{@repository_path}" if @repository_path
+    p << "-Safe" if @safe
+    p
   end
   
-  def get_array_parameter(arr)
-    "\"#{arr.join(';')}\""
+  def safe
+    @safe = true
   end
-  
 end

data/lib/albacore/nunit.rb

@@ -0,0 +1,46 @@
+require "albacore/albacoretask"
+require "albacore/config/nunitconfig"
+
+class NUnit
+  TaskName = :nunit
+  
+  include Albacore::Task
+  include Albacore::RunCommand
+  include Configuration::NUnit
+  
+  attr_reader   :no_logo
+  
+  attr_accessor :results_path
+  
+  attr_array    :assemblies
+  
+  def initialize()
+    super()
+    update_attributes(nunit.to_hash)
+  end
+  
+  def execute()
+    result = run_command("nunit", build_parameters)
+    fail_with_message("NUnit failed, see the build log for more details.") unless result
+  end
+    
+  def build_parameters
+    p = []
+    p << @assemblies.map{ |asm| "\"#{asm}\"" } if @assemblies
+    p << "/xml=\"#{@results_path}\"" if @results_path
+    p << "/nologo" if @no_logo
+    p
+  end
+    
+  def no_logo
+    @no_logo = true
+  end
+
+  def build_command_line
+    c = []
+    c << @command
+    c << build_parameters
+    c << @parameters
+    c
+  end
+end

data/lib/albacore/nuspec.rb

@@ -1,5 +1,6 @@
-require 'albacore/albacoretask'
-require 'rexml/document'
+require "albacore/albacoretask"
+require "albacore/config/nuspecconfig"
+require "rexml/document"
 
 class NuspecFile
   def initialize(src, target, exclude) 
@@ -9,15 +10,13 @@ class NuspecFile
   end
   
   def render(xml) 
-    depend = xml.add_element 'file', { 'src' => @src }
-    
-    depend.add_attribute( 'target', @target ) unless @target.nil?
-    depend.add_attribute( 'exclude', @exclude ) unless @exclude.nil?
+    depend = xml.add_element("file", { "src" => @src })
+    depend.add_attribute("target", @target) if @target
+    depend.add_attribute("exclude", @exclude) if @exclude
   end
 end
 
 class NuspecDependency
-
   attr_accessor :id, :version
 
   def initialize(id, version)
@@ -25,13 +24,12 @@ class NuspecDependency
     @version = version
   end
   
-  def render( xml )
-    depend = xml.add_element 'dependency', {'id' => @id, 'version' => @version}
+  def render(xml)
+    depend = xml.add_element("dependency", {"id" => @id, "version" => @version})
   end
 end
 
 class NuspecFrameworkAssembly
-
   attr_accessor :name, :target_framework
 
   def initialize(name, target_framework)
@@ -39,140 +37,144 @@ class NuspecFrameworkAssembly
     @target_framework = target_framework
   end
 
-  def render( xml )
-    depend = xml.add_element 'frameworkAssembly', {'assemblyName' => @name, 'targetFramework' => @target_framework}
+  def render(xml)
+    depend = xml.add_element("frameworkAssembly", {"assemblyName" => @name, "targetFramework" => @target_framework})
   end
 end
 
 class NuspecReference
-
   attr_accessor :file
 
   def initialize(file)
     @file = file
   end
 
-  def render( xml )
-    depend = xml.add_element 'reference', {'file' => @file}
+  def render(xml)
+    depend = xml.add_element("reference", {"file" => @file})
   end
 end
 
 class Nuspec
   include Albacore::Task
+  include Configuration::Nuspec
   
-  attr_accessor :id, :version, :title, :authors, :description, :language, :license_url, :project_url, :output_file,
-                :owners, :summary, :icon_url, :require_license_acceptance, :tags, :working_directory, :copyright,
+  attr_reader   :pretty_formatting,
+                :require_license_acceptance
+  
+  attr_accessor :id, 
+                :version, 
+                :title, 
+                :description, 
+                :language, 
+                :license_url, 
+                :project_url, 
+                :output_file,
+                :summary, 
+                :icon_url, 
+                :copyright,
                 :release_notes
 
-  # Keep these around for backwards compatibility
-  alias :licenseUrl :license_url
-  alias :licenseUrl= :license_url=
-  alias :projectUrl :project_url
-  alias :projectUrl= :project_url=
-  alias :iconUrl :icon_url
-  alias :iconUrl= :icon_url=
-  alias :requireLicenseAcceptance :require_license_acceptance
-  alias :requireLicenseAcceptance= :require_license_acceptance=
+  attr_array    :authors,
+                :owners,
+                :tags
 
   def initialize()
     @dependencies = []
     @files = []
     @frameworkAssemblies = []
     @references = []
+    
     super()
+    update_attributes(nuspec.to_hash)
+  end
+
+  def pretty_formatting
+    @pretty_formatting = true
   end
 
-  attr_writer :pretty_formatting
-  def pretty_formatting?
-    @pretty_formatting
+  def require_license_acceptance
+    @require_license_acceptance = true
   end
 
   def dependency(id, version)
-    @dependencies.push NuspecDependency.new(id, version)
+    @dependencies << NuspecDependency.new(id, version)
   end
   
   def file(src, target = nil, exclude = nil)
-    @files.push NuspecFile.new(src, target, exclude)
+    @files << NuspecFile.new(src, target, exclude)
   end
 
   def framework_assembly(name, target_framework)
-    @frameworkAssemblies.push NuspecFrameworkAssembly.new(name, target_framework)
+    @frameworkAssemblies << NuspecFrameworkAssembly.new(name, target_framework)
   end
 
-  def reference (file)
-    @references.push NuspecReference.new(file)
+  def reference(file)
+    @references << NuspecReference.new(file)
   end
   
   def execute
-    check_required_field @output_file, "output_file"
-    check_required_field @id, "id" 
-    check_required_field @version, "version" 
-    check_required_field @authors, "authors" 
-    check_required_field @description, "description" 
+    check_required_field(@output_file, "output_file")
+    check_required_field(@id, "id")
+    check_required_field(@version, "version")
+    check_required_field(@authors, "authors")
+    check_required_field(@description, "description")
+    
+    output = ""
     
-    if(@working_directory.nil?)
-      @working_output_file = @output_file
-    else
-      @working_output_file = File.join(@working_directory, @output_file)
-    end
-
     builder = REXML::Document.new
     build(builder)
-    output = ""
-    builder.write(output, self.pretty_formatting? ? 2 : -1)
+    builder.write(output, @pretty_formatting ? 2 : -1)
 
-    @logger.debug "Writing #{@working_output_file}"
+    @logger.debug("Writing #{@output_file}")
 
-    File.open(@working_output_file, 'w') {|f| f.write(output) }
+    File.open(@output_file, "w") { |f| f.write(output) }
   end
 
   def build(document)
     document << REXML::XMLDecl.new
 
-    package = document.add_element('package')
+    package = document.add_element("package")
     package.add_attribute("xmlns", "http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd")
 
-    metadata = package.add_element('metadata')
-    
-    metadata.add_element('id').add_text(@id)
-    metadata.add_element('version').add_text(@version)
-    metadata.add_element('title').add_text(@title) unless @title.nil?
-    metadata.add_element('authors').add_text(@authors)
-    metadata.add_element('description').add_text(@description)
-    metadata.add_element('releaseNotes').add_text(@release_notes)
-    metadata.add_element('copyright').add_text(@copyright)
-    metadata.add_element('language').add_text(@language) unless @language.nil?
-    metadata.add_element('licenseUrl').add_text(@license_url) unless @license_url.nil?
-    metadata.add_element('projectUrl').add_text(@project_url) unless @project_url.nil?
-    metadata.add_element('owners').add_text(@owners) unless @owners.nil?
-    metadata.add_element('summary').add_text(@summary) unless @summary.nil?
-    metadata.add_element('iconUrl').add_text(@icon_url) unless @icon_url.nil?
-    metadata.add_element('requireLicenseAcceptance').add_text(@require_license_acceptance) unless @require_license_acceptance.nil?
-    metadata.add_element('tags').add_text(@tags) unless @tags.nil?
+    metadata = package.add_element("metadata")
+    metadata.add_element("id").add_text(@id)
+    metadata.add_element("version").add_text(@version)
+    metadata.add_element("title").add_text(@title) if @title
+    metadata.add_element("authors").add_text(@authors.join(", "))
+    metadata.add_element("description").add_text(@description)
+    metadata.add_element("releaseNotes").add_text(@release_notes)
+    metadata.add_element("copyright").add_text(@copyright)
+    metadata.add_element("language").add_text(@language) if @language
+    metadata.add_element("licenseUrl").add_text(@license_url) if @license_url
+    metadata.add_element("projectUrl").add_text(@project_url) if @project_url
+    metadata.add_element("owners").add_text(@owners.join(", ")) if @owners
+    metadata.add_element("summary").add_text(@summary) if @summary
+    metadata.add_element("iconUrl").add_text(@icon_url) if @icon_url
+    metadata.add_element("requireLicenseAcceptance").add_text("true") if @require_license_acceptance
+    metadata.add_element("tags").add_text(@tags.join(" ")) if @tags
 
     if @dependencies.length > 0
-      depend = metadata.add_element('dependencies')
-      @dependencies.each {|x| x.render(depend)}
+      depend = metadata.add_element("dependencies")
+      @dependencies.each { |x| x.render(depend) }
     end
 
     if @files.length > 0
-      files = package.add_element('files')
-      @files.each {|x| x.render(files)}
+      files = package.add_element("files")
+      @files.each { |x| x.render(files) }
     end
 	
     if @frameworkAssemblies.length > 0
-      depend = metadata.add_element('frameworkAssemblies')
-      @frameworkAssemblies.each {|x| x.render(depend)}
+      depend = metadata.add_element("frameworkAssemblies")
+      @frameworkAssemblies.each { |x| x.render(depend) }
     end
 
     if @references.length > 0
-      depend = metadata.add_element('references')
-      @references.each {|x| x.render(depend)}
+      depend = metadata.add_element("references")
+      @references.each { |x| x.render(depend) }
     end
   end
 
   def check_required_field(field, fieldname)
-    raise "Nuspec: required field '#{fieldname}' is not defined" if field.nil?
-    true
+    raise "nuspec requires \"#{fieldname}\"" unless field
   end
 end