structured_changelog 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664aee7c11b7b9ca26529a0a8b2e008598684c74
-  data.tar.gz: e5178e0f57a8b66084b0ddf231f78b6d32867c09
+  metadata.gz: ac7ccb6be19c589aa19a3be4b9fff1a6638b0d43
+  data.tar.gz: aea678c0d73cc03e5062eeef2a3cada42a976596
 SHA512:
-  metadata.gz: 0ca2f2a8cbf4b9f17f62fc49a552e6f861ed338d08017e73291d95cb0196c671f28be902a3b0848468237df5a777f1cf9be6927c8a8bf8c197aa684000fa1651
-  data.tar.gz: 01f883a91e896e01e5d4306f0c1d0e7f5f71daa418bd027c689beda1d43c422a66b7eb2e5d6cea7d95976edd204c912358f5f00fb8fe8482a931529ea99dc13e
+  metadata.gz: 09ad392a6b20c6f3394ee69cbbd073f98618b63ee3cb64efad0207520191cfd22f96c12fbfd0920c6d870427f70af00c68684cf92ebaed84c668d191417b0623
+  data.tar.gz: 6f8423680af8a11ec95674b8e001e5a765b17f80938e01ebf2ab29f4f303368b081288e0815e7e79cdacf21943d79f3da6698a9cb4ab8cdc624b038daabd95f0

data/CHANGELOG.md

@@ -11,6 +11,10 @@
 * require release block lines to be ordered in descending severity
 * disable strict semver version validation before 1.0.0
 
+## RELEASE 0.8.1
+
+* FIX: `rake changelog:commit` wasn't allowing Gemfile.lock to change version.
+
 ## RELEASE 0.8.0
 
 * FEATURE: `rake changelog:sync` will update your gem's VERSION constant to your changelog's latest release version. This will let devs stop requiring `structured_changelog` to be installed before they can bundle their projects.

data/lib/structured_changelog/tasks/commit.rb

@@ -5,25 +5,40 @@ desc 'Commit changes to the Changelog & version files as necessary'
 task 'changelog:commit', [:repo_path, :changelog_path, :version_path] do |_task, arguments|
   repo_path      = arguments.to_h.fetch(:repo_path)      { Pathname.pwd }
   changelog_path = arguments.to_h.fetch(:changelog_path) { "CHANGELOG.md" }
-  version_path   = arguments.to_h.fetch(:version_path)   { "lib/#{Pathname.pwd.basename}/version.rb"}
+  version_path   = arguments.to_h.fetch(:version_path)   { "lib/#{Pathname.pwd.basename}/version.rb" }
 
   changelog = StructuredChangelog.new(changelog_path)
-  repo      = Git.open(repo_path)
+  git       = Git.open(repo_path)
 
-  if repo.status.deleted.any?
+  if git.status.deleted.any?
     abort "Please commit all file deletions before bumping the version."
   end
 
-  if repo.status.added.any?
+  if git.status.added.any?
     abort "Please commit all new files before bumping the version."
   end
 
-  if repo.status.changed.keys.sort != [changelog_path, version_path].sort
-    abort "Please commit all files that aren't #{changelog_path} or #{version_path} before bumping the version."
+  diff               = git.diff('HEAD').stats[:files]
+  acceptable_changes = [changelog_path, version_path, 'Gemfile.lock']
+
+  only_release_changes = (diff.keys - acceptable_changes).empty?
+
+  unless only_release_changes
+    abort "Please commit all files that aren't #{acceptable_changes.join(' or ')} before bumping the version."
+  end
+
+  if diff.key?('Gemfile.lock')
+    lockfile_only_changed_version = diff['Gemfile.lock'][:deletions] == 1 && diff['Gemfile.lock'][:insertions] == 1
+
+    unless lockfile_only_changed_version
+      abort "Please commit all Gemfile.lock changes not related to this version bump."
+    end
+
+    git.add(['Gemfile.lock'])
   end
 
-  repo.add([changelog_path, version_path])
-  repo.commit("Version bump to #{changelog.version}")
+  git.add([changelog_path, version_path])
+  git.commit("Version bump to #{changelog.version}")
 
   puts "Commited 'Version bumped to #{changelog.version}'"
 end

data/lib/structured_changelog/version.rb

@@ -1,3 +1,3 @@
 class StructuredChangelog
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: structured_changelog
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Chris Hoffman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler