chef-zero 2.2.1 → 3.0.0.rc.1

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.2.1'
+  VERSION = '3.0.0.rc.1'
 end

data/spec/run_oc_pedant.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+require 'bundler'
+require 'bundler/setup'
+
+require 'chef_zero/server'
+require 'rspec/core'
+
+tmpdir = nil
+
+begin
+  if ENV['FILE_STORE']
+    require 'tmpdir'
+    require 'chef_zero/data_store/raw_file_store'
+    tmpdir = Dir.mktmpdir
+    data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
+    data_store = ChefZero::DataStore::DefaultFacade.new(data_store, false, false)
+    server = ChefZero::Server.new(:port => 8889, :single_org => false, :data_store => data_store)
+    server.start_background
+
+  else
+    server = ChefZero::Server.new(:port => 8889, :single_org => false)#, :log_level => :debug)
+    server.start_background
+  end
+
+  require 'rspec/core'
+  require 'pedant'
+  require 'pedant/opensource/platform'
+  require 'pedant/multitenant'
+  require 'pedant/organization'
+
+  #Pedant::Config.rerun = true
+
+  Pedant.config.suite = 'api'
+  Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
+  Pedant.setup([
+    '--skip-knife',
+    '--skip-validation',
+    '--skip-authentication',
+    '--skip-authorization',
+    '--skip-omnibus',
+    '--skip-usags',
+    '--skip-internal_orgs',
+    '--skip-rename_org'
+  ])
+
+  result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
+
+  server.stop if server.running?
+ensure
+  FileUtils.remove_entry_secure(tmpdir) if tmpdir
+end
+
+exit(result)

data/spec/{run.rb → run_pedant.rb}

@@ -23,8 +23,8 @@ def start_local_server(chef_repo_path)
   Chef::Config.versioned_cookbooks = true
   chef_fs = Chef::ChefFS::Config.new.local_fs
   data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
-  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'chef', :org_defaults => ChefZero::DataStore::V1ToV2Adapter::ORG_DEFAULTS)
-  server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
+  server = ChefZero::Server.new(:port => 8889, :data_store => data_store)
+  ENV['SINGLE_ORG'] = 'true'
   server.start_background
   server
 end
@@ -46,11 +46,20 @@ begin
     server = start_local_server(chef_repo_path)
 
   elsif ENV['SINGLE_ORG']
-    server = ChefZero::Server.new(:port => 8889, :single_org => 'singleorg')
+    server = ChefZero::Server.new(:port => 8889, :single_org => 'chef')
+    server.start_background
+
+  elsif ENV['FILE_STORE']
+    require 'tmpdir'
+    require 'chef_zero/data_store/raw_file_store'
+    tmpdir = Dir.mktmpdir
+    data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
+    data_store = ChefZero::DataStore::DefaultFacade.new(data_store, true, false)
+    server = ChefZero::Server.new(:port => 8889, :single_org => 'chef', :data_store => data_store)
     server.start_background
 
   else
-    server = ChefZero::Server.new(:port => 8889, :single_org => false)
+    server = ChefZero::Server.new(:port => 8889, :single_org => false, :osc_compat => true)
     server.data_store.create_dir([ 'organizations' ], 'pedant')
     server.start_background
   end

data/spec/server_spec.rb

@@ -1,4 +1,5 @@
 require 'chef_zero/server'
+require 'uri'
 
 describe ChefZero::Server do
   context 'with a server bound to port 8889' do
@@ -24,5 +25,58 @@ describe ChefZero::Server do
     it 'a server bound to range 8889-8889 throws an exception' do
       expect { ChefZero::Server.new(:port => 8889.upto(8889)).start_background }.to raise_error Errno::EADDRINUSE
     end
+
+    context 'accept headers' do
+      def get_nodes(accepts)
+        uri = URI(@server.url)
+        httpcall = Net::HTTP.new(uri.host, uri.port)
+        httpcall.get('/nodes', 'Accept' => accepts)
+      end
+
+      it 'accepts requests with no accept header' do
+        request = Net::HTTP::Get.new('/nodes')
+        request.delete('Accept')
+        uri = URI(@server.url)
+        response = Net::HTTP.new(uri.host, uri.port).request(request)
+        expect(response.code).to eq '200'
+      end
+
+      it 'accepts requests with accept: application/json' do
+        expect(get_nodes('application/json').code).to eq '200'
+      end
+
+      it 'accepts requests with accept: application/*' do
+        expect(get_nodes('application/*').code).to eq '200'
+      end
+
+      it 'accepts requests with accept: application/*' do
+        expect(get_nodes('*/*').code).to eq '200'
+      end
+
+      it 'denies requests with accept: application/blah' do
+        expect(get_nodes('application/blah').code).to eq '406'
+      end
+
+      it 'denies requests with accept: blah/json' do
+        expect(get_nodes('blah/json').code).to eq '406'
+      end
+
+      it 'denies requests with accept: blah/*' do
+        expect(get_nodes('blah/*').code).to eq '406'
+      end
+
+      it 'denies requests with accept: blah/*' do
+        expect(get_nodes('blah/*').code).to eq '406'
+      end
+
+      it 'denies requests with accept: <empty string>' do
+        expect(get_nodes('').code).to eq '406'
+      end
+
+      it 'accepts requests with accept: a/b;a=b;c=d, application/json;a=b, application/xml;a=b' do
+        expect(get_nodes('a/b;a=b;c=d, application/json;a=b, application/xml;a=b').code).to eq '200'
+      end
+
+    end
   end
 end

data/spec/support/oc_pedant.rb

@@ -0,0 +1,134 @@
+# Copyright: Copyright (c) 2012 Opscode, Inc.
+# License: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This annotated Pedant configuration file details the various
+# configuration settings available to you.  It is separate from the
+# actual Pedant::Config class because not all settings have sane
+# defaults, and not all settings are appropriate in all settings.
+
+################################################################################
+# You MUST specify the address of the server the API requests will be
+# sent to.  Only specify protocol, hostname, and port.
+chef_server 'http://127.0.0.1:8889'
+
+# If you are doing development testing, you can specify the address of
+# the Solr server.  The presence of this parameter will enable tests
+# to force commits to Solr, greatly decreasing the amout of time
+# needed for testing the search endpoint.  This is only an
+# optimization for development!  If you are testing a "live" Chef
+# Server, or otherwise do not have access to the Solr server from your
+# testing location, you should not specify a value for this parameter.
+# The tests will still run, albeit slower, as they will now need to
+# poll for a period to ensure they are querying committed results.
+#search_server "http://localhost:8983"
+
+# Related to the 'search_server' parameter, this specifies the maximum
+# amout of time (in seconds) that search endpoint requests should be
+# retried before giving up.  If not explicitly set, it will default to
+# 65 seconds; only set it if you know that your Solr commit interval
+# differs significantly from this.
+maximum_search_time 0
+
+# OSC sends erchef a host header with a port, so this option needs
+# # to be enabled for Pedant tests to work correctly
+explicit_port_url true
+
+# We're starting to break tests up into groups based on different
+# criteria.  The proper API tests (the results of which are viewable
+# to OPC customers) should be the only ones run by Pedant embedded in
+# OPC installs.  There are other specs that help us keep track of API
+# cruft that we want to come back and fix later; these shouldn't be
+# viewable to customers, but we should be able to run them in
+# development and CI environments.  If this parameter is missing or
+# explicitly `false` only the customer-friendly tests will be run.
+#
+# This is mainly here for documentation purposes, since the
+# command-line `opscode-pedant` utility ultimately determines this
+# value.
+include_internal false
+
+# This is the bit that is different from pedant.rb
+org({:name => "pedant-testorg",
+     :create_me => true})
+internal_account_url chef_server
+delete_org true
+
+# Test users.  The five users specified below are required; their
+# names (:user, :non_org_user, etc.) are indicative of their role
+# within the tests.  All users must have a ':name' key.  If they have
+# a ':create_me' key, Pedant will create these users for you.  If you
+# are using pre-existing users, you must supply a ':key_file' key,
+# which should be the fully-qualified path /on the machine Pedant is
+# running on/ to a private key for that user.
+key = 'spec/support/stickywicket.pem'
+superuser_name 'pivotal'
+superuser_key key
+webui_key key
+
+# Set the platform_class
+platform_class Pedant::MultiTenantPlatform
+
+requestors({
+             :clients => {
+               # The the admin user, for the purposes of getting things rolling
+               :admin => {
+                 :name => "pedant_admin_client",
+                 :create_me => true,
+                 :create_knife => true,
+                 :admin => true
+               },
+               :non_admin => {
+                 :name => 'pedant_client',
+                 :create_me => true,
+                 :create_knife => true,
+               },
+               :bad => {
+                 :name => 'bad_client',
+                 :create_me => true,
+                 :create_knife => true,
+                 :bogus => true
+               }
+             },
+
+             :users => {
+               # An administrator in the testing organization
+               :admin => {
+                 :name => "pedant_admin_user",
+                 :create_me => true,
+                 :create_knife => true
+               },
+
+               :non_admin => {
+                 :name => "pedant_user",
+                 :create_me => true,
+                 :create_knife => true
+               },
+
+               # A user that is not a member of the testing organization
+               :bad => {
+                 :name => "pedant-nobody",
+                 :create_me => true,
+                 :create_knife => true,
+                 :associate => false
+               },
+             }
+           })
+
+self[:tags] = [:validation, :authentication, :authorization]
+verify_error_messages false
+
+ruby_users_endpoint? false
+ruby_acls_endpoint? false
+ruby_org_assoc? false

data/spec/support/pedant.rb

@@ -21,7 +21,7 @@
 ################################################################################
 # You MUST specify the address of the server the API requests will be
 # sent to.  Only specify protocol, hostname, and port.
-if ENV['SINGLE_ORG']
+if ENV['SINGLE_ORG'] || ENV['FILE_STORE']
   chef_server 'http://127.0.0.1:8889'
 else
   chef_server 'http://127.0.0.1:8889/organizations/pedant'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0.rc.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ffi-yajl
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -105,20 +119,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/chef_zero/cookbook_data.rb
-- lib/chef_zero/data_normalizer.rb
+- bin/chef-zero
+- lib/chef_zero.rb
+- lib/chef_zero/chef_data/acl_path.rb
+- lib/chef_zero/chef_data/cookbook_data.rb
+- lib/chef_zero/chef_data/data_normalizer.rb
+- lib/chef_zero/chef_data/default_creator.rb
 - lib/chef_zero/data_store/data_already_exists_error.rb
 - lib/chef_zero/data_store/data_error.rb
 - lib/chef_zero/data_store/data_not_found_error.rb
+- lib/chef_zero/data_store/default_facade.rb
 - lib/chef_zero/data_store/interface_v1.rb
 - lib/chef_zero/data_store/interface_v2.rb
 - lib/chef_zero/data_store/memory_store.rb
 - lib/chef_zero/data_store/memory_store_v2.rb
+- lib/chef_zero/data_store/raw_file_store.rb
 - lib/chef_zero/data_store/v1_to_v2_adapter.rb
 - lib/chef_zero/data_store/v2_to_v1_adapter.rb
+- lib/chef_zero/endpoints/acl_endpoint.rb
+- lib/chef_zero/endpoints/acls_endpoint.rb
 - lib/chef_zero/endpoints/actor_endpoint.rb
 - lib/chef_zero/endpoints/actors_endpoint.rb
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb
+- lib/chef_zero/endpoints/container_endpoint.rb
+- lib/chef_zero/endpoints/containers_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_endpoint.rb
 - lib/chef_zero/endpoints/cookbook_version_endpoint.rb
 - lib/chef_zero/endpoints/cookbooks_base.rb
@@ -134,8 +158,19 @@ files:
 - lib/chef_zero/endpoints/environment_recipes_endpoint.rb
 - lib/chef_zero/endpoints/environment_role_endpoint.rb
 - lib/chef_zero/endpoints/file_store_file_endpoint.rb
+- lib/chef_zero/endpoints/group_endpoint.rb
+- lib/chef_zero/endpoints/groups_endpoint.rb
+- lib/chef_zero/endpoints/license_endpoint.rb
 - lib/chef_zero/endpoints/node_endpoint.rb
 - lib/chef_zero/endpoints/not_found_endpoint.rb
+- lib/chef_zero/endpoints/organization_association_request_endpoint.rb
+- lib/chef_zero/endpoints/organization_association_requests_endpoint.rb
+- lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb
+- lib/chef_zero/endpoints/organization_endpoint.rb
+- lib/chef_zero/endpoints/organization_user_endpoint.rb
+- lib/chef_zero/endpoints/organization_users_endpoint.rb
+- lib/chef_zero/endpoints/organization_validator_key_endpoint.rb
+- lib/chef_zero/endpoints/organizations_endpoint.rb
 - lib/chef_zero/endpoints/principal_endpoint.rb
 - lib/chef_zero/endpoints/rest_list_endpoint.rb
 - lib/chef_zero/endpoints/rest_object_endpoint.rb
@@ -145,6 +180,11 @@ files:
 - lib/chef_zero/endpoints/sandboxes_endpoint.rb
 - lib/chef_zero/endpoints/search_endpoint.rb
 - lib/chef_zero/endpoints/searches_endpoint.rb
+- lib/chef_zero/endpoints/system_recovery_endpoint.rb
+- lib/chef_zero/endpoints/user_association_request_endpoint.rb
+- lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb
+- lib/chef_zero/endpoints/user_association_requests_endpoint.rb
+- lib/chef_zero/endpoints/user_organizations_endpoint.rb
 - lib/chef_zero/log.rb
 - lib/chef_zero/rest_base.rb
 - lib/chef_zero/rest_error_response.rb
@@ -162,13 +202,13 @@ files:
 - lib/chef_zero/solr/solr_doc.rb
 - lib/chef_zero/solr/solr_parser.rb
 - lib/chef_zero/version.rb
-- lib/chef_zero.rb
-- spec/run.rb
+- spec/run_oc_pedant.rb
+- spec/run_pedant.rb
 - spec/search_spec.rb
 - spec/server_spec.rb
+- spec/support/oc_pedant.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
-- bin/chef-zero
 homepage: http://www.opscode.com
 licenses:
 - Apache 2.0
@@ -184,14 +224,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 test_files: []
+has_rdoc: