chef-zero 1.6.3 → 1.7.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab2212b0f762b019319fc6ab562aa117df0835e1
-  data.tar.gz: ef6125fd415f0d38f2040b29170cbf18d435d470
+  metadata.gz: 9d8f6de63322dfa150bf6c96c90123f53987b230
+  data.tar.gz: 716d2b989782680c7910a640badfac8f579fb208
 SHA512:
-  metadata.gz: 79cba74de00ae3293ca0e19f947734227cfeee66ef26c4f7af2eae0d55d0559d0f3e6a6da7b57b7d44c804a4543e58d04130c43c7095e2c87ee118707305b7e5
-  data.tar.gz: 860b7e96f72fa3d2dd330e9baead3881d15ab1ab14ffbe3d7120ecd998d1650a15d98c19a0bde0eb84a2558e4dbccb9c39a74df1f99b5bcd39e7ff762556a429
+  metadata.gz: 1c6ab04cd6a08f77135691c87469a0d65a5179db0b1e28c76848a67599026ee46f4b3f3bc19fc80c227c3732848d1edb07304d1ece9508c2e64c89147aad4f16
+  data.tar.gz: ec2b872272e594b12f1fc71492b7674db4a95d16c36d46e5454be43db7cf3127c1a43d2de40bc180801ef609aea51b2ecf084633d0c79c05449bff3ebdfb920b

data/lib/chef_zero/cookbook_data.rb

@@ -73,8 +73,8 @@ module ChefZero
         end
       end
 
-      def from_json(json)
-        self.merge!(JSON.parse(json))
+      def from_json(filepath)
+        self.merge!(JSON.parse(File.read(filepath)))
       end
 
       private

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -6,6 +6,7 @@ module ChefZero
   module Endpoints
     # /environments/NAME/cookbook_versions
     class EnvironmentCookbookVersionsEndpoint < RestBase
+
       def post(request)
         cookbook_names = list_data(request, ['cookbooks'])
 
@@ -35,7 +36,14 @@ module ChefZero
         # Depsolve!
         solved = depsolve(request, desired_versions.keys, desired_versions, environment_constraints)
         if !solved
-          return raise RestErrorResponse.new(412, "Unsolvable versions!")
+          if @last_missing_dep && !cookbook_names.include?(@last_missing_dep)
+            return raise RestErrorResponse.new(412, "No such cookbook: #{@last_missing_dep}")
+          elsif @last_constraint_failure
+            return raise RestErrorResponse.new(412, "Could not satisfy version constraints for: #{@last_constraint_failure}")
+          else
+
+            return raise RestErrorResponse.new(412, "Unsolvable versions!")
+          end
         end
 
         result = {}
@@ -47,7 +55,12 @@ module ChefZero
       end
 
       def depsolve(request, unsolved, desired_versions, environment_constraints)
-        return nil if desired_versions.values.any? { |versions| versions.empty? }
+        desired_versions.each do |cb, ver|
+          if ver.empty?
+            @last_constraint_failure = cb
+            return nil
+          end
+        end
 
         # If everything is already
         solve_for = unsolved[0]
@@ -72,6 +85,7 @@ module ChefZero
               new_unsolved = new_unsolved + [dep_name]
               # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
               if !exists_data_dir?(request, ['cookbooks', dep_name])
+                @last_missing_dep = dep_name.to_s
                 dep_not_found = true
                 break
               end

data/lib/chef_zero/server.rb

@@ -17,9 +17,9 @@
 #
 
 require 'openssl'
-require 'puma'
 require 'rubygems'
 require 'timeout'
+require 'stringio'
 
 require 'chef_zero'
 require 'chef_zero/cookbook_data'
@@ -67,40 +67,79 @@ module ChefZero
 
     def initialize(options = {})
       options = DEFAULT_OPTIONS.merge(options)
+      @options = options
       @url = "http://#{options[:host]}:#{options[:port]}"
       @generate_real_keys = options[:generate_real_keys]
 
       ChefZero::Log.level = options[:log_level].to_sym
 
-      @server = Puma::Server.new(make_app, Puma::Events.new(STDERR, STDOUT))
-      if options[:socket]
-        @server.add_unix_listener(options[:socket])
-      else
-        @server.add_tcp_listener(options[:host], options[:port])
+      begin
+        require 'puma'
+        @server = Puma::Server.new(make_app, Puma::Events.new(STDERR, STDOUT))
+        if options[:socket]
+          @server.add_unix_listener(options[:socket])
+        else
+          @server.add_tcp_listener(options[:host], options[:port])
+        end
+        @server_type = :puma
+      rescue LoadError
+        require 'rack'
+        @server_type = :webrick
       end
 
-
       @data_store = options[:data_store] || DataStore::MemoryStore.new
     end
 
+    attr_reader :options
     attr_reader :server
     attr_reader :data_store
     attr_reader :url
 
     include ChefZero::Endpoints
 
-    def start(options = {})
-      if options[:publish]
+    def start(start_options = {})
+      if start_options[:publish]
         puts ">> Starting Chef Zero (v#{ChefZero::VERSION})..."
-        puts ">> Puma (v#{Puma::Const::PUMA_VERSION}) is listening at #{url}"
+        case @server_type
+        when :puma
+          puts ">> Puma (v#{Puma::Const::PUMA_VERSION}) is listening at #{url}"
+        when :webrick
+          puts ">> WEBrick (v#{WEBrick::VERSION}) on Rack (v#{Rack.release}) is listening at #{url}"
+        end
         puts ">> Press CTRL+C to stop"
       end
 
       begin
-        thread = server.run.join
+        case @server_type
+        when :puma
+          server.run.join
+        when :webrick
+          Rack::Handler::WEBrick.run(
+            make_app,
+            :BindAddress => @options[:host],
+            :Port => @options[:port],
+            :AccessLog => [],
+            :Logger => WEBrick::Log::new(StringIO.new, 7)
+          ) do |server|
+            @server = server
+          end
+        end
       rescue Object, Interrupt
-        puts "\n>> Stopping Puma..."
-        server.stop(true) if running?
+        if running?
+          puts "\n>> Stopping Chef Zero ..."
+          case @server_type
+          when :puma
+            server.stop(true)
+          when :webrick
+            server.shutdown
+          end
+        end
+      ensure
+        case @server_type
+        when :webrick
+          @server = nil
+        else
+        end
       end
     end
 
@@ -125,17 +164,32 @@ module ChefZero
     end
 
     def running?
-      !!server.running
+      case @server_type
+      when :puma
+        !!server.running
+      when :webrick
+        !!(server && server.status == :Running)
+      end
     end
 
     def stop(wait = 5)
-      server.stop(true)
+      case @server_type
+      when :puma
+        server.stop(true)
+      when :webrick
+        server.shutdown
+        @server
+      end
       if @thread
-        @thread.join(wait)
+        begin
+          @thread.join(wait) if @thread
+        rescue
+          if @thread
+            ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..."
+            @thread.kill
+          end
+        end
       end
-    rescue
-      ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..."
-      @thread.kill if @thread
     ensure
       @thread = nil
     end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.6.3'
+  VERSION = '1.7.beta.1'
 end

data/spec/run.rb

@@ -17,7 +17,8 @@ unless ENV['SKIP_PEDANT']
   Pedant.setup([
     '--skip-validation',
     '--skip-authentication',
-    '--skip-authorization'
+    '--skip-authorization',
+    '--skip-omnibus'
   ])
 
   result = RSpec::Core::Runner.run(Pedant.config.rspec_args)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.beta.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,8 +119,6 @@ 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
@@ -173,10 +171,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
@@ -192,12 +192,12 @@ 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.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