albacore 2.0.0.rc.7 → 2.0.0.rc.8

data/README.md

@@ -170,19 +170,37 @@ end
 
 ### Docs: nugets_pack
 
-TBD
+```
+nugets_pack :create_nugets do |p|
+  p.files   = FileList['src/**/*.{csproj,fsproj,nuspec}'].
+    exclude(/Tests/)
+  p.out     = 'build/pkg'
+  p.exe     = 'buildsupport/NuGet.exe'
+  p.with_metadata do |m|
+    m.description = 'A cool nuget'
+    m.authors = 'Henrik'
+    m.version = ENV['NUGET_VERSION']
+  end
+  p.with_package do |p|
+    p.add_file 'file/relative/to/proj', 'lib/net40'
+  end
+end
+```
 
-#### #no_project_dependencies
+#### nugets_pack Config##no_project_dependencies
 
 Cancel following of references between projects that cause nugets_pack to find and add as nuget dependencies, linked projects.
 
-```
-# TODO
-```
-
 ### Docs: nugets_restore
 
-TBD
+Enables nuget restore throughout the solution.
+
+```
+nugets_restore :restore do |p|
+  p.out = 'src/packages'
+  p.exe = 'buildsupport/NuGet.exe'
+end
+```
 
 ### Docs: asmver
 
@@ -203,7 +221,13 @@ end
 
 ### Docs: test_runner
 
-TBD
+```
+test_runner :tests do |tests|
+  tests.files = FileList['**/*.Tests/bin/Release/*.Tests.dll'] # dll files with test
+  tests.exe = 'src/packages/NUnit.Runners.2.5.3/tools/nunit-console.exe' # executable to run tests with
+  tests.copy_local # when running from network share
+end
+```
 
 ### Docs: nugets_authentication
 

data/albacore.gemspec

@@ -28,7 +28,6 @@ EOF
   s.add_dependency 'semver2', '~> 3.3'
   s.add_dependency 'ProcessPilot', '~> 2.0'
   s.add_dependency 'highline', '~> 1.6'
-  s.add_dependency 'rubyzip', '=0.9.9'
 	
   s.add_development_dependency 'rubygems-tasks', '~>0.2'
   s.add_development_dependency 'rspec', '>= 2.13'

data/lib/albacore/cross_platform_cmd.rb

@@ -68,13 +68,13 @@ module Albacore
     def system *cmd, &block
       raise ArgumentError, "cmd is nil" if cmd.nil? # don't allow nothing to be passed
       opts = Map.options((Hash === cmd.last) ? cmd.pop : {}). # same arg parsing as rake
-        apply(
-          silent: false,
-          output: true,
-          work_dir: FileUtils.pwd,
-          out: Albacore.application.output,
-          err: Albacore.application.output_err,
-          clr_command: false)
+        apply({
+          :silent => false,
+          :output => true,
+          :work_dir => FileUtils.pwd,
+          :out => Albacore.application.output,
+          :err => Albacore.application.output_err,
+          :clr_command => false })
 
       exe, pars, printable, block = prepare_command cmd, (opts.get('clr_command')), &block
 
@@ -101,16 +101,13 @@ module Albacore
 
         debug 'execute the new process, letting it write to the write FD (file descriptor)'
         @pid = Process.spawn(*[exe, *pars],
-          out:   write,
-        #  err:   ewrite,
-          chdir: opts.get(:work_dir))
+          { :out => write,
+            #:err => ewrite,
+            :chdir => opts.get(:work_dir) })
 
         debug 'waiting for process completion'
         _, status = Process.wait2 @pid
 
-        #debug 'waiting for thread completion'
-        #@out_thread.join
-
         return block.call(status.success? && inmem.string, status, inmem.string)
       end
     end  

data/lib/albacore/dsl.rb

@@ -66,11 +66,7 @@ module Albacore
       Albacore.define_task *args do
         c = Albacore::TestRunner::Config.new
         yield c
-
-        c.files.each { |dll|
-          command = Albacore::TestRunner::Cmd.new c.work_dir, c.exe, c.parameters, dll
-          Albacore::TestRunner::Task.new(command).execute
-        }
+        Albacore::TestRunner::Task.new(c.opts).execute
       end
     end
 

data/lib/albacore/ext/teamcity.rb

@@ -2,10 +2,13 @@ require 'albacore'
 
 module Albacore
   module Ext
+
     # The teamcity module writes appropriate build-script "interaction messages"
     # (see http://confluence.jetbrains.com/display/TCD7/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-artPublishing)
     # to STDOUT.
+    #
     module TeamCity
+
       # Escaped the progress message
       # (see http://confluence.jetbrains.com/display/TCD7/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ServiceMessages)
       # The Unicode symbol escape is not implemented
@@ -17,16 +20,18 @@ module Albacore
       # | (vertical bar)                           ||
       # [ (opening bracket)                        |[
       # ] (closing bracket)                        |]
+      #
       def self.escape message
         message.gsub(/([\[|\]|\|'])/, '|\1').gsub(/\n/, '|n').gsub(/\r/, '|r')
       end
+
       def self.configure
         Albacore.subscribe :artifact do |artifact|
           ::Albacore.puts "##teamcity[publishArtifacts '#{artifact.location}']"
         end
         Albacore.subscribe :build_version do |version|
           # tell teamcity our decision
-          ::Albacore.puts "##teamcity[buildNumber '#{version.build_version}']"
+          ::Albacore.puts "##teamcity[buildNumber '#{version.build_number}']"
         end
         Albacore.subscribe :progress do |p|
           # tell teamcity of our progress
@@ -41,13 +46,17 @@ module Albacore
           finish_progress p.message
         end
       end
+
       private
+
       PROGRESS_QUEUE = []
+
       # Starts a new progress block
       def self.start_progress(name)
         PROGRESS_QUEUE.push name
         ::Albacore.puts "##teamcity[progressStart '#{escape name}']"
       end
+
       # Finishes the progress block and all child progress blocks
       def self.finish_progress(name = '')
         loop do

data/lib/albacore/package.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+
+module Albacore
+  # a package encapsulates the properties of a set package with a 
+  # distinct path, version and id
+  class Package
+
+    # id of the package as known by nuget
+    attr_reader :id
+
+    # path of the package in question
+    attr_reader :path
+
+    # create a new package with the given id and path
+    def initialize id, path
+      @id = id
+      @path = path
+    end
+
+    def to_s
+      "Package[#{path}]"
+    end
+  end
+end

data/lib/albacore/package_repo.rb

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+require 'albacore/package'
+
+module Albacore
+  # a package repository is a location where the nugets or wraps are stored
+  class PackageRepo
+    include Logging
+
+    # initialize that package repository with a path to all the packages
+    def initialize path
+      @path = path
+    end
+
+    # find the latest package based on the package id
+    def find_latest pkg_id
+      trace "finding latest from #{@path}, id: #{pkg_id}"
+      sorted = Dir.glob(File.join(@path, "#{pkg_id}*/**/*.dll")) # find the latest
+      path = sorted.first
+      Package.new pkg_id, path
+    end
+  end
+end
+

data/lib/albacore/project.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'albacore/logging'
 require 'albacore/semver'
+require 'albacore/package_repo'
 
 module Albacore
 
@@ -58,12 +59,21 @@ module Albacore
       nil
     end
 
+    # This is the output path if the project file doens't have a configured
+    # 'Configuration' condition like all default project files have that come
+    # from Visual Studio/Xamarin Studio.
     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
+
+    # Gets the relative location (to the project base path) of the dll
+    # that it will output
+    def output_dll conf
+      Paths.join(output_path(conf) || fallback_output_path, "#{asmname}.dll")
+    end
     
     # find the NodeList reference list
     def find_refs
@@ -122,7 +132,7 @@ module Albacore
     # returns enumerable Package
     def find_packages
       declared_packages.collect do |package|
-        guess = PackageRepo.new('./src/packages').find_latest package['id']
+        guess = ::Albacore::PackageRepo.new('./src/packages').find_latest package.id
         debug "#{name}: guess: #{guess} [albacore: project]"
         guess
       end
@@ -134,8 +144,9 @@ module Albacore
     end
     
     # save the xml
-    def save
-      File.open(path, 'w') { |f| @proj_xml_node.write_xml_to f }
+    def save(output = nil)
+      output = path unless output
+      File.open(output, 'w') { |f| @proj_xml_node.write_xml_to f }
     end
     
     # get the path of 'packages.config'

data/lib/albacore/task_types/asmver/cpp.rb

@@ -12,9 +12,18 @@ module Albacore::Asmver
     def build_attribute_re(attr_name)
       /^\[assembly: #{attr_name}(.+)/  
     end
+
+    def namespace_start ns
+      "namespace #{ns.gsub /\./, '::'} {"
+    end
+
+    def namespace_end
+      "}\n"
+    end
     
     def build_using_statement(namespace)
       "using namespace #{namespace.gsub(/\./, '::')};"
     end
+
   end
 end

data/lib/albacore/task_types/asmver/vb.rb

@@ -14,6 +14,14 @@ module Albacore::Asmver
       /^\<assembly: #{attr_name}(.+)/i  
     end
 
+    def namespace_start ns
+      ""
+    end
+
+    def namespace_end
+      ""
+    end
+
     # override
     def comment_singleline_token
       '\''

data/lib/albacore/task_types/test_runner.rb

@@ -1,5 +1,8 @@
-require 'rake'
 require 'set'
+require 'map'
+require 'tmpdir'
+require 'fileutils'
+require 'pathname'
 require 'albacore/cmd_config'
 require 'albacore/cross_platform_cmd'
 
@@ -10,15 +13,45 @@ module Albacore
       def initialize work_dir, executable, parameters, file
         @work_dir, @executable = work_dir, executable
         @parameters = parameters.to_a.unshift(file)
-        mono_command
       end
+
       def execute
-        system @executable, @parameters, :work_dir => @work_dir
+        system @executable,
+          @parameters,
+          :work_dir    => @work_dir,
+          :clr_command => true
       end
     end
+
+    # the configuration object for the test runner
     class Config
       include CmdConfig
+
+      # give this property the list of dlls you want to test
       attr_writer :files
+
+      # constructor, no parameters
+      def initialize
+        @copy_local = false
+        @files = []
+      end
+
+      # gets the configured options
+      def opts
+        Map.new(
+          :files      => files,
+          :copy_local => @copy_local,
+          :exe        => @exe)
+      end
+
+      # mark that it should be possible to copy the test files local
+      # -- this is great if you are running a VM and the host disk is
+      # mapped as a network drive, which crashes some test runners
+      def copy_local
+        @copy_local = true
+      end
+
+      private
       def files
         if @files.respond_to? :each
           @files
@@ -27,12 +60,51 @@ module Albacore
         end
       end
     end
+
     class Task
-      def initialize command_line
-        @command_line = command_line
+      include Logging
+
+      def initialize opts
+        @opts = opts
       end
+
       def execute
-        @command_line.execute
+        raise ArgumentError, 'missing :exe' unless @opts.get :exe
+        raise ArgumentError, 'missing :files' unless @opts.get :files
+        @opts.get(:files).each do |dll|
+          raise ArgumentError, "could not find test dll '#{dll}' in dir #{FileUtils.pwd}" unless File.exists? dll
+          execute_tests_for dll
+        end
+      end
+
+      private
+      def execute_tests_for dll
+        handle_directory dll, @opts.get(:exe) do |dir, exe|
+          filename = File.basename dll
+          cmd = Albacore::TestRunner::Cmd.new dir, exe, @opts.get(:parameters, []), filename
+          cmd.execute
+        end
+      end
+      def handle_directory dll, exe, &block
+        if @opts.get(:copy_local)
+          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 }
+
+            sut_glob = Paths.join(File.dirname(dll), '*').as_unix.to_s
+            debug { "copying recursively from #{sut_glob} [test_runner #handle_directory]" }
+            FileUtils.cp_r(Dir.glob(sut_glob), sut, :verbose => true)
+
+            runners_glob = Paths.join(File.dirname(exe), '*').as_unix.to_s
+            debug { "copying the runners form #{runners_glob} [test_runner #handle_directory]" }
+            FileUtils.cp_r(Dir.glob(runners_glob), runners, :verbose => true)
+
+            # call back with the new paths
+            yield [sut, Paths.join(runners, File.basename(exe)).to_s]
+          end
+        else
+          yield [File.dirname(dll), exe]
+        end
       end
     end
   end

data/lib/albacore/tasks/versionizer.rb

@@ -22,28 +22,39 @@ module Albacore
       #
       def self.new *sym
         ver = XSemVer::SemVer.find
-        revision = (ENV['BUILD_NUMBER'] || ver.patch).to_i
-        ver = XSemVer::SemVer.new(ver.major, ver.minor, revision, ver.special)
+        ver.patch = (ENV['BUILD_NUMBER'] || ver.patch).to_i
+        version_data = versions(ver, &method(:commit_data))
         
-        # extensible number w/ git hash
-        ENV['BUILD_VERSION'] = ver.format("%M.%m.%p%s") + ".#{commit_data()[0]}"
-        
-        # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
-        ENV['NUGET_VERSION'] = ver.format("%M.%m.%p%s")
-        
-        # purely M.m.p format
-        ENV['FORMAL_VERSION'] = "#{ XSemVer::SemVer.new(ver.major, ver.minor, revision).format "%M.%m.%p"}"
-        
-        body = proc {
-          Albacore.publish :build_version, OpenStruct.new(
-            :build_number   => revision,
-            :build_version  => ENV['BUILD_VERSION'],
-            :semver         => ver,
-            :formal_version => ENV['FORMAL_VERSION']
-          )
-        }
+        Albacore.subscribe :build_version do |data|
+          ENV['BUILD_VERSION']  = data.build_version
+          ENV['NUGET_VERSION']  = data.nuget_version
+          ENV['FORMAL_VERSION'] = data.formal_version
+          ENV['LONG_VERSION']   = data.long_version
+        end
 
-        Albacore.define_task *sym, &body
+        Albacore.define_task(*sym) do
+          Albacore.publish :build_version, OpenStruct.new(version_data)
+        end
+      end
+
+      def self.versions semver, &commit_data
+        {
+          # just a monotonic inc
+          :build_number   => semver.patch,
+          :semver         => semver,
+
+          # purely M.m.p format
+          :formal_version => "#{ XSemVer::SemVer.new(semver.major, semver.minor, semver.patch).format "%M.%m.%p"}",
+
+          # four-numbers version, useful if you're dealing with COM/Windows
+          :long_version   => "#{semver.format '%M.%m.%p'}.0",
+
+          # extensible number w/ git hash
+          :build_version  => semver.format("%M.%m.%p%s") + ".#{yield[0]}",
+
+          # nuget (not full semver 2.0.0-rc.1 support) see http://nuget.codeplex.com/workitem/1796
+          :nuget_version  => semver.format("%M.%m.%p%s")
+        }
       end
 
       # load the commit data
@@ -53,10 +64,10 @@ module Albacore
         begin
           commit = `git rev-parse --short HEAD`.chomp()[0,6]
           git_date = `git log -1 --date=iso --pretty=format:%ad`
-          commit_date = DateTime.parse( git_date ).strftime("%Y-%m-%d %H%M%S")
-        rescue Exception => e
+          commit_date = DateTime.parse( git_date ).strftime("%Y-%m-%d %H:%M:%S")
+        rescue
           commit = (ENV['BUILD_VCS_NUMBER'] || "000000")[0,6]
-          commit_date = Time.new.strftime("%Y-%m-%d %H%M%S")
+          commit_date = Time.new.strftime("%Y-%m-%d %H:%M:%S")
         end
         [commit, commit_date]
       end

data/lib/albacore/tools/restore_hint_paths.rb

@@ -5,39 +5,10 @@ require 'pathname'
 require 'rake'
 require 'albacore/logging'
 require 'albacore/project'
+require 'albacore/package'
+require 'albacore/package_repo'
 
 module Albacore::Tools
-  # a package repository is a location where the nugets or wraps are stored
-  class PackageRepo
-    include Logging
-    # initialize that package repository with a path to all the packages
-    def initialize path
-      @path = path
-    end
-    # find the latest package based on the package id
-    def find_latest pkg_id
-      trace "finding latest from #{@path}, id: #{pkg_id}"
-      sorted = Dir.glob(File.join(@path, "#{pkg_id}*/**/*.dll")) # find the latest
-      path = sorted.first
-      Package.new pkg_id, path
-    end
-  end
-
-  # a package encapsulates the properties of a set package with a 
-  # distinct path, version and id
-  class Package
-    attr_reader :id, :path
-    def initialize id, path
-      @id = id
-      @path = path
-    end
-    def path
-      @path
-    end
-    def to_s
-      "Package[#{@path}]"
-    end
-  end
 
   # a tuple of a package and a ref
   class MatchedRef
@@ -46,7 +17,6 @@ module Albacore::Tools
       @package, @ref = package, ref
     end
   end
-
   
   module RestoreHintPaths
     class Config

data/lib/albacore/version.rb

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

data/spec/asmver_spec.rb

@@ -5,15 +5,18 @@ include Albacore::Asmver
 
 %w|Fs Vb Cpp Cs|.each do |lang|
   require "albacore/task_types/asmver/#{lang.downcase}"
+
   describe "the #{lang} engine" do
     subject do
       "Albacore::Asmver::#{lang}".split('::').inject(Object) { |o, c| o.const_get c }.new
     end
+
     %w|build_attribute build_named_parameters build_positional_parameters build_using_statement build_comment namespace_end namespace_start|.each do |m|
       it "should have a public API ##{m.to_s}" do
         should respond_to(:"#{m}")
       end
     end
+
     describe 'when building version attribute' do
       let :version do
         subject.build_attribute 'AssemblyVersion', '0.2.3'
@@ -28,6 +31,7 @@ include Albacore::Asmver
         version.should include('assembly: ')
       end
     end
+
     describe 'when building using statement' do
       let :using do
         subject.build_using_statement 'System.Runtime.CompilerServices'
@@ -36,6 +40,7 @@ include Albacore::Asmver
         using.should =~ /System.{1,2}Runtime.{1,2}CompilerServices/
       end
     end
+
     describe 'when building named parameters' do
       let :plist do
         subject.build_named_parameters milk_cows: true, birds_fly: false, hungry_server: 'sad server'
@@ -44,6 +49,7 @@ include Albacore::Asmver
         plist.should =~ /milk_cows .{1,2} true. birds_fly .{1,2} false. hungry_server .{1,2} "sad server"/
       end
     end
+
     describe 'when building positional parameters' do
       let :plist do
         subject.build_positional_parameters ((%w|a b c hello|) << false)
@@ -52,6 +58,7 @@ include Albacore::Asmver
         plist.should eq('"a", "b", "c", "hello", false')
       end
     end
+
     describe 'when building single line comment' do
       let :comment do
         subject.build_comment 'this is my comment'
@@ -70,6 +77,7 @@ include Albacore::Asmver
         comment.should =~ expected
       end
     end
+
     describe 'when building a multi-line comment' do
       let :comment do
         subject.build_comment %{This is a very interesting comment
@@ -97,8 +105,28 @@ on many lines}
         comment.should eq(expected)
       end
     end
+
+    describe 'when building namespace' do
+      let :ns do
+        subject.send :namespace_start, 'This.Ns.Here'
+      end
+      it 'should include the string verbatim' do
+        ns =~ /This\.Ns\.Here/
+      end
+      let :expected do
+        { 'Fs' => %r{namespace This\.Ns\.Here},
+          'Vb' => %r{^$},
+          'Cs' => %r{^$},
+          'Cpp' => %r{namespace This::Ns::Here \{}
+        }[lang]
+      end
+      it 'should include the correct syntax for single line comment' do
+        ns.should =~ expected
+      end
+    end
   end
 end
+
 describe FileGenerator do
   subject do FileGenerator.new(Fs.new, 'MyNamespace.Here', {}) end
   it do
@@ -108,6 +136,7 @@ describe FileGenerator do
     FileGenerator.new(Fs.new, '', {})
   end
 end
+
 describe FileGenerator, 'when generating F# file' do
   before :all do
     @out = StringIO.new
@@ -153,6 +182,7 @@ describe FileGenerator, 'when generating F# file' do
     generated.should =~ /\(\)(\r\n?|\n)$/m
   end
 end
+
 describe FileGenerator do
   before :all do
     @out = StringIO.new

data/spec/package_repo_spec.rb

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

data/spec/package_spec.rb

@@ -0,0 +1,25 @@
+require 'albacore/package'
+
+describe ::Albacore::Package do
+  subject do
+    Package.new 'NLog', 'path/to/asm.dll'
+  end
+  it do
+    should respond_to :id
+  end
+  it do
+    should respond_to :path
+  end
+  it do
+    should respond_to :to_s
+  end
+  it 'has id' do
+    subject.id.should eq 'NLog'
+  end 
+  it 'has path' do
+    subject.path.should eq 'path/to/asm.dll'
+  end
+  it 'formats with #to_s' do
+    subject.to_s.should eq 'Package[path/to/asm.dll]'
+  end
+end

data/spec/project_spec.rb

@@ -45,9 +45,11 @@ describe Albacore::Project, "when loading packages.config" do
 end
 
 describe Albacore::Project, "when reading project file" do
+  def project_path
+    File.expand_path('../testdata/Project/Project.fsproj', __FILE__)
+  end
   subject do
-    p = File.expand_path('../testdata/Project/Project.fsproj', __FILE__)
-    Albacore::Project.new(p)
+    Albacore::Project.new project_path
   end
   let :library1 do
     subject.included_files.find { |p| p.include == 'Library1.fs' }
@@ -55,7 +57,42 @@ describe Albacore::Project, "when reading project file" do
   it "should contain library1" do
     library1.should_not be_nil
   end
+
+  describe 'public API' do
+    it do
+      subject.should respond_to(:name)
+    end
+    it do
+      subject.should respond_to(:asmname)
+    end
+    it do
+      subject.should respond_to(:version)
+    end
+    it do
+      subject.should respond_to(:authors)
+    end
+    it 'should have five referenced assemblies' do
+      subject.find_refs.length.should eq(5)
+    end
+    it 'knows about referenced packages' do
+      subject.should respond_to(:declared_packages)
+    end
+    it 'knows about referenced projects' do
+      subject.should respond_to(:declared_projects)
+    end
+    it 'should have three referenced packages' do
+      expected = %w|Intelliplan.Util Newtonsoft.Json NLog|
+      subject.find_packages.map(&:id).should eq(expected)
+    end
+
+    # TODO: check whether output is DLL or EXE or something else
+    it 'should know its output dll' do
+      should respond_to :output_dll
+      subject.output_dll('Release').should eq(Paths.join 'bin', 'Release', 'Project.dll')
+    end
+  end
 end
+
 describe Albacore::Project, 'when given a PathnameWrap' do
   it 'should allow argument of PathnameWrap' do
     require 'albacore/paths'

data/spec/tasks/versionizer_spec.rb

@@ -1,5 +1,6 @@
 require 'albacore'
 require 'albacore/tasks/versionizer'
+require 'xsemver'
 
 describe 'adding versionizer to a class' do
   class VersioniserUsage
@@ -15,3 +16,49 @@ describe 'adding versionizer to a class' do
     end
   end
 end
+
+describe 'finding build versions' do
+  subject do
+    ver = XSemVer::SemVer.new(1, 2, 3, 'deadbeef')
+    ::Albacore::Tasks::Versionizer.versions ver do
+      ['123456', '2014-02-27 16:55:55']
+    end
+  end
+
+  it 'should return a hash' do
+    subject.should be_a(Hash)
+  end
+
+  it 'should return the correct build number' do
+    subject[:build_number].should eq(3)
+  end
+
+  it 'should return the same semver' do
+    subject[:semver].should eq(::XSemVer::SemVer.new(1, 2, 3, 'deadbeef'))
+  end
+
+  it 'should return the correct long_version' do
+    subject[:long_version].should eq('1.2.3.0')
+  end
+
+  it 'should return the correct formal_version' do
+    subject[:formal_version].should eq('1.2.3')
+  end
+
+  it 'should return a build_version' do
+    subject[:build_version].should_not be_nil
+  end
+
+  it 'should return a build_version with correct hash/special substring' do
+    subject[:build_version].should eq('1.2.3-deadbeef.123456')
+  end
+
+  it 'should return a nuget_version' do
+    subject[:nuget_version].should_not be_nil
+  end
+
+  it 'should return a proper semver nuget version' do
+    subject[:nuget_version].should eq('1.2.3-deadbeef')
+  end
+end
+

data/spec/test_runner_spec.rb

@@ -0,0 +1,38 @@
+require 'albacore/task_types/test_runner'
+require 'map'
+
+describe ::Albacore::TestRunner::Config do
+  it do
+    should respond_to :opts
+  end
+  it do
+    should respond_to :files=
+  end
+  it do
+    should_not respond_to :files
+  end
+  it do
+    should respond_to :copy_local
+  end
+  it do
+    should respond_to :exe=
+  end
+end
+
+describe ::Albacore::TestRunner::Cmd do
+  subject do
+    ::Albacore::TestRunner::Cmd.new 'work_dir', 'run-tests.exe', %w[params go here], 'lib.tests.dll'
+  end
+  it do
+    should respond_to :execute
+  end
+end
+
+describe ::Albacore::TestRunner::Task do
+  subject do
+    ::Albacore::TestRunner::Task.new Map.new
+  end
+  it do
+    should respond_to :execute
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.7
+  version: 2.0.0.rc.8
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,22 +124,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +189,8 @@ files:
 - lib/albacore/facts.rb
 - lib/albacore/logging.rb
 - lib/albacore/nuget_model.rb
+- lib/albacore/package.rb
+- lib/albacore/package_repo.rb
 - lib/albacore/paths.rb
 - lib/albacore/project.rb
 - lib/albacore/rake_overrides.rb
@@ -242,6 +228,8 @@ files:
 - spec/nuget_model_spec.rb
 - spec/nugets_pack_spec.rb
 - spec/nugets_restore_spec.rb
+- spec/package_repo_spec.rb
+- spec/package_spec.rb
 - spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj
@@ -275,6 +263,7 @@ files:
 - spec/support/returnstatus/returnstatus.pdb
 - spec/support/sh_interceptor.rb
 - spec/tasks/versionizer_spec.rb
+- spec/test_runner_spec.rb
 - spec/testdata/.gitignore
 - spec/testdata/DebugProject/.gitignore
 - spec/testdata/DebugProject/Degbu.fsproj
@@ -327,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1819249028440337935
+      hash: 3238636988153789761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -354,6 +343,8 @@ test_files:
 - spec/nuget_model_spec.rb
 - spec/nugets_pack_spec.rb
 - spec/nugets_restore_spec.rb
+- spec/package_repo_spec.rb
+- spec/package_spec.rb
 - spec/paths_spec.rb
 - spec/project_spec.rb
 - spec/projectlint/added_but_not_on_filesystem/aproject.csproj
@@ -387,6 +378,7 @@ test_files:
 - spec/support/returnstatus/returnstatus.pdb
 - spec/support/sh_interceptor.rb
 - spec/tasks/versionizer_spec.rb
+- spec/test_runner_spec.rb
 - spec/testdata/.gitignore
 - spec/testdata/DebugProject/.gitignore
 - spec/testdata/DebugProject/Degbu.fsproj