albacore 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a173804828e8fec262da15c11b33854eb576d9
-  data.tar.gz: 947fd7c8917e02c47fd004cb194e2f039f9c9438
+  metadata.gz: 6ffa4abad9bf197d86c725a07a2b7d3e52b871c7
+  data.tar.gz: e81f21ef482a36f64da60ec37faad4666817f1f5
 SHA512:
-  metadata.gz: 9a594f836cf00d4626dbc828dc8bafcd301dfa8d916f1d25e22ea8425fe343cad2acd02555e512d0c8c42b8c9cf78f7141736ada333611a370157f43e82206ed
-  data.tar.gz: 59d3576f7a92a9e984ba47497212a11f1c59ee155befc5b8302cd5b0c36be935839330fec9d1f209b123dbd96c73b08286942dc9251aa229f64c6e6b71f137c6
+  metadata.gz: 7b97e9d2a9c4dc76ac2635a79c56d990affd8ff7ef447bebd50864aa29c711d94341cb398c9b7c4f1909674bcd3905457bf411947956c0ac9aa073a5519427a4
+  data.tar.gz: 947336c3a138d82a7e8c36b3fb007bd6801818271ef03498ad4284e18ac636dea03c2b076b54ea387f98d1a922c0aee49034823fa25d018ae1f80a851eac225d

data/Guardfile

@@ -1,6 +1,6 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-guard 'rspec' do
+guard 'rspec', cmd: "bundle exec RAISE_DEPRECATED=true" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
 end

data/albacore.gemspec

@@ -27,7 +27,7 @@ EOF
   s.add_dependency 'semver2', '~> 3.4'
 	
   s.add_development_dependency 'rubygems-tasks', '~>0.2'
-  s.add_development_dependency 'rspec', '~> 2.13'
+  s.add_development_dependency 'rspec', '~> 3.00'
 
   s.files         = `git ls-files`.split("\n").concat(Dir.glob('./resources/**'))
   s.test_files    = `git ls-files -- spec/*`.split("\n")

data/lib/albacore/cross_platform_cmd.rb

@@ -191,8 +191,11 @@ module Albacore
 
       cmd = ::Rake::Win32.windows? ? 'where' : 'which'
       parameters = []
-      parameters << Paths.normalise_slashes(file) if dir == '.'
-      parameters << Paths.normalise_slashes("#{dir}:#{file}") unless dir == '.'
+      pattern = if dir == '.' then file
+      elsif ::Rake::Win32.windows? then "#{dir}:#{file}"
+      else executable
+      end
+      parameters << Paths.normalise_slashes("\"#{pattern}\"")
       parameters << '2> nul' if ::Rake::Win32.windows?
       cmd, parameters = Paths.normalise cmd, parameters
       cmd = "#{cmd} #{parameters.join(' ')}"

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/spec/asmver_spec.rb

@@ -50,13 +50,13 @@ end
         subject.build_attribute 'AssemblyVersion', '0.2.3'
       end
       it 'should contain the name AssemblyVersion' do
-        version.should include('AssemblyVersion')
+        expect(version).to include('AssemblyVersion')
       end
       it 'should contain the version 0.2.3' do
-        version.should include('0.2.3')
+        expect(version).to include('0.2.3')
       end
       it 'should include the "assembly:" string' do
-        version.should include('assembly: ')
+        expect(version).to include('assembly: ')
       end
     end
 
@@ -65,7 +65,7 @@ end
         subject.build_using_statement 'System.Runtime.CompilerServices'
       end
       it 'should contain the namespace System.Runtime.CompilerServices' do
-        using.should =~ /System.{1,2}Runtime.{1,2}CompilerServices/
+        expect(using).to match(/System.{1,2}Runtime.{1,2}CompilerServices/)
       end
     end
 
@@ -74,7 +74,7 @@ end
         subject.build_named_parameters milk_cows: true, birds_fly: false, hungry_server: 'sad server'
       end
       it 'should include the parameter names' do
-        plist.should =~ /milk_cows .{1,2} true. birds_fly .{1,2} false. hungry_server .{1,2} "sad server"/
+        expect(plist).to match(/milk_cows .{1,2} true. birds_fly .{1,2} false. hungry_server .{1,2} "sad server"/)
       end
     end
 
@@ -83,7 +83,7 @@ end
         subject.build_positional_parameters ((%w|a b c hello|) << false)
       end
       it 'should include the positional parameters' do
-        plist.should eq('"a", "b", "c", "hello", false')
+        expect(plist).to eq('"a", "b", "c", "hello", false')
       end
     end
 
@@ -102,7 +102,7 @@ end
         }[lang]
       end
       it 'should include the correct syntax for single line comment' do
-        comment.should =~ expected
+        expect(comment).to match(expected)
       end
     end
 
@@ -130,7 +130,7 @@ on many lines}
         }[lang]
       end
       it 'should build the multiline comment' do
-        comment.should eq(expected)
+        expect(comment).to eq(expected)
       end
     end
 
@@ -149,7 +149,7 @@ on many lines}
         }[lang]
       end
       it 'should include the correct syntax for single line comment' do
-        ns.should =~ expected
+        expect(ns).to match(expected)
       end
     end
   end
@@ -158,7 +158,7 @@ end
 describe FileGenerator do
   subject do FileGenerator.new(Fs.new, 'MyNamespace.Here', {}) end
   it do
