albacore 2.8.0 → 3.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8baa52d6989b0d3f080795555823d9ae24685a
-  data.tar.gz: 441f7dcbbe42462740445415106c420a072e531c
+  metadata.gz: 9dfa11c2bc3112b05ccea24961efa85bba34debd
+  data.tar.gz: a7cfcaa1dab72c5136ff7f41b08b08f638b34827
 SHA512:
-  metadata.gz: 0fff84ebb448c5cfa105d1f8d45c511c6bb40ed9e5ea1da283b171d3e064bfb4b11d28b09ed565394e990e7009430af3f08c12faa1e2a635a752cd5fa2f29064
-  data.tar.gz: d00c5499c3e82e2e07c9bc88fdf498c22b2df7fefdc96be63d4dd9453eed62e764d3907051638dfbe1a80d3e2fc7e6a9c3b4dd1f920612adbaac9b2468de5d03
+  metadata.gz: b9052b233fb098ac1d6a5abc9b1085525fe700c882633fadb67ab2d215185b315c78c3b6f3447ab396b5bcb4731ccac2ac223e4af2e99131796c2e5303a02d86
+  data.tar.gz: 2e9efe5a7afac83b40d7526ae640046853bab62757654eb8ef89ffcbedafabac1c0d186b27d8aab1c1911b295869822256892e76696c7f040c73fe9ed8bb40a5

data/lib/albacore/cli.rb

@@ -161,7 +161,7 @@ nugets_pack :create_nugets => ['build/pkg', :versioning, :compile] do |p|
   p.files   = FileList['src/**/*.{csproj,fsproj,nuspec}'].
     exclude(/Tests/)
   p.out     = 'build/pkg'
-  p.exe     = 'packages/NuGet.CommandLine/tools/NuGet.exe'
+  p.exe     = '.paket/paket.exe'
   p.with_metadata do |m|
     # m.id          = 'MyProj'
     m.title       = 'TODO'
@@ -190,7 +190,7 @@ task :default => :create_nugets #, :tests ]
 #Albacore::Tasks::Release.new :release,
 #                             pkg_dir: 'build/pkg',
 #                             depend_on: [:create_nugets, :ensure_nuget_key],
-#                             nuget_exe: 'packages/NuGet.CommandLine/tools/NuGet.exe',
+#                             nuget_exe: '.paket/paket.exe',
 #                             api_key: ENV['NUGET_KEY']
         DATA
       end

data/lib/albacore/dsl.rb

@@ -51,17 +51,8 @@ module Albacore
 
     # restore the nugets to the solution
     def nugets_restore *args, &block
-      require 'albacore/task_types/nugets_restore'
       Albacore.define_task *args do |task_name, own_args|
-        c = Albacore::NugetsRestore::Config.new
-        yield c, own_args
-
-        c.ensure_authentication!
-
-        c.packages.each do |p|
-          command = Albacore::NugetsRestore::Cmd.new(c.work_dir, c.exe, c.opts_for_pkgcfg(p))
-          Albacore::NugetsRestore::Task.new(command).execute
-        end
+        system '.paket/paket.exe', %w|restore|
       end
     end
 
@@ -71,38 +62,7 @@ module Albacore
       Albacore.define_task *args do |task_name, own_args|
         c = Albacore::NugetsPack::Config.new
         yield c, own_args
-        Albacore::NugetsPack::ProjectTask.new(c.opts).execute
-      end
-    end
-
-    # Restore hint paths to registered nugets
-    def restore_hint_paths *args, &block
-      require 'albacore/tools/restore_hint_paths'
-      Albacore.define_task *args do |task_name, own_args|
-        c = Albacore::RestoreHintPaths::Config.new
-        yield c, own_args
-
-        t = Albacore::RestoreHintPaths::Task.new c
-        t.execute
-      end
-    end
-
-    # Generate .rpm or .deb files from .appspec files
-    def appspecs *args, &block
-      if Albacore.windows?
-        require 'albacore/cpack_app_spec'
-        Albacore.define_task *args do |task_name, own_args|
-          c = ::Albacore::CpackAppSpec::Config.new
-          yield c, own_args
-          ::Albacore::CpackAppSpec::Task.new(c.opts).execute
-        end
-      else
-        require 'albacore/fpm_app_spec'
-        Albacore.define_task *args do |task_name, own_args|
-          c = ::Albacore::FpmAppSpec::Config.new
-          yield c, own_args
-          ::Albacore::FpmAppSpec::Task.new(c.opts).execute
-        end
+        Albacore::NugetsPack::Cmd.new(c).execute
       end
     end
 

data/lib/albacore/nuget_model.rb

@@ -9,12 +9,18 @@ require 'albacore/tools'
 module Albacore
   module NugetModel
     class IdVersion
