albacore 2.0.0.rc.6 → 2.0.0.rc.7

data/README.md

@@ -1,10 +1,10 @@
 # Albacore
 
-[![Build Status](https://secure.travis-ci.org/Albacore/albacore.png?branch=clean_slate)](http://travis-ci.org/Albacore/albacore)
+[![Build Status](https://secure.travis-ci.org/Albacore/albacore.png?branch=master)](http://travis-ci.org/Albacore/albacore)
 
 Version 2.0 of Albacore.
 
-This branch is the next official version. It is currently being used for
+It is currently being used for
 numerous builds for us and is free of known bugs. It works on RMI 1.9.3 and RMI
 2.0.
 
@@ -32,7 +32,7 @@ build will use. Create a new file, named `Gemfile`. This file should look like
 this:
 
     source 'http://rubygems.org'
-    gem 'albacore', '2.0.0.rc.5'
+    gem 'albacore', '2.0.0.rc.7'
 
 When setting up your build you need to ensure it is reproducible.  Bundler
 allows you to lock down all gems that albacore depend on to their specific
@@ -152,7 +152,21 @@ and methods in the DSL you get when you do `require 'albacore'`
 
 ### Docs: build
 
-TBD
+``` ruby
+require 'albacore'
+build :compile_this do |b|
+  b.file   = Paths.join 'src', 'MyProj.fsproj' # the file that you want to build
+  # b.sln  = Paths.join 'src', 'MyProj.sln'    # alt. name
+  b.target = ['Clean', 'Rebuild']              # call with an array of targets or just a single target
+  b.prop 'Configuration', 'Release'            # call with 'key, value', to specify a MsBuild property
+  b.cores = 4                                  # no of cores to build with, defaults to the number of cores on your machine
+  b.clp 'ShowEventId'                          # any parameters you want to pass to the console logger of MsBuild
+  b.logging = 'verbose'                          # verbose logging mode
+  # b.be_quiet                                 # opposite of the above
+  b.no_logo                                    # no Microsoft/XBuild header output
+end
+
+```
 
 ### Docs: nugets_pack
 
@@ -200,7 +214,7 @@ TBD
 Tasks are things you can include that create singleton ruby tasks that are
 pre-named and pre-made. As opposed to the task types, these are 'includeable'.
 More info can be found in the
-[README](https://github.com/Albacore/albacore/blob/clean_slate/lib/albacore/tasks/README.md).
+[README](https://github.com/Albacore/albacore/blob/master/lib/albacore/tasks/README.md).
 
 ### Versionizer
 

data/lib/albacore.rb

@@ -1,5 +1,6 @@
 require 'albacore/version'
 require 'albacore/albacore_module'
+require 'albacore/rake_overrides'
 require 'albacore/dsl'
 
 module Albacore

data/lib/albacore/albacore_module.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require 'albacore/application'
 require 'albacore/logging'
 

data/lib/albacore/application.rb

@@ -1,4 +1,5 @@
 require 'rake'
+
 module Albacore
   class Application
 

data/lib/albacore/cross_platform_cmd.rb

@@ -81,7 +81,7 @@ module Albacore
       # TODO: figure out how to interleave output and error streams
       out, _, inmem = opts.get(:out), opts.get(:err), StringIO.new
 
-      trace { "system( exe=#{exe}, pars=[#{pars.join(', ')}], options=#{opts.to_s}), in directory: #{opts.getopt(:workdir, '<<current>>')} [cross_platform_cmd #system]" }
+      trace { "system( exe=#{exe}, pars=[#{pars.join(', ')}], options=#{opts.to_s}), in directory: #{opts.getopt(:work_dir, '<<current>>')} [cross_platform_cmd #system]" }
 
       puts printable unless opts.get :silent, false # log cmd verbatim
 
@@ -111,7 +111,7 @@ module Albacore
         #debug 'waiting for thread completion'
         #@out_thread.join
 
-        return block.call(status.success? && inmem.string, status)
+        return block.call(status.success? && inmem.string, status, inmem.string)
       end
     end  
 
@@ -162,7 +162,7 @@ module Albacore
           end
         end
 
-        return block.call($? == 0 && lines, $?)
+        return block.call($? == 0 && lines, $?, lines)
       end
     end
     
@@ -173,7 +173,7 @@ module Albacore
     #    #exitstatus : Int
     #    #pid      : Int
     def shie *cmd, &block
-      block = lambda { |ok, status| ok } unless block_given?
+      block = lambda { |ok, status, output| ok } unless block_given?
       sh *cmd, &block
     end
     
@@ -196,7 +196,7 @@ module Albacore
     end
 
     def which executable
-      raise ArgumentError, "executable is nil" unless executable
+      raise ArgumentError, "executable to #which is nil" unless executable
 
       dir = File.dirname executable
       file = File.basename executable
@@ -247,16 +247,16 @@ module Albacore
     end
 
     def handler_with_message printable
-      lambda { |ok, status| ok or raise_failure(printable, status) }
+      lambda { |ok, status, output| ok or raise_failure(printable, status, output) }
     end
 
     # handles the errors from not finding the executable on the system
     def handle_not_found rescue_block
       yield
     rescue Errno::ENOENT => e
-      rescue_block.call(nil, PseudoStatus.new(127))
+      rescue_block.call(nil, PseudoStatus.new(127), e.to_s)
     rescue IOError => e # rescue for JRuby
-      rescue_block.call(nil, PseudoStatus.new(127)) 
+      rescue_block.call(nil, PseudoStatus.new(127), e.to_s) 
     end
 
 
@@ -264,11 +264,11 @@ module Albacore
       { 127 => 'number 127 in particular means that the operating system could not find the executable' }
     end
 
-    def raise_failure cmd, status
+    def raise_failure cmd, status, output
       if status.exitstatus == 127
         raise CommandNotFoundError.new(format_failure(cmd, status), cmd)
       else
-        raise CommandFailedError.new(format_failure(cmd, status), cmd)
+        raise CommandFailedError.new(format_failure(cmd, status), cmd, output)
       end
     end
 

data/lib/albacore/dsl.rb

@@ -1,4 +1,5 @@
 require 'albacore/cross_platform_cmd'
+require 'albacore/paths'
 
 module Albacore
   module DSL

data/lib/albacore/errors/command_failed_error.rb

@@ -3,9 +3,19 @@ module Albacore
 
     attr_reader :executable
 
-    def initialize message, executable
+    attr_reader :output
+
+    def initialize message, executable, output = nil
       super(message)
       @executable = executable
+      @output = output
+    end
+
+    def message
+      s = StringIO.new
+      s.puts super
+      s.puts output if output
+      s.string
     end
   end
 end

data/lib/albacore/logging.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
+
 require 'logger'
-require 'albacore/application'
+require 'albacore/albacore_module'
 
 module Albacore
   module Logging

data/lib/albacore/nuget_model.rb

@@ -335,7 +335,7 @@ end})
             verify_files:         false,
             nuget_dependencies:   true })
 
-        trace { "#from_xxproj opts: #{opts} [nuget model: package]" }
+        trace { "#from_xxproj proj: #{proj} opts: #{opts} [nuget model: package]" }
 
         version = opts.get :version
         package = Package.new
@@ -361,7 +361,7 @@ end})
           end
         end
 
