chef-zero 4.2.3 → 4.3.0

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
-module ChefZero
-  VERSION = '4.2.3'
-end
+module ChefZero
+  VERSION = '4.3.0'
+end

data/spec/run_oc_pedant.rb

@@ -1,56 +1,63 @@
-#!/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-keys',
-    '--skip-controls',
-    '--skip-acl',
-    '--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)
+#!/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/organization'
+
+  #Pedant::Config.rerun = true
+
+  Pedant.config.suite = 'api'
+  Pedant.config.internal_server = 'http://localhost:8889'
+  Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
+  Pedant.config[:server_api_version] = 0
+  Pedant.setup([
+    '--skip-knife',
+    '--skip-keys',
+    '--skip-controls',
+    '--skip-acl',
+    '--skip-validation',
+    '--skip-authentication',
+    '--skip-authorization',
+    '--skip-omnibus',
+    '--skip-usags',
+    '--exclude-internal-orgs',
+    '--skip-headers',
+
+    # Chef 12 features not yet 100% supported by Chef Zero
+    '--skip-policies',
+    '--skip-cookbook-artifacts',
+    '--skip-containers',
+    '--skip-api-v1'
+
+  ])
+
+  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/search_spec.rb

@@ -1,32 +1,32 @@
-require 'chef_zero/solr/solr_parser'
-require 'chef_zero/solr/solr_doc'
-
-describe ChefZero::Solr::SolrParser do
-  let (:all_docs) do
-    docs = []
-    [{'foo' => 'a'},
-     {'foo' => 'd'}].each_with_index do |h, i|
-      docs.push ChefZero::Solr::SolrDoc.new(h, i)
-    end
-    docs
-  end
-
-  def search_for(query)
-    q = ChefZero::Solr::SolrParser.new(query).parse
-    all_docs.select {|doc| q.matches_doc?(doc) }
-  end
-
-  it "handles terms" do
-    search_for('foo:d').size.should eq(1)
-  end
-
-  it "handles ranges" do
-    search_for('foo:[a TO c]').size.should eq(1)
-  end
-
-  it "handles wildcard ranges" do
-    search_for('foo:[* TO c]').size.should eq(1)
-    search_for('foo:[c TO *]').size.should eq(1)
-    search_for('foo:[* TO *]').size.should eq(2)
-  end
-end
+require 'chef_zero/solr/solr_parser'
+require 'chef_zero/solr/solr_doc'
+
+describe ChefZero::Solr::SolrParser do
+  let (:all_docs) do
+    docs = []
+    [{'foo' => 'a'},
+     {'foo' => 'd'}].each_with_index do |h, i|
+      docs.push ChefZero::Solr::SolrDoc.new(h, i)
+    end
+    docs
+  end
+
+  def search_for(query)
+    q = ChefZero::Solr::SolrParser.new(query).parse
+    all_docs.select {|doc| q.matches_doc?(doc) }
+  end
+
+  it "handles terms" do
+    search_for('foo:d').size.should eq(1)
+  end
+
+  it "handles ranges" do
+    search_for('foo:[a TO c]').size.should eq(1)
+  end
+
+  it "handles wildcard ranges" do
+    search_for('foo:[* TO c]').size.should eq(1)
+    search_for('foo:[c TO *]').size.should eq(1)
+    search_for('foo:[* TO *]').size.should eq(2)
+  end
+end

data/spec/server_spec.rb

@@ -1,91 +1,92 @@
-require 'chef_zero/server'
-require 'uri'
-
-describe ChefZero::Server do
-  context 'with a server bound to port 8889' do
-    before :each do
-      @server = ChefZero::Server.new(:port => 8889)
-      @server.start_background
-    end
-    after :each do
-      @server.stop
-    end
-
-    it 'a second server bound to port 8889 throws EADDRINUSE' do
-      expect { ChefZero::Server.new(:port => 8889).start }.to raise_error Errno::EADDRINUSE
-    end
-
-    it 'a server bound to range 8889-9999 binds to a port > 8889' do
-      server = ChefZero::Server.new(:port => 8889.upto(9999))
-      server.start_background
-      expect(server.port).to be > 8889
-      expect(URI(server.url).port).to be > 8889
-    end
-
-    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
-
-      def get_version
-        uri = URI(@server.url)
-        httpcall = Net::HTTP.new(uri.host, uri.port)
-        httpcall.get('/version', 'Accept' => 'text/plain, application/json')
-      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
-
-      it 'accepts /version' do
-        expect(get_version.body.start_with?('chef-zero')).to be true
-      end
-    end
-  end
-end
+require 'chef_zero/server'
+require 'net/http'
+require 'uri'
+
+describe ChefZero::Server do
+  context 'with a server bound to port 8889' do
+    before :each do
+      @server = ChefZero::Server.new(:port => 8889)
+      @server.start_background
+    end
+    after :each do
+      @server.stop
+    end
+
+    it 'a second server bound to port 8889 throws EADDRINUSE' do
+      expect { ChefZero::Server.new(:port => 8889).start }.to raise_error Errno::EADDRINUSE
+    end
+
+    it 'a server bound to range 8889-9999 binds to a port > 8889' do
+      server = ChefZero::Server.new(:port => 8889.upto(9999))
+      server.start_background
+      expect(server.port).to be > 8889
+      expect(URI(server.url).port).to be > 8889
+    end
+
+    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
+
+      def get_version
+        uri = URI(@server.url)
+        httpcall = Net::HTTP.new(uri.host, uri.port)
+        httpcall.get('/version', 'Accept' => 'text/plain, application/json')
+      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
+
+      it 'accepts /version' do
+        expect(get_version.body.start_with?('chef-zero')).to be true
+      end
+    end
+  end
+end

data/spec/socketless_server_map_spec.rb

@@ -1,76 +1,76 @@
-require 'chef_zero/socketless_server_map'
-
-
-describe "Socketless Mode" do
-
-  let(:server_map) { ChefZero::SocketlessServerMap.instance.tap { |i| i.reset! } }
-
-  let(:server) { instance_double("ChefZero::Server") }
-
-  let(:second_server) { instance_double("ChefZero::Server") }
-
-  it "registers a socketful server" do
-    server_map.register_port(8889, server)
-    expect(server_map).to have_server_on_port(8889)
-  end
-
-  it "retrieves a server by port" do
-    server_map.register_port(8889, server)
-    expect(ChefZero::SocketlessServerMap.server_on_port(8889)).to eq(server)
-  end
-
-  context "when a no-listen server is registered" do
-
-    let!(:port) { server_map.register_no_listen_server(server) }
-
-    it "assigns the server a low port number" do
-      expect(port).to eq(1)
-    end
-
-    context "and another server is registered" do
-
-      let!(:next_port) { server_map.register_no_listen_server(second_server) }
-
-      it "assigns another port when another server is registered" do
-        expect(next_port).to eq(2)
-      end
-
-      it "raises NoSocketlessPortAvailable when too many servers are registered" do
-        expect { 1000.times { server_map.register_no_listen_server(server) } }.to raise_error(ChefZero::NoSocketlessPortAvailable)
-      end
-
-      it "deregisters a server" do
-        expect(server_map).to have_server_on_port(1)
-        server_map.deregister(1)
-        expect(server_map).to_not have_server_on_port(1)
-      end
-
-      describe "routing requests to a server" do
-
-        let(:rack_req) do
-          r = {}
-          r["REQUEST_METHOD"] = "GET"
-          r["SCRIPT_NAME"] = ""
-          r["PATH_INFO"] = "/clients"
-          r["QUERY_STRING"] = ""
-          r["rack.input"] = StringIO.new("")
-          r
-        end
-
-        let(:rack_response) { [200, {}, ["this is the response body"] ] }
-
-        it "routes a request to the registered port" do
-          expect(server).to receive(:handle_socketless_request).with(rack_req).and_return(rack_response)
-          response = server_map.request(1, rack_req)
-          expect(response).to eq(rack_response)
-        end
-
-        it "raises ServerNotFound when a request is sent to an unregistered port" do
-          expect { server_map.request(99, rack_req) }.to raise_error(ChefZero::ServerNotFound)
-        end
-      end
-    end
-  end
-
-
-end
+require 'chef_zero/socketless_server_map'
+
+
+describe "Socketless Mode" do
+
+  let(:server_map) { ChefZero::SocketlessServerMap.instance.tap { |i| i.reset! } }
+
+  let(:server) { instance_double("ChefZero::Server") }
+
+  let(:second_server) { instance_double("ChefZero::Server") }
+
+  it "registers a socketful server" do
+    server_map.register_port(8889, server)
+    expect(server_map).to have_server_on_port(8889)
+  end
+
+  it "retrieves a server by port" do
+    server_map.register_port(8889, server)
+    expect(ChefZero::SocketlessServerMap.server_on_port(8889)).to eq(server)
+  end
+
+  context "when a no-listen server is registered" do
+
+    let!(:port) { server_map.register_no_listen_server(server) }
+
+    it "assigns the server a low port number" do
+      expect(port).to eq(1)
+    end
+
+    context "and another server is registered" do
+
+      let!(:next_port) { server_map.register_no_listen_server(second_server) }
+
+      it "assigns another port when another server is registered" do
+        expect(next_port).to eq(2)
+      end
+
+      it "raises NoSocketlessPortAvailable when too many servers are registered" do
+        expect { 1000.times { server_map.register_no_listen_server(server) } }.to raise_error(ChefZero::NoSocketlessPortAvailable)
+      end
+
+      it "deregisters a server" do
+        expect(server_map).to have_server_on_port(1)
+        server_map.deregister(1)
+        expect(server_map).to_not have_server_on_port(1)
+      end
+
+      describe "routing requests to a server" do
+
+        let(:rack_req) do
+          r = {}
+          r["REQUEST_METHOD"] = "GET"
+          r["SCRIPT_NAME"] = ""
+          r["PATH_INFO"] = "/clients"
+          r["QUERY_STRING"] = ""
+          r["rack.input"] = StringIO.new("")
+          r
+        end
+
+        let(:rack_response) { [200, {}, ["this is the response body"] ] }
+
+        it "routes a request to the registered port" do
+          expect(server).to receive(:handle_socketless_request).with(rack_req).and_return(rack_response)
+          response = server_map.request(1, rack_req)
+          expect(response).to eq(rack_response)
+        end
+
+        it "raises ServerNotFound when a request is sent to an unregistered port" do
+          expect { server_map.request(99, rack_req) }.to raise_error(ChefZero::ServerNotFound)
+        end
+      end
+    end
+  end
+
+
+end