Merge pull request #30 from OpenVoxProject/8_14_0

8.14.0

Author: nmburgan

Rakefile

@@ -5,6 +5,16 @@ require 'rake'
 require 'rubygems'
 require 'rubygems/package_task'
 
+def run_command(cmd)
+  output, status = Open3.capture2e(cmd)
+  abort "Command failed! Command: #{cmd}, Output: #{output}" unless status.exitstatus.zero?
+  output.chomp
+end
+
+Dir.glob(File.join('tasks/**/*.rake')).each { |file| load file }
+
+### Puppetlabs stuff ###
+
 if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin
     require 'packaging'

lib/puppet/version.rb

@@ -8,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.13.0'
+  PUPPETVERSION = '8.14.0'
 
   ##
   # version is a public API method intended to always provide a fast and

puppet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "openvox"
-  spec.version = "8.13.0"
+  spec.version = "8.14.0"
   spec.licenses = ['Apache-2.0']
 
   spec.required_rubygems_version = Gem::Requirement.new("> 1.3.1")

tasks/tag.rake

@@ -0,0 +1,34 @@
+namespace :vox do
+    desc 'Update version, create tag, and push to origin'
+    task :tag, [:tag] do |_, args|
+        abort 'You must provide a tag.' if args[:tag].nil? || args[:tag].empty?
+        version = args[:tag]
+        abort "#{version} does not appear to be a valid version string in x.y.z format" unless Gem::Version.correct?(version)
+
+        # Update lib/puppet/version.rb and puppet.gemspec
+        puts "Setting version to #{version}"
+        data = File.read('lib/puppet/version.rb')
+        data = data.sub(/PUPPETVERSION = '\d+\.\d+\.\d+'/, "PUPPETVERSION = '#{version}'")
+        File.write('lib/puppet/version.rb', data)
+        data = File.read('puppet.gemspec')
+        data = data.sub(/spec.version = "\d+\.\d+\.\d+"/, "spec.version = \"#{version}\"")
+        File.write('puppet.gemspec', data)
+        run_command("git add lib/puppet/version.rb && git add puppet.gemspec && git commit -m 'Set version to #{version}'", true)
+
+        # Run git command to get short SHA and one line description of the commit on HEAD
+        branch = run_command('git rev-parse --abbrev-ref HEAD', true)
+        sha = run_command('git rev-parse --short HEAD', true)
+        msg = run_command('git log -n 1 --pretty=%B', true)
+
+        puts "Branch: #{branch}"
+        puts "SHA: #{sha}"
+        puts "Commit: #{msg}"
+
+        run_command("git tag -a #{version} -m '#{version}'")
+
+        unless !ENV['NOPUSH'].nil?
+            puts "Pushing to origin"
+            run_command("git push origin && git push origin #{version}")
+        end
+    end
+end