Bump version to 4.6jk/bump-version

6 files changed, 34 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index c13d06c..e29766c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ InstalledFiles
 _yardoc
 coverage
 doc/
+binstubs/
 lib/bundler/man
 pkg
 rdoc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98dda55..cb4a3c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,26 @@
 # Change Log
 
-## [Unreleased](https://github.com/chef/chef-zero/tree/HEAD)
+## [4.6.0](https://github.com/chef/chef-zero/tree/4.6.0) (2016-04-14)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.5.0...4.6.0)
 
-[Full Changelog](https://github.com/chef/chef-zero/compare/v4.4.2...HEAD)
+**Implemented enhancements:**
+
+- Enable listening on more than one address [\#208](https://github.com/chef/chef-zero/pull/208) ([jaymzh](https://github.com/jaymzh))
+- Implemented GET /orgs/ORG/users/USER/keys\(/key\) endpoint recently added to server. [\#205](https://github.com/chef/chef-zero/pull/205) ([tylercloke](https://github.com/tylercloke))
+- Implement APIv1 behaviors [\#201](https://github.com/chef/chef-zero/pull/201) ([danielsdeleo](https://github.com/danielsdeleo))
+- Make user and client keys endpoints pass Pedant specs [\#199](https://github.com/chef/chef-zero/pull/199) ([jrunning](https://github.com/jrunning))
+- fix necessary for metadata gem [\#197](https://github.com/chef/chef-zero/pull/197) ([lamont-granquist](https://github.com/lamont-granquist))
+
+**Fixed bugs:**
+
+- Fix bugs related to Array vs Enumerator vs Port for options\[:port/host\]. [\#212](https://github.com/chef/chef-zero/pull/212) ([tylercloke](https://github.com/tylercloke))
+
+## [v4.5.0](https://github.com/chef/chef-zero/tree/v4.5.0) (2016-01-29)
+[Full Changelog](https://github.com/chef/chef-zero/compare/v4.4.2...v4.5.0)
 
 **Merged pull requests:**
 
+- Run chef-zero against master Chef in travis [\#195](https://github.com/chef/chef-zero/pull/195) ([jkeiser](https://github.com/jkeiser))
 - Make ACLs for policies/policy\_groups/cookbook\_artifacts work [\#194](https://github.com/chef/chef-zero/pull/194) ([jkeiser](https://github.com/jkeiser))
 - Return 410 on /controls so we stop skipping that pedant spec. [\#192](https://github.com/chef/chef-zero/pull/192) ([randomcamel](https://github.com/randomcamel))
 - Enable container specs. [\#191](https://github.com/chef/chef-zero/pull/191) ([randomcamel](https://github.com/randomcamel))
@@ -521,4 +536,4 @@
 ## [v0.9](https://github.com/chef/chef-zero/tree/v0.9) (2012-12-24)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index f11fdb4..ca2d322 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,10 @@ gemspec
 
 gem 'oc-chef-pedant', :github => 'chef/chef-server'
 
+group :changelog do
+  gem "github_changelog_generator"
+end
+
 # bundler resolve failure on "rspec_junit_formatter"
 # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
 
diff --git a/Rakefile b/Rakefile
index bbb984c..c43a6a3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -52,11 +52,15 @@ task :berkshelf_spec do
   system("cd #{gem_path} && thor spec:ci")
 end
 
-require 'github_changelog_generator/task'
+begin
+  require "github_changelog_generator/task"
 
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  # config.future_release = ChefZero::VERSION
-  config.enhancement_labels = "enhancement,Enhancement,New Feature".split(',')
-  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(',')
-  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog".split(',')
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    config.future_release = ChefZero::VERSION
+    config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
+    config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
+    config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
+  end
+rescue LoadError
+  puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
 end
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index 24220dc..17962a9 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry-stack_explorer'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'github_changelog_generator'
   s.add_development_dependency 'chef'
 
   s.bindir       = 'bin'
diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb
index 6fb6e7e..09841fd 100644
--- a/lib/chef_zero/version.rb
+++ b/lib/chef_zero/version.rb
@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 end