chef-zero 1.4.0.alpha → 1.4

data/Rakefile

@@ -1,11 +1,8 @@
 require 'bundler'
-require 'bundler/gem_helper'
+require 'bundler/gem_tasks'
 
-# Get build, install and release tasks for each gem flavor
-%w(chef-zero chef-zero-x86-mingw32).each do |gem_name|
-  Bundler::GemHelper.install_tasks :name => gem_name
-end
+require 'chef_zero/version'
 
 task :spec do
-  sh 'ruby spec/run.rb'
+  require File.expand_path('spec/run')
 end

data/lib/chef_zero/solr/query/binary_operator.rb

@@ -26,12 +26,11 @@ module ChefZero
             left.matches_doc?(doc)
           when ':'
             if left.respond_to?(:literal_string) && left.literal_string
-              value = doc[left.literal_string]
-              right.matches_values?([value])
+              values = doc[left.literal_string]
             else
               values = doc.matching_values { |key| left.matches_values?([key]) }
-              right.matches_values?(values)
             end
+            right.matches_values?(values)
           end
         end
 

data/lib/chef_zero/solr/query/regexpable_query.rb

@@ -14,8 +14,7 @@ module ChefZero
         attr_reader :regexp
 
         def matches_doc?(doc)
-          value = doc[DEFAULT_FIELD]
-          return value ? matches_values?([value]) : false
+          matches_values?(doc[DEFAULT_FIELD])
         end
         def matches_values?(values)
           values.any? { |value| !@regexp.match(value).nil? }

data/lib/chef_zero/solr/solr_doc.rb

@@ -9,31 +9,22 @@ module ChefZero
       end
 
       def [](key)
-        values = matching_values { |match_key| match_key == key }
-        values[0]
+        matching_values { |match_key| match_key == key }
       end
 
       def matching_values(&block)
-        result = {}
+        result = []
         key_values(nil, @json) do |key, value|
           if block.call(key)
-            if result.has_key?(key)
-              result[key] << value.to_s
-            else
-              result[key] = value.to_s.clone
-            end
+            result << value.to_s
           end
         end
         # Handle manufactured value(s)
         if block.call('X_CHEF_id_CHEF_X')
-          if result.has_key?('X_CHEF_id_CHEF_X')
-            result['X_CHEF_id_CHEF_X'] << @id.to_s
-          else
-            result['X_CHEF_id_CHEF_X'] = @id.to_s.clone
-          end
+          result << @id.to_s
         end
 
-        result.values
+        result.uniq
       end
 
       private

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.4.0.alpha'
+  VERSION = '1.4'
 end

data/spec/run.rb

@@ -5,21 +5,32 @@ require 'bundler/setup'
 require 'chef_zero/server'
 require 'rspec/core'
 
-require 'pedant'
-require 'pedant/opensource'
-
 server = ChefZero::Server.new(:port => 8889)
 server.start_background
 
-Pedant.config.suite = 'api'
-Pedant.config[:config_file] = 'spec/support/pedant.rb'
-Pedant.setup([
-  '--skip-validation',
-  '--skip-authentication',
-  '--skip-authorization'
-])
+unless ENV['SKIP_PEDANT']
+  require 'pedant'
+  require 'pedant/opensource'
+
+  Pedant.config.suite = 'api'
+  Pedant.config[:config_file] = 'spec/support/pedant.rb'
+  Pedant.setup([
+    '--skip-validation',
+    '--skip-authentication',
+    '--skip-authorization'
+  ])
 
-result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+  result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+else
+  require 'net/http'
+  response = Net::HTTP.new('127.0.0.1', 8889).get("/environments", { 'Accept' => 'application/json'}).body
+  if response =~ /_default/
+    result = 0
+  else
+    puts "GET /environments returned #{response}.  Expected _default!"
+    result = 1
+  end
+end
 
 server.stop
 exit(result)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.4.0.alpha
-  prerelease: 6
+  version: '1.4'
+  prerelease: 
 platform: ruby
 authors:
 - John Keiser
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 email: jkeiser@opscode.com
@@ -174,9 +206,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23