-    subject.should respond_to(:generate)
+    expect(subject).to respond_to(:generate)
   end
   it 'can be constructed with empty namespace' do
     FileGenerator.new(Fs.new, '', {})

data/spec/asmver_task_spec.rb

@@ -20,13 +20,13 @@ describe ::Albacore::Asmver::Config, 'when setting attributes and out' do
     @task.execute
   end
   it 'should write namespace' do
-    strio.string.should include('namespace Hello.World')
+    expect(strio.string).to include('namespace Hello.World')
   end
   it 'should write Guid("...")' do
-    strio.string.should include('[<assembly: Guid("b766f4f3-3f4e-49d0-a451-9c152059ae81")>]')
+    expect(strio.string).to include('[<assembly: Guid("b766f4f3-3f4e-49d0-a451-9c152059ae81")>]')
   end
   it 'should write AssemblyVersion' do
-    strio.string.should include('[<assembly: AssemblyVersion("0.1.2")>]')
+    expect(strio.string).to include('[<assembly: AssemblyVersion("0.1.2")>]')
   end
   it 'should allow changing attributes' do
     expect(subject).to respond_to :change_attributes

data/spec/cli_spec.rb

@@ -7,9 +7,9 @@ describe Albacore::Cli do
     @test_rake = 'Test_Rakefile'
     @test_gem = 'Test_Gemfile'
     @test_semver = 'Test_Semver'
-    Albacore.stub(:rakefile).and_return @test_rake
-    Albacore.stub(:gemfile).and_return @test_gem
-    Albacore.stub(:semver_file).and_return @test_semver
+    allow(Albacore).to receive(:rakefile).and_return @test_rake
+    allow(Albacore).to receive(:gemfile).and_return @test_gem
+    allow(Albacore).to receive(:semver_file).and_return @test_semver
 
     # Capture the output that would typically appear in the console.
     @original_stdout = $stdout
@@ -42,7 +42,7 @@ describe Albacore::Cli do
         end
         it 'outputs a warning message' do
           described_class.new [command]
-          @output.string.should match /One of \[.*\] already exists\n/
+          expect(@output.string).to match /One of \[.*\] already exists\n/
         end
         it "does not overwrite the existing file" do
           expect {

data/spec/config_dsl_spec.rb

@@ -50,16 +50,16 @@ describe Example, 'when setting properties' do
     ::Rake::Win32.windows? ? 'a\\b\\c' : 'a/b/c'
   end
   it 'should have remapped :in' do
-    subject.in.should eq(expected)
+    expect(subject.in).to eq(expected)
   end
   it 'should have remapped :out' do
-    subject.out.should eq(expected)
+    expect(subject.out).to eq(expected)
   end
   it 'should be able to read and write :a' do
-    subject.a.should eq(expected)
+    expect(subject.a).to eq(expected)
   end
   it 'should be able to read and write :b' do
-    subject.b.should eq(expected)
+    expect(subject.b).to eq(expected)
   end
 end
 
@@ -72,12 +72,12 @@ describe Example, 'when using blocks for properties' do
     ::Rake::Win32.windows? ? 'a\\b\\c' : 'a/b/c'
   end
   it 'should have written x' do
-    subject.x.should eq(expected)
+    expect(subject.x).to eq(expected)
   end
   it 'should have called x block' do
-    subject.was_called.should eq(expected)
+    expect(subject.was_called).to eq(expected)
   end
   it 'should have called y block' do
-    subject.y_called.should eq(expected)
+    expect(subject.y_called).to eq(expected)
   end
 end

data/spec/cross_platform_cmd_spec.rb

@@ -5,19 +5,23 @@ require 'albacore/errors/command_failed_error'
 
 describe Albacore::CrossPlatformCmd.method(:which), "what happens when calling #which" do
   it "should be callable" do
-    subject.should respond_to(:call)
+    expect(subject).to respond_to(:call)
   end
   it "should return a non-null path" do
-    subject.call("ruby").should_not be_empty
+    expect(subject.call("ruby")).to_not be_empty
+  end
+  it "should return its input if given an absolute path to an executable that exists" do
+    pathToRuby = subject.call("ruby")
+    expect(subject.call(pathToRuby)).to eq(pathToRuby)
   end
   it "should return nil if nothing was found" do
-    subject.call("notlikelyonsystem").should be_nil
+    expect(subject.call("notlikelyonsystem")).to be_nil
   end
 end
 
 describe Albacore::CrossPlatformCmd.method(:prepare_command) do
   it 'should be callable' do
-    subject.should respond_to(:call)
+    expect(subject).to respond_to(:call)
   end
   before :each do
     # noteworthy: escape spaces with backslash!
@@ -29,38 +33,38 @@ describe Albacore::CrossPlatformCmd.method(:prepare_command) do
       printable: @printable,
       handler:   @handler
     }.each do |kv|
-      kv[1].should_not be_nil
+      expect(kv[1]).to_not be_nil
     end
   end
   if Albacore.windows? then
     it 'should not include mono' do
-      @exe.should_not include('mono')
+      expect(@exe).to_not include('mono')
     end
 
     it 'should return first param correctly' do
-      @pars[0].should eq('Hello')
+      expect(@pars[0]).to eq('Hello')
     end
     it 'should return second param correctly' do
-      @pars[1].should eq('World')
+      expect(@pars[1]).to eq('World')
     end
     it 'should return third param correctly' do
-      @pars[2].should eq('Goodbye World')
+      expect(@pars[2]).to eq('Goodbye World')
     end
   else
     it 'should include mono' do
-      @exe.should include('mono')
+      expect(@exe).to include('mono')
     end
     it 'should return first param as "echo"' do
-      @pars[0].should eq('echo')
+      expect(@pars[0]).to eq('echo')
     end
     it 'should return second param as "Hello"' do
-      @pars[1].should eq('Hello')
+      expect(@pars[1]).to eq('Hello')
     end
     it 'should return third param as "World"' do
-      @pars[2].should eq('World')
+      expect(@pars[2]).to eq('World')
     end
     it 'should return fourth param as "Goodbye World"' do
-      @pars[3].should eq('Goodbye World')
+      expect(@pars[3]).to eq('Goodbye World')
     end
   end
 end
@@ -69,10 +73,10 @@ end
   describe Albacore::CrossPlatformCmd.method(method), "##{method}" do
     describe 'its positive modes' do
       it "should be callable" do
-        subject.should respond_to(:call)
+        expect(subject).to respond_to(:call)
       end
       it "doesn't crash everything when called" do
-        subject.call("whoami").should_not be_nil
+        expect(subject.call("whoami")).to_not be_nil
       end
     end
     unless method == :shie
@@ -108,7 +112,7 @@ end
         # #system => \r\n$ on windows
         # #sh => \n$ on windows/powershell
         # #shie => \n$ on windows/powershell
-        res.should include("this is a test")
+        expect(res).to include("this is a test")
       end
     end
   end

data/spec/ext_teamcity_spec.rb

@@ -10,29 +10,29 @@ describe Albacore::Ext::TeamCity, 'When outputting Teamcity progress messages' d
 
   describe 'Simple escaping' do
     it 'Should escape [ with a pipe |' do
-      Albacore::Ext::TeamCity.escape('[').should == '|['
+      expect(Albacore::Ext::TeamCity.escape('[')).to eq '|['
     end
     it 'Should escape ] with a pipe |' do
-      Albacore::Ext::TeamCity.escape(']').should == '|]'
+      expect(Albacore::Ext::TeamCity.escape(']')).to eq '|]'
     end
     it 'Should escape | with a pipe |' do
-      Albacore::Ext::TeamCity.escape('|').should == '||'
+      expect(Albacore::Ext::TeamCity.escape('|')).to eq '||'
     end
     it 'Should escape \' with a pipe |' do
-      Albacore::Ext::TeamCity.escape('\'').should == '|\''
+      expect(Albacore::Ext::TeamCity.escape('\'')).to eq '|\''
     end
     it 'Should escape \\n with a pipe |' do
-      Albacore::Ext::TeamCity.escape("\n").should == '|n'
+      expect(Albacore::Ext::TeamCity.escape("\n")).to eq '|n'
     end
     it 'Should escape \\r with a pipe |' do
-      Albacore::Ext::TeamCity.escape("\r").should == '|r'
+      expect(Albacore::Ext::TeamCity.escape("\r")).to eq '|r'
     end
   end
 
   describe 'Escaping in text block' do
     text = "Some sample text.\nDidn't need to use [ brackets ].\r\n"
     it 'Should escape the text correctly' do
-      Albacore::Ext::TeamCity.escape(text).should == 'Some sample text.|nDidn|\'t need to use |[ brackets |].|r|n'
+      expect(Albacore::Ext::TeamCity.escape(text)).to eq 'Some sample text.|nDidn|\'t need to use |[ brackets |].|r|n'
     end
   end
 
@@ -44,7 +44,7 @@ describe Albacore::Ext::TeamCity, 'When outputting Teamcity progress messages' d
         Albacore.publish :start_progress, OpenStruct.new(:message => message)
         Albacore.publish :finish_progress, OpenStruct.new(:message => message)
       end
-      out.string.should == "##teamcity[progressStart 'Successfully deployed']\n##teamcity[progressFinish 'Successfully deployed']\n"
+      expect(out.string).to eq "##teamcity[progressStart 'Successfully deployed']\n##teamcity[progressFinish 'Successfully deployed']\n"
     end
 
     it 'Should output progressFinish on parent progress then on children when supplying parent progress name' do
@@ -54,7 +54,7 @@ describe Albacore::Ext::TeamCity, 'When outputting Teamcity progress messages' d
         Albacore.publish :start_progress, OpenStruct.new(:message => 'child progress')
         Albacore.publish :finish_progress, OpenStruct.new(:message => parent_message)
       end
-      out.string.should == "##teamcity[progressStart '#{parent_message}']\n##teamcity[progressStart 'child progress']\n##teamcity[progressFinish 'child progress']\n##teamcity[progressFinish '#{parent_message}']\n"
+      expect(out.string).to eq "##teamcity[progressStart '#{parent_message}']\n##teamcity[progressStart 'child progress']\n##teamcity[progressFinish 'child progress']\n##teamcity[progressFinish '#{parent_message}']\n"
     end
 
     it 'Should output progress messages in the order they are defined' do
@@ -65,7 +65,7 @@ describe Albacore::Ext::TeamCity, 'When outputting Teamcity progress messages' d
         Albacore.publish :progress, OpenStruct.new(:message => 'some progress')
         Albacore.publish :finish_progress, OpenStruct.new(:message => parent_message)
       end
-      out.string.should == "##teamcity[progressStart '#{parent_message}']\n##teamcity[progressStart 'child progress']\n##teamcity[progressMessage 'some progress']\n##teamcity[progressFinish 'child progress']\n##teamcity[progressFinish '#{parent_message}']\n"
+      expect(out.string).to eq "##teamcity[progressStart '#{parent_message}']\n##teamcity[progressStart 'child progress']\n##teamcity[progressMessage 'some progress']\n##teamcity[progressFinish 'child progress']\n##teamcity[progressFinish '#{parent_message}']\n"
     end
   end
 end

data/spec/fpm_app_spec_spec.rb

@@ -24,21 +24,15 @@ describe ::Albacore::FpmAppSpec, 'public API' do
     ::Albacore::FpmAppSpec.new spec
   end
 
-  it do
-    should respond_to :filename
-  end
+  it { is_expected.to respond_to :filename }
 
   it 'should know resulting filename' do
-    subject.filename.should eq('my.app-5.6.7-1.x86_64.rpm')
+    expect(subject.filename).to eq('my.app-5.6.7-1.x86_64.rpm')
   end
 
-  it do
-    should respond_to :generate
-  end
+  it { is_expected.to respond_to :generate }
 
-  it do
-    should respond_to :generate_flags
-  end
+  it { is_expected.to respond_to :generate_flags }
 end
 
 
@@ -91,7 +85,7 @@ describe ::Albacore::FpmAppSpec, 'when generating command from valid AppSpec' do
 
   if ::Albacore.windows?
     it 'should generate command "look in this directory" flag' do
-      expect(flags['-C']).should match  /^.:\/a\/b$/
+      expect(flags['-C']).to match  /^.:\/a\/b$/
     end
   else
     it 'should generate command "look in this directory" flag' do

data/spec/nuget_model_spec.rb

@@ -9,7 +9,7 @@ describe Albacore::NugetModel::Metadata do
     :require_license_acceptance, :copyright, :tags, :dependencies,
     :framework_assemblies ].each do |prop|
     it "responds to :#{prop}" do
-      subject.should respond_to(prop)
+      expect(subject).to respond_to(prop)
     end
   end
 
@@ -39,31 +39,31 @@ describe Albacore::NugetModel::Metadata do
       subject.framework_assemblies.first[1]
     end
     it "should contain the dependency id" do
-      dep.id.should eq('System.Transactions')
+      expect(dep.id).to eq('System.Transactions')
     end
     it "should contain the dependency version" do
-      dep.version.should eq('2.0.0')
+      expect(dep.version).to eq('2.0.0')
     end
     it "should contain a single dependency" do
-      subject.framework_assemblies.length.should eq(1)
+      expect(subject.framework_assemblies.length).to eq(1)
     end
   end
 end
 
 describe Albacore::NugetModel::Package, "when doing some xml generation" do
   it "should be newable" do
-    subject.should_not be_nil
+    expect(subject).to_not be_nil
   end
   [:metadata, :files, :to_xml, :to_xml_builder].each do |prop|
     it "should respond to #{prop}" do
-      subject.should respond_to(prop)
+      expect(subject).to respond_to(prop)
     end
   end
   it "should generate default metadata" do
-    subject.to_xml.should include('<metadata')
+    expect(subject.to_xml).to include('<metadata')
   end
   it "should not generate default files" do
-    subject.to_xml.should_not include('<files')
+    expect(subject.to_xml).to_not include('<files')
   end
 end
 
@@ -117,7 +117,7 @@ XML
     package
   end
   it "should exist" do
-    subject.should_not be_nil
+    expect(subject).to_not be_nil
   end
   it "should have the metadata properties of the XML above" do
     parser.
@@ -127,31 +127,31 @@ XML
       reject { |n| n.text? }.
       each do |node|
       name = Albacore::NugetModel::Metadata.underscore node.name
-      subject.metadata.send(:"#{name}").should eq(node.inner_text.chomp)
+      expect(subject.metadata.send(:"#{name}")).to eq(node.inner_text.chomp)
     end
   end
 
   # 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
-      Nokogiri::XML(subject.to_xml, &:noblanks).to_xml.should 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
 
   describe "all dependencies" do
     it "should have the SampleDependency dependency of the XML above" do
       parser.xpath('./ng:metadata/ng:dependencies', ns).children.reject{ |c| c.text? }.each do |dep|
-        subject.metadata.dependencies[dep['id']].should_not be_nil
+        expect(subject.metadata.dependencies[dep['id']]).to_not be_nil
       end
     end 
   end
 
   it "should have all the files of the XML above" do
-    subject.files.length.should eq(5)
+    expect(subject.files.length).to eq(5)
   end
 
   it "should have a dep on SampleDependency version 1.0" do
-    subject.metadata.dependencies['SampleDependency'].should_not be_nil
+    expect(subject.metadata.dependencies['SampleDependency']).to_not be_nil
   end
 end
 
@@ -188,7 +188,7 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
       Albacore::NugetModel::Package.from_xxproj_file projfile, :symbols => true
     end
     it "should contain all files (just one) and all dll and pdb files (two)" do
-      subject.files.length.should eq 3
+      expect(subject.files.length).to eq 3
     end
 
     has_file 'Library1.fs', 'src/Library1.fs'

data/spec/nugets_pack_spec.rb

@@ -87,17 +87,17 @@ describe Cmd, "when calling #execute" do
   describe "first invocation" do
     include_context 'pack_config'
     it "should run the correct executable" do
-      subject.mono_command(0).should eq('NuGet.exe')
+      expect(subject.mono_command(0)).to eq('NuGet.exe')
     end
     it "should include the correct parameters" do
-      subject.mono_parameters(0).should eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec])
+      expect(subject.mono_parameters(0)).to eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec])
     end
   end
 
   describe "second invocation" do
     include_context 'pack_config'
     it "should include -Symbols" do
-      subject.mono_parameters(1).should eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} -Symbols ./spec/testdata/example.symbols.nuspec])
+      expect(subject.mono_parameters(1)).to eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} -Symbols ./spec/testdata/example.symbols.nuspec])
     end
   end
 
@@ -109,10 +109,10 @@ describe Cmd, "when calling #execute" do
       cmd
     end
     it 'should not include -Symbols'  do
-      subject.mono_parameters(0).should eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec])
+      expect(subject.mono_parameters(0)).to eq(%W[Pack -OutputDirectory #{path 'spec/testdata/pkg'} ./spec/testdata/example.nuspec])
     end
     it 'should not have a second invocation' do
-      subject.invocations.length.should eq(1)
+      expect(subject.invocations.length).to eq(1)
     end
   end
 end
@@ -164,27 +164,27 @@ EXAMPLE_OUTPUT
 
   it "should match sample1 with last nupkg mentioned" do
     match = subject.send(:get_nuget_path_of) { sample1 }
-    match.should eq('Y:\\Shared\\build\\pkg\\MyNuget.Package.1.0.0.symbols.nupkg')
+    expect(match).to eq('Y:\\Shared\\build\\pkg\\MyNuget.Package.1.0.0.symbols.nupkg')
   end
 
   it 'should match sample2 with last nupkg mentioned' do
     match = subject.send(:get_nuget_path_of) { sample2 }
-    match.should eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0.symbols.nupkg')
+    expect(match).to eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0.symbols.nupkg')
   end
 
   it 'should match sample3 with last nupkg mentioned' do
     match = subject.send(:get_nuget_path_of) { sample3 }
-    match.should eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-alpha3.symbols.nupkg')
+    expect(match).to eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-alpha3.symbols.nupkg')
   end
 
   it 'should match sample4 with last nupkg mentioned' do
     match = subject.send(:get_nuget_path_of) { sample4 }
-    match.should eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-alpha.nupkg')
+    expect(match).to eq('/home/xyz/Shared/build/pkg/MyNuget.Package.1.0.0-alpha.nupkg')
   end
 
   it 'should match sample5 despite non-ASCII' do
     match = subject.send(:get_nuget_path_of) { sample5 }
-    match.should eq('/home/xyz/Shared/build/pkg/Fröken.1.0.0-alpha.nupkg')
+    expect(match).to eq('/home/xyz/Shared/build/pkg/Fröken.1.0.0-alpha.nupkg')
   end
 end
 
@@ -227,7 +227,7 @@ describe ProjectTask do
   include_context 'package_metadata_dsl'
 
   it 'sanity: should have config with target=mono32' do
-    config.opts().get(:target).should eq('mono32')
+    expect(config.opts().get(:target)).to eq('mono32')
   end
 
   let :projfile do
@@ -252,7 +252,7 @@ describe ProjectTask, "when testing public interface" do
     ProjectTask.new(Map.new(:files => [projfile]))
   end
   it "rejects .nuspec files" do
-    ProjectTask.accept?('some.nuspec').should eq false
+    expect(ProjectTask.accept?('some.nuspec')).to eq false
   end
 end
 
@@ -273,20 +273,20 @@ describe ProjectTask, "creating nuget from proj file" do
   describe 'when generating symbols' do
     include_context 'pack_config'
     it 'should have generated a nuspec' do
-      cmdo[:cmd].mono_parameters(0)[-1].should include('Sample.Nuget.nuspec')
+      expect(cmdo[:cmd].mono_parameters(0)[-1]).to include('Sample.Nuget.nuspec')
     end
     it 'should have generated a symbol nuspec' do
-      cmdo[:cmd].mono_parameters(1)[-1].should include('Sample.Nuget.symbols.nuspec')
+      expect(cmdo[:cmd].mono_parameters(1)[-1]).to include('Sample.Nuget.symbols.nuspec')
     end
   end
 
   describe 'when not generating symbols' do
     include_context 'pack_config no symbols'
     it 'should have generated a nuspec' do
-      cmdo[:cmd].mono_parameters(0)[-1].should include('Sample.Nuget.nuspec')
+      expect(cmdo[:cmd].mono_parameters(0)[-1]).to include('Sample.Nuget.nuspec')
     end
     it 'should have done no further calls' do
-      cmdo[:cmd].invocations.length.should eq(1)
+      expect(cmdo[:cmd].invocations.length).to eq(1)
     end
     it 'should have no further invocations' do
       begin

data/spec/package_repo_spec.rb

@@ -5,6 +5,6 @@ describe ::Albacore::PackageRepo do
     Albacore::PackageRepo.new '.'
   end
   it 'can find latest amongst a number of packages in the repo' do
-    should respond_to(:find_latest)
+    is_expected.to respond_to(:find_latest)
   end
 end

data/spec/package_spec.rb

@@ -14,12 +14,12 @@ describe ::Albacore::Package do
     should respond_to :to_s
   end
   it 'has id' do
-    subject.id.should eq 'NLog'
+    expect(subject.id).to eq 'NLog'
   end 
   it 'has path' do
-    subject.path.should eq 'path/to/asm.dll'
+    expect(subject.path).to eq 'path/to/asm.dll'
   end
   it 'formats with #to_s' do
-    subject.to_s.should eq 'Package[path/to/asm.dll]'
+    expect(subject.to_s).to eq 'Package[path/to/asm.dll]'
   end
 end

data/spec/paths_spec.rb

@@ -14,39 +14,39 @@ describe Paths.method(:join), 'when joining path segments' do
   end
 
   it 'should return id' do
-    subject.call('abc').to_s.should eq('abc')
+    expect(subject.call('abc').to_s).to eq('abc')
   end 
 
   it 'should return with proper separator' do
-    sample.to_s.should eq('a' + s + 'b' + s + 'c')
+    expect(sample.to_s).to eq('a' + s + 'b' + s + 'c')
   end
 
   it 'should be joinable' do
-    sample.join('d').to_s.should include(s)
+    expect(sample.join('d').to_s).to include(s)
   end
 
   it 'should be +-able' do
-    (sample + 'd').to_s.should include(s)
+    expect((sample + 'd').to_s).to include(s)
   end
 
   it 'can join with *' do
-    subject.call('a').join('*/').to_s.should eq('a' + s + '*' + s)
+    expect(subject.call('a').join('*/').to_s).to eq('a' + s + '*' + s)
   end
 
   it 'accepts multiple paths' do
-    subject.call('a', 'b', 'c').to_s.should eq(abc)
+    expect(subject.call('a', 'b', 'c').to_s).to eq(abc)
   end
 
   it 'returns something accepting multiple paths' do
-    subject.call('a', 'b', 'c').join('d', 'e').to_s.should eq(abc + s + 'd' + s + 'e')
+    expect(subject.call('a', 'b', 'c').join('d', 'e').to_s).to eq(abc + s + 'd' + s + 'e')
   end
 
   it 'should be presentable in "unix" style' do
-    sample.as_unix.to_s.should_not include('\\')
+    expect(sample.as_unix.to_s).to_not include('\\')
   end
 
   it 'should handle joining on a type like itself' do
-    sample.join(sample).to_s.should eq(abc + s + abc)
+    expect(sample.join(sample).to_s).to eq(abc + s + abc)
     sample.join(sample, sample)
   end
 
@@ -56,28 +56,28 @@ describe Paths.method(:join), 'when joining path segments' do
 
   it 'should handle joining with a Pathname' do
     pending "don't know why not working" if Albacore.windows?
-    (sample.join Pathname.new('x')).should eq(Paths::PathnameWrap.new(abc + s + 'x'))
+    expect((sample.join Pathname.new('x'))).to eq(Paths::PathnameWrap.new(abc + s + 'x'))
   end
 
   it 'should handle +-ing with a Pathname' do
     pending "don't know why not working" if Albacore.windows?
-    (sample + Pathname.new('x')).should eq(Paths::PathnameWrap.new(abc + s + 'x'))
+    expect((sample + Pathname.new('x'))).to eq(Paths::PathnameWrap.new(abc + s + 'x'))
   end
 
   it do
-    sample.should respond_to(:hash)
+    expect(sample).to respond_to(:hash)
   end
 
   it do
-    sample.should respond_to(:eql?)
+    expect(sample).to respond_to(:eql?)
   end
   
   it 'joins with identity' do
-    subject.call(Paths::PathnameWrap.new(abc)).to_s.should eq(abc)
+    expect(subject.call(Paths::PathnameWrap.new(abc)).to_s).to eq(abc)
   end
 
   it 'joins with others' do
-    sample.join(Paths::PathnameWrap.new(abc)).to_s.should eq(abc + s + abc)
+    expect(sample.join(Paths::PathnameWrap.new(abc)).to_s).to eq(abc + s + abc)
   end
 end
 
@@ -87,31 +87,31 @@ describe Paths.method(:join_str), 'when joining path segments' do
   end
 
   it 'id' do
-    subject.call('.').should eq('.')
+    expect(subject.call('.')).to eq('.')
   end
 
   it 'id slash' do
-    subject.call('.', '/').should eq(s)
+    expect(subject.call('.', '/')).to eq(s)
   end
 
   it 'id slash win' do
-    subject.call('.', '\\').should eq(s)
+    expect(subject.call('.', '\\')).to eq(s)
   end
 
   it 'id slash with root' do
-    subject.call('.', '/', '/b').should eq(s + 'b')
+    expect(subject.call('.', '/', '/b')).to eq(s + 'b')
   end
 
   it 'id slash with root win' do
-    subject.call('.', '\\', '\\b').should eq(s + 'b')
+    expect(subject.call('.', '\\', '\\b')).to eq(s + 'b')
   end
 
   it 'id double slash' do
-    subject.call('.', 'b/', 'c/').should eq('b' + s + 'c' + s)
+    expect(subject.call('.', 'b/', 'c/')).to eq('b' + s + 'c' + s)
   end
 
   it 'id double slash win' do
-    subject.call('.', 'b\\', 'c\\').should eq('b' + s + 'c' + s)
+    expect(subject.call('.', 'b\\', 'c\\')).to eq('b' + s + 'c' + s)
   end
 end
 

data/spec/project_spec.rb

@@ -14,7 +14,7 @@ describe Albacore::Project, "when loading packages.config" do
   end
 
   it 'should have a guid' do
-    subject.guid.should match /^[A-F0-9]{8}(?:-[A-F0-9]{4}){3}-[A-F0-9]{12}$/i
+    expect(subject.guid).to match /^[A-F0-9]{8}(?:-[A-F0-9]{4}){3}-[A-F0-9]{12}$/i
   end
 
   it 'assumption: can gsub("[\{\}]", "")' do
@@ -22,14 +22,14 @@ describe Albacore::Project, "when loading packages.config" do
   end
 
   it 'should have an OutputPath' do
-    subject.output_path('Debug').should_not be_nil
+    expect(subject.output_path('Debug')).to_not be_nil
   end
   it 'should have the correct OutputPath' do
-    subject.output_path('Debug').should eq('bin\\Debug\\')
+    expect(subject.output_path('Debug')).to eq('bin\\Debug\\')
   end
   it 'should also have a Release OutputPath' do
-    subject.output_path('Release').should eq('bin\\Release\\')
-    subject.try_output_path('Release').should eq('bin\\Release\\')
+    expect(subject.output_path('Release')).to eq('bin\\Release\\')
+    expect(subject.try_output_path('Release')).to eq('bin\\Release\\')
   end
   it 'should raise "ConfigurationNotFoundEror" if not found' do
     begin
@@ -38,19 +38,19 @@ describe Albacore::Project, "when loading packages.config" do
     end
   end
   it 'should return nil with #try_output_path(conf)' do
-    subject.try_output_path('weeeo').should be_nil
+    expect(subject.try_output_path('weeeo')).to be_nil
   end
   it "should have three packages" do
-    subject.declared_packages.length.should == 3
+    expect(subject.declared_packages.length).to eq 3
   end
   it "should contain NLog" do
-    nlog.should_not be_nil
+    expect(nlog).to_not be_nil
   end
   it "should have a four number on NLog" do
-    nlog.version.should eq("2.0.0.2000")
+    expect(nlog.version).to eq("2.0.0.2000")
   end
   it "should have a semver number" do
-    nlog.semver.should eq(Albacore::SemVer.new(2, 0, 0))
+    expect(nlog.semver).to eq(Albacore::SemVer.new(2, 0, 0))
   end
 end
 
@@ -65,7 +65,7 @@ describe Albacore::Project, "when reading project file" do
     subject.included_files.find { |p| p.include == 'Library1.fs' }
   end
   it "should contain library1" do
-    library1.should_not be_nil
+    expect(library1).to_not be_nil
   end
 
   describe 'public API' do
@@ -95,13 +95,13 @@ describe Albacore::Project, "when reading project file" do
     end
     it 'should have three referenced packages' do
       expected = %w|Intelliplan.Util Newtonsoft.Json NLog|
-      subject.find_packages.map(&:id).should eq(expected)
+      expect(subject.find_packages.map(&:id)).to 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')
+      expect(subject.output_dll('Release')).to eq(Paths.join 'bin', 'Release', 'Project.dll')
     end
   end
 end

data/spec/rake_overrides_spec.rb

@@ -3,19 +3,19 @@ require 'albacore/rake_overrides'
 
 describe 'when overriding rake' do
   it 'has string return value by default' do
-    ::Rake.old_original_dir.should be_an_instance_of String
+    expect(::Rake.old_original_dir).to be_an_instance_of String
   end
 
   it 'should override Rake#original_dir so that includes separator chars' do
     # assume we never test from root of file system:
-    ::Rake.original_dir.should include(Paths.separator)
+    expect(::Rake.original_dir).to include(Paths.separator)
   end
 
   it 'should have #original_dir_path' do
-    ::Rake.should respond_to(:original_dir_path)
+    expect(::Rake).to respond_to(:original_dir_path)
   end
 
   it 'should have #original_dir_path().to_s include the separator' do
-    ::Rake.original_dir_path.to_s.should include(Paths.separator)
+    expect(::Rake.original_dir_path.to_s).to include(Paths.separator)
   end
 end

data/spec/shared_contexts.rb

@@ -7,7 +7,7 @@ shared_context 'package_metadata_dsl' do
 
   def self.has_value sym, e
     it "should have overridden #{sym}, to be #{e}" do
-      m.send(sym).should eq e
+      expect(m.send(sym)).to eq e
     end
   end
 

data/spec/smoke_spec.rb

@@ -5,7 +5,7 @@ require 'logger'
 describe Array, "with some elements" do
   subject { [1,2,3] }
   it "should have the prescribed elements" do
-    subject.should == [1,2,3]
+    expect(subject).to eq [1,2,3]
   end
 end
 
@@ -14,14 +14,14 @@ describe Enumerable, "when using #find" do
     [OpenStruct.new(:a => "1 apple")]
   end
   it "should handle find properly one arg" do
-    subject.find { |f| f.a == "1 apple" }.a.should eq "1 apple"
+    expect(subject.find { |f| f.a == "1 apple" }.a).to eq "1 apple"
   end
   it "should handle find properly, two args" do
     s = subject.clone
     s << OpenStruct.new(:a => "2 banana")
-    s.find { |f| f.a == "2 banana" }.a.should eq "2 banana"
-    s.find { |f| f.a == "1 banana" }.should be_nil
-    s.find { |f| f.a == "1 apple" }.a.should eq "1 apple" 
+    expect(s.find { |f| f.a == "2 banana" }.a).to eq "2 banana"
+    expect(s.find { |f| f.a == "1 banana" }).to be_nil
+    expect(s.find { |f| f.a == "1 apple" }.a).to eq "1 apple" 
   end
 end
 
@@ -46,10 +46,10 @@ describe 'logging methods' do
       subject.blocky 'trace-is-enabled with ::DEBUG'
     end
     it 'should contain non-block line' do
-      @logout.string.should include('my-trace-line')
+      expect(@logout.string).to include('my-trace-line')
     end
     it 'should contain block line' do
-      @logout.string.should include('trace-is-enabled')
+      expect(@logout.string).to include('trace-is-enabled')
     end
   end
 end

data/spec/tasks/versionizer_spec.rb

@@ -26,31 +26,31 @@ describe 'finding build special versions' do
   end
 
   it 'should return a hash' do
-    subject.should be_a(Hash)
+    expect(subject).to be_a(Hash)
   end
 
   it 'should return the correct build number' do
-    subject[:build_number].should eq(3)
+    expect(subject[:build_number]).to eq(3)
   end
 
   it 'should return the same semver' do
-    subject[:semver].should eq(::XSemVer::SemVer.new(1, 2, 3, 'deadbeef'))
+    expect(subject[:semver]).to 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')
+    expect(subject[:long_version]).to eq('1.2.3.0')
   end
 
   it 'should return the correct formal_version' do
-    subject[:formal_version].should eq('1.2.3')
+    expect(subject[:formal_version]).to eq('1.2.3')
   end
 
   it 'should return a build_version' do
-    subject[:build_version].should_not be_nil
+    expect(subject[:build_version]).to_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')
+    expect(subject[:build_version]).to eq('1.2.3-deadbeef.123456')
   end
 
   it 'should return a nuget_version' do

data/spec/test_runner_spec.rb

@@ -33,7 +33,7 @@ describe ::Albacore::TestRunner::Config do
   end
 
   it 'should have the appropriate parameter in #opts.get(:parameters)' do
-    subject.opts.get(:parameters).should include('/TestResults=/b/c/d/e.xml')
+    expect(subject.opts.get(:parameters)).to include('/TestResults=/b/c/d/e.xml')
   end
   
   it 'should have clr_command=false' do
@@ -55,11 +55,11 @@ describe 'the order of which parameters are passed', ::Albacore::TestRunner::Con
   end
 
   it 'should first pass the flags' do
-    params.first.should eq('/TestResults=abc.xml')
+    expect(params.first).to eq('/TestResults=abc.xml')
   end
 
   it 'should pass the file as a :files' do
-    subject.opts.get(:files).should eq(['a/b/c/file.dll'])
+    expect(subject.opts.get(:files)).to eq(['a/b/c/file.dll'])
   end
 end
 
@@ -73,12 +73,12 @@ describe ::Albacore::TestRunner::Cmd do
 
   it 'should include the parameters when executing' do
     # the intersection of actual parameters with expected should eq expected
-    (subject.parameters - (subject.parameters - %w|params go here|)).
-      should eq(%w|params go here|)
+    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
-    (subject.parameters - %w|params go here|).should eq(%w|a/b/c/lib.tests.dll|)
+    expect((subject.parameters - %w|params go here|)).to eq(%w|a/b/c/lib.tests.dll|)
   end
 end
 
@@ -103,8 +103,8 @@ describe ::Albacore::TestRunner::Task do
     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])
+      expect(dir).to eq(expected[0])
+      expect(exe).to eq(expected[1])
     end
 
   end
@@ -119,9 +119,9 @@ describe ::Albacore::TestRunner::Task do
 
   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('..')
+      expect(dir).to eq('..')
       # at this point, the exe file is just a dir in
-      exe.should =~ /\w+\/e\.exe/
+      expect(exe).to match /\w+\/e\.exe/
     end
   end
 end

data/spec/tools/fluent_migrator_spec.rb

@@ -60,10 +60,10 @@ describe Albacore::Tools::FluentMigrator::Cmd, "when calling #execute" do
     let (:c) { cmd :task_override => '--toversion=4' }
     include_context 'executing command'
     it 'does not contain --task' do
-      subject.should_not include('--task')
+      expect(subject).to_not include('--task')
     end
     it 'includes --toversion=4' do
-      subject.should include('--toversion=4')
+      expect(subject).to include('--toversion=4')
     end
   end
 
@@ -73,7 +73,7 @@ describe Albacore::Tools::FluentMigrator::Cmd, "when calling #execute" do
     include_context 'executing command'
     it 'should contain extras' do
       extras.
-        each { |e| subject.should include(e) }
+        each { |e| expect(subject).to include(e) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.00'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.00'
 description: |2
       Easily build your .Net or Mono project using this collection of Rake tasks.
       Albacore assist you in creating nugets, managing nugets, building your projects,
@@ -405,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: albacore
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dolphin-safe and awesome Mono and .Net Rake-tasks