Update testing / sync with other mixlib repos

Bump rake
Simplify the rake setup
Test on modern rubies with the latest rubygem / bundler

Signed-off-by: Tim Smith <tsmith@chef.io>

5 files changed, 38 insertions, 18 deletions

diff --git a/.rspec b/.rspec
index 7438fbe..8c18f1a 100644
--- a/.rspec
+++ b/.rspec
@@ -1,2 +1,2 @@
---colour
 --format documentation
+--color
diff --git a/.travis.yml b/.travis.yml
index bdb180d..cdd64b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,24 @@
+sudo: false
 language: ruby
 cache: bundler
 
-sudo: false
-
-branches:
-  only:
-    - master
-
 before_install:
+  - gem install bundler
   - bundle --version
+  - gem update --system
   - gem --version
-rvm:
-  - 2.2.5
-  - 2.3.1
+
+matrix:
+  include:
+    - rvm: 2.2.7
+    - rvm: 2.3.4
+    - rvm: 2.4.1
+    - rvm: ruby-head
+  allow_failures:
+    - rvm: ruby-head
+branches:
+  only:
+  - master
 
 script:
-  - bundle exec chefstyle
-  - bundle exec rake spec
+  - bundle exec rake ci
diff --git a/Gemfile b/Gemfile
index b4e2a20..4182e8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,7 @@
 source "https://rubygems.org"
 
 gemspec
+
+group(:changelog) do
+  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
+end
diff --git a/Rakefile b/Rakefile
index 4321fb1..26ab183 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,7 @@
-require "bundler"
-require "rubygems"
-require "rubygems/package_task"
+require "bundler/gem_tasks"
 require "rdoc/task"
 require "rspec/core/rake_task"
-
-Bundler::GemHelper.install_tasks
+require "mixlib/cli/version"
 
 task :default => :spec
 
@@ -22,6 +19,9 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
+desc "Run tests for Travis CI"
+task ci: [:style, :spec]
+
 begin
   require "chefstyle"
   require "rubocop/rake_task"
@@ -31,3 +31,14 @@ begin
 rescue LoadError
   puts "chefstyle/rubocop is not available.  gem install chefstyle to do style checking."
 end
+
+begin
+  require "github_changelog_generator/task"
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.issues = false
+    config.future_release = Mixlib::CLI::VERSION
+  end
+rescue LoadError
+  puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
+end
diff --git a/mixlib-cli.gemspec b/mixlib-cli.gemspec
index e3951de..27e230d 100644
--- a/mixlib-cli.gemspec
+++ b/mixlib-cli.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   # Uncomment this to add a dependency
   #s.add_dependency "mixlib-log"
-  s.add_development_dependency "rake", "~> 11.0"
+  s.add_development_dependency "rake", "~> 12"
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "chefstyle"