albacore 2.8.0 → 3.0.0.pre.alpha

data/lib/albacore/task_types/sql_cmd.rb

@@ -63,7 +63,7 @@ module Albacore
 
       attr_path_accessor :database do |d|
         @parameters.add("-d#{d}")
-      end      
+      end
 
       attr_path_accessor :username do |u|
         @parameters.add("-U#{u}")

data/lib/albacore/tasks/release.rb

@@ -39,7 +39,7 @@ module Albacore
         @name = name
         @opts = Map.new(opts).apply \
           pkg_dir:      'build/pkg',
-          nuget_exe:    'tools/NuGet.exe',
+          paket_exe:    '.paket/paket.exe',
           nuget_source: 'https://www.nuget.org/api/v2/package',
           clr_command:  true,
           depend_on:    :versioning,
@@ -135,7 +135,7 @@ module Albacore
         exe = @opts.get(:nuget_exe)
         (! packages.empty?) or \
           raise("You must have built your packages for version #{nuget_version}, use 'depend_on: :nuget_pkg'")
-        (File.exists?(exe)) or raise("You don't have a NuGet.exe file to push with, expected path: #{exe}")
+        (File.exists?(exe)) or raise("You don't have a paket.exe file to push with, expected path: #{exe}")
       end
 
       def committed?

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.8.0"
+  VERSION = "3.0.0-alpha"
 end

data/spec/dsl_spec.rb

@@ -14,7 +14,7 @@ end
 
 #puts "X has methods: #{X.new.private_methods.inspect}"
 
-%w[nugets_restore nugets_pack asmver build restore_hint_paths appspecs].each do |sym|
+%w[nugets_restore nugets_pack asmver build].each do |sym|
   method = :"#{sym}"
   describe "that #{method}(*args, &block) is included when doing `require 'albacore'`" do
     subject do

data/spec/nuget_model_spec.rb

@@ -4,6 +4,18 @@ require 'albacore/paths'
 require 'albacore/nuget_model'
 require 'albacore/application'
 
+##  Table of contents
+#
+# - Structure of Metadata
+# - Package#to_xml
+# - Package#from_xml
+# - Package#from_xxproj_file (full fw)
+# - Package#from_xxproj_file with metadata/title in proj file (full fw)
+# - Package#with_metadata
+# - Package#from_xxproj_file with packages.config (full fw)
+# - Package#from_xxproj_file with dependent project (full fw)
+#
+
 describe Albacore::NugetModel::Metadata do
   [ :id, :version, :authors, :title, :description, :summary, :language,
     :project_url, :license_url, :release_notes, :owners,
@@ -14,64 +26,144 @@ describe Albacore::NugetModel::Metadata do
     end
   end
 
-  describe "when adding a dependency" do
+  describe "adding dependency w/o group" do
     before do 
-      subject.add_dependency 'DepId', '=> 3.4.5'
+      subject.add_dependency 'DepId', '[3.4.5, 4.0)', '', false
     end
+
     let :dep do
       subject.dependencies['DepId']
     end
-    it "should contain the dependency version" do
-      expect(dep.version).to eq '=> 3.4.5'
+
+    it "contains the dependency version" do
+      expect(dep.version).to eq '[3.4.5, 4.0)'
     end
-    it "should contain the dependency id" do
+
+    it "contains the dependency id" do
       expect(dep.id).to eq 'DepId'
     end
-    it "should contain only one dependency" do
+
+    it "has group=false from invocation" do
+      expect(dep.group).to eq false
+    end
+
+    it "defaults to target_framework=''" do
+      expect(dep.target_framework).to be_empty
+    end
+
+    it "contains only one dependency" do
       expect(subject.dependencies.length).to eq 1
     end
+
+    describe "#to_xml" do
+      let :xml do
+        subject.to_xml
+      end
+
+      it "generates a list" do
+        expect(xml).to include("  <dependencies>\n    <dependency id=\"DepId\" version=\"[3.4.5, 4.0)\"/>")
+      end
+    end
   end
 
-  describe "when adding a framework dependency" do
+  describe "adding framework dependency" do
     before do
       subject.add_framework_dependency 'System.Transactions', '2.0.0' 
     end
+
     let :dep do
       subject.framework_assemblies.first[1]
     end
+
     it "should contain the dependency id" do
       expect(dep.id).to eq('System.Transactions')
     end
+
     it "should contain the dependency version" do
       expect(dep.version).to eq('2.0.0')
     end
+
     it "should contain a single dependency" do
       expect(subject.framework_assemblies.length).to eq(1)
     end
   end
+
+  describe "when adding dependency w/ groups" do
+    before do
+      subject.add_dependency 'Dep', '[1.2.3, 2.0)', 'net461'
+      subject.add_dependency 'Dep', '[1.2.3, 2.0)', 'netstandard2.0'
+    end
+
+    it "has both deps" do
+      expect(subject.dependencies.length).to eq 2
+    end
+
+    it "rejects non-grouped dependencies (after grouped)" do
+      expect(lambda {
+        subject.add_dependency 'Hepp', '1.2.3', '', false
+      }).to raise_error(ArgumentError)
+    end
+
+    describe "#to_xml" do
+      let :xml do
+        subject.to_xml
+      end
+
+      it "generates a list" do
+        expected = <<XML
+  <dependencies>
+    <group targetFramework="net461">
+      <dependency id="DepId" version="[3.4.5, 4.0)" />
+    </group>
+    <group targetFramework="netstandard2.0">
+      <dependency id="DepId" version="[3.4.5, 4.0)" />
+    </group>
+  </dependencies>
+XML
+        expect(Nokogiri::XML(xml, &:noblanks).to_xml).to \
+          include(Nokogiri::XML(StringIO.new(xml), &:noblanks).to_xml)
+      end
+    end
+  end
+
+  describe "inverse rejection (no group, then group)" do
+    before do
+      subject.add_dependency 'Dep', '[1.2.3, 2.0)', '', false
+    end
+
+    it "rejects grouped dependencies (after non-grouped)" do
+      expect(lambda {
+        subject.add_dependency 'Hepp', '1.2.3', '', true
+      }).to raise_error(ArgumentError)
+    end
+  end
 end
 
-describe Albacore::NugetModel::Package, "when doing some xml generation" do
+describe Albacore::NugetModel::Package, "#to_xml" do
   it "should be newable" do
     expect(subject).to_not be_nil
   end
+
   [:metadata, :files, :to_xml, :to_xml_builder].each do |prop|
     it "should respond to #{prop}" do
       expect(subject).to respond_to(prop)
     end
   end
+
   it "should generate default metadata" do
     expect(subject.to_xml).to include('<metadata')
   end
+
   it "should not generate default files" do
     expect(subject.to_xml).to_not include('<files')
   end
 end
 
-describe Albacore::NugetModel::Package, "from XML" do
+describe Albacore::NugetModel::Package, "#from_xml" do
   let :dir do
     File.basename(__FILE__)
   end
+
   let :xml do
     <<XML
 <?xml version="1.0" encoding="utf-8"?>
@@ -88,7 +180,12 @@ describe Albacore::NugetModel::Package, "from XML" do
     <copyright>none</copyright>
     <tags>example spec</tags>
     <dependencies>
-      <dependency id="SampleDependency" version="1.0"/>
+      <group>
+        <dependency id="FSharp.Core" version="[4.1, 4.2)"/>
+      </group>
+      <group targetFramework="netstandard1.6">
+        <dependency id="System.Net" version="[1.1, 2.0)"/>
+      </group>
     </dependencies>
   </metadata>
   <files>
@@ -113,14 +210,14 @@ XML
 
   subject do
     package = Albacore::NugetModel::Package.from_xml xml
-    #puts "node: #{package.inspect}"
-    #puts "node meta: #{package.metadata.inspect}"
     package
   end
-  it "should exist" do
+
+  it "exists" do
     expect(subject).to_not be_nil
   end
-  it "should have the metadata properties of the XML above" do
+
+  it "has identical metadata props" do
     parser.
       xpath('./ng:metadata', ns).
       children.
@@ -134,7 +231,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 'roundtrips XML' do
       expect(Nokogiri::XML(subject.to_xml, &:noblanks).to_xml).to \
         eq(Nokogiri::XML(StringIO.new(xml), &:noblanks).to_xml)
     end
@@ -153,11 +250,11 @@ XML
   end
 
   it "should have a dep on SampleDependency version 1.0" do
-    expect(subject.metadata.dependencies['SampleDependency']).to_not be_nil
+    expect(subject.metadata.dependencies['FSharp.Core']).to_not be_nil
   end
 end
 
-describe "when reading xml from a fsproj file into Project/Metadata" do
+describe Albacore::NugetModel::Package, "#from_xxproj_file (full) => Package" do
   let :projfile do
     curr = File.dirname(__FILE__)
     File.join curr, "testdata", "Project", "Project.fsproj"
@@ -185,22 +282,53 @@ describe "when reading xml from a fsproj file into Project/Metadata" do
     expect(m.title).to eq 'Project'
   end
 
-  describe "when including files" do
+  describe "with sources" do
     subject do
-      Albacore::NugetModel::Package.from_xxproj_file projfile, :symbols => true
-    end
-    it "should contain all files (just one) and all dll and pdb+mdb files (two)" do
-      expect(subject.files.length).to eq 4
+      Albacore::NugetModel::Package.from_xxproj_file projfile, :sources => true
     end
 
     has_file 'Library1.fs', 'src/Library1.fs'
-    has_file 'bin/Debug/Project.dll', 'lib/net45'
-    has_file 'bin/Debug/Project.pdb', 'lib/net45'
-    has_file 'bin/Debug/Project.dll.mdb', 'lib/net45'
+    has_file 'bin/Debug/Project.dll', 'lib/net451'
+    has_file 'bin/Debug/Project.pdb', 'lib/net451'
+  end
+end
+
+describe Albacore::NugetModel::Package, "#from_xxproj_file (core) => Package" do
+  let :projfile do
+    curr = File.dirname(__FILE__)
+    File.join curr, "testdata", "console-core-argu", "ConsoleArgu.fsproj"
+  end
+
+  subject do
+    Albacore::NugetModel::Package.from_xxproj_file projfile
+  end
+
+  include_context 'package_metadata_dsl'
+
+  let :frameworks do
+    subject
+      .metadata
+      .dependencies
+      .group_by { |k, dep| dep.target_framework }
+      .map { |g| g[0] }
+  end
+
+  it "targets netstandard2.0 and net461" do
+    expect(frameworks).to eq %w|netstandard2.0 net461|
+  end
+
+  it "has groups" do
+    h = subject.metadata.dependencies
+    h.each do |key, depspec|
+      expect(depspec.group).to eq true
+    end
   end
+
+  has_file 'bin/Debug/net461/ConsoleArgu.dll', 'lib/net461'
+  has_file 'bin/Debug/netstandard2.0/ConsoleArgu.dll', 'lib/netstandard2.0'
 end
 
-describe "when reading xml from a fsproj file into Project/Metadata (with Id different form Name)" do
+describe Albacore::NugetModel::Package, "#from_xxproj_file (full) => Package w/ title" do
   let :projfile do
     curr = File.dirname(__FILE__)
     File.join curr, "testdata", "Project", "ProjectWithTitle.fsproj"
@@ -229,7 +357,7 @@ describe "when reading xml from a fsproj file into Project/Metadata (with Id dif
   end
 end
 
-describe Albacore::NugetModel::Package, "overriding metadata" do
+describe Albacore::NugetModel::Package, "#with_metadata (full)" do
   let :p1 do
     p = Albacore::NugetModel::Package.new.with_metadata do |m|
       m.id = 'A.B'
@@ -254,7 +382,7 @@ describe Albacore::NugetModel::Package, "overriding metadata" do
 
   include_context 'package_metadata_dsl'
 
-  describe "when overriding:" do
+  describe "when overriding" do
     has_value :id, 'A.B.C'
     has_value :owners, 'Henrik Feldt'
     has_value :version, '2.1.3'
@@ -268,7 +396,7 @@ describe Albacore::NugetModel::Package, "overriding metadata" do
   end
 end
 
-describe "creating nuget (not symbols) from dependent proj file" do
+describe Albacore::NugetModel::Package, "(full) w/ packages.config" do
 
   let :projfile do
     curr = File.dirname(__FILE__)
@@ -278,38 +406,39 @@ describe "creating nuget (not symbols) from dependent proj file" do
   subject do
     Albacore::NugetModel::Package.from_xxproj_file projfile,
       :known_projects => %w[Sample.Core],
-      :version        => '2.3.0',
+      :version        => '2.3.0', # TODO: [2.3.0, 3.0.0)
       :configuration  => 'Debug'
   end
 
   include_context 'package_metadata_dsl'
 
   # from fsproj
-  has_dep 'Sample.Core', '2.3.0'
+  has_dep 'Sample.Core', '2.3.0', 'net40' # TODO: [2.3.0, 3.0.0)
 
   # from packages.config
-  has_dep 'Magnum', '2.1.0'
-  has_dep 'MassTransit', '2.8.0'
-  has_dep 'Newtonsoft.Json', '5.0.6'
+  has_dep 'Magnum', '2.1.0', 'net40' # TODO: [2.3.0, 3.0.0)
+  has_dep 'MassTransit', '2.8.0', 'net40' # TODO: [2.3.0, 3.0.0)
+  has_dep 'Newtonsoft.Json', '5.0.6', 'net40' # TODO: [2.3.0, 3.0.0)
 
   # actual nuspec contents
-  has_file 'bin/Debug/Sample.Commands.dll', 'lib/net45'
-  has_file 'bin/Debug/Sample.Commands.xml', 'lib/net45'
+  has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
+  has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
 
-  describe 'when dotnet_version is set' do
-    subject do
-      Albacore::NugetModel::Package.from_xxproj_file projfile,
-        known_projects: %w[Sample.Core],
-        dotnet_version: 'mono32'
+  describe "#to_template" do
+    let :template do
+      subject.to_template
+    end
+
+    it "contains all dependencies" do
+      expect(template).to include('dependencies')
+      expect(template).to include('  MassTransit ~> 2.8.0')
+      expect(template).to include('  Magnum ~> 2.1.0')
+      expect(template).to include('  Newtonsoft.Json ~> 5.0.6')
     end
-    # actual nuspec contents
-    has_file 'bin/Debug/Sample.Commands.dll', 'lib/mono32'
-    has_file 'bin/Debug/Sample.Commands.xml', 'lib/mono32'
   end
 end
 
-describe "creating nuget on dependent proj file" do
-
+describe Albacore::NugetModel::Package, "(full) w/ dependent project" do
   let :projfile do
     curr = File.dirname(__FILE__)
     File.join curr, "testdata", "TestingDependencies", "Sample.Commands",
@@ -331,11 +460,11 @@ describe "creating nuget on dependent proj file" do
   describe 'without project_dependencies' do
     # 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'
-    has_dep 'Newtonsoft.Json', '5.0.6'
-    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net45'
-    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net45'
+    has_dep 'Magnum', '2.1.0', 'net40'
+    has_dep 'MassTransit', '2.8.0', 'net40'
+    has_dep 'Newtonsoft.Json', '5.0.6', 'net40'
+    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
+    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
     has_not_file 'Library.fs'
   end
 
@@ -348,12 +477,12 @@ describe "creating nuget on dependent proj file" do
     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/net45'
-    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net45'
+    has_dep 'Sample.Core', '2.3.0', 'net40'
+    has_dep 'Magnum', '2.1.0', 'net40'
+    has_dep 'MassTransit', '2.8.0', 'net40'
+    has_dep 'Newtonsoft.Json', '5.0.6', 'net40'
+    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
+    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
     has_not_file 'Library.fs'
 
   end
@@ -365,43 +494,43 @@ describe "creating nuget on dependent proj file" do
         version:           '2.3.0' }
     end
 