-        output = proj.output_path(opts.get(:configuration))
+        output = get_output_path proj, opts
         target_lib = %W[lib #{opts.get(:dotnet_version)}].join(Albacore::Paths.separator)
 
         if opts.get :symbols 
@@ -401,6 +401,13 @@ end})
 
         package
       end
+      def self.get_output_path proj, opts
+        try = proj.try_output_path(opts.get(:configuration))
+        return try if try
+        warn 'using fallback output path'
+        proj.fallback_output_path
+      end
+
     end
   end
 end

data/lib/albacore/paths.rb

@@ -1,34 +1,113 @@
 # -*- encoding: utf-8 -*-
 
 require 'rake'
+require 'albacore/albacore_module'
+require 'albacore/logging'
+require 'pathname'
 
-module Albacore
-  # module methods for handling paths
-  module Paths
-    class << self
-      def separator
-        ::Rake::Win32.windows? ? '\\' : '/'
-      end
+# module methods for handling paths
+module Albacore::Paths
+  class PathnameWrap
+    include ::Albacore::Logging
 
-      # normalize the slashes of the path to what the operating system prefers
-      def normalise_slashes path
-        raise ArgumentError, "path is nil" if path.nil?
-        ::Rake::Win32.windows? ? path.gsub('/', '\\') : path.gsub('\\', '/')
-      end
+    # inner pathname
+    attr_reader :inner
 
-      def make_command executable, parameters
-        raise ArgumentError, "executable is nil" if executable.nil?
-        params = parameters.collect{|p| '"' + p + '"'}.join ' '
-        exe = normalise_slashes executable
-        %Q{"#{exe}" #{params}}
-      end
+    # string pathname
+    attr_reader :p
+
+    def initialize p
+      raise ArgumentError, 'p is nil' if p.nil?
+      @p = (p.is_a?(String) ? p : p.to_s)
+      @inner = Pathname.new @p
+    end
+
+    def parent
+      PathnameWrap.new(inner.parent)
+    end
+
+    def +(other)
+      join other
+    end
+
+    def join *other
+      args = other.collect { |x| x.is_a?(PathnameWrap) ? x.p : x }
+      PathnameWrap.new(inner.join(*args))
+    end
+
+    def to_s
+      Paths.normalise_slashes p
+    end
+
+    def ==(o)
+      trace { "#{self} ==( #{o} )" }
+      (o.respond_to? :p) && o.p == p
+    end
+
+    alias_method :eql?, :==
+
+    def hash
+      p.hash
+    end
 
-      def normalise executable, parameters
-        raise ArgumentError, "executable is nil" if executable.nil?
-        parameters = parameters.collect{ |p| (p === String) ? p : p.to_s }
-        exe = normalise_slashes executable
-        ["#{exe}", parameters]
+    # unwraps the pathname; defaults all return forward slashes
+    def as_unix
+      to_s.gsub /\\/, '/'
+    end
+  end
+
+  class << self
+
+    # returns the operating system separator character as a string
+    def separator
+      ::Albacore.windows? ? '\\' : '/'
+    end
+
+    # normalize the slashes of the path to what the operating system prefers
+    def normalise_slashes path
+      return path unless path.respond_to? :gsub
+      raise ArgumentError, "path is nil" if path.nil?
+      ::Rake::Win32.windows? ? path.gsub('/', '\\') : path.gsub('\\', '/')
+    end
+
+    # make a single string-command from a given executable string, by quoting each parameter
+    # individually. You can also use Albacore::CrossPlatformCmd#system given an array
+    # of 'stringly' things.
+    def make_command executable, parameters
+      raise ArgumentError, "executable is nil" if executable.nil?
+      params = parameters.collect{|p| '"' + p + '"'}.join ' '
+      exe = normalise_slashes executable
+      %Q{"#{exe}" #{params}}
+    end
+
+    # normalise slashes in an executable/parameters combo
+    def normalise executable, parameters
+      raise ArgumentError, "executable is nil" if executable.nil?
+      parameters = parameters.collect{ |p| (p === String) ? p : p.to_s }
+      exe = normalise_slashes executable
+      ["#{exe}", parameters]
+    end
+
+    # join an Enumerable of paths by normalising slashes on each of the segments, then
+    # joining them
+    def join *paths
+      raise ArgumentError, 'no paths given' if paths.nil?
+
+      joined = paths[1..-1].inject(PathnameWrap.new(normalise_slashes(paths[0]))) do |s, t|
+        s + normalise_slashes(t)
       end
+
+      PathnameWrap.new joined
+    end
+
+    # join an Enumerable of paths by normalising slashes on each of the segments, then
+    # joining them, returning a string
+    def join_str *paths
+      join(*paths).to_s
     end
   end
 end
+
+# Paths should be accessible if you require this file
+self.include Albacore
+

data/lib/albacore/project.rb

@@ -1,7 +1,14 @@
 require 'nokogiri'
+require 'albacore/logging'
 require 'albacore/semver'
 
 module Albacore
+
+  # error raised from Project#output_path if the given configuration wasn't
+  # found
+  class ConfigurationNotFoundError < ::StandardError
+  end
+
   # a project encapsulates the properties from a xxproj file.
   class Project
     include Logging
@@ -9,6 +16,7 @@ module Albacore
     attr_reader :proj_path_base, :proj_filename, :proj_xml_node
     
     def initialize proj_path
+      proj_path = proj_path.to_s unless proj_path.is_a? String
       @proj_xml_node = Nokogiri.XML(open(proj_path))
       @proj_path_base, @proj_filename = File.split proj_path
     end
@@ -34,14 +42,27 @@ module Albacore
       read_property "Authors"
     end 
 
-    # gets the output path of the project given the configuration
+    # gets the output path of the project given the configuration or raise
+    # an error otherwise
     def output_path conf
-      path = @proj_xml_node.css("Project PropertyGroup[Condition*=#{conf}] OutputPath")
-      debug "#{name}: output path node[#{conf}]: #{ (path.empty? ? 'empty' : path.inspect) } [albacore: project]"
+      try_output_path conf || raise(ConfigurationNotFoundError, "could not find configuration '#{conf}'")
+    end
+
+    def try_output_path conf
+      path = @proj_xml_node.css("Project PropertyGroup[Condition*='#{conf}|'] OutputPath")
+      # path = @proj_xml_node.xpath("//Project/PropertyGroup[matches(@Condition, '#{conf}')]/OutputPath")
+
+      debug { "#{name}: output path node[#{conf}]: #{ (path.empty? ? 'empty' : path.inspect) } [albacore: project]" }
+
       return path.inner_text unless path.empty?
+      nil
+    end
 
-      path = @proj_xml_node.css("Project PropertyGroup OutputPath")
-      path.inner_text
+    def fallback_output_path
+      fallback = @proj_xml_node.css("Project PropertyGroup OutputPath").first
+      condition = fallback.parent['Condition'] || 'No \'Condition\' specified'
+      warn "chose an OutputPath in: '#{self}' for Configuration: <#{condition}> [albacore: project]"
+      fallback.inner_text
     end
     
     # find the NodeList reference list

data/lib/albacore/rake_overrides.rb

@@ -0,0 +1,21 @@
+require 'albacore/paths'
+require 'albacore/albacore_module'
+
+module ::Rake
+  class << self
+    alias_method :old_original_dir, :original_dir
+
+    # get the original dir that rake was called from as a string
+    def albacore_original_dir *args
+      ::Albacore::Paths::PathnameWrap.new(old_original_dir(*args)).to_s
+    end
+
+    alias_method :original_dir, :albacore_original_dir
+
+    # get the original dir that rake was called from a Pathname
+    def original_dir_path
+      ::Albacore::Paths::PathnameWrap.new(old_original_dir())
+    end
+  end
+end
+

data/lib/albacore/task_types/build.rb

@@ -68,7 +68,7 @@ module Albacore
       # If you specify any targets by using this switch, they are run instead of any targets in the DefaultTargets attribute in the project file. For more information, see Target Build Order (http://msdn.microsoft.com/en-us/library/vstudio/ee216359.aspx) and How to: Specify Which Target to Build First (http://msdn.microsoft.com/en-us/library/vstudio/ms171463.aspx).
       # A target is a group of tasks. For more information, see MSBuild Targets (http://msdn.microsoft.com/en-us/library/vstudio/ms171462.aspx)."
       #
-      # t  :: the array or string target to add to the list of tarets to build
+      # t  :: the array or string target to add to the list of targets to build
       attr_path_accessor :target do |t|
         update_array_prop "target", method(:make_target), :targets, t
       end
@@ -99,6 +99,16 @@ module Albacore
         set_logging mode
       end
 
+
+      #  Gets or sets a target .NET Framework version to build the project with, which
+      #  enables an MSBuild task to build a project that targets a different version of
+      #  the .NET Framework than the one specified in the project. Valid values are 2.0,
+      #  3.0 and 3.5.
+      #
+      attr_path_accessor :tools_version do |t|
+        @parameters.add "/toolsversion:#{t}"
+      end
+
       # Specifies the number of parallel worker processes to build with
       # Defaults to the number of logical cores
       attr_path_accessor :cores do |num|
@@ -178,7 +188,7 @@ module Albacore
           %w{v4.0.30319 v4.0 v3.5 v2.0}.collect { |fw_ver|
             msb = File.join ENV['WINDIR'], 'Microsoft.NET', 'Framework', fw_ver, 'msbuild.exe'
             CrossPlatformCmd.which(msb) ? msb : nil
-          }.first
+          }.compact.first
         else
           nil
         end

data/lib/albacore/task_types/nugets_pack.rb

@@ -306,6 +306,7 @@ module Albacore
       end
 
       def write_nuspec! proj, nuspec, symbols
+        raise ArgumentError, "no nuspect metadata id, project at path: #{proj.proj_path_base}, nuspec: #{nuspec.inspect}" unless nuspec.metadata.id
         nuspec_path = File.join(proj.proj_path_base, nuspec.metadata.id + "#{ symbols ? '.symbols' : '' }.nuspec")
 
         File.write(nuspec_path, nuspec.to_xml)

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.6"
+  VERSION = "2.0.0.rc.7"
 end

data/spec/albacore_spec.rb

@@ -17,3 +17,4 @@ describe "pub sub" do
     ::Albacore.windows?.should_not be_nil
   end
 end
+

data/spec/build_spec.rb

@@ -7,7 +7,7 @@ describe 'build config' do
   subject do
     Albacore::Build::Config.new
   end
-  %w[file= sln= target target= logging logging= prop cores cores=].each do |writer|
+  %w[file= sln= target target= logging logging= prop cores cores= tools_version tools_version=].each do |writer|
     it "should have property :#{writer}" do
       subject.respond_to?(:"#{writer}").should be_true
     end
@@ -19,9 +19,11 @@ describe 'build config' do
   describe 'when setting properties' do
     before do
       subject.logging = 'minimal'
+      subject.tools_version = '3.5'
     end
     it do
       subject.parameters.should include('/verbosity:minimal')
+      subject.parameters.should include('/toolsversion:3.5')
     end
   end
 end
@@ -40,6 +42,7 @@ describe 'when running with sln' do
 
   before do
     cfg.sln = 'src/HelloWorld.sln'
+    cfg.target = %w|Clean Build|
     cmd.execute
   end
 
@@ -51,7 +54,7 @@ describe 'when running with sln' do
     subject.executable.should eq('xbuild')
   end
   it do
-    subject.parameters.should eq(%W|/verbosity:minimal #{path 'src/HelloWorld.sln'}|)
+    subject.parameters.should eq(%W|/verbosity:minimal #{path 'src/HelloWorld.sln'} /target:Clean;Build|)
   end
   it do
     subject.is_mono_command?.should be_false

data/spec/nuget_model_spec.rb

@@ -151,7 +151,6 @@ XML
   end
 end
 
-
 describe "when reading xml from a fsproj file into Project/Metadata" do
   let :projfile do
     curr = File.dirname(__FILE__)
@@ -189,7 +188,6 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
   end
 end
 
-
 describe Albacore::NugetModel::Package, "overriding metadata" do
   let :p1 do
     p = Albacore::NugetModel::Package.new.with_metadata do |m|
@@ -347,6 +345,12 @@ describe "creating nuget on dependent proj file" do
   end
 
   describe 'Release-only output' do
+    # In this case we only have a Release output, and the nuget should pick the
+    # single one that exists.
+    # The idea is that we should succeed rather than fail, to remove friction, but
+    # there should also be a warning about it in the output; that an OutputPath
+    # was selected from a specific configuration that wasn't configured in the
+    # task type.
     let :projfile do
       curr = File.dirname(__FILE__)
       File.join curr, "testdata", "EmptyProject", "EmptyProject.csproj"

data/spec/paths_spec.rb

@@ -0,0 +1,117 @@
+require 'albacore/paths'
+
+describe ::Albacore::Paths.method(:join), 'when joining path segments' do
+  let :s do
+    Paths.separator
+  end
+
+  let :sample do
+    subject.call(*%w|a b c|)
+  end
+
+  let :abc do
+    'a' + s + 'b' + s + 'c'
+  end
+
+  it 'should return id' do
+    subject.call('abc').to_s.should eq('abc')
+  end 
+
+  it 'should return with proper separator' do
+    sample.to_s.should eq('a' + s + 'b' + s + 'c')
+  end
+
+  it 'should be joinable' do
+    sample.join('d').to_s.should include(s)
+  end
+
+  it 'should be +-able' do
+    (sample + 'd').to_s.should include(s)
+  end
+
+  it 'can join with *' do
+    subject.call('a').join('*/').to_s.should eq('a' + s + '*' + s)
+  end
+
+  it 'accepts multiple paths' do
+    subject.call('a', 'b', 'c').to_s.should eq(abc)
+  end
+
+  it 'returns something accepting multiple paths' do
+    subject.call('a', 'b', 'c').join('d', 'e').to_s.should eq(abc + s + 'd' + s + 'e')
+  end
+
+  it 'should be presentable in "unix" style' do
+    sample.as_unix.to_s.should_not include('\\')
+  end
+
+  it 'should handle joining on a type like itself' do
+    sample.join(sample).to_s.should eq(abc + s + abc)
+    sample.join(sample, sample)
+  end
+
+  it 'should handle +-ing on a type like itself' do
+    sample + sample
+  end
+
+  it 'should handle joining with a Pathname' do
+    pending "don't know why not working" if Albacore.windows?
+    (sample.join Pathname.new('x')).should eq(Paths::PathnameWrap.new(abc + s + 'x'))
+  end
+
+  it 'should handle +-ing with a Pathname' do
+    pending "don't know why not working" if Albacore.windows?
+    (sample + Pathname.new('x')).should eq(Paths::PathnameWrap.new(abc + s + 'x'))
+  end
+
+  it do
+    sample.should respond_to(:hash)
+  end
+
+  it do
+    sample.should respond_to(:eql?)
+  end
+  
+  it 'joins with identity' do
+    subject.call(Paths::PathnameWrap.new(abc)).to_s.should eq(abc)
+  end
+
+  it 'joins with others' do
+    sample.join(Paths::PathnameWrap.new(abc)).to_s.should eq(abc + s + abc)
+  end
+end
+
+describe ::Albacore::Paths.method(:join_str), 'when joining path segments' do
+  let :s do
+    Paths.separator
+  end
+
+  it 'id' do
+    subject.call('.').should eq('.')
+  end
+
+  it 'id slash' do
+    subject.call('.', '/').should eq(s)
+  end
+
+  it 'id slash win' do
+    subject.call('.', '\\').should eq(s)
+  end
+
+  it 'id slash with root' do
+    subject.call('.', '/', '/b').should eq(s + 'b')
+  end
+
+  it 'id slash with root win' do
+    subject.call('.', '\\', '\\b').should eq(s + 'b')
+  end
+
+  it 'id double slash' do
+    subject.call('.', 'b/', 'c/').should eq('b' + s + 'c' + s)
+  end
+
+  it 'id double slash win' do
+    subject.call('.', 'b\\', 'c\\').should eq('b' + s + 'c' + s)
+  end
+end
+

data/spec/project_spec.rb

@@ -3,24 +3,62 @@ require 'albacore/semver'
 require 'albacore/project'
 
 describe Albacore::Project, "when loading packages.config" do
-  subject {
+  subject do
     p = File.expand_path('../testdata/Project/Project.fsproj', __FILE__)
     #puts "path: #{p}"
     Albacore::Project.new(p)
-  }
-  let(:nlog) { subject.declared_packages.find { |p| p.id == 'NLog' } }
-  it("should have three packages") { subject.declared_packages.length.should == 3 }
-  it("should contain NLog") { nlog.should_not be_nil }
-  it("should have a four number on NLog") { nlog.version.should eq("2.0.0.2000") }
-  it("should have a semver number") { nlog.semver.should eq(Albacore::SemVer.new(2, 0, 0)) }
+  end
+  let :nlog do
+    subject.declared_packages.find { |p| p.id == 'NLog' }
+  end
+  it 'should have an OutputPath' do
+    subject.output_path('Debug').should_not be_nil
+  end
+  it 'should have the correct OutputPath' do
+    subject.output_path('Debug').should eq('bin\\Debug\\')
+  end
+  it 'should also have a Release OutputPath' do
+    subject.output_path('Release').should eq('bin\\Release\\')
+    subject.try_output_path('Release').should eq('bin\\Release\\')
+  end
+  it 'should raise "ConfigurationNotFoundEror" if not found' do
+    begin
+      subject.output_path('wazaaa')
+    rescue ::Albacore::ConfigurationNotFoundError
+    end
+  end
+  it 'should return nil with #try_output_path(conf)' do
+    subject.try_output_path('weeeo').should be_nil
+  end
+  it "should have three packages" do
+    subject.declared_packages.length.should == 3
+  end
+  it "should contain NLog" do
+    nlog.should_not be_nil
+  end
+  it "should have a four number on NLog" do
+    nlog.version.should eq("2.0.0.2000")
+  end
+  it "should have a semver number" do
+    nlog.semver.should eq(Albacore::SemVer.new(2, 0, 0))
+  end
 end
 
 describe Albacore::Project, "when reading project file" do
-  subject {
+  subject do
     p = File.expand_path('../testdata/Project/Project.fsproj', __FILE__)
     Albacore::Project.new(p)
-  }
-  let(:library1) { subject.included_files.find { |p| p.include == 'Library1.fs' } }
-  it("should contain library1") { library1.should_not be_nil }
-
+  end
+  let :library1 do
+    subject.included_files.find { |p| p.include == 'Library1.fs' }
+  end
+  it "should contain library1" do
+    library1.should_not be_nil
+  end
+end
+describe Albacore::Project, 'when given a PathnameWrap' do
+  it 'should allow argument of PathnameWrap' do
+    require 'albacore/paths'
+    Albacore::Project.new(Paths::PathnameWrap.new(File.expand_path('../testdata/Project/Project.fsproj', __FILE__)))
+  end
 end

data/spec/rake_overrides_spec.rb

@@ -0,0 +1,21 @@
+require 'albacore/paths'
+require 'albacore/rake_overrides'
+
+describe 'when overriding rake' do
+  it 'has string return value by default' do
+    ::Rake.old_original_dir.should be_an_instance_of String
+  end
+
+  it 'should override Rake#original_dir so that includes separator chars' do
+    # assume we never test from root of file system:
+    ::Rake.original_dir.should include(Paths.separator)
+  end
+
+  it 'should have #original_dir_path' do
+    ::Rake.should respond_to(:original_dir_path)
+  end
+
+  it 'should have #original_dir_path().to_s include the separator' do
+    ::Rake.original_dir_path.to_s.should include(Paths.separator)
+  end
+end

data/spec/smoke_require_spec.rb

@@ -0,0 +1,5 @@
+require 'albacore'
+
+describe 'absolutely nothing' do
+  it 'should pass' do ; end
+end

data/spec/testdata/Project/Project.fsproj

@@ -23,6 +23,15 @@
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>bin\Debug\Project.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseXanna|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Project.xml</DocumentationFile>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
@@ -49,4 +58,4 @@
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
-</Project>
+</Project>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.6
+  version: 2.0.0.rc.7
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -189,7 +189,6 @@ files:
 - Guardfile
 - README.md
 - Rakefile
-- albacore-2.0.0.rc.5.gem
 - albacore.gemspec
 - lib/albacore.rb
 - lib/albacore/albacore_module.rb
@@ -208,6 +207,7 @@ files:
 - lib/albacore/nuget_model.rb
 - lib/albacore/paths.rb
 - lib/albacore/project.rb
+- lib/albacore/rake_overrides.rb
 - lib/albacore/semver.rb
 - lib/albacore/task_types/asmver.rb
 - lib/albacore/task_types/asmver/cpp.rb
@@ -242,6 +242,7 @@ files:
 - spec/nuget_model_spec.rb
 - spec/nugets_pack_spec.rb
 - spec/nugets_restore_spec.rb
+- spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj
 - spec/projectlint/correct/File.cs
@@ -254,7 +255,9 @@ files:
 - spec/projectlint/on_filesystem_but_not_added/Image.txt
 - spec/projectlint/on_filesystem_but_not_added/aproject.csproj
 - spec/projectlint_spec.rb
+- spec/rake_overrides_spec.rb
 - spec/shared_contexts.rb
+- spec/smoke_require_spec.rb
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
 - spec/support/Nuget/NuGet.exe
@@ -324,7 +327,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4498584903254051555
+      hash: 1819249028440337935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,6 +354,7 @@ test_files:
 - spec/nuget_model_spec.rb
 - spec/nugets_pack_spec.rb
 - spec/nugets_restore_spec.rb
+- spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj
 - spec/projectlint/correct/File.cs
@@ -363,7 +367,9 @@ test_files:
 - spec/projectlint/on_filesystem_but_not_added/Image.txt
 - spec/projectlint/on_filesystem_but_not_added/aproject.csproj
 - spec/projectlint_spec.rb
+- spec/rake_overrides_spec.rb
 - spec/shared_contexts.rb
+- spec/smoke_require_spec.rb
 - spec/smoke_spec.rb
 - spec/spec_helper.rb
 - spec/support/Nuget/NuGet.exe