community_cookbook_releaser 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6292b9e30de3eefcae81c354eaeb6a3d59d1fd
-  data.tar.gz: f73b56b25c8bf4491eb0389272bfc349a8852690
+  metadata.gz: aeaf69832312ef54d8d6798cb0f0b1edd553b65a
+  data.tar.gz: cecfe431cdf5bc6b88fbf3afcc4ceb0e008a55c1
 SHA512:
-  metadata.gz: b2784f5293352006091fc0a04e9fdfea67b85b10d1eb6452da2a8dbd239632753e4f99b752b952ae07bc4ca2e6c5373c8eb5ccff916914d3b8c68626b29ea5d7
-  data.tar.gz: 1b43d468f1317e8587cbe603d995e6ce5f346abd3c19c232caef7152681734ba7cba13d77a92042e4fe56c6567f7fe27b5d6adc24d6795448fd0913749a6fc43
+  metadata.gz: 1e0a35dccd4625e9be1142d046adaa880f192800f45a28160b86bb952dc1348535bce99a836909e8ea883c28428845b0bf633b28b8b9d6d75965eba81d459ced
+  data.tar.gz: fc5153c09204716706cebda667e35c5ed6e86609a1d09136a5edc01f7bdbe3e37bf0ad8bc8b8a9169e919167e134d968d05abfe552d4df9bb55af0e3a955b933

data/bin/ccr

@@ -49,6 +49,10 @@ def bump_version(old_version)
   bumped.join('.')
 end
 
+def current_metadata_version
+  File.open('metadata.rb').read.match(/version\s*'(\d*.\d*.\d*)'/)[1]
+end
+
 def prompted_new_version
   current_version = File.open('metadata.rb').read.match(/version\s*'(\d*.\d*.\d*)'/)[1]
   next_version = bump_version(current_version)
@@ -60,19 +64,23 @@ def prompted_new_version
   next_version
 end
 
-def update_metadata_version
+# update the version line in a way that we maintain formatting and don't accidently
+# match a depends line further down in the cookbook with the same string
+def update_metadata_version(old_version, new_version)
   contents = File.read('metadata.rb')
-  new_contents = contents.gsub(/version\s*'(\d*.\d*.\d*)'/, "version '#{@new_version}'") # forget formatting!
+  old_version_line = /^version.*/.match(contents)[0]
+  new_version_line = old_version_line.gsub(old_version, new_version)
+  new_contents = contents.gsub(old_version_line, new_version_line)
   File.open('metadata.rb', 'w') { |file| file.write(new_contents) }
 end
 
-def write_updated_changelog
+def write_updated_changelog(new_version)
   temp_content = ''
   # read in the old content to a tempstring and insert our new content where appropriate
   File.open('CHANGELOG.md', 'r').each_line do |line|
     if line =~ /^This file/
       temp_content << "#{line}\n"
-      temp_content << "## #{@new_version} (#{Time.now.strftime('%Y-%m-%d')})\n"
+      temp_content << "## #{new_version} (#{Time.now.strftime('%Y-%m-%d')})\n\n"
       changes_since_last_tag.each do |change|
         temp_content << "- #{change}\n"
       end
@@ -109,8 +117,8 @@ fail_if_cb_files
 # load the YAML config
 @config = parse_config
 
-@new_version = prompted_new_version
-update_metadata_version
-write_updated_changelog
+new_cookbook_version = prompted_new_version
+update_metadata_version(current_metadata_version, new_cookbook_version)
+write_updated_changelog(new_cookbook_version)
 
 puts "\nVersion bumped & changelog written out with each commit as an item. Now edit, commit, and release!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: community_cookbook_releaser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -24,8 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A systems integration framework, built to bring the benefits of configuration
-  management to your entire infrastructure.
+description: A simple script in gem form for releasing chef managed community cookbooks.
 email: tsmith@chef.io
 executables:
 - ccr
@@ -57,9 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: A systems integration framework, built to bring the benefits of configuration
-  management to your entire infrastructure.
+summary: A simple script in gem form for releasing chef managed community cookbooks.
 test_files: []