albacore 2.5.14 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5504fa88181023236c6e51b93d975ef953f36ae8
-  data.tar.gz: e019e93bb5c942f574d41679ac57164599eb6c04
+  metadata.gz: fca7e93d7733d7e5bf335e38ef80e88591d7f2ab
+  data.tar.gz: 6e7eb09131e0bd1f2633ba1e9d6791d20467bf8c
 SHA512:
-  metadata.gz: 138d9e0ab76538cfe63613b21f53f77f6321a8a5afcc0c4ecc994c899a547c63f4053b79acdb4ad1dd879d10f8a5a4c15990d86e760cb78ba8f50b26823e4497
-  data.tar.gz: 7d878c75fd44c9881716a06cfa910a134df35920ffe9b04f721e571439e5ee409c3798988e226a81ab255f793fd84132da4f91f7bfeccbbc1248db2db1f7f387
+  metadata.gz: 675c67991bf94a14ff29b67d3404d01b38869b488a9129739dd0cef8da00bab5a40842841757355837bff31b5a26d952f0c8a3abd2b906945bbf59d6dff7b918
+  data.tar.gz: d44ae46744d7c752a2b69fec2c3d013c43545a21a64cccb568a610060e9026a4fe6181b7fb9dbfe7f0ede2ecfc2a2877c759c30d7f3f33740e9ade4b05a302db

data/lib/albacore/task_types/sql_package.rb

@@ -77,7 +77,7 @@ module Albacore
       # target database that do not exist in the database project, and that will 
       # cause errors when you publish.
       def verify_deployment
-        @parameters.add "/p:VerifyDeployment:True"
+        @parameters.add "/p:VerifyDeployment=True"
       end
 
       # Specifies whether detailed feedback is suppressed. Defaults to False.

data/lib/albacore/task_types/test_runner.rb

@@ -26,6 +26,7 @@ module Albacore
         @copy_local = false
         @is_ms_test = false
         @clr_command = true
+        @execute_as_batch = false
         @files = []
       end
 
@@ -38,7 +39,8 @@ module Albacore
           :is_ms_test  => @is_ms_test, 
           :exe         => @exe,
           :parameters  => @parameters,
-          :clr_command => @clr_command)
+          :clr_command => @clr_command,
+          :execute_as_batch => @execute_as_batch)
       end
 
       attr_path_accessor :settings do |s|
@@ -63,6 +65,11 @@ module Albacore
         @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
@@ -78,9 +85,14 @@ module Albacore
 
       # expects both parameters and executable to be relative to the
       # work_dir parameter
-      def initialize work_dir, executable, parameters, file, clr_command = true
+      def initialize work_dir, executable, parameters, files, clr_command = true
         @work_dir, @executable = work_dir, executable
-        @parameters = parameters.to_a.unshift(file)
+        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
 
@@ -103,28 +115,52 @@ module Albacore
       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
-          execute_tests_for 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_tests_for dll
+      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
-          cmd = Albacore::TestRunner::Cmd.new dir,
-                                              exe, 
-                                              @opts.get(:parameters, []),
-                                              filename,
-                                              @opts.get(:clr_command)
-          cmd.execute
+          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?

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.5.14"
+  VERSION = "2.6.0"
 end

data/spec/sql_package_spec.rb

@@ -76,9 +76,9 @@ describe 'when running with sql' do
     expect(subject.executable).to eq('SqlPackage')
   end
   it do
-    expect(subject.parameters).to eq(%W|/Action:Publish /SourceFile:testdata/test.dacpac /Profile:testdata/test.publish /p:VerifyDeployment:True /Quiet:True|)
+    expect(subject.parameters).to eq(%W|/Action:Publish /SourceFile:testdata/test.dacpac /Profile:testdata/test.publish /p:VerifyDeployment=True /Quiet:True|)
   end
   it do
     expect(subject.is_mono_command?).to be false
   end
-end
+end

data/spec/test_runner_spec.rb

@@ -21,7 +21,11 @@ describe ::Albacore::TestRunner::Config do
   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
@@ -35,7 +39,7 @@ describe ::Albacore::TestRunner::Config do
   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
@@ -82,46 +86,255 @@ describe ::Albacore::TestRunner::Cmd do
   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
-  let :config 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
+  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
-    ::Albacore::TestRunner::Task.new(config.opts)
+    create_task_that_intercepts_commands config.opts
   end
 
-  it do
-    should respond_to :execute
+  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
 
-  def test_dir_exe hash
-    given = hash.first[0]
-    expected = hash.first[1]
-    subject.send(:handle_directory, given[0], given[1]) do |dir, exe|
-      expect(dir).to eq(expected[0])
-      expect(exe).to eq(expected[1])
+  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
 
-  it 'should handle relative handle_directory' do
-    test_dir_exe ['d.dll', 'e.exe'] => ['.', 'e.exe']
+  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
 
-  it 'should handle actual relative directories correctly' do
-    test_dir_exe ['a/d.dll', 'e.exe'] => ['a', '../e.exe']
+  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 handle negative dirs by getting current dir name' do
-    subject.send(:handle_directory, '../d.dll', 'e.exe') do |dir, exe|
-      expect(dir).to eq('..')
-      # at this point, the exe file is just a dir in
-      expect(exe).to match /\w+\/e\.exe/
+      it "should prepend the files to the parameters list" do
+        expect(subject.invocations[0].parameters).to eq(['file1', 'file2', '/parameter'])
+      end
     end
   end
 end

metadata

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