albacore 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2596f8a02ce89dde76572eb6505e6ea000043fc3
-  data.tar.gz: 9977d5a8fcc3eed52691888ed6ecb79bcaa313d3
+  metadata.gz: c9ff60be90fd9e1faa33cdb6093b5ac47e54356d
+  data.tar.gz: 1199a00917e052a941aa5b107dfe214cd5afe6e2
 SHA512:
-  metadata.gz: 880751cac4bfea808ffa6bb1084be450648e23edf8965e67cb87e0be3c62d4fed4fc1928eff7c53d6db4dee3cb4fb89f5f14f5e965526bd79f44c7de8337fa3e
-  data.tar.gz: d664ecd49dd31ce24df8813b33ba3dd380f787e18dcceaa5837c318b087daeabe63d92ecc0ae0c0c7beb721da0226ce9d955c0bc60ffdc9086f12aeb7f4d8736
+  metadata.gz: d50d3630157c1e9f30532cdd1af2eda19154638833ab4519a9c12f878d5b60ba89446d5d3dcec17bace8d142e66d3d320e0b0b06e25b67f38b95433e31387a76
+  data.tar.gz: d75087d34b604a9d5dc24078b9a3cb7b02badd3da83c27cf3cb6627a984d0e90cdcb7c03edc12cda83d5f6ab2e65efa326b511ccf6b1740eba9901dc931ddcc4

data/README.md

@@ -75,8 +75,8 @@ Now you are ready to continue reading below for your first Rakefile.
 
 ### Installing Ruby on Windows
 
-First install Ruby from http://rubyinstaller.org/downloads/ - e.g. [v2.1.3
-32-bits](http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.1.3.exe?direct)
+First install Ruby **32 bits** from http://rubyinstaller.org/downloads/ - e.g. [v2.1.5
+32-bits](http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.1.5.exe?direct)
 which is the latest version, at time of writing.
 
 Second, install Ruby DevKit, or you won't be able to install nokogiri. Download
@@ -97,6 +97,8 @@ Now close that console and open a new console, and run:
 This gives you a working ruby installation. Continue below with your first
 Rakefile.
 
+You can also try chocolatey [`ruby`](https://chocolatey.org/packages/ruby) and [`ruby2.devkit`](https://chocolatey.org/packages/ruby2.devkit) packages.
+
 ### Installing Ruby on OS X
 
 ``` bash

data/lib/albacore/nuget_model.rb

@@ -43,7 +43,7 @@ end})
 %{def #{sym}= val
   @#{sym} = val
   @set_fields.add? :#{sym}
-end})                      
+end})
         end 
       end
 
@@ -353,7 +353,8 @@ end})
 
         version = opts.get :version
         package = Package.new
-        package.metadata.id = proj.name if proj.name
+        package.metadata.id      = proj.id if proj.id
+        package.metadata.title   = proj.name if proj.name
         package.metadata.version = version if version
         package.metadata.authors = proj.authors if proj.authors
 

data/lib/albacore/project.rb

@@ -24,7 +24,14 @@ module Albacore
       sanity_checks
     end
 
-    # get the project name specified in the project file
+    # Get the project id specified in the project file. Defaults to #name.
+    def 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

data/lib/albacore/version.rb

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

data/spec/fpm_app_spec_spec.rb

@@ -89,7 +89,7 @@ describe ::Albacore::FpmAppSpec, 'when generating command from valid AppSpec' do
     expect(flags['--license']).to eq 'MIT'
   end
 
-  if ::Rake::Win32.windows?
+  if ::Albacore.windows?
     it 'should generate command "look in this directory" flag' do
       expect(flags['-C']).should match  /^.:\/a\/b$/
     end

data/spec/nuget_model_spec.rb

@@ -4,7 +4,10 @@ require 'albacore/paths'
 require 'albacore/nuget_model'
 
 describe Albacore::NugetModel::Metadata do
-  [:id, :version, :authors, :description, :summary, :language, :project_url, :license_url, :release_notes, :owners, :require_license_acceptance, :copyright, :tags, :dependencies, :framework_assemblies].each do |prop|
+  [ :id, :version, :authors, :title, :description, :summary, :language,
+    :project_url, :license_url, :release_notes, :owners,
+    :require_license_acceptance, :copyright, :tags, :dependencies,
+    :framework_assemblies ].each do |prop|
     it "responds to :#{prop}" do
       subject.should respond_to(prop)
     end
@@ -18,13 +21,13 @@ describe Albacore::NugetModel::Metadata do
       subject.dependencies['DepId']
     end
     it "should contain the dependency version" do
-      dep.version.should eq('=> 3.4.5')
+      expect(dep.version).to eq '=> 3.4.5'
     end
     it "should contain the dependency id" do
-      dep.id.should eq('DepId')
+      expect(dep.id).to eq 'DepId'
     end
     it "should contain only one dependency" do
-      subject.dependencies.length.should eq(1)
+      expect(subject.dependencies.length).to eq 1
     end
   end
 
@@ -99,14 +102,15 @@ XML
   end
 
   let :parser do
-    io = StringIO.new xml    
+    io = StringIO.new xml
     Nokogiri::XML(io)
   end
+
   let :ns do
     { ng: 'http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd' }
   end
+
   subject do
-    #puts "parser: #{parser}"
     package = Albacore::NugetModel::Package.from_xml xml
     #puts "node: #{package.inspect}"
     #puts "node meta: #{package.metadata.inspect}"
@@ -155,7 +159,8 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
   let :projfile do
     curr = File.dirname(__FILE__)
     File.join curr, "testdata", "Project", "Project.fsproj"
-  end 
+  end
+
   subject do
     Albacore::NugetModel::Package.from_xxproj_file projfile
   end
@@ -171,7 +176,11 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
   end
 
   it "should find Authors element" do
-    m.authors.should eq "Henrik Feldt"
+    expect(m.authors).to eq "Henrik Feldt"
+  end
+
+  it 'should have the same title as <Name />' do
+    expect(m.title).to eq 'Project'
   end
 
   describe "when including files" do
@@ -188,6 +197,35 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
   end
 end
 
+describe "when reading xml from a fsproj file into Project/Metadata (with Id different form Name)" do
+  let :projfile do
+    curr = File.dirname(__FILE__)
+    File.join curr, "testdata", "Project", "ProjectWithTitle.fsproj"
+  end 
+
+  subject do
+    Albacore::NugetModel::Package.from_xxproj_file projfile
+  end
+
+  include_context 'package_metadata_dsl'
+
+  it "should find Name element" do
+    expect(m.id).to eq 'Project'
+  end
+
+  it "should not find Version element" do
+    expect(m.version).to be_nil
+  end
+
+  it "should find Authors element" do
+    expect(m.authors).to eq "Henrik Feldt"
+  end
+
+  it 'should use the Name tag here, too' do
+    expect(m.title).to eq 'Project for Glorious Success'
+  end
+end
+
 describe Albacore::NugetModel::Package, "overriding metadata" do
   let :p1 do
     p = Albacore::NugetModel::Package.new.with_metadata do |m|

data/spec/testdata/Project/Project.fsproj

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

data/spec/testdata/Project/ProjectWithTitle.fsproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>c821e8b3-528b-40c4-88c2-57a1119da596</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Project</RootNamespace>
+    <AssemblyName>Project</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <Name>Project for Glorious Success</Name>
+    <Id>Project</Id>
+    <Authors>Henrik Feldt</Authors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Debug\Project.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseXanna|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Project.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\Release\Project.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Library1.fs" />
+    <None Include="Script.fsx" />
+  </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets" Condition=" Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')" />
+</Project>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -357,6 +357,7 @@ files:
 - spec/testdata/Project/Project.fsproj
 - spec/testdata/Project/Project.sln
 - spec/testdata/Project/Project.v11.suo
+- spec/testdata/Project/ProjectWithTitle.fsproj
 - spec/testdata/Project/bin/Debug/Project.dll
 - spec/testdata/Project/bin/Debug/Project.xml
 - spec/testdata/Project/bin/Release/Project.dll
@@ -592,6 +593,7 @@ test_files:
 - spec/testdata/Project/Project.fsproj
 - spec/testdata/Project/Project.sln
 - spec/testdata/Project/Project.v11.suo
+- spec/testdata/Project/ProjectWithTitle.fsproj
 - spec/testdata/Project/bin/Debug/Project.dll
 - spec/testdata/Project/bin/Debug/Project.xml
 - spec/testdata/Project/bin/Release/Project.dll