albacore 2.6.4 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 569f47e4cc889df5d9202cf8a7a25e49d8ab10fe
-  data.tar.gz: fb33c7409649a6a79a51a45cc04913d26430a6fe
+  metadata.gz: 6fed563fd034b47695f62584a8742278ef369007
+  data.tar.gz: e4421db741ff0bde734b0a73f5c3b74b0863bbfa
 SHA512:
-  metadata.gz: 657d342f87d71efa8a73b7806cf22e6244f04c74a7cdca259daf1af0a1a858cc394dad2b5e10ef0fe2f23d5bb90d092255d6263b00f52217e808e26a5192e836
-  data.tar.gz: 78cc075bcdc8a0a081e0283f84f6a1970f30bff1660eb0f6fd4345c029b3cf5c24f06bbe7aefc5b86a24b3e83b829bfd8ce87451f4f5f7827c9c9efb374a6f90
+  metadata.gz: 4c592bb8fdde41fc4e0f2e2a8ee4a710f81e8b56a9129fd70ccaeb0b63912d0b9e91680334c340960405bd62ee34d00f0d606184e995a650934b82922500cc30
+  data.tar.gz: f1e6d65a43954c054c29c55de33597d4e95fddc0a29a20cc9924f3defd15436bd6fa9904db166e1bad1fa45265430dc786d93b4c5185250f8c015493740eecb0

data/lib/albacore/dsl.rb

@@ -75,17 +75,6 @@ module Albacore
       end
     end
 
-    # basically a command with some parameters; allows you to execute your
-    # tests with albacore
-    def test_runner *args, &block
-      require 'albacore/task_types/test_runner'
-      Albacore.define_task *args do |task_name, own_args|
-        c = Albacore::TestRunner::Config.new
-        yield c, own_args
-        Albacore::TestRunner::Task.new(c.opts).execute
-      end
-    end
-
     # Restore hint paths to registered nugets
     def restore_hint_paths *args, &block
       require 'albacore/tools/restore_hint_paths'

data/lib/albacore/nuget_model.rb

@@ -144,11 +144,13 @@ end})
                 x.dependency id: d.id, version: d.version
               }
             }
-            x.frameworkAssemblies {
-              @framework_assemblies.each { |k, d|
-                x.frameworkAssembly assemblyName: d.id, targetFramework: d.version
+            if @frameworkAssemblies.respond_to? :each
+              x.frameworkAssemblies {
+                @framework_assemblies.each { |k, d|
+                  x.frameworkAssembly assemblyName: d.id, targetFramework: d.version
+                }
               }
-            }
+            end
           }
         end
       end
@@ -386,8 +388,9 @@ end})
           end
         end
 
-        if opts.get :framework_dependencies
-          fd = opts.get :framework_dependencies
+
+        fd = opts.get :framework_dependencies
+        if fd && fd.respond_to?(:each)
           fd.each { |n, p|
             package.metadata.add_framework_dependency p.id, p.version
           }

data/lib/albacore/task_types/find_msbuild_versions.rb

@@ -20,6 +20,11 @@ module Albacore
     rescue
       error "failed to open HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions"
     end
+    
+    # MSBuild 15, assume default installation path
+    vs2017_dir = Dir[File.join(ENV['ProgramFiles(x86)'].gsub('\\', '/'), 'Microsoft Visual Studio', '2017', '*')].first
+    retval[15] = File.join(vs2017_dir, 'MSBuild', '15.0', 'Bin') unless vs2017_dir.nil?
+    
     return retval
   end
 end

data/lib/albacore/task_types/nugets_restore.rb

@@ -55,6 +55,7 @@ module Albacore
           @parameters = [%W{install #{opts.getopt(:pkgcfg)} -OutputDirectory #{opts.getopt(:out)} -source #{@opts[:source][:uri]}}, pars.to_a].flatten
         else
           @parameters = [%W{install #{opts.getopt(:pkgcfg)} -OutputDirectory #{opts.getopt(:out)}}, pars.to_a].flatten
+        end
 
         mono_command
       end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.6.4"
+  VERSION = "2.6.6"
 end

data/spec/dsl_spec.rb

@@ -14,7 +14,7 @@ end
 
 #puts "X has methods: #{X.new.private_methods.inspect}"
 
-%w[nugets_restore nugets_pack asmver build test_runner restore_hint_paths appspecs].each do |sym|
+%w[nugets_restore nugets_pack asmver build restore_hint_paths appspecs].each do |sym|
   method = :"#{sym}"
   describe "that #{method}(*args, &block) is included when doing `require 'albacore'`" do
     subject do

data/spec/nuget_model_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'shared_contexts'
 require 'albacore/paths'
 require 'albacore/nuget_model'
+require 'albacore/application'
 
 describe Albacore::NugetModel::Metadata do
   [ :id, :version, :authors, :title, :description, :summary, :language,
@@ -134,7 +135,8 @@ XML
   # on Windows this fails due to replacement of path separators (by design)
   unless ::Albacore.windows?
     it 'should generate the same (semantic) XML as above' do
-      expect(Nokogiri::XML(subject.to_xml, &:noblanks).to_xml).to eq(Nokogiri::XML(StringIO.new(xml), &:noblanks).to_xml)
+      expect(Nokogiri::XML(subject.to_xml, &:noblanks).to_xml).to \
+        eq(Nokogiri::XML(StringIO.new(xml), &:noblanks).to_xml)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.6
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,7 +170,6 @@ files:
 - "./lib/albacore/task_types/nugets_restore.rb"
 - "./lib/albacore/task_types/sql_cmd.rb"
 - "./lib/albacore/task_types/sql_package.rb"
-- "./lib/albacore/task_types/test_runner.rb"
 - "./lib/albacore/tasks/README.md"
 - "./lib/albacore/tasks/albasemver.rb"
 - "./lib/albacore/tasks/projectlint.rb"
@@ -347,7 +346,6 @@ files:
 - spec/test_appspecs/corp.service/corp.service.svc/App.config
 - spec/test_appspecs/corp.service/corp.service.svc/Program.fs
 - spec/test_appspecs/corp.service/corp.service.svc/corp.service.svc.fsproj
-- spec/test_runner_spec.rb
 - spec/testdata/.gitignore
 - spec/testdata/DebugProject/.gitignore
 - spec/testdata/DebugProject/Degbu.fsproj
@@ -601,7 +599,6 @@ test_files:
 - spec/test_appspecs/corp.service/corp.service.svc/App.config
 - spec/test_appspecs/corp.service/corp.service.svc/Program.fs
 - spec/test_appspecs/corp.service/corp.service.svc/corp.service.svc.fsproj
-- spec/test_runner_spec.rb
 - spec/testdata/.gitignore
 - spec/testdata/DebugProject/.gitignore
 - spec/testdata/DebugProject/Degbu.fsproj

data/lib/albacore/task_types/test_runner.rb

@@ -1,200 +0,0 @@
-require 'set'
-require 'map'
-require 'tmpdir'
-require 'fileutils'
-require 'pathname'
-require 'albacore/cmd_config'
-require 'albacore/cross_platform_cmd'
-require 'albacore/paths'
-
-module Albacore
-  module TestRunner
-    # the configuration object for the test runner
-    class Config
-      include CmdConfig
-      self.extend ConfigDSL
-
-      # give this property the list of dlls you want to test
-      attr_writer :files
-
-      # give this property the settings file for the dlls you want to test
-      attr_writer :settings
-
-      # constructor, no parameters
-      def initialize
-        @parameters = Set.new
-        @copy_local = false
-        @is_ms_test = false
-        @clr_command = true
-        @execute_as_batch = false
-        @files = []
-      end
-
-      # Gets the configured options from the test runner configuration.
-      #
-      def opts
-        Map.new(
-          :files => files,
-          :copy_local  => @copy_local,
-          :is_ms_test  => @is_ms_test, 
-          :exe         => @exe,
-          :parameters  => @parameters,
-          :clr_command => @clr_command,
-          :execute_as_batch => @execute_as_batch)
-      end
-
-      attr_path_accessor :settings do |s|
-        @parameters.add("/testsettings:#{s}")
-      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
-
-      # Call this on the confiuguration if you don't want 'mono' prefixed to the
-      # exe path on non-windows systems.
-      #
-      def native_exe
-        @clr_command = false
-      end
-
-      def is_ms_test
-        @is_ms_test = true
-      end 
-
-      # Will cause the executable to be run only once, testing all files as a batch.
-      def execute_as_batch
-        @execute_as_batch = true
-      end
-
-      private
-      def files
-        if @files.respond_to? :each
-          @files
-        else
-          [@files]
-        end
-      end
-    end
-
-    class Cmd
-      include CrossPlatformCmd
-
-      # expects both parameters and executable to be relative to the
-      # work_dir parameter
-      def initialize work_dir, executable, parameters, files, clr_command = true
-        @work_dir, @executable = work_dir, executable
-        if files.respond_to? :each
-          @parameters = files.to_a.concat(parameters.to_a)
-        else
-          @parameters = parameters.to_a.unshift(files)
-        end
-
-        @clr_command = clr_command
-      end
-
-      def execute
-        info { "executing in directory '#{@work_dir}'" }
-        system @executable,
-          @parameters,
-          :work_dir    => @work_dir,
-          :clr_command => @clr_command
-      end
-    end
-
-    class Task
-      include Logging
-
-      def initialize opts
-        @opts = opts
-      end
-
-      def execute
-        raise ArgumentError, 'missing :exe' unless @opts.get :exe
-        raise ArgumentError, 'missing :files' unless @opts.get :files
-        raise ArgumentError, 'cannot specify both execute_as_batch and is_ms_test' if @opts.get :execute_as_batch and @opts.get :is_ms_test
-        raise ArgumentError, 'cannot specify both execute_as_batch and is_ms_test' if @opts.get :execute_as_batch and @opts.get :copy_local
-
-        @opts.get(:files).each do |dll|
-          raise ArgumentError, "could not find test dll '#{dll}' in dir #{FileUtils.pwd}" unless File.exists? dll
-        end
-
-        commands = []
-        if @opts.get(:execute_as_batch)
-          commands = build_command_for_all_dlls
-        else
-          commands = @opts.get(:files).map { |dll| build_command_for dll }
-        end
-
-        execute_commands commands
-      end
-
-      private
-      def execute_commands commands
-        commands.each { |command| command.execute }
-      end
-
-      def build_command_for dll
-        handle_directory dll, @opts.get(:exe) do |dir, exe|
-          filename = File.basename dll
-          
-          if @opts.get(:is_ms_test)
-            filename = "/testcontainer:#{filename}"
-          end
-          Albacore::TestRunner::Cmd.new dir,
-                                        exe,
-                                        @opts.get(:parameters, []),
-                                        [filename],
-                                        @opts.get(:clr_command)
-        end
-      end
-
-      def build_command_for_all_dlls
-        command = Albacore::TestRunner::Cmd.new '.',
-                                                @opts.get(:exe),
-                                                @opts.get(:parameters, []),
-                                                @opts.get(:files),
-                                                @opts.get(:clr_command)
-        [command]
-      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 }
-
-            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, easy because we have copied everything
-            yield [sut, Paths.join(runners, File.basename(exe)).to_s]
-          end
-        else
-          dir, exe =
-            case File.dirname dll
-              when /^\.\./
-                # if the dll is negative to this Rakefile, use absolute paths
-                [Pathname.new(File.absolute_path(dll)), Pathname.new(File.absolute_path(exe))]
-              else 
-                # otherwise, please continue with the basics
-                [Paths.normalise_slashes(Pathname.new(File.dirname(dll))), Pathname.new(exe)]
-            end
-
-          exe_rel = (Pathname.new exe.to_s).absolute? ? exe : exe.relative_path_from(dir)
-          yield [File.dirname(dll), exe_rel.to_s]
-        end
-      end
-    end
-  end
-end

data/spec/test_runner_spec.rb

@@ -1,340 +0,0 @@
-require 'albacore/task_types/test_runner'
-require 'support/sh_interceptor'
-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
-  it do
-    should respond_to :native_exe
-  end
-  it do
-    should respond_to :execute_as_batch
-  end
-end
-
-describe ::Albacore::TestRunner::Config do
-  subject do
-    ::Albacore::TestRunner::Config.new
-  end
-
-  before :each do
-    subject.add_parameter '/TestResults=/b/c/d/e.xml'
-    subject.native_exe
-  end
-
-  it 'should have the appropriate parameter in #opts.get(:parameters)' do
-    expect(subject.opts.get(:parameters)).to include('/TestResults=/b/c/d/e.xml')
-  end
-
-  it 'should have clr_command=false' do
-    expect(subject.opts.get(:clr_command)).to be false
-  end
-end
-
-describe 'the order of which parameters are passed', ::Albacore::TestRunner::Config do
-  subject do
-    config = ::Albacore::TestRunner::Config.new
-    config.files = 'a/b/c/file.dll'
-    config.exe   = 'test-runner.exe'
-    config.add_parameter '/TestResults=abc.xml'
-    config
-  end
-
-  let :params do
-    subject.opts.get(:parameters)
-  end
-
-  it 'should first pass the flags' do
-    expect(params.first).to eq('/TestResults=abc.xml')
-  end
-
-  it 'should pass the file as a :files' do
-    expect(subject.opts.get(:files)).to eq(['a/b/c/file.dll'])
-  end
-end
-
-describe ::Albacore::TestRunner::Cmd do
-  subject do
-    cmd = ::Albacore::TestRunner::Cmd.new 'work_dir', 'run-tests.exe', %w[params go here], 'a/b/c/lib.tests.dll'
-    cmd.extend ShInterceptor
-    cmd.execute
-    cmd
-  end
-
-  it 'should include the parameters when executing' do
-    # the intersection of actual parameters with expected should eq expected
-    expect(subject.parameters - (subject.parameters - %w|params go here|)).
-      to eq(%w|params go here|)
-  end
-
-  it 'should give the full path when executing' do
-    expect((subject.parameters - %w|params go here|)).to eq(%w|a/b/c/lib.tests.dll|)
-  end
-end
-
-describe ::Albacore::TestRunner::Task, 'when configured improperly' do
-  context 'is_ms_test and execute_as_batch both specified' do
-    it 'should raise ArgumentError' do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'Rakefile' # not a real DLL, but we need something that exists
-      config.is_ms_test
-      config.execute_as_batch
-
-      task = ::Albacore::TestRunner::Task.new(config.opts)
-
-      expect {
-        task.execute
-      }.to raise_error(ArgumentError)
-    end
-  end
-
-  context 'copy_local and execute_as_batch both specified' do
-    it 'should raise ArgumentError' do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'Rakefile' # not a real DLL, but we need something that exists
-      config.copy_local
-      config.execute_as_batch
-
-      task = ::Albacore::TestRunner::Task.new(config.opts)
-
-      expect {
-        task.execute
-      }.to raise_error(ArgumentError)
-    end
-  end
-end
-
-describe ::Albacore::TestRunner::Task do
-  def create_task_that_intercepts_commands opts
-    task = ::Albacore::TestRunner::Task.new(config.opts)
-    def task.execute_commands commands
-      @commands = commands
-      commands.each { |command|
-        command.extend ShInterceptor
-        command.execute
-      }
-    end
-
-    def task.commands
-      @commands
-    end
-
-    task.execute
-    task
-  end
-
-  before(:context) do
-    Dir.chdir 'spec'
-  end
-
-  after(:context) do
-    Dir.chdir '..'
-  end
-
-  subject do
-    create_task_that_intercepts_commands config.opts
-  end
-
-  context "native_exe not specified" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'utils_spec.rb' # not a real DLL, but we need something that exists
-      config
-    end
-
-    it "should execute command as CLR command" do
-      expect(subject.commands[0].invocations[0].options[:clr_command]).to eq(true)
-    end
-
-    it "should include the file at the beginning of the command" do
-      expect(subject.commands[0].invocations[0].parameters.first).to eq('utils_spec.rb')
-    end
-  end
-
-  context "native_exe specified" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'utils_spec.rb' # not a real DLL, but we need something that exists
-      config.native_exe
-      config
-    end
-
-    it "should execute command as non-CLR command" do
-      expect(subject.commands[0].invocations[0].options[:clr_command]).to eq(false)
-    end
-
-    it "should include the file at the beginning of the command" do
-      expect(subject.commands[0].invocations[0].parameters.first).to eq('utils_spec.rb')
-    end
-  end
-
-  context "extra parameters and options specified" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'utils_spec.rb' # not a real DLL, but we need something that exists
-      config.add_parameter '/magic_parameter1'
-      config.add_parameter '/magic_parameter2'
-      config
-    end
-
-    it "should include the parameters at the end of the command" do
-      expect(subject.commands[0].invocations[0].parameters.last(2)).to eq(['/magic_parameter1', '/magic_parameter2'])
-    end
-
-    it "should include the file at the beginning of the command" do
-      expect(subject.commands[0].invocations[0].parameters.first).to eq('utils_spec.rb')
-    end
-  end
-
-  context "file is in current directory" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'utils_spec.rb' # not a real DLL, but we need something that exists
-      config
-    end
-
-    it "should run the command from the current directory" do
-      expect(subject.commands[0].invocations[0].options[:work_dir]).to eq('.')
-      expect(subject.commands[0].invocations[0].executable).to eq('test-runner.exe')
-    end
-
-    it "should reference the file without directory qualifiers" do
-      expect(subject.commands[0].invocations[0].parameters).to include 'utils_spec.rb'
-    end
-  end
-
-  context "file is in subdirectory" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = 'tools/fluent_migrator_spec.rb' # not a real DLL, but we need something that exists
-      config
-    end
-
-    it "should run the command from the subdirectory" do
-      expect(subject.commands[0].invocations[0].options[:work_dir]).to eq('tools')
-      expect(subject.commands[0].invocations[0].executable).to eq('../test-runner.exe')
-    end
-
-    it "should reference the file without directory qualifiers" do
-      expect(subject.commands[0].invocations[0].parameters).to include 'fluent_migrator_spec.rb'
-    end
-  end
-
-  context "file is in parent directory" do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = '../Rakefile' # not a real DLL, but we need something that exists
-      config
-    end
-
-    it "should run the command from the parent directory" do
-      expect(subject.commands[0].invocations[0].options[:work_dir]).to eq('..')
-      expect(subject.commands[0].invocations[0].executable).to eq('../spec/test-runner.exe')
-    end
-
-    it "should reference the file without directory qualifiers" do
-      expect(subject.commands[0].invocations[0].parameters).to include 'Rakefile'
-    end
-  end
-
-  context 'is_ms_test specified' do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.is_ms_test
-      config.files = 'utils_spec.rb' # not a real DLL, but we need something that exists
-      config
-    end
-
-    it 'should handle is_ms_test by adding testcontainer to the filename' do
-      expect(subject.commands.length).to eq(1)
-      expect(subject.commands[0].invocations[0].parameters.last).to eq('/testcontainer:utils_spec.rb')
-    end
-  end
-
-  context 'multiple files tested individually' do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = ['utils_spec.rb', 'tools/fluent_migrator_spec.rb'] # not real DLLs, but we need files that exist
-      config
-    end
-
-    it 'should execute one command per file' do
-      expect(subject.commands.length).to eq(2)
-      expect(subject.commands[0].invocations[0].parameters.last).to eq('utils_spec.rb')
-      expect(subject.commands[1].invocations[0].parameters.last).to eq('fluent_migrator_spec.rb')
-    end
-  end
-
-  context 'multiple files tested as a batch' do
-    let :config do
-      config = ::Albacore::TestRunner::Config.new
-      config.exe = 'test-runner.exe'
-      config.files = ['utils_spec.rb', 'tools/fluent_migrator_spec.rb'] # not real DLLs, but we need files that exist
-      config.execute_as_batch
-      config
-    end
-
-    it 'should execute a single command for all the files' do
-      expect(subject.commands.length).to eq(1)
-      expect(subject.commands[0].invocations[0].parameters).to eq(['utils_spec.rb', 'tools/fluent_migrator_spec.rb'])
-    end
-  end
-end
-
-describe ::Albacore::TestRunner::Cmd do
-  describe "creation" do
-    subject do
-      command = ::Albacore::TestRunner::Cmd.new '.',
-                                                'test-runner.exe',
-                                                ['/parameter'],
-                                                files
-      command.extend ShInterceptor
-      command.execute
-      command
-    end
-
-    context "files is a single file" do
-      let :files do
-        'file'
-      end
-
-      it "should prepend the file to the parameters list" do
-        expect(subject.invocations[0].parameters).to eq(['file', '/parameter'])
-      end
-    end
-
-    context "files is an array" do
-      let :files do
-        ['file1', 'file2']
-      end
-
-      it "should prepend the files to the parameters list" do
-        expect(subject.invocations[0].parameters).to eq(['file1', 'file2', '/parameter'])
-      end
-    end
-  end
-end