chef-zero 2.0.2 → 2.1

data/lib/chef_zero/rest_request.rb

@@ -2,11 +2,13 @@ require 'rack/request'
 
 module ChefZero
   class RestRequest
-    def initialize(env)
+    def initialize(env, rest_base_prefix = [])
       @env = env
+      @rest_base_prefix = rest_base_prefix
     end
 
     attr_reader :env
+    attr_reader :rest_base_prefix
 
     def base_uri
       @base_uri ||= "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
@@ -17,7 +19,7 @@ module ChefZero
     end
 
     def rest_path
-      @rest_path ||= env['PATH_INFO'].split('/').select { |part| part != "" }
+      @rest_path ||= rest_base_prefix + env['PATH_INFO'].split('/').select { |part| part != "" }
     end
 
     def body=(body)
@@ -53,4 +55,3 @@ module ChefZero
     end
   end
 end
-

data/lib/chef_zero/server.rb

@@ -28,7 +28,8 @@ require 'webrick'
 require 'chef_zero'
 require 'chef_zero/cookbook_data'
 require 'chef_zero/rest_router'
-require 'chef_zero/data_store/memory_store'
+require 'chef_zero/data_store/memory_store_v2'
+require 'chef_zero/data_store/v1_to_v2_adapter'
 require 'chef_zero/version'
 
 require 'chef_zero/endpoints/authenticate_user_endpoint'
@@ -65,7 +66,8 @@ module ChefZero
       :host => '127.0.0.1',
       :port => 8889,
       :log_level => :info,
-      :generate_real_keys => true
+      :generate_real_keys => true,
+      :single_org => 'chef'
     }.freeze
 
     def initialize(options = {})
@@ -102,10 +104,25 @@ module ChefZero
     #
     # The data store for this server (default is in-memory).
     #
-    # @return [~ChefZero::DataStore]
+    # @return [ChefZero::DataStore]
     #
     def data_store
-      @data_store ||= @options[:data_store] || DataStore::MemoryStore.new
+      @data_store ||= begin
+        result = @options[:data_store] || DataStore::MemoryStoreV2.new
+        if options[:single_org]
+          if result.respond_to?(:interface_version) && result.interface_version >= 2 && result.interface_version < 3
+            result.create_dir([ 'organizations' ], options[:single_org])
+          else
+            result = ChefZero::DataStore::V1ToV2Adapter.new(result, options[:single_org])
+          end
+        else
+          if !(result.respond_to?(:interface_version) && result.interface_version >= 2 && result.interface_version < 3)
+            raise "Multi-org not supported by data store #{result}!"
+          end
+        end
+
+        result
+      end
     end
 
     #
@@ -123,8 +140,8 @@ module ChefZero
     # Start a Chef Zero server in the current thread. You can stop this server
     # by canceling the current thread.
     #
-    # @param [Boolean] publish
-    #   publish the server information to STDOUT
+    # @param [Boolean|IO] publish
+    #   publish the server information to the publish parameter or to STDOUT if it's "true"
     #
     # @return [nil]
     #   this method will block the main thread until interrupted
@@ -133,7 +150,8 @@ module ChefZero
       publish = publish[:publish] if publish.is_a?(Hash) # Legacy API
 
       if publish
-        puts <<-EOH.gsub(/^ {10}/, '')
+        output = publish.respond_to?(:puts) ? publish : STDOUT
+        output.puts <<-EOH.gsub(/^ {10}/, '')
           >> Starting Chef Zero (v#{ChefZero::VERSION})...
           >> WEBrick (v#{WEBrick::VERSION}) on Rack (v#{Rack.release}) is listening at #{url}
           >> Press CTRL+C to stop
@@ -208,9 +226,9 @@ module ChefZero
     #   server
     #
     def stop(wait = 5)
-      Timeout.timeout(wait) do
+      if @thread
         @server.shutdown
-        @thread.join(wait) if @thread
+        @thread.join(wait)
       end
     rescue Timeout::Error
       if @thread
@@ -265,19 +283,20 @@ module ChefZero
     #     }
     #   }
     # }
-    def load_data(contents)
+    def load_data(contents, org_name = 'chef')
+      data_store.create_dir('organizations', org_name)
       %w(clients environments nodes roles users).each do |data_type|
         if contents[data_type]
           dejsonize_children(contents[data_type]).each_pair do |name, data|
-            data_store.set([data_type, name], data, :create)
+            data_store.set(['organizations', org_name, data_type, name], data, :create)
           end
         end
       end
       if contents['data']
         contents['data'].each_pair do |key, data_bag|
-          data_store.create_dir(['data'], key, :recursive)
+          data_store.create_dir(['organizations', org_name, 'data'], key, :recursive)
           dejsonize_children(data_bag).each do |item_name, item|
-            data_store.set(['data', key, item_name], item, :create)
+            data_store.set(['organizations', org_name, 'data', key, item_name], item, :create)
           end
         end
       end
@@ -289,12 +308,12 @@ module ChefZero
             cookbook_data = CookbookData.to_hash(cookbook, name_version)
           end
           raise "No version specified" if !cookbook_data[:version]
-          data_store.create_dir(['cookbooks'], cookbook_data[:cookbook_name], :recursive)
-          data_store.set(['cookbooks', cookbook_data[:cookbook_name], cookbook_data[:version]], JSON.pretty_generate(cookbook_data), :create)
+          data_store.create_dir(['organizations', org_name, 'cookbooks'], cookbook_data[:cookbook_name], :recursive)
+          data_store.set(['organizations', org_name, 'cookbooks', cookbook_data[:cookbook_name], cookbook_data[:version]], JSON.pretty_generate(cookbook_data), :create)
           cookbook_data.values.each do |files|
             next unless files.is_a? Array
             files.each do |file|
-              data_store.set(['file_store', 'checksums', file[:checksum]], get_file(cookbook, file[:path]), :create)
+              data_store.set(['organizations', org_name, 'file_store', 'checksums', file[:checksum]], get_file(cookbook, file[:path]), :create)
             end
           end
         end
@@ -303,6 +322,9 @@ module ChefZero
 
     def clear_data
       data_store.clear
+      if options[:single_org]
+        data_store.create_dir([ 'organizations' ], options[:single_org])
+      end
     end
 
     def request_handler(&block)
@@ -319,45 +341,54 @@ module ChefZero
 
     private
 
+    def open_source_endpoints
+      [
+        [ "/organizations/*/authenticate_user", AuthenticateUserEndpoint.new(self) ],
+        [ "/organizations/*/clients", ActorsEndpoint.new(self) ],
+        [ "/organizations/*/clients/*", ActorEndpoint.new(self) ],
+        [ "/organizations/*/cookbooks", CookbooksEndpoint.new(self) ],
+        [ "/organizations/*/cookbooks/*", CookbookEndpoint.new(self) ],
+        [ "/organizations/*/cookbooks/*/*", CookbookVersionEndpoint.new(self) ],
+        [ "/organizations/*/data", DataBagsEndpoint.new(self) ],
+        [ "/organizations/*/data/*", DataBagEndpoint.new(self) ],
+        [ "/organizations/*/data/*/*", DataBagItemEndpoint.new(self) ],
+        [ "/organizations/*/environments", RestListEndpoint.new(self) ],
+        [ "/organizations/*/environments/*", EnvironmentEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/cookbooks", EnvironmentCookbooksEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/cookbooks/*", EnvironmentCookbookEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/cookbook_versions", EnvironmentCookbookVersionsEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/nodes", EnvironmentNodesEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/recipes", EnvironmentRecipesEndpoint.new(self) ],
+        [ "/organizations/*/environments/*/roles/*", EnvironmentRoleEndpoint.new(self) ],
+        [ "/organizations/*/nodes", RestListEndpoint.new(self) ],
+        [ "/organizations/*/nodes/*", NodeEndpoint.new(self) ],
+        [ "/organizations/*/principals/*", PrincipalEndpoint.new(self) ],
+        [ "/organizations/*/roles", RestListEndpoint.new(self) ],
+        [ "/organizations/*/roles/*", RoleEndpoint.new(self) ],
+        [ "/organizations/*/roles/*/environments", RoleEnvironmentsEndpoint.new(self) ],
+        [ "/organizations/*/roles/*/environments/*", EnvironmentRoleEndpoint.new(self) ],
+        [ "/organizations/*/sandboxes", SandboxesEndpoint.new(self) ],
+        [ "/organizations/*/sandboxes/*", SandboxEndpoint.new(self) ],
+        [ "/organizations/*/search", SearchesEndpoint.new(self) ],
+        [ "/organizations/*/search/*", SearchEndpoint.new(self) ],
+        [ "/organizations/*/users", ActorsEndpoint.new(self) ],
+        [ "/organizations/*/users/*", ActorEndpoint.new(self) ],
+
+        [ "/organizations/*/file_store/**", FileStoreFileEndpoint.new(self) ],
+      ]
+    end
+
     def app
-      router = RestRouter.new([
-        [ '/authenticate_user', AuthenticateUserEndpoint.new(self) ],
-        [ '/clients', ActorsEndpoint.new(self) ],
-        [ '/clients/*', ActorEndpoint.new(self) ],
-        [ '/cookbooks', CookbooksEndpoint.new(self) ],
-        [ '/cookbooks/*', CookbookEndpoint.new(self) ],
-        [ '/cookbooks/*/*', CookbookVersionEndpoint.new(self) ],
-        [ '/data', DataBagsEndpoint.new(self) ],
-        [ '/data/*', DataBagEndpoint.new(self) ],
-        [ '/data/*/*', DataBagItemEndpoint.new(self) ],
-        [ '/environments', RestListEndpoint.new(self) ],
-        [ '/environments/*', EnvironmentEndpoint.new(self) ],
-        [ '/environments/*/cookbooks', EnvironmentCookbooksEndpoint.new(self) ],
-        [ '/environments/*/cookbooks/*', EnvironmentCookbookEndpoint.new(self) ],
-        [ '/environments/*/cookbook_versions', EnvironmentCookbookVersionsEndpoint.new(self) ],
-        [ '/environments/*/nodes', EnvironmentNodesEndpoint.new(self) ],
-        [ '/environments/*/recipes', EnvironmentRecipesEndpoint.new(self) ],
-        [ '/environments/*/roles/*', EnvironmentRoleEndpoint.new(self) ],
-        [ '/nodes', RestListEndpoint.new(self) ],
-        [ '/nodes/*', NodeEndpoint.new(self) ],
-        [ '/principals/*', PrincipalEndpoint.new(self) ],
-        [ '/roles', RestListEndpoint.new(self) ],
-        [ '/roles/*', RoleEndpoint.new(self) ],
-        [ '/roles/*/environments', RoleEnvironmentsEndpoint.new(self) ],
-        [ '/roles/*/environments/*', EnvironmentRoleEndpoint.new(self) ],
-        [ '/sandboxes', SandboxesEndpoint.new(self) ],
-        [ '/sandboxes/*', SandboxEndpoint.new(self) ],
-        [ '/search', SearchesEndpoint.new(self) ],
-        [ '/search/*', SearchEndpoint.new(self) ],
-        [ '/users', ActorsEndpoint.new(self) ],
-        [ '/users/*', ActorEndpoint.new(self) ],
-
-        [ '/file_store/**', FileStoreFileEndpoint.new(self) ],
-      ])
+      router = RestRouter.new(open_source_endpoints)
       router.not_found = NotFoundEndpoint.new
 
+      if options[:single_org]
+        rest_base_prefix = [ 'organizations', 'chef' ]
+      else
+        rest_base_prefix = []
+      end
       return proc do |env|
-        request = RestRequest.new(env)
+        request = RestRequest.new(env, rest_base_prefix)
         if @on_request_proc
           @on_request_proc.call(request)
         end
@@ -387,7 +418,7 @@ module ChefZero
     def dejsonize_children(hash)
       result = {}
       hash.each_pair do |key, value|
-        result[key] = value.is_a?(Hash)  ? JSON.pretty_generate(value) : value
+        result[key] = value.is_a?(Hash) ? JSON.pretty_generate(value) : value
       end
       result
     end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.0.2'
+  VERSION = '2.1'
 end

data/spec/run.rb

@@ -5,33 +5,80 @@ require 'bundler/setup'
 require 'chef_zero/server'
 require 'rspec/core'
 
-server = ChefZero::Server.new(:port => 8889)
-server.start_background
-
-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',
-    '--skip-omnibus'
-  ])
-
-  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
+tmpdir = nil
+
+def start_server(chef_repo_path)
+  Dir.mkdir(chef_repo_path) if !File.exists?(chef_repo_path)
+
+  # 11.6 and below had a bug where it couldn't create the repo children automatically
+  if Chef::VERSION.to_f < 11.8
+    %w(clients cookbooks data_bags environments nodes roles users).each do |child|
+      Dir.mkdir("#{chef_repo_path}/#{child}") if !File.exists?("#{chef_repo_path}/#{child}")
+    end
+  end
+
+  # Start the new server
+  Chef::Config.repo_mode = 'everything'
+  Chef::Config.chef_repo_path = chef_repo_path
+  Chef::Config.versioned_cookbooks = true
+  chef_fs = Chef::ChefFS::Config.new.local_fs
+  data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+  server = ChefZero::Server.new(:port => 8889, :data_store => data_store)#, :log_level => :debug)
+  server.start_background
+  server
+end
+
+begin
+  if ENV['CHEF_FS']
+    require 'chef/chef_fs/chef_fs_data_store'
+    require 'chef/chef_fs/config'
+    require 'tmpdir'
+    require 'fileutils'
+    require 'chef/version'
+
+    # Create chef repository
+    tmpdir = Dir.mktmpdir
+    chef_repo_path = "#{tmpdir}/repo"
+
+    # Capture setup data into master_chef_repo_path
+    server = start_server(chef_repo_path)
+
+  else
+    server = ChefZero::Server.new(:port => 8889)
+    server.start_background
+  end
+
+  unless ENV['SKIP_PEDANT']
+    require 'pedant'
+    require 'pedant/opensource'
+
+    #Pedant::Config.rerun = true
+
+    Pedant.config.suite = 'api'
+    Pedant.config[:config_file] = 'spec/support/pedant.rb'
+    Pedant.setup([
+      '--skip-knife',
+      '--skip-validation',
+      '--skip-authentication',
+      '--skip-authorization',
+      '--skip-omnibus'
+    ])
+
+    result = RSpec::Core::Runner.run(Pedant.config.rspec_args)
   else
-    puts "GET /environments returned #{response}.  Expected _default!"
-    result = 1
+    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 if server.running?
+ensure
+  FileUtils.remove_entry_secure(tmpdir) if tmpdir
 end
 
-server.stop
 exit(result)

data/spec/support/pedant.rb

@@ -41,6 +41,10 @@ chef_server 'http://127.0.0.1:8889'
 # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: '2.1'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -105,14 +105,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/chef-zero
-- lib/chef_zero.rb
 - lib/chef_zero/cookbook_data.rb
 - lib/chef_zero/data_normalizer.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/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/v1_to_v2_adapter.rb
+- lib/chef_zero/data_store/v2_to_v1_adapter.rb
 - lib/chef_zero/endpoints/actor_endpoint.rb
 - lib/chef_zero/endpoints/actors_endpoint.rb
 - lib/chef_zero/endpoints/authenticate_user_endpoint.rb
@@ -159,10 +162,12 @@ 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/search_spec.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
+- bin/chef-zero
 homepage: http://www.opscode.com
 licenses:
 - Apache 2.0
@@ -183,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing