albacore 2.0.0.rc.9 → 2.0.0.rc.10

data/lib/albacore/application.rb

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

data/lib/albacore/ext/teamcity.rb

@@ -31,7 +31,9 @@ module Albacore
         end
         Albacore.subscribe :build_version do |version|
           # tell teamcity our decision
-          ::Albacore.puts "##teamcity[buildNumber '#{version.build_number}']"
+          ::Albacore.puts "##teamcity[buildNumber '#{version.build_number}']" # available as 'build.number' in TC
+          ::Albacore.puts "##teamcity[setParameter name='build.version' value='#{version.build_version}']"
+          ::Albacore.puts "##teamcity[setParameter name='build.version.formal' value='#{version.formal_version}']"
         end
         Albacore.subscribe :progress do |p|
           # tell teamcity of our progress

data/lib/albacore/package_repo.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require 'albacore/logging'
 require 'albacore/package'
 
 module Albacore

data/lib/albacore/paths.rb

@@ -1,12 +1,63 @@
 # -*- encoding: utf-8 -*-
 
 require 'rake'
+require 'pathname'
+
 require 'albacore/albacore_module'
 require 'albacore/logging'
-require 'pathname'
 
 # module methods for handling paths
-module Albacore::Paths
+module Paths
+  extend 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
+
   class PathnameWrap
     include ::Albacore::Logging
 
@@ -36,7 +87,7 @@ module Albacore::Paths
     end
 
     def to_s
-      Paths.normalise_slashes p
+      ::Albacore::Paths.normalise_slashes p
     end
 
     def ==(o)
@@ -55,59 +106,9 @@ module Albacore::Paths
       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
-
+module Albacore::Paths
+  self.extend ::Paths
+end

data/lib/albacore/rake_overrides.rb

@@ -7,14 +7,14 @@ module ::Rake
 
     # 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
+      ::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())
+      ::Paths::PathnameWrap.new(old_original_dir())
     end
   end
 end

data/lib/albacore/task_types/test_runner.rb

@@ -87,6 +87,8 @@ module Albacore
       end
       def handle_directory dll, exe, &block
         if @opts.get(:copy_local)
+          # TODO: #mktmpdir is not always reliable; consider contributing a patch to ruby?
+          # Fails sometimes with "directory already exists"
           Dir.mktmpdir 'alba-test' do |dir|
             sut, runners = Paths.join(dir, 'sut').to_s, Paths.join(dir, 'runners').to_s
             [sut, runners].each { |d| FileUtils.mkdir_p d }

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.9"
+  VERSION = "2.0.0.rc.10"
 end

data/spec/package_repo_spec.rb

@@ -2,7 +2,7 @@ require 'albacore/package_repo'
 
 describe ::Albacore::PackageRepo do
   subject do
-    PackageRepo.new '.'
+    Albacore::PackageRepo.new '.'
   end
   it 'can find latest amongst a number of packages in the repo' do
     should respond_to(:find_latest)

data/spec/package_spec.rb

@@ -2,7 +2,7 @@ require 'albacore/package'
 
 describe ::Albacore::Package do
   subject do
-    Package.new 'NLog', 'path/to/asm.dll'
+    Albacore::Package.new 'NLog', 'path/to/asm.dll'
   end
   it do
     should respond_to :id

data/spec/paths_spec.rb

@@ -1,6 +1,6 @@
 require 'albacore/paths'
 
-describe ::Albacore::Paths.method(:join), 'when joining path segments' do
+describe Paths.method(:join), 'when joining path segments' do
   let :s do
     Paths.separator
   end
@@ -81,7 +81,7 @@ describe ::Albacore::Paths.method(:join), 'when joining path segments' do
   end
 end
 
-describe ::Albacore::Paths.method(:join_str), 'when joining path segments' do
+describe Paths.method(:join_str), 'when joining path segments' do
   let :s do
     Paths.separator
   end

data/spec/project_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'albacore/semver'
 require 'albacore/project'
+require 'albacore/paths'
 
 describe Albacore::Project, "when loading packages.config" do
   subject do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.9
+  version: 2.0.0.rc.10
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3459761293197322545
+      hash: 996579621817901824
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks