Merge pull request #245 from chef/contrib

Add link to contributing docs and fix chefstyle warnings

5 files changed, 13 insertions, 11 deletions

diff --git a/README.md b/README.md
index 5456b20..03e054c 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,10 @@ Usage: chef-zero [ARGS]
         --version                    Show version
 ```
 
+## Contributing
+
+For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>
+
 ## License
 
 Copyright 2012-2016, Chef Software, Inc.
diff --git a/lib/chef_zero/chef_data/data_normalizer.rb b/lib/chef_zero/chef_data/data_normalizer.rb
index 58b0d26..939acc5 100644
--- a/lib/chef_zero/chef_data/data_normalizer.rb
+++ b/lib/chef_zero/chef_data/data_normalizer.rb
@@ -221,7 +221,7 @@ module ChefZero
       end
 
       def self.normalize_run_list(run_list)
-        run_list.map {|item|
+        run_list.map do |item|
           case item
           when /^recipe\[.*\]$/
             item # explicit recipe
@@ -230,7 +230,7 @@ module ChefZero
           else
             "recipe[#{item}]"
           end
-        }.uniq
+        end.uniq
       end
     end
   end
diff --git a/lib/chef_zero/rest_router.rb b/lib/chef_zero/rest_router.rb
index 2b5e129..ce08204 100644
--- a/lib/chef_zero/rest_router.rb
+++ b/lib/chef_zero/rest_router.rb
@@ -60,13 +60,13 @@ module ChefZero
     end
 
     def log_response(response)
-      ChefZero::Log.debug {
+      ChefZero::Log.debug do
         [ "",
           "--- RESPONSE (#{response[0]}) ---",
           response[2].chomp,
           "--- END RESPONSE ---",
         ].join("\n")
-      }
+      end
     end
   end
 end
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb
index 53f4776..bb3a927 100644
--- a/lib/chef_zero/rspec.rb
+++ b/lib/chef_zero/rspec.rb
@@ -48,13 +48,13 @@ module ChefZero
 
         # Take the passed-in options
 
-        define_singleton_method(:chef_server_options) {
+        define_singleton_method(:chef_server_options) do
           @chef_server_options ||= begin
             _chef_server_options = { port: 8900, signals: false, log_requests: true }
             _chef_server_options = _chef_server_options.merge(tags.last) if tags.last.is_a?(Hash)
             _chef_server_options = _chef_server_options.freeze
           end
-        }
+        end
 
         # Merge in chef_server_options from let(:chef_server_options)
         def chef_server_options
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index dd83fe3..43b42f8 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -287,9 +287,9 @@ module ChefZero
         :SSLEnable => options[:ssl],
         :SSLOptions => ssl_opts,
         :SSLCertName => [ [ "CN", WEBrick::Utils.getservername ] ],
-        :StartCallback => proc {
+        :StartCallback => proc do
           @running = true
-        }
+        end
       )
       ENV["HTTPS"] = "on" if options[:ssl]
       @server.mount("/", Rack::Handler::WEBrick, app)
@@ -320,9 +320,7 @@ module ChefZero
       end
 
       # Do not return until the web server is genuinely started.
-      while !@running && @thread.alive?
-        sleep(0.01)
-      end
+      sleep(0.01) while !@running && @thread.alive?
 
       SocketlessServerMap.instance.register_port(@port, self)