albacore 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cea9701e83877d8f6a6a0ff1b03cf6edb323339
-  data.tar.gz: 80a334c78c0f56b9b5538fed415b217a39cfb15a
+  metadata.gz: 9801c7ed5cef1ddabe9f23e38d41fb43959ca653
+  data.tar.gz: e038c9674250ff958da7b5b1a6a2e890ec8f21a8
 SHA512:
-  metadata.gz: 71a0b5d41a28ed32c2fd5b1aabffb284af293168bdac97d14b285f6d60b1c3399cf70d616b48d6e8e7079b63a179d9baaa8798a949adf507c2d1cb7ac568e4b6
-  data.tar.gz: 2f547c0645ac83afa2c09c727959709381a0dded7b28612372d933ad6b47697868bb66b8a2057ca0d4dcc18057ae029ebddc8e10f2b72b926dce9096833b1ac8
+  metadata.gz: 79132c321a3166d391a8e086000d5b502b240ff4ed8d2d7aac7a0b03d37eca1627783a16aa8a5174c54cc525d411afefe654e4f78e706a142d93ac8d3d11f1b8
+  data.tar.gz: ce83a1a5d446e91eada1f8d5bf5ebff013fdf669ae53e358e7dbebe725b7d3acf9ffd957a9254b42d3d1680473508637357365c9f8fe2868480215b37ad14893

data/lib/albacore/task_types/nugets_pack.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rake'
 require 'nokogiri'
 require 'fileutils'
@@ -85,9 +83,7 @@ module Albacore
           args = ARGV.inject("") { |state, arg| state + " " + '"' + arg + '"' }
           warn do
             %{Couldn't match package, please run
-
      bundle exec rake DEBUG=true #{args} --trace
-
 and report a bug to albacore with the full output. Here's the nuget process output:
 --- START OUTPUT ---
 #{out}
@@ -138,6 +134,10 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       # sets the files to search
       attr_writer :files
 
+      # sets the nuspec file
+      attr_writer :nuspec      
+
+
       # sets the MsBuild configuration that is used to produce the output into
       # <OutputPath>...</OutputPath>
       attr_writer :configuration
@@ -193,12 +193,15 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       def opts
         files = @files.respond_to?(:each) ? @files : [@files]
 
-        [:authors, :description, :version].each do |required|
-          warn "metadata##{required} is missing from nugets_pack [nugets pack: config]" if @package.metadata.send(required) == 'MISSING' 
+        unless @nuspec
+          [:authors, :description, :version].each do |required|
+            warn "metadata##{required} is missing from nugets_pack [nugets pack: config]" if @package.metadata.send(required) == 'MISSING' 
+          end
         end
 
         Map.new({
           :out           => @out,
+          :nuspec        => @nuspec,
           :exe           => @exe,
           :symbols       => @symbols,
           :package       => @package,
@@ -227,18 +230,26 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       include Logging
 
       def initialize opts, &before_execute
-        raise ArgumentError, 'opts is not a map' unless opts.is_a? Map
-        raise ArgumentError, 'no files given' unless opts.get(:files).length > 0
+        
+        unless opts.get(:nuspec)
+          raise ArgumentError, 'opts is not a map' unless opts.is_a? Map
+          raise ArgumentError, 'no files given' unless opts.get(:files).length > 0
+        end
+
         @opts           = opts.apply :out => '.'
         @files          = opts.get :files
         @before_execute = before_execute
       end
 
       def execute
-        knowns = compute_knowns
-        @files.each do |p|
-          proj, n, ns = generate_nuspec p, knowns
-          execute_inner! proj, n, ns
+        unless @opts.get(:nuspec)
+          knowns = compute_knowns
+          @files.each do |p|
+            proj, n, ns = generate_nuspec p, knowns
+            execute_inner! proj, n, ns
+          end
+        else
+          create_nuget! "#{Dir.pwd}", @opts.get(:nuspec)
         end
       end
 
@@ -287,11 +298,8 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         trace do
           %{
  PROJECT #{proj.name} nuspec:
-
 #{nuspec.to_xml}
-
  PROJECT #{proj.name} symbol nuspec:
-
 #{if nuspec_symbols then nuspec_symbols.to_xml else 'NO SYMBOLS' end}}
         end
 
@@ -360,6 +368,7 @@ and report a bug to albacore with the full output. Here's the nuget process outp
         out = path_to(@opts.get(:out), cwd)
         nuspec = path_to nuspec, cwd
         nuspec_symbols = path_to nuspec_symbols, cwd if nuspec_symbols
+        
         cmd = Albacore::NugetsPack::Cmd.new exe,
                 work_dir: cwd,
                 out:      out
@@ -442,4 +451,4 @@ and report a bug to albacore with the full output. Here's the nuget process outp
       end
     end
   end
-end
+end

data/lib/albacore/task_types/test_runner.rb

@@ -18,6 +18,7 @@ module Albacore
       # constructor, no parameters
       def initialize
         @copy_local = false
+        @is_ms_test = false
         @clr_command = true
         @files = []
       end
@@ -26,8 +27,9 @@ module Albacore
       #
       def opts
         Map.new(
-          :files       => files,
+          :files => files,
           :copy_local  => @copy_local,
+          :is_ms_test  => @is_ms_test, 
           :exe         => @exe,
           :parameters  => @parameters,
           :clr_command => @clr_command)
@@ -47,6 +49,10 @@ module Albacore
         @clr_command = false
       end
 
+      def is_ms_test
+        @is_ms_test = true
+      end 
+
       private
       def files
         if @files.respond_to? :each
@@ -69,7 +75,7 @@ module Albacore
       end
 
       def execute
-        info { "executing in directory './#{@work_dir}'" }
+        info { "executing in directory '#{@work_dir}'" }
         system @executable,
           @parameters,
           :work_dir    => @work_dir,
@@ -97,8 +103,13 @@ module Albacore
       def execute_tests_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
           cmd = Albacore::TestRunner::Cmd.new dir,
-                                              exe, @opts.get(:parameters, []),
+                                              exe, 
+                                              @opts.get(:parameters, []),
                                               filename,
                                               @opts.get(:clr_command)
           cmd.execute

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.8"
+  VERSION = "2.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake