albacore 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad7e2ccdd0029e01e2d2fce9d84659101fe21663
-  data.tar.gz: c6c019c230185fae7118a2c032f5e4a52f26d215
+  metadata.gz: 901e30922303f765f41f212911ce9eebd2bd37dc
+  data.tar.gz: b89dbbfc09371b22ce7f1c79dbbba0a291b0cf84
 SHA512:
-  metadata.gz: 5224e0bcd7619547d797834d84d4b10834f2221ce2efb6274add9a8cf8d7d1af6cab901e6cbf18ca0da1cd7489f0b687b75cf3c6032f478e7b82e3d476d90ff3
-  data.tar.gz: 18f7870efc0eaa72550db608b330152e4221c25680f98f27a78aea55a3445cbb4e3576cd666ee9adaa8636f98f4c0968c005f501eb74828f0aef7d7154f4debc
+  metadata.gz: 69e554a5c31ea4d26551fcb15e09397c54f122808ba1e10119d73c348075fbe5f434ec9917d1fdbff003f23f8ae11bfa4975dc2f1413de14cb54f93e8e9bc5ed
+  data.tar.gz: 9e0be39b88850f9b6f41431c4c10aa1a831960e89b0cbf9598d8b383ad8724ffc04fbb49506ef8b89ac22c73bd566cd3b568ea371b64aa74ca08a9962081e2b0

data/lib/albacore/nuget_model.rb

@@ -359,10 +359,10 @@ end})
         package.metadata.authors = proj.authors if proj.authors
 
         if opts.get :nuget_dependencies
-          trace "adding nuget dependencies for #{proj.name}"
+          trace "adding nuget dependencies for id #{proj.id}"
           # add declared packages as dependencies
           proj.declared_packages.each do |p|
-            debug "adding package dependency: #{proj.name} => #{p.id} at #{p.version} [nuget model: package]"
+            debug "adding package dependency: #{proj.id} => #{p.id} at #{p.version} [nuget model: package]"
             package.metadata.add_dependency p.id, p.version
           end
         end
@@ -409,7 +409,7 @@ end})
           package.files.each do |file|
             file_path = File.expand_path file.src, proj.proj_path_base
             unless File.exists? file_path
-              info "while building nuspec for proj: #{proj.name}, file: #{file_path} => #{file.target} not found, removing from nuspec [nuget model: package]"
+              info "while building nuspec for proj id: #{proj.id}, file: #{file_path} => #{file.target} not found, removing from nuspec [nuget model: package]"
               package.remove_file file.src
               trace { "files: #{package.files.map { |f| f.src }.inspect} [nuget model: package]" }
             end

data/lib/albacore/project.rb

@@ -24,9 +24,18 @@ module Albacore
       sanity_checks
     end
 
+    # Get the project GUID without '{' or '}' characters.
+    def guid
+      guid_raw.gsub /[\{\}]/, ''
+    end
+
+    # Get the project GUID as it is in the project file.
+    def guid_raw
+      read_property 'ProjectGuid'
+    end
+
     # Get the project id specified in the project file. Defaults to #name.
     def id
-      debug { "Id: #{read_property('Id')}" }
       (read_property 'Id') || name
     end
 
@@ -34,7 +43,6 @@ module Albacore
     # the title of the nuspec and, if Id is not specified, also the id of the
     # nuspec.
     def name
-      debug { "Name: #{read_property('Name')}" }
       (read_property 'Name') || asmname
     end
 
@@ -128,10 +136,12 @@ module Albacore
     end
 
     def declared_projects
-      @proj_xml_node.css("ProjectReference").collect do |proj|
-        debug "#{name}: found project reference: #{proj.css("Name").inner_text} [albacore: project]"
-        Project.new(File.join(@proj_path_base, Albacore::Paths.normalise_slashes(proj['Include'])))
-        #OpenStruct.new :name => proj.inner_text
+      @proj_xml_node.css("ProjectReference").collect do |proj_ref|
+        debug do
+          ref_name = proj_ref.css("Name").inner_text
+          "found project reference: #{name} => #{ref_name} [albacore: project]"
+        end
+        Project.new(File.join(@proj_path_base, Albacore::Paths.normalise_slashes(proj_ref['Include'])))
       end
     end
 

data/lib/albacore/task_types/nugets_pack.rb

@@ -245,8 +245,9 @@ and report a bug to albacore with the full output. Here's the nuget process outp
 
       private
 
+      # Computes the known *Ids* of the projects; as Name = Title when creating nugets.
       def compute_knowns
-        Set.new(@files.map { |f| Albacore::Project.new f }.map { |p| p.name })
+        Set.new(@files.map { |f| Albacore::Project.new f }.map { |p| p.id })
       end
 
       def generate_nuspec p, knowns

data/lib/albacore/version.rb

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

data/spec/project_spec.rb

@@ -12,6 +12,15 @@ describe Albacore::Project, "when loading packages.config" do
   let :nlog do
     subject.declared_packages.find { |p| p.id == 'NLog' }
   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
+  end
+
+  it 'assumption: can gsub("[\{\}]", "")' do
+    expect('{a}'.gsub(/[\{\}]/, '')).to eq 'a'
+  end
+
   it 'should have an OutputPath' do
     subject.output_path('Debug').should_not be_nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake