knife-changelog 0.5.5 → 0.5.6.pre.alpha.pre.67

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: acc494a345d43a84c9ff696728b4caaf988d1ff7
-  data.tar.gz: 4c76558c23f94d9ba018835ea8d4a196ca45701a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzY5MGExYWJmYzA4NTExMjNhZTVjYTQzOTQ3ZDQ4MWQ2MGIyZTk1MA==
+  data.tar.gz: !binary |-
+    ZjUyODA1NWM5ZjYxZTM1MGUxOWJiMTNjNTUzOTlhNDJjYzY3OGQ0Yg==
 SHA512:
-  metadata.gz: 6608f5da9bd84c7d39cff9e6f44060418dae5f3c07df293a8c9e112414210bf9b6ff9ce26fa8ae712a6576d17c4eadf59acbaa51acd52001b1b4ff4c2afe3f68
-  data.tar.gz: 0cb54cd784524e752928f692f7b4ee4f44519854f5c4aeca7deaef236627cb44567d8668a82e55739fcb36640e734d0af82773e3e7f40c7c8bbca57515699f86
+  metadata.gz: !binary |-
+    NGJkNjgzZTdjZDEwM2I3ZThmYzM0YmNkOTk1YWYzMzRlNDVlNTA2Mzk0OGNj
+    MzM1NTM2MzBjY2IzOTE1NTU3NTRlMWY1MjBkNDIzNDNmYWM4M2RmODkzMTk3
+    OGVlMDQ2ODE5ZTA3MDAxMjgzZWViOTQ0OTJkNGEwZTE0YTgxZTU=
+  data.tar.gz: !binary |-
+    YTZhZTJmOGRlYTM4ZmUxNTRkZjdkOTNmY2M1MTdmNmE5ZTk3YTMyOGY4ZDFh
+    YjU3YjkwNmMzYjU5NjE3NWNjNTNmNjAzNzMyYWU2Y2U4Mzg5YmFkZmE3NGIy
+    MTk4ZTAwY2JhZGQ2MWI1OTk3ZTMzYTgyZjJjZWFjN2E4ZDZiY2M=

data/lib/knife/changelog/changelog.rb

@@ -98,8 +98,8 @@ class KnifeChangelog
         [
           "Changelog for #{name}",
           "==============#{'=' * name.size}",
-          changelog.join,
-        ].join("\n")
+          changelog,
+        ].compact.join("\n")
       end
     end
 
@@ -190,9 +190,14 @@ class KnifeChangelog
     end
 
     def generate_from_changelog_file(filename, current_rev, rev_parse, tmp_dir)
-      diff = Mixlib::ShellOut.new("git diff #{current_rev}..#{rev_parse} -- #{filename}", :cwd => tmp_dir)
+      diff = Mixlib::ShellOut.new("git diff #{current_rev}..#{rev_parse} --word-diff -- #{filename}", :cwd => tmp_dir)
       diff.run_command
-      ch = diff.stdout.lines.collect {|line| $1 if line =~ /^\+([^+].*)/}.compact
+      ch = diff.
+        stdout.
+        lines.
+        collect {|line| $1.strip if line =~ /^{\+(.*)\+}$/}.compact.
+        map { |line| line.gsub(/^#+(.*)$/, "\\1\n---")}. # replace section by smaller header
+        select { |line| !(line =~ /^===+/)}.compact # remove header lines
       ch.empty? ? nil : ch
     end
 
@@ -203,6 +208,7 @@ class KnifeChangelog
       n = https_url(location)
       c = linkify(n, c) if @config[:linkify] and n
       c = c.map { |line| "* " + line } if @config[:markdown]
+      c = c.map { |line| line.strip } # clean end of line
       c
     end
 

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6.pre.alpha.pre.67
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -115,8 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -137,19 +137,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Facilitate access to cookbooks changelog
 test_files: []
-has_rdoc: