community_cookbook_releaser 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a35e1e2f755dabcafc467125b67ddd5583c55f54dd276e52e8d9ed99467a221
-  data.tar.gz: bd66b145e988c158f534f6ce09e84e2faf188bce4fb6c4a598243fb4f98ed854
+  metadata.gz: 91c7f7ce05176cb4c34b82d012684def2edac14cd36f53dac3c16cebe543aa9c
+  data.tar.gz: 67a732b440a96857d11147f44718f417fc91e6c9a66776df3e91ce8bf4524bd1
 SHA512:
-  metadata.gz: ab08ffc469629a6e2613ff19757f8ca25f6de7a780718f7917d8d28556a46fae363c440112a56c9e8ebd77e8286f7bf9b06cd696b2462a0abddbf4f0c5f606ce
-  data.tar.gz: 84487e580754ef8b759c807c47b23fb1afb36bf9c81a2f52c65929ba1168242db4ff4cb3fbb8d3dd8f1e8653f0e2dc6f9aabdb97fd76ad3dbbc925c9e1ff9198
+  metadata.gz: 4b138e304cd8eaad05329489a14f95273a6a61541d7b1dda97e7f791242e16a4e1280c88c9759f7a104042d22d6200b68479cda7bb5db1faf061f5a08b8b9450
+  data.tar.gz: 6f7c2708a15353365764eaa341dd7b00b8fde1a2dae25612ba8cab30b82fed59f2dd24978cd6e576276bef118cd476e48cdc0f74b9000d7905fbcf29ecc5eb2e

data/bin/ccr

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'time'
-require 'yaml'
-require 'octokit'
+require "time"
+require "yaml"
+require "octokit"
 
 def puts_red(text)
   puts "\033[31m#{text}\e[0m"
@@ -16,27 +16,27 @@ def file_or_error(filename)
 end
 
 def fail_if_cb_files
-  file_or_error('metadata.rb')
-  file_or_error('CHANGELOG.md')
+  file_or_error("metadata.rb")
+  file_or_error("CHANGELOG.md")
 
-  unless File.open('CHANGELOG.md').read =~ /This file is used/
-    puts_red('CHANGELOG.md is not in the standard changelog format. Cannot determine where to insert new changes!')
+  unless File.open("CHANGELOG.md").read =~ /This file is used/
+    puts_red("CHANGELOG.md is not in the standard changelog format. Cannot determine where to insert new changes!")
     exit 1
   end
 
-  unless File.open('metadata.rb').read =~ /version\s*('|")\d*.\d*.\d*('|")/
+  unless File.open("metadata.rb").read =~ /version\s*('|")\d*.\d*.\d*('|")/
     puts_red("metadata.rb doesn't appear to have a valid version string!")
     exit 1
   end
 end
 
 def parse_config
-  file_or_error('~/.ccr_config.yml')
+  file_or_error("~/.ccr_config.yml")
 
-  yconfig = YAML.load_file(File.expand_path('~/.ccr_config.yml'))
-  yconfig['github_organization'] ||= 'chef-cookbooks'
+  yconfig = YAML.load_file(File.expand_path("~/.ccr_config.yml"))
+  yconfig["github_organization"] ||= "chef-cookbooks"
 
-  unless yconfig['token']
+  unless yconfig["token"]
     puts_red("~/.ccr_config.yml does not contain a 'token' value. Cannot continue without a Github token!")
     exit 1
   end
@@ -49,43 +49,43 @@ def config
 end
 
 def bump_version(old_version)
-  bumped = old_version.split('.').map(&:to_i)
+  bumped = old_version.split(".").map(&:to_i)
   bumped[2] += 1
-  bumped.join('.')
+  bumped.join(".")
 end
 
 def current_metadata_version
-  File.open('metadata.rb').read.match(/version\s*('|")(\d*.\d*.\d*)('|")/)[2]
+  File.open("metadata.rb").read.match(/version\s*('|")(\d*.\d*.\d*)('|")/)[2]
 end
 
 def prompted_new_version
-  current_version = File.open('metadata.rb').read.match(/version\s*('|")(\d*.\d*.\d*)('|")/)[2]
+  current_version = File.open("metadata.rb").read.match(/version\s*('|")(\d*.\d*.\d*)('|")/)[2]
   next_version = bump_version(current_version)
 
   print "New version to release [autobump to #{next_version}]: "
 
   provided = gets.chomp
-  next_version = provided unless provided == '' # use the auto increment if nothing provided
+  next_version = provided unless provided == "" # use the auto increment if nothing provided
   next_version
 end
 
 # 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')
+  contents = File.read("metadata.rb")
   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) }
+  File.open("metadata.rb", "w") { |file| file.write(new_contents) }
 end
 
 def write_updated_changelog(new_version)
-  temp_content = ''
+  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|
+  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\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
@@ -95,20 +95,21 @@ def write_updated_changelog(new_version)
   end
 
   # write out our updated changelog content
-  File.open('CHANGELOG.MD', 'w') { |file| file.write(temp_content) }
+  File.open("CHANGELOG.MD", "w") { |file| file.write(temp_content) }
 end
 
 def changes_since_last_tag
-  client = Octokit::Client.new(access_token: config['token'])
+  client = Octokit::Client.new(access_token: config["token"])
   Octokit.auto_paginate = true
   cb_name = File.split(Dir.getwd)[-1]
-  last_tag_sha = client.tags("#{config['github_organization']}/#{cb_name}")[0][:commit][:sha]
-  commit_data = client.compare("#{config['github_organization']}/#{cb_name}", last_tag_sha, 'master')
+  last_tag_sha = client.tags("#{config["github_organization"]}/#{cb_name}")[0][:commit][:sha]
+  commit_data = client.compare("#{config["github_organization"]}/#{cb_name}", last_tag_sha, "master")
   commit_messages = []
-  commit_data['commits'].each do |commit|
-    msg = commit['commit']['message'].split("\n")[0] # get just the commit title not the entire thing
+  commit_data["commits"].each do |commit|
+    msg = commit["commit"]["message"].split("\n")[0] # get just the commit title not the entire thing
     next if msg =~ /^Merge pull request.*/
-    msg << " - [@#{commit[:author][:login]}](#{commit[:author][:html_url]})"
+
+    msg << " - [@#{commit[:author][:login]}](#{commit[:author][:html_url]})" unless commit[:author].nil? # author is nil if the account was deleted before the merge happened
     commit_messages << msg
   end
   commit_messages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: community_cookbook_releaser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -48,15 +48,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple script in gem form for releasing chef managed community cookbooks.