albacore 3.0.0.pre.alpha → 3.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dfa11c2bc3112b05ccea24961efa85bba34debd
-  data.tar.gz: a7cfcaa1dab72c5136ff7f41b08b08f638b34827
+  metadata.gz: 0d8d6861b98e42667d38dd2c30470958387f481e
+  data.tar.gz: 5b40c5f5645dc93216bcd7951829878a8e9bbd22
 SHA512:
-  metadata.gz: b9052b233fb098ac1d6a5abc9b1085525fe700c882633fadb67ab2d215185b315c78c3b6f3447ab396b5bcb4731ccac2ac223e4af2e99131796c2e5303a02d86
-  data.tar.gz: 2e9efe5a7afac83b40d7526ae640046853bab62757654eb8ef89ffcbedafabac1c0d186b27d8aab1c1911b295869822256892e76696c7f040c73fe9ed8bb40a5
+  metadata.gz: 67cad4c15fdbe1a8d3ff78284b8818756423e9fedb2f02383f25f3d0c1e1dbfeb810f0fcb863df200d5324e7e0e83a9fecb72a83d6165a3fc0e9d03469416595
+  data.tar.gz: 973aa00d6ed341eccc5875cefb7819c625071bcf84233b0e5dc28b029fdb738d265819fef6093ee23dd382d779d029df1a895a80191d7570a5316ae4deb9aba0

data/lib/albacore/nuget_model.rb

@@ -150,7 +150,15 @@ end})
 
         # fields
         @set_fields.each do |f|
-          lines << "#{Metadata.pascal_case(f)} #{send(f)}"
+          key, value = Metadata.pascal_case(f), send(f)
+          if value.include?("\n")
+            lines << "#{key}"
+            value.split(/\r\n|\n/).map{ |line| "  #{line}"}.each do |line|
+              lines << line
+            end
+          else
+            lines << "#{key} #{value}"
+          end
         end
 
         lines << 'dependencies' unless @dependencies.empty?
@@ -476,7 +484,6 @@ end})
         package.metadata.title   = proj.name if proj.name
         package.metadata.version = version if version
         package.metadata.authors = proj.authors if proj.authors
-        package.metadata.release_notes = Albacore::Tools.git_release_notes
 
         if opts.get :nuget_dependencies
           trace "adding nuget dependencies for id #{proj.id} [nuget model: package]"

data/lib/albacore/task_types/nugets_pack.rb

@@ -65,6 +65,13 @@ module Albacore
           raise '"version" is a required property'
         end
       end
+
+      def fallbacks!
+        if @metadata.release_notes.nil?
+          notes = Albacore::Tools.git_release_notes
+          @metadata.release_notes = notes
+        end
+      end
     end
 
     class Cmd
@@ -77,6 +84,7 @@ module Albacore
 
       def execute
         @config.validate
+        @config.fallbacks!
         invocations(@config).each do |parameters|
           system @executable, parameters, clr_command: true
         end

data/lib/albacore/tools.rb

@@ -12,8 +12,15 @@ module Albacore::Tools
     last_tag = tags[-1]
     # second_last_tag = tags[-2] || `git rev-list --max-parents=0 HEAD`
     # logs = `git log --pretty=format:%s #{second_last_tag}..`.split(/\n/)
-    logs = `git log --pretty=format:%s #{last_tag}..`.encode!('UTF-8').split(/\n/)
-    "Release Notes:
-#{logs.inject('') { |state, line| state + "\n * #{line}" }}"
+
+    logs = []
+    logs << '## Release notes'
+    `git log --pretty=format:%s #{last_tag}..`
+      .encode!('UTF-8')
+      .split(/\n/)
+      .each do |logline|
+        logs << " * #{logline}"
+    end
+    logs
   end
 end

data/lib/albacore/version.rb

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

data/spec/tools_spec.rb

@@ -4,8 +4,8 @@ describe 'when calling Tools#git_release_notes' do
   subject do
     Albacore::Tools.git_release_notes
   end
-  it 'should start with "Release Notes"...' do
-    expect(subject).to match /Release Notes/
+  it 'should start with "Release notes"...' do
+    expect(subject).to match /Release notes/
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha
+  version: 3.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Henrik Feldt