chef-zero 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b00232a363d25d0bd7a96ce90fe890da73e828c
-  data.tar.gz: 588b5fcd98c7df1f73df1a3c8e9b881bd992bfa1
+  metadata.gz: cdca57f2c1f1b6b83c281e4b47b8ddd84fca03eb
+  data.tar.gz: cfb147366f9d3a05f26855fcb6e33335f484c4e0
 SHA512:
-  metadata.gz: 9563e75f68e99b6d113778834468f4c5bd40a705fccfc6007432a0c390d9494d8669b245f12f04aae0d250d01551f27c67bc9c4c4075846076cd0835e5c8c45a
-  data.tar.gz: 6c669dac6b41d749bd5a99e515caf6cc95099925e890ceff4b98ade5a0b3db8e09dee999d54324789caafc9b88b6d67d509ca95753cb963ee01d065cee727d03
+  metadata.gz: 12c4155f7402cdda0364fbb0b09e52249419f50eadd70536089168e05379579e0ab5f40384c4a917ee9b53c10efcad49f1035b36263e05202dcc341e7ae23d40
+  data.tar.gz: 2ea8061572057a986dc50064a4e81cbcd673e1a7042028f7eda72650a97d6f5d2807f1e85cb3055a4a85af5a0f30123e7c2da3f5d87a54c234bb1d854f5e03b5

data/Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 gemspec
 
-# gem 'rest-client', :github => 'chef/rest-client'
+# gem 'rest-client', :git => 'https://github.com/chef/rest-client.git'
 
-gem "oc-chef-pedant", :github => "chef/chef-server"
+gem "oc-chef-pedant", :git => "https://github.com/chef/chef-server.git"
 
 group :changelog do
   gem "github_changelog_generator"
@@ -13,10 +13,7 @@ group :development, :test do
   gem "chefstyle", "= 0.3.1"
 end
 
-# bundler resolve failure on "rspec_junit_formatter"
-# gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
-
-gem "chef", github: "chef/chef" # until chef 12.15 is released
+gem "chef"
 
 if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"

data/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.

data/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

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -12,7 +12,9 @@ module ChefZero
       def get(request)
         orgname = request.rest_path[1]
         results = search(request, orgname)
+
         results["rows"] = results["rows"].map { |name, uri, value, search_value| value }
+
         json_response(200, results)
       rescue ChefZero::Solr::ParseError
         bad_search_request(request)
@@ -112,10 +114,8 @@ module ChefZero
         query_string = request.query_params["q"] || "*:*"
         solr_query = ChefZero::Solr::SolrParser.new(query_string).parse
         sort_string = request.query_params["sort"]
-        start = request.query_params["start"]
-        start = start.to_i if start
-        rows = request.query_params["rows"]
-        rows = rows.to_i if rows
+        start = request.query_params["start"].to_i
+        rows = request.query_params["rows"].to_i
 
         # Get the search container
         container, expander = search_container(request, index, orgname)
@@ -139,13 +139,18 @@ module ChefZero
           result = result.reverse if sort_order == "DESC"
         end
 
-        # Paginate
-        if start
-          result = result[start..start + (rows || -1)]
-        end
         {
-          "rows" => result,
-          "start" => start || 0,
+          # Paginate
+          #
+          # Slice the array based on the value of the "rows" query parameter. If
+          # this is a positive integer, we'll get the number of rows asked for.
+          # If it's nil, we'll get -1, which gives us all of the elements.
+          #
+          # Do the same for "start", which will start at 0 if that value is not
+          # given.
+          "rows" => result[start..(rows - 1)],
+          # Also return start and total in the object
+          "start" => start,
           "total" => total,
         }
       end
@@ -200,7 +205,6 @@ module ChefZero
         end
         dest
       end # deep_merge!
-
     end
   end
 end

data/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

data/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

data/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)
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "5.1.0"
+  VERSION = "5.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing