albacore 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0b0c03d8f5156d2b5492496d09ad42d88097e6
-  data.tar.gz: ca451c9559ec59721dd5ee7111868bae3fd8ed6e
+  metadata.gz: ad7e2ccdd0029e01e2d2fce9d84659101fe21663
+  data.tar.gz: c6c019c230185fae7118a2c032f5e4a52f26d215
 SHA512:
-  metadata.gz: 35ef6e04bcb515467e8fd9fd7fb55c776dcc81924ad29ec7ad22b03c1fe098f7ebcf429c547685c12894f5ee5fb4706807bf704a06297d60718d74c94e40234d
-  data.tar.gz: ca8300748ac7e18a85ba0816118fb4a66a392c1d01f89e9bf8d27765d80bc945e4d167a0d295e5845c088c17e338a6f26ccdaf4740c85c7a0f7b8a1e5deb6433
+  metadata.gz: 5224e0bcd7619547d797834d84d4b10834f2221ce2efb6274add9a8cf8d7d1af6cab901e6cbf18ca0da1cd7489f0b687b75cf3c6032f478e7b82e3d476d90ff3
+  data.tar.gz: 18f7870efc0eaa72550db608b330152e4221c25680f98f27a78aea55a3445cbb4e3576cd666ee9adaa8636f98f4c0968c005f501eb74828f0aef7d7154f4debc

data/lib/albacore/nuget_model.rb

@@ -371,10 +371,10 @@ end})
           # add declared projects as dependencies
           proj.
             declared_projects.
-            keep_if { |p| opts.get(:known_projects).include? p.name }.
+            keep_if { |p| opts.get(:known_projects).include? p.id }.
             each do |p|
-            debug "adding project dependency: #{proj.name} => #{p.name} at #{version} [nuget model: package]"
-            package.metadata.add_dependency p.name, version
+            debug "adding project dependency: #{proj.id} => #{p.id} at #{version} [nuget model: package]"
+            package.metadata.add_dependency p.id, version
           end
         end
 

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end

data/spec/app_spec_spec.rb

@@ -12,7 +12,7 @@ project_path: spec/testdata/Project/Project.fsproj
 
   %w|title description uri category version license dir_path to_s|.map { |w| :"#{w}" }.each do |s|
     it "should respond to ##{s}" do
-      subject.should respond_to s
+      expect(subject).to respond_to s
     end
 
     it "should be possible to always call ##{s}" do
@@ -25,43 +25,43 @@ project_path: spec/testdata/Project/Project.fsproj
   end
 
   it 'should have correct title' do
-    subject.title.should eq 'superapp.now'
+    expect(subject.title).to eq 'superapp.now'
   end
 
   it 'should have nil license' do
-    subject.license.should be_nil
+    expect(subject.license).to be_nil
   end
 
   it 'should have nil description' do
-    subject.description.should be_nil
+    expect(subject.description).to be_nil
   end
 
   it 'should never have nil uri, since we\'re in the albacore git repo and it defaults to the current repo' do
-    subject.uri.should include 'albacore.git' unless teamcity? # teamcity doesn't keep git folder
+    expect(subject.uri).to include 'albacore.git' unless teamcity? # teamcity doesn't keep git folder
   end
 
   it 'should have "apps" category, since it\'s not specified anywhere' do
-    subject.category.should eq 'apps'
+    expect(subject.category).to eq 'apps'
   end
 
   it 'should have a nil version' do
-    subject.version.should eq('1.0.0')
+    expect(subject.version).to eq('1.0.0')
   end
 
   it 'should have non-nil #bin_folder' do
-    subject.bin_folder.should_not be_nil
+    expect(subject.bin_folder).to_not be_nil
   end
 
   it 'should have non-nil #conf_folder' do
-    subject.conf_folder.should_not be_nil
+    expect(subject.conf_folder).to_not be_nil
   end
 
   it 'should have non-nil #contents' do
-    subject.contents.should_not be_nil
+    expect(subject.contents).to_not be_nil
   end
 
   it 'should have a #contents that responds to #each' do
-    subject.contents.should respond_to :each
+    expect(subject.contents).to respond_to :each
   end
 end
 
@@ -73,8 +73,6 @@ title: superapp.now
 project_path: spec/testdata/Project/Project.fsproj
 }
   end
-
-  # TODO: create a spike that actually works and document what is required here  
 end
 
 describe ::Albacore::AppSpec, 'when getting version from semver' do
@@ -88,7 +86,7 @@ project_path: spec/testdata/Project/Project.fsproj
   end
 
   it 'should take version from the semver first' do
-    subject.version.should eq '1.2.3'
+    expect(subject.version).to eq '1.2.3'
   end
 end
 
@@ -103,7 +101,7 @@ project_path: spec/testdata/Project/Project.fsproj
   end
 
   it 'should take version from the semver first' do
-    subject.version.should eq '4.5.6'
+    expect(subject.version).to eq '4.5.6'
   end
 end
 
@@ -136,15 +134,15 @@ describe ::Albacore::AppSpec, 'when fetching ALL data from Project.fsproj' do
   it 'should find the directory of the project' do
     # this also means it found a project and successfully parsed its project
     # definition
-    subject.proj.proj_path_base.should include File.dirname(project_path)
+    expect(subject.proj.proj_path_base).to include File.dirname(project_path)
   end
 
   it 'should have the title' do
-    subject.title.should eq 'project'
-    subject.title_raw.should eq 'Project'
+    expect(subject.title).to eq 'project'
+    expect(subject.title_raw).to eq 'Project'
   end
 
   it 'should have no license' do
-    subject.license.should be_nil
+    expect(subject.license).to be_nil
   end
 end

data/spec/nuget_model_spec.rb

@@ -133,7 +133,7 @@ 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
+    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)
     end
   end
@@ -278,7 +278,7 @@ describe "creating nuget (not symbols) from dependent proj file" do
       :version        => '2.3.0',
       :configuration  => 'Debug'
   end
-  
+
   include_context 'package_metadata_dsl'
 
   # from fsproj
@@ -309,7 +309,8 @@ describe "creating nuget on dependent proj file" do
 
   let :projfile do
     curr = File.dirname(__FILE__)
-    File.join curr, "testdata", "TestingDependencies", "Sample.Commands", "Sample.Commands.fsproj"
+    File.join curr, "testdata", "TestingDependencies", "Sample.Commands",
+              "Sample.Commands.fsproj"
   end 
 
   let :opts do
@@ -321,11 +322,11 @@ describe "creating nuget on dependent proj file" do
   subject do
     Albacore::NugetModel::Package.from_xxproj_file projfile, opts
   end
-  
+
   include_context 'package_metadata_dsl'
 
   describe 'without project_dependencies' do
-    # just as the opts in the main describe says...
+    # just as the opts in the main describe says
     has_not_dep 'Sample.Core'
     has_dep 'Magnum', '2.1.0'
     has_dep 'MassTransit', '2.8.0'
@@ -335,6 +336,25 @@ describe "creating nuget on dependent proj file" do
     has_not_file 'Library.fs'
   end
 
+  describe 'with project_dependencies' do
+
+    let :opts do
+      { project_dependencies: true,
+        known_projects:       %w[Sample.Core],
+        version:             '2.3.0' }
+    end
+
+    # just as the opts in the main describe says
+    has_dep 'Sample.Core', '2.3.0'
+    has_dep 'Magnum', '2.1.0'
+    has_dep 'MassTransit', '2.8.0'
+    has_dep 'Newtonsoft.Json', '5.0.6'
+    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
+    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
+    has_not_file 'Library.fs'
+
+  end
+
   describe 'without nuget_dependencies' do
     let :opts do
       { nuget_dependencies: false,

data/spec/testdata/TestingDependencies/Sample.Core/Sample.Core.fsproj

@@ -10,7 +10,8 @@
     <RootNamespace>Sample.Core</RootNamespace>
     <AssemblyName>Sample.Core</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <Name>Sample.Core</Name>
+    <Name>Sample.Core is the Greatest</Name>
+    <Id>Sample.Core</Id>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Henrik Feldt