-    has_dep 'Sample.Core', '2.3.0'
+    has_dep 'Sample.Core', '2.3.0', 'net40'
     has_not_dep 'Magnum'
     has_not_dep 'MassTransit'
     has_not_dep 'Newtonsoft.Json'
-    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net45'
-    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net45'
+    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 symbols' do
+  describe 'without sources' do
     let :opts do
-      { symbols:        false,
+      { sources:        false,
         known_projects: %w[Sample.Core],
         version:       '2.3.0' }
     end
-    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/net45'
-    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net45'
+    has_dep 'Sample.Core', '2.3.0', 'net40'
+    has_dep 'Magnum', '2.1.0', 'net40'
+    has_dep 'MassTransit', '2.8.0', 'net40'
+    has_dep 'Newtonsoft.Json', '5.0.6', 'net40'
+    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 'with symbols' do
+  describe 'with sources' do
     let :opts do
-      { symbols:        true,
+      { sources:        true,
         known_projects: %w[Sample.Core],
         version:        '2.3.0' }
     end
-    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_not_file 'bin/Debug/Sample.Commands.xml'
-    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net45'
-    has_file 'bin/Debug/Sample.Commands.pdb', 'lib/net45'
+    has_dep 'Sample.Core', '2.3.0', 'net40'
+    has_dep 'Magnum', '2.1.0', 'net40'
+    has_dep 'MassTransit', '2.8.0', 'net40'
+    has_dep 'Newtonsoft.Json', '5.0.6', 'net40'
+    has_file 'bin/Debug/Sample.Commands.xml', 'lib/net40'
+    has_file 'bin/Debug/Sample.Commands.dll', 'lib/net40'
+    has_file 'bin/Debug/Sample.Commands.pdb', 'lib/net40'
     has_file 'Library.fs', 'src/Library.fs'
   end
 
@@ -419,6 +548,6 @@ describe "creating nuget on dependent proj file" do
     has_not_file 'bin/Debug/Sample.Commands.dll'
     has_not_file 'bin/Debug/EmptyProject.dll' 
     has_not_file 'bin/Debug/EmptyProject.xml' 
-    has_file 'bin/Release/EmptyProject.dll', 'lib/net45'
+    has_file 'bin/Release/EmptyProject.dll', 'lib/net40'
   end
-end
+end