Merge pull request #292 from chef/loosen

Loosen the mixlib-log depedency + misc cleanup

7 files changed, 33 insertions, 29 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 03f8478..94d1e13 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -15,7 +15,9 @@ github:
   version_tag_format: "v{{version}}"
   # allow bumping the minor release via label
   minor_bump_labels:
-    - "Expeditor: Bump Minor Version"
+    - "Expeditor: Bump Version Minor"
+  major_bump_labels:
+    - "Expeditor: Bump Version Major"
 
 changelog:
   rollup_header: Changes not yet released to rubygems.org
@@ -30,7 +32,7 @@ merge_actions:
       only_if: built_in:bump_version
   - built_in:update_changelog:
       ignore_labels:
-        - "Expeditor: Exclude From Changelog"
+        - "Expeditor: Skip Changelog"
         - "Expeditor: Skip All"
   - built_in:build_gem:
       only_if: built_in:bump_version
diff --git a/.rubocop.yml b/.rubocop.yml
index 5b837e2..f0f0459 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,2 +1,5 @@
-Style/HashSyntax:
-  Enabled: true
+# Feel free to correct anything in this file
+
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/chef_zero/chef_data/acl_path.rb'
diff --git a/.travis.yml b/.travis.yml
index fdbe34a..1c82a67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ before_install:
   - gem update --system
   - gem install bundler
 
-sudo: false
 language: ruby
 cache: bundler
 bundler_args: --jobs 7 --without debug
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index 9a1c56f..7be98d9 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -6,14 +6,14 @@ Gem::Specification.new do |s|
   s.version = ChefZero::VERSION
   s.summary = "Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes"
   s.description = s.summary
-  s.author = "John Keiser"
-  s.email = "jkeiser@chef.io"
+  s.author = "Chef Software, Inc."
+  s.email = "oss@chef.io"
   s.homepage = "https://github.com/chef/chef-zero"
   s.license = "Apache-2.0"
 
   s.required_ruby_version = ">= 2.4.0"
 
-  s.add_dependency "mixlib-log", "~> 2.0"
+  s.add_dependency "mixlib-log", ">= 2.0", "< 4.0"
   s.add_dependency "hashie", ">= 2.0", "< 4.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index 0b155f2..5f6cf8b 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -278,10 +278,10 @@ module ChefZero
           when "root", "containers/containers", "containers/groups"
             {
               "create" => { "groups" => %w{admins} },
-              "read"   => { "groups" => %w{admins users} },
+              "read" => { "groups" => %w{admins users} },
               "update" => { "groups" => %w{admins} },
               "delete" => { "groups" => %w{admins} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "containers/environments", "containers/roles",
             "containers/policy_groups", "containers/policies",
@@ -289,50 +289,50 @@ module ChefZero
             "containers/data"
             {
               "create" => { "groups" => %w{admins users} },
-              "read"   => { "groups" => %w{admins users clients} },
+              "read" => { "groups" => %w{admins users clients} },
               "update" => { "groups" => %w{admins users} },
               "delete" => { "groups" => %w{admins users} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "containers/nodes"
             {
               "create" => { "groups" => %w{admins users clients} },
-              "read"   => { "groups" => %w{admins users clients} },
+              "read" => { "groups" => %w{admins users clients} },
               "update" => { "groups" => %w{admins users} },
               "delete" => { "groups" => %w{admins users} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "containers/clients"
             {
               "create" => { "groups" => %w{admins} },
-              "read"   => { "groups" => %w{admins users} },
+              "read" => { "groups" => %w{admins users} },
               "update" => { "groups" => %w{admins} },
               "delete" => { "groups" => %w{admins users} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "containers/sandboxes"
             {
               "create" => { "groups" => %w{admins users} },
-              "read"   => { "groups" => %w{admins} },
+              "read" => { "groups" => %w{admins} },
               "update" => { "groups" => %w{admins} },
               "delete" => { "groups" => %w{admins} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "groups/admins", "groups/clients", "groups/users"
             {
               "create" => { "groups" => %w{admins} },
-              "read"   => { "groups" => %w{admins} },
+              "read" => { "groups" => %w{admins} },
               "update" => { "groups" => %w{admins} },
               "delete" => { "groups" => %w{admins} },
-              "grant"  => { "groups" => %w{admins} },
+              "grant" => { "groups" => %w{admins} },
             }
           when "groups/billing-admins"
             {
               "create" => { "groups" => %w{} },
-              "read"   => { "groups" => %w{billing-admins} },
+              "read" => { "groups" => %w{billing-admins} },
               "update" => { "groups" => %w{billing-admins} },
               "delete" => { "groups" => %w{} },
-              "grant"  => { "groups" => %w{} },
+              "grant" => { "groups" => %w{} },
             }
           else
             {}
diff --git a/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb b/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
index bfe2ff5..e2d1d2a 100644
--- a/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_artifacts_endpoint.rb
@@ -8,12 +8,12 @@ module ChefZero
         data = {}
 
         artifacts = begin
-          list_data(request)
-        rescue Exception => e
-          if e.response_code == 404
-            return already_json_response(200, "{}")
-          end
-        end
+                      list_data(request)
+                    rescue Exception => e
+                      if e.response_code == 404
+                        return already_json_response(200, "{}")
+                      end
+                    end
 
         artifacts.each do |cookbook_artifact|
           cookbook_url = build_uri(request.base_uri, request.rest_path + [cookbook_artifact])
diff --git a/lib/chef_zero/endpoints/cookbooks_base.rb b/lib/chef_zero/endpoints/cookbooks_base.rb
index d8af80a..e515992 100644
--- a/lib/chef_zero/endpoints/cookbooks_base.rb
+++ b/lib/chef_zero/endpoints/cookbooks_base.rb
@@ -52,7 +52,7 @@ module ChefZero
         cookbooks_list.keys.sort.each do |name|
           constraint = Gem::Requirement.new(constraints[name])
           versions = []
-          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse.each do |version|
+          cookbooks_list[name].sort_by { |version| Gem::Version.new(version.dup) }.reverse_each do |version|
             break if num_versions && versions.size >= num_versions
             if constraint.satisfied_by?(Gem::Version.new(version.dup))
               versions << version