diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/chef_zero/chef_data/default_creator.rb | 2 | ||||
| -rw-r--r-- | lib/chef_zero/data_store/memory_store_v2.rb | 8 | ||||
| -rw-r--r-- | lib/chef_zero/data_store/raw_file_store.rb | 2 | ||||
| -rw-r--r-- | lib/chef_zero/rest_base.rb | 2 | ||||
| -rw-r--r-- | lib/chef_zero/version.rb | 2 |
7 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bba9bb3..e8a3e3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> # Change Log -<!-- latest_release 14.0.2 --> -## [v14.0.2](https://github.com/chef/chef-zero/tree/v14.0.2) (2018-03-16) +<!-- latest_release 14.0.3 --> +## [v14.0.3](https://github.com/chef/chef-zero/tree/v14.0.3) (2018-04-19) #### Merged Pull Requests -- Disable Hashie method override warns [#276](https://github.com/chef/chef-zero/pull/276) ([adamdecaf](https://github.com/adamdecaf)) +- fix for new rubocop engine [#278](https://github.com/chef/chef-zero/pull/278) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.1.0 --> ### Changes not yet released to rubygems.org #### Merged Pull Requests +- fix for new rubocop engine [#278](https://github.com/chef/chef-zero/pull/278) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.3 --> - Disable Hashie method override warns [#276](https://github.com/chef/chef-zero/pull/276) ([adamdecaf](https://github.com/adamdecaf)) <!-- 14.0.2 --> - bump required ruby version [#274](https://github.com/chef/chef-zero/pull/274) ([thommay](https://github.com/thommay)) <!-- 14.0.1 --> <!-- release_rollup --> @@ -1 +1 @@ -14.0.2
\ No newline at end of file +14.0.3
\ No newline at end of file diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb index 46c0165..1af04a1 100644 --- a/lib/chef_zero/chef_data/default_creator.rb +++ b/lib/chef_zero/chef_data/default_creator.rb @@ -22,7 +22,7 @@ module ChefZero attr_reader :single_org attr_reader :osc_compat attr_reader :creators - attr_reader :deleted + attr_writer :deleted PERMISSIONS = %w{create read update delete grant} DEFAULT_SUPERUSERS = %w{pivotal} diff --git a/lib/chef_zero/data_store/memory_store_v2.rb b/lib/chef_zero/data_store/memory_store_v2.rb index b35d490..85f8b3d 100644 --- a/lib/chef_zero/data_store/memory_store_v2.rb +++ b/lib/chef_zero/data_store/memory_store_v2.rb @@ -115,9 +115,9 @@ module ChefZero if value.is_a?(Hash) && !options[:allow_dirs] raise "exists? does not work with directories (#{path} = #{value.class})" end - return true + true rescue DataNotFoundError - return false + false end def exists_dir?(path) @@ -125,9 +125,9 @@ module ChefZero if !dir.is_a? Hash raise "exists_dir? only works with directories (#{path} = #{dir.class})" end - return true + true rescue DataNotFoundError - return false + false end private diff --git a/lib/chef_zero/data_store/raw_file_store.rb b/lib/chef_zero/data_store/raw_file_store.rb index 8b4c442..2d4b3f5 100644 --- a/lib/chef_zero/data_store/raw_file_store.rb +++ b/lib/chef_zero/data_store/raw_file_store.rb @@ -80,7 +80,7 @@ module ChefZero end def get(path, request = nil) - return IO.read(path_to(path)) + IO.read(path_to(path)) rescue Errno::ENOENT raise DataNotFoundError.new(path) end diff --git a/lib/chef_zero/rest_base.rb b/lib/chef_zero/rest_base.rb index e6114c4..b6d4b6a 100644 --- a/lib/chef_zero/rest_base.rb +++ b/lib/chef_zero/rest_base.rb @@ -35,7 +35,7 @@ module ChefZero ) end rescue ArgumentError - return json_response(406, + json_response(406, { "username" => request.requestor }, request_version: -1, response_version: -1 ) diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb index 15e2ea7..051040c 100644 --- a/lib/chef_zero/version.rb +++ b/lib/chef_zero/version.rb @@ -1,3 +1,3 @@ module ChefZero - VERSION = "14.0.2" + VERSION = "14.0.3" end |