albacore 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ff60be90fd9e1faa33cdb6093b5ac47e54356d
-  data.tar.gz: 1199a00917e052a941aa5b107dfe214cd5afe6e2
+  metadata.gz: 8f0b0c03d8f5156d2b5492496d09ad42d88097e6
+  data.tar.gz: ca451c9559ec59721dd5ee7111868bae3fd8ed6e
 SHA512:
-  metadata.gz: d50d3630157c1e9f30532cdd1af2eda19154638833ab4519a9c12f878d5b60ba89446d5d3dcec17bace8d142e66d3d320e0b0b06e25b67f38b95433e31387a76
-  data.tar.gz: d75087d34b604a9d5dc24078b9a3cb7b02badd3da83c27cf3cb6627a984d0e90cdcb7c03edc12cda83d5f6ab2e65efa326b511ccf6b1740eba9901dc931ddcc4
+  metadata.gz: 35ef6e04bcb515467e8fd9fd7fb55c776dcc81924ad29ec7ad22b03c1fe098f7ebcf429c547685c12894f5ee5fb4706807bf704a06297d60718d74c94e40234d
+  data.tar.gz: ca8300748ac7e18a85ba0816118fb4a66a392c1d01f89e9bf8d27765d80bc945e4d167a0d295e5845c088c17e338a6f26ccdaf4740c85c7a0f7b8a1e5deb6433

data/.gitignore

@@ -7,3 +7,4 @@ spec/testdata/TestingDependencies/Sample.Commands/Sample.Commands.nuspec
 spec/testdata/Project/Sample.Nuget.nuspec
 spec/testdata/TestingDependencies/Sample.Core/Sample.Core.nuspec
 
+*.userprefs

data/lib/albacore/nuget_model.rb

@@ -208,7 +208,7 @@ end})
         str = str.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
         :"#{str}"
       end
-      
+
       def self.underscore str
         str.gsub(/::/, '/').
           gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').

data/lib/albacore/project.rb

@@ -26,15 +26,16 @@ module Albacore
 
     # Get the project id specified in the project file. Defaults to #name.
     def id
-      read_property 'Id' || name
+      debug { "Id: #{read_property('Id')}" }
+      (read_property 'Id') || name
     end
 
     # Get the project name specified in the project file. This is the same as
     # the title of the nuspec and, if Id is not specified, also the id of the
     # nuspec.
     def name
-      prop = read_property 'Name' || asmname
-      prop || asmname
+      debug { "Name: #{read_property('Name')}" }
+      (read_property 'Name') || asmname
     end
 
     # The same as #name

data/lib/albacore/version.rb

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

data/spec/nuget_model_spec.rb

@@ -168,11 +168,11 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
   include_context 'package_metadata_dsl'
 
   it "should find Name element" do
-    m.id.should eq 'Project'
+    expect(m.id).to eq 'Project'
   end
 
   it "should not find Version element" do
-    m.version.should eq nil
+    expect(m.version).to eq nil
   end
 
   it "should find Authors element" do

data/spec/testdata/Project/Project.fsproj

@@ -10,7 +10,7 @@
     <RootNamespace>Project</RootNamespace>
     <AssemblyName>Project</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <Id>Project</Id>
+    <Name>Project</Name>
     <Authors>Henrik Feldt</Authors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

metadata

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