-      attr_reader :id, :version
-      def initialize id, version
-        @id, @version = id, version
+      attr_reader :id, :version, :group, :target_framework
+
+      def initialize id, version, group, target_framework
+        @id, @version, @group, @target_framework = id, version, group, target_framework
       end
+
       def to_s
-        "#{id}@#{version}"
+        if ! target_framework.nil? && target_framework != ''
+          "#{id}@#{version} when #{target_framework}"
+        else
+          "#{id}@#{version} grouped:#{group}"
+        end
       end
     end
 
@@ -106,7 +112,7 @@ end})
 
       # (v2.5 or above) Specifies the minimum version of the NuGet client that
       # can install this package. This requirement is enforced by both the
-      # NuGet Visual Studio extension and nuget.exe program.
+      # NuGet Visual Studio extension and .paket/paket.exe program.
       nuspec_field :min_client_version
 
       # gets the field symbols that have been set
@@ -117,41 +123,110 @@ end})
         @set_fields   = Set.new
         @dependencies = dependencies || Hash.new
         @framework_assemblies = framework_assemblies || Hash.new
+        @has_group = false
 
         debug "creating new metadata with dependencies: #{dependencies} [nuget model: metadata]" unless dependencies.nil?
         debug "creating new metadata (same as prev) with fw asms: #{framework_assemblies} [nuget model: metadata]" unless framework_assemblies.nil?
       end
 
       # add a dependency to the package; id and version
-      def add_dependency id, version
-        @dependencies[id] = IdVersion.new id, version
+      def add_dependency id, version, target_framework = '', group = true
+        guard_groups_or_not group
+        extra = (target_framework || '') == '' ? '' : "|#{target_framework}"
+        @has_group ||= group
+        @dependencies["#{id}#{extra}"] = IdVersion.new id, version, group, target_framework
       end
 
       # add a framework dependency for the package
-      def add_framework_dependency id, version
-        @framework_assemblies[id] = IdVersion.new id, version
+      def add_framework_dependency id, version, target_framework = '', group = true
+        guard_groups_or_not group
+        @has_group ||= group
+        @framework_assemblies[id] = IdVersion.new id, version, group, target_framework
+      end
+
+      def to_template
+        lines = []
+        lines << 'type file'
+
+        # fields
+        @set_fields.each do |f|
+          lines << "#{Metadata.pascal_case(f)} #{send(f)}"
+        end
+
+        lines << 'dependencies' unless @dependencies.empty?
+        if @has_group
+          groups = @dependencies.group_by { |k, d| d.target_framework }
+          groups.each do |group|
+            fw, deps = group
+            if fw == ''
+              deps.each do |k, d|
+                lines << "  #{d.id} ~> #{d.version}"
+              end
+            else
+              lines << "  framework: #{fw}"
+              deps.each do |k, d|
+                lines << "    #{d.id} ~> #{d.version}"
+              end
+            end
+          end
+        else
+          @dependencies.each do |k, d|
+            lines << "  #{d.id} ~> #{d.version}"
+          end
+        end
+
+        if @framework_assemblies.respond_to?(:each) && @framework_assemblies.length > 0
+          lines << 'frameworkAssemblies'
+          @framework_assemblies.each do |k, d|
+            lines << "  #{d.id}"
+          end
+        end
+
+        lines
       end
 
       def to_xml_builder
         # alt: new(encoding: 'utf-8')
         Nokogiri::XML::Builder.new do |x|
-          x.metadata {
+          x.metadata do
             @set_fields.each do |f|
               x.send(Metadata.pascal_case(f), send(f))
             end
-            x.dependencies {
-              @dependencies.each { |k, d|
-                x.dependency id: d.id, version: d.version
-              }
-            }
-            if @frameworkAssemblies.respond_to? :each
-              x.frameworkAssemblies {
-                @framework_assemblies.each { |k, d|
+
+            x.dependencies do
+              if @has_group
+                groups = @dependencies.group_by { |k, d| d.target_framework }
+                groups.each do |group|
+                  fw, deps = group
+                  if fw == ''
+                    x.group do
+                      deps.each do |k, d|
+                        x.dependency id: d.id, version: d.version
+                      end
+                    end
+                  else
+                    x.group(targetFramework: fw) do
+                      deps.each do |k, d|
+                        x.dependency id: d.id, version: d.version
+                      end
+                    end
+                  end
+                end
+              else
+                @dependencies.each do |k, d|
+                  x.dependency id: d.id, version: d.version
+                end
+              end
+            end
+
+            if @framework_assemblies.respond_to?(:each) && @framework_assemblies.length > 0
+              x.frameworkAssemblies do
+                @framework_assemblies.each do |k, d|
                   x.frameworkAssembly assemblyName: d.id, targetFramework: d.version
-                }
-              }
+                end
+              end
             end
-          }
+          end
         end
       end
 
@@ -196,12 +271,26 @@ end})
         m = Metadata.new
         node.children.reject { |n| n.text? }.each do |n|
           if n.name == 'dependencies'
-            n.children.reject { |n| n.text? }.each do |dep|
-              m.add_dependency dep['id'], dep['version']
+            n.children.reject { |n| n.text? }.each do |node|
+              if node.name == 'group'
+                node.children.reject { |n| n.text? }.each do |dep|
+                  tfw = node['targetFramework'] || ''
+                  m.add_dependency dep['id'], dep['version'], tfw, group=true
+                end
+              else
+                m.add_dependency node['id'], node['version'], group=false
+              end
             end
           elsif n.name == 'frameworkDependencies'
-            n.children.reject { |n| n.text? }.each do |dep|
-              m.add_framework_dependency dep['id'], dep['version']
+            n.children.reject { |n| n.text? }.each do |node|
+              if node.name == 'group'
+                node.children.reject { |n| n.text? }.each do |dep|
+                  tfw = node['targetFramework'] || ''
+                  m.add_framework_dependency dep['id'], dep['version'], tfw, group=true
+                end
+              else
+                m.add_framework_dependency node['id'], node['version'], group=false
+              end
             end
           else
             # just set the property
@@ -224,8 +313,18 @@ end})
           tr("-", "_").
           downcase
       end
+
+    private
+      def guard_groups_or_not add_in_group
+        if @has_group && ! add_in_group \
+           || ! @has_group && @dependencies.length > 0 && add_in_group
+          raise ArgumentError.new("If you've added dependencies in group, you must add the rest in groups, too. See https://docs.microsoft.com/en-us/nuget/schema/nuspec#framework-assembly-references")
+        end
+      end
     end
 
+    ############################ PACKAGE
+
     # the nuget package element writer
     class Package
       include Logging
@@ -263,14 +362,26 @@ end})
         self
       end
 
+      def to_template
+        lines = @metadata.to_template
+
+        unless @files.empty?
+          lines << 'files'
+          @files.each do |file|
+            lines << "  #{file.src} ==> #{file.target}" unless file.exclude
+            lines << "  !#{file.src}" if file.exclude
+          end
+        end
+
+        lines.join("\n")
+      end
+
       # gets the current package as a xml builder
       def to_xml_builder
         md = Nokogiri::XML(@metadata.to_xml).at_css('metadata').to_xml
         Nokogiri::XML::Builder.new(encoding: 'utf-8') do |x|
           x.package(xmlns: 'http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd') {
             x << md
-            #x.__send__ :insert, md.at_css("metadata")
-#           x << md.at_css("metadata").to_xml(indent: 4)
             unless @files.empty?
               x.files {
                 @files.each do |f|
@@ -338,7 +449,6 @@ end})
       # Read the nuget specification from a xxproj instance (e.g. csproj, fsproj)
       # Options:
       #  - symbols
-      #  - dotnet_version
       #   Specifies the version to use for constructing the nuspec's lib folder
       #  - known_projects
       #  - configuration
@@ -349,19 +459,19 @@ end})
       def self.from_xxproj proj, *opts
         opts = Map.options(opts || {}).
           apply({
-            symbols:              false,
-            dotnet_version:       'net45',
-            known_projects:       Set.new,
-            configuration:        'Debug',
-            project_dependencies: true,
-            verify_files:         false,
-            nuget_dependencies:   true,
-            framework_dependencies: true })
+            symbols:                false,
+            known_projects:         Set.new,
+            configuration:          'Debug',
+            project_dependencies:   true,
+            verify_files:           false,
+            nuget_dependencies:     true,
+            framework_dependencies: true,
+            metadata:               Metadata.new })
 
         trace { "#from_xxproj proj: '#{proj}' opts: #{opts} [nuget model: package]" }
 
         version = opts.get :version
-        package = Package.new
+        package = Package.new(opts.get(:metadata))
         package.metadata.id      = proj.id if proj.id
         package.metadata.title   = proj.name if proj.name
         package.metadata.version = version if version
@@ -369,11 +479,12 @@ end})
         package.metadata.release_notes = Albacore::Tools.git_release_notes
 
         if opts.get :nuget_dependencies
-          trace "adding nuget dependencies for id #{proj.id}"
+          trace "adding nuget dependencies for id #{proj.id} [nuget model: package]"
           # add declared packages as dependencies
           proj.declared_packages.each do |p|
-            debug "adding package dependency: #{proj.id} => #{p.id} at #{p.version} [nuget model: package]"
-            package.metadata.add_dependency p.id, p.version
+            # p is a Package
+            debug "adding package dependency: #{proj.id} => #{p.id} at #{p.version}, fw #{p.target_framework} [nuget model: package]"
+            package.metadata.add_dependency p.id, p.version, p.target_framework, group=true
           end
         end
 
@@ -383,44 +494,39 @@ end})
             declared_projects.
             keep_if { |p| opts.get(:known_projects).include? p.id }.
             each do |p|
-            debug "adding project dependency: #{proj.id} => #{p.id} at #{version} [nuget model: package]"
-            package.metadata.add_dependency p.id, version
+            # p is a Project
+            debug "adding project dependency: #{proj.id} => #{p.id} at #{version}, fw #{p.target_frameworks.inspect} [nuget model: package]"
+            p.target_frameworks.each do |fw|
+              package.metadata.add_dependency p.id, version, fw, group=true
+            end
           end
         end
 
-
         fd = opts.get :framework_dependencies
         if fd && fd.respond_to?(:each)
           fd.each { |n, p|
-            package.metadata.add_framework_dependency p.id, p.version
+            package.metadata.add_framework_dependency p.id, p.version, p.target_framework, p.group
           }
         end
 
-        output = get_output_path proj, opts
-        target_lib = %W[lib #{opts.get(:dotnet_version)}].join(Albacore::Paths.separator)
+        debug "including files for frameworks #{proj.target_frameworks.inspect}"
+        proj.target_frameworks.each do |fw|
+          conf = opts.get(:configuration)
 
-        if opts.get :symbols
-          compile_files = proj.included_files.keep_if { |f| f.item_name == "compile" }
+          proj.outputs(conf, fw).each do |output|
+            lib_filepath = %W|lib #{fw}|.join(Albacore::Paths.separator)
+            debug "adding output file #{output.path} => #{lib_filepath} [nuget model: package]"
+            package.add_file output.path, lib_filepath
+          end
 
-          debug "add compiled files: #{compile_files} [nuget model: package]"
-          compile_files.each do |f|
-            target = %W[src #{Albacore::Paths.normalise_slashes(f.include)}].join(Albacore::Paths.separator)
-            package.add_file f.include, target
-          end 
+          if opts.get :sources
+            compile_files = proj.included_files.keep_if { |f| f.item_name == "compile" }
 
-          debug "add dll and pdb files [nuget model: package]"
-          package.add_file(Albacore::Paths.normalise_slashes(output + proj.asmname + '.pdb'), target_lib)
-          package.add_file(Albacore::Paths.normalise_slashes(output + proj.asmname + '.dll.mdb'), target_lib)
-          package.add_file(Albacore::Paths.normalise_slashes(output + proj.asmname + '.dll'), target_lib)
-        else
-          # add *.{dll,xml,config}
-          %w[dll xml config pdb dll.mdb].each do |ext|
-            file = %W{#{output} #{proj.asmname}.#{ext}}.
-              map { |f| f.gsub /\\$/, '' }.
-              map { |f| Albacore::Paths.normalise_slashes f }.
-              join(Albacore::Paths.separator)
-            debug "adding binary file #{file} [nuget model: package]"
-            package.add_file file, target_lib
+            debug "add compiled files: #{compile_files} [nuget model: package]"
+            compile_files.each do |f|
+              target = %W[src #{Albacore::Paths.normalise_slashes(f.include)}].join(Albacore::Paths.separator)
+              package.add_file f.include, target
+            end
           end
         end
 
@@ -446,4 +552,4 @@ end})
       end
     end
   end
-end
+end

data/lib/albacore/paket.rb

@@ -3,21 +3,36 @@ require 'albacore/semver'
 
 module Albacore
   module Paket
-    def self.parse_line line
+    def self.parse_lock_line line
       if (m = line.match(/^\s*(?<id>[\w\-\.]+) \((?<ver>[\.\d\w\-]+)\)( - )?((framework: >= (?<tf>\w+))|(redirects: (?<redir>\w+)))?$/i))
         ver = Albacore::SemVer.parse(m[:ver], '%M.%m.%p', false)
         OpenStruct.new(:id               => m[:id],
                        :version          => m[:ver],
-                       :target_framework => m[:tf] || 'net40',
+                       :group            => true,
+                       :target_framework => m[:tf],
                        :redirects        => m[:redir] || nil,
                        :semver           => ver)
       end
     end
 
+    # returns [id, {id,version,group,target_framework,redirects,semver}][]
     def self.parse_paket_lock data
-      data.map { |line| parse_line line }.
-           compact.
-           map { |package| [package.id, package] }
+      data.map { |line| parse_lock_line line }
+          .compact
+          .map { |package| [package.id, package] }
+    end
+
+    # returns string or nil
+    def self.parse_dependencies_line line
+      if (m = line.match(/^nuget (?<id>[\w\-\.]+)$/i))
+        m[:id]
+      end
+    end
+
+    # returns a string[]
+    def self.parse_dependencies_file data
+      data.map { |line| parse_dependencies_line line }
+          .compact
     end
   end
 end