Merge pull request #552 from chef/cleanup

Misc cleanup to sync with other gems

.expeditor/config.yml

@@ -17,6 +17,9 @@ github:
   minor_bump_labels:
     - "Expeditor: Bump Minor Version"
 
+changelog:
+  rollup_header: Changes not yet released to rubygems.org
+
 # These actions are taken, in order they are specified, anytime a Pull Request is merged.
 merge_actions:
   - built_in:bump_version:

.travis.yml

@@ -15,6 +15,6 @@ branches:
   only:
   - master
 
-bundler_args: --without docs development
+bundler_args: --jobs 7 --without docs debug
 
 script: bundle exec rake

Gemfile

@@ -2,23 +2,23 @@ source "https://rubygems.org"
 
 gemspec
 
-group :docs do
-  gem "yard"
-  gem "redcarpet"
-  gem "github-markup"
+group :debug do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-stack_explorer"
 end
 
 group :test do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
-  gem "rspec", "~> 3.0"
-  gem "rake"
   gem "chef", ">= 13.0"
+  gem "chefstyle", "= 0.10.0"
+  gem "rake"
+  gem "rspec", "~> 3.0"
 end
 
-group :development do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
+group :docs do
+  gem "github-markup"
+  gem "redcarpet"
+  gem "yard"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]

Rakefile

@@ -1,27 +1,13 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Daniel DeLeo (<dan@chef.io>)
-# Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright (c) 2008-2018 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-task default: [:style, :spec]
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
 Bundler::GemHelper.install_tasks
 
@@ -53,3 +39,5 @@ task :console do
   ARGV.clear
   IRB.start
 end
+
+task default: [:style, :spec]