albacore 2.0.0.rc.11 → 2.0.0.rc.12

data/lib/albacore/task_types/test_runner.rb

@@ -49,12 +49,16 @@ module Albacore
 
     class Cmd
       include CrossPlatformCmd
+
+      # expects both parameters and executable to be relative to the
+      # work_dir parameter
       def initialize work_dir, executable, parameters, file
         @work_dir, @executable = work_dir, executable
         @parameters = parameters.to_a.unshift(file)
       end
 
       def execute
+        info { "executing in directory './#{@work_dir}'" }
         system @executable,
           @parameters,
           :work_dir    => @work_dir,
@@ -62,7 +66,6 @@ module Albacore
       end
     end
 
-
     class Task
       include Logging
 
@@ -103,11 +106,22 @@ module Albacore
             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
+            # call back with the new paths, easy because we have copied everything
             yield [sut, Paths.join(runners, File.basename(exe)).to_s]
           end
         else
-          yield [File.dirname(dll), exe]
+          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
+                [Pathname.new(File.dirname(dll)), Pathname.new(exe)]
+            end
+
+          exe_rel = exe.relative_path_from dir
+          yield [File.dirname(dll), exe_rel.to_s]
         end
       end
     end

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.0.0.rc.11"
+  VERSION = "2.0.0.rc.12"
 end

data/spec/cross_platform_cmd_spec.rb

@@ -19,7 +19,7 @@ describe Albacore::CrossPlatformCmd.method(:prepare_command) do
   it 'should be callable' do
     subject.should respond_to(:call)
   end
-  before :all do
+  before :each do
     # noteworthy: escape spaces with backslash!
     @exe, @pars, @printable, @handler = subject.call %w[echo Hello World Goodbye\ World], true
   end

data/spec/test_runner_spec.rb

@@ -35,11 +35,11 @@ end
 
 describe 'the order of which parameters are passed', ::Albacore::TestRunner::Config do
   subject do
-    cmd = ::Albacore::TestRunner::Config.new
-    cmd.files = 'file.dll'
-    cmd.exe   = 'test-runner.exe'
-    cmd.add_parameter '/TestResults=abc.xml'
-    cmd
+    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
@@ -51,35 +51,69 @@ describe 'the order of which parameters are passed', ::Albacore::TestRunner::Con
   end
 
   it 'should pass the file as a :files' do
-    subject.opts.get(:files).should eq(['file.dll'])
+    subject.opts.get(:files).should 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], 'lib.tests.dll'
+    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 do
-    should respond_to :execute
-  end
-
   it 'should include the parameters when executing' do
-    subject.execute
-
     # the intersection of actual parameters with expected should eq expected
     (subject.parameters - (subject.parameters - %w|params go here|)).
       should eq(%w|params go here|)
   end
+
+  it 'should give the full path when executing' do
+    (subject.parameters - %w|params go here|).should eq(%w|a/b/c/lib.tests.dll|)
+  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
+  end
+
   subject do
-    ::Albacore::TestRunner::Task.new Map.new
+    ::Albacore::TestRunner::Task.new(config.opts)
   end
+
   it do
     should respond_to :execute
   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|
+      dir.should eq(expected[0])
+      exe.should eq(expected[1])
+    end
+
+  end
+
+  it 'should handle relative handle_directory' do
+    test_dir_exe ['d.dll', 'e.exe'] => ['.', 'e.exe']
+  end
+
+  it 'should handle actual relative directories correctly' do
+    test_dir_exe ['a/d.dll', 'e.exe'] => ['a', '../e.exe']
+  end
+
+  it 'should handle negative dirs by getting current dir name' do
+    subject.send(:handle_directory, '../d.dll', 'e.exe') do |dir, exe|
+      dir.should eq('..')
+      # at this point, the exe file is just a dir in
+      exe.should =~ /\w+\/e\.exe/
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.11
+  version: 2.0.0.rc.12
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-07 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: 2914469606549085872
+      hash: 238623882763255620
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: