knife-changelog 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42b8ebdc6c1d371430a8d3c9d9623fd42a5e24f3
-  data.tar.gz: c09025a1ea5804c850431e08fb7a221d3f4dad4c
+  metadata.gz: 9ba116e510147c69ec799adfddd749fdbc5e86a9
+  data.tar.gz: e52264b4ccfc9d0c3c32e4cf4ab7b085962a098c
 SHA512:
-  metadata.gz: 4bdf31349f11854ddad60c1deeb1c28c091ebc055b22c530bd2aceddcf63aa56176ca224f39de0633b8c40ae7531235c789cc7822ce6b00ab0e2903c18cec111
-  data.tar.gz: 11731016efb77bd4645c34bfc614cd97e6e84b016ddaf1a444ebc20397fc6a2432adc65608326eddb7b077e363a85f29df47b10beedd8e92276dce1044fc018a
+  metadata.gz: a4f3393f8359ee5b9c77f1c41b779b8672750fa670a26e54d09f48e4eeb9e4ace8b8b409a8fc6bbb9ae808c849f7268789664e5ed933192a10d0def344e69a36
+  data.tar.gz: e6c69313c42e4c19fa712259ea06d03de976e66599eb1cabe5b52c686e001b8b4d689935c8e22f9e6e7ef3a35532b963e5780f20fbcf05502655f191b7343f12

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  TargetRubyVersion: 2.1
+
+Metrics/LineLength:
+  Max: 150

data/knife-changelog.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
 
 
   spec.add_dependency  'berkshelf'

data/lib/knife/changelog/changelog.rb

@@ -70,37 +70,36 @@ class KnifeChangelog
     end
 
     def execute(name, submodule=false)
-      changelog = if submodule
-                    handle_submodule(name)
-                  elsif ck_dep(name).nil?
-                    handle_new_cookbook(name)
-                  else
-                    loc = ck_location(name)
-                    case loc
-                    when NilClass
-                      handle_source name, ck_dep(name)
-                    when Berkshelf::GitLocation
-                      handle_git name, loc
-                    when Berkshelf::PathLocation
-                      Chef::Log.debug "path location are always at the last version"
-                      ""
-                    else
-                      raise "Cannot handle #{loc.class} yet"
-                    end
-                  end
-      format_changelog(name, changelog)
-    end
-
-    def format_changelog(name, changelog)
+      version_change, changelog = if submodule
+                                    handle_submodule(name)
+                                  elsif ck_dep(name).nil?
+                                    handle_new_cookbook(name)
+                                  else
+                                    loc = ck_location(name)
+                                    case loc
+                                    when NilClass
+                                      handle_source name, ck_dep(name)
+                                    when Berkshelf::GitLocation
+                                      handle_git name, loc
+                                    when Berkshelf::PathLocation
+                                      Chef::Log.debug "path location are always at the last version"
+                                      ["", ""]
+                                    else
+                                      raise "Cannot handle #{loc.class} yet"
+                                    end
+                                  end
+      format_changelog(name, version_change, changelog)
+    end
+
+    def format_changelog(name, version_change, changelog)
       if changelog.empty?
         nil
       else
-        [
-          "Changelog for #{name}",
-          "==============#{'=' * name.size}",
-          changelog,
-          ''
-        ].compact.join("\n")
+        full = ["Changelog for #{name}: #{version_change}"]
+        full << '=' * full.first.size
+        full << changelog
+        full << ''
+        full.compact.join("\n")
       end
     end
 
@@ -187,7 +186,8 @@ class KnifeChangelog
                     Chef::Log.info "Found changelog file : " + $1
                     generate_from_changelog_file($1, cur_rev, rev_parse, tmp_dir)
                   end
-      changelog || generate_from_git_history(tmp_dir, location, cur_rev, rev_parse)
+      changelog ||= generate_from_git_history(tmp_dir, location, cur_rev, rev_parse)
+      [ "#{cur_rev}->#{rev_parse}", changelog ]
     end
 
     def generate_from_changelog_file(filename, current_rev, rev_parse, tmp_dir)
@@ -215,7 +215,7 @@ class KnifeChangelog
 
     def linkify(url, changelog)
       changelog.map do |line|
-        line.gsub(/^([a-f0-9]+) /, '[\1](%s/commit/\1) ' % [url.chomp('.git')])
+        line.gsub(/^([a-f0-9]+) (.*)$/, '\2 (%s/commit/\1) ' % [url.chomp('.git')])
       end
     end
 

data/lib/knife/changelog/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Changelog
-    VERSION = "0.5.13"
+    VERSION = "0.5.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-changelog
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Gregoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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
@@ -116,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt