chef-zero 1.7.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d38cb11a3fe7092a692d98004814e30cc020125
-  data.tar.gz: 013c513df87cc911756effd9972f4bc4c7481b21
+  metadata.gz: d2731ca89a7a17e4eddfe989bd8dc57c361105ed
+  data.tar.gz: f81dabcb437d9e327d547b6723273a7bb1c760c7
 SHA512:
-  metadata.gz: fafcc37dcd06536619c82c2789add5bb0ff2616c0a5d06e17d8c3aae3a8285a75d9ad76e5bda6d58b17ddcca31d3d8beb9256a76430f1164db69cdafea028fa0
-  data.tar.gz: 9fa9d3a2560709fd418e70d25a02aca905b159a3d0491efe3ccb9269eb731c29225cad048421eec302ed20688d364484e969678385e958f5f0ea5c427383f499
+  metadata.gz: c87db48733d2add9a6de265fddfc99f028051feaf9c2aaef7b849bdde3f02c9d17966ca88fc3df6fc8d44572262a33392aeccc321ce12fff2da25a6831dbacf0
+  data.tar.gz: bbb68d646e14d774987d46d13e3541b20d1f93813d8a0112525569ef22f1e8b00940e057242ce39f7f773e2ae363751da10dd8152f85ce8814b0d18e8139671e

data/bin/chef-zero

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# Trap interrupts to quit cleanly.
+Signal.trap('INT') { exit 1 }
+
 require 'rubygems'
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
@@ -20,10 +23,6 @@ OptionParser.new do |opts|
     options[:port] = value
   end
 
-  opts.on("--socket PATH", String, "Unix socket path to listen on") do |value|
-    options[:socket] = value
-  end
-
   opts.on("--[no-]generate-keys", "Whether to generate actual keys or fake it (faster).  Default: false.") do |value|
     options[:generate_real_keys] = value
   end
@@ -50,12 +49,12 @@ end.parse!
 server = ChefZero::Server.new(options)
 
 if options[:daemon]
-  unless Process.respond_to?('daemon')
-    abort 'Process.deamon requires Ruby >= 1.9'
-  else
+  if Process.respond_to?(:daemon)
     Process.daemon(true)
-    server.start(:publish => true)
+    server.start(true)
+  else
+    abort 'Process.daemon requires Ruby >= 1.9'
   end
 else
-  server.start(:publish => true)
+  server.start(true)
 end

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/server.rb

@@ -17,10 +17,13 @@
 #
 
 require 'openssl'
+require 'open-uri'
 require 'rubygems'
 require 'timeout'
 require 'stringio'
-require 'webrick/version'
+
+require 'rack'
+require 'webrick'
 
 require 'chef_zero'
 require 'chef_zero/cookbook_data'
@@ -61,138 +64,155 @@ module ChefZero
     DEFAULT_OPTIONS = {
       :host => '127.0.0.1',
       :port => 8889,
-      :socket => nil,
       :log_level => :info,
       :generate_real_keys => true
     }.freeze
 
     def initialize(options = {})
-      options = DEFAULT_OPTIONS.merge(options)
-      @options = options
-      uri_safe_host = options[:host].include?(":") ? "[#{options[:host]}]" : options[:host]
-      @url = "http://#{uri_safe_host}:#{options[:port]}"
-      @generate_real_keys = options[:generate_real_keys]
-
-      ChefZero::Log.level = options[:log_level].to_sym
-
-      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
+      @options = DEFAULT_OPTIONS.merge(options)
+      @options[:host] = "[#{@options[:host]}]" if @options[:host].include?(':')
+      @options.freeze
 
-      @data_store = options[:data_store] || DataStore::MemoryStore.new
+      ChefZero::Log.level = @options[:log_level].to_sym
     end
 
+    # @return [Hash]
     attr_reader :options
+
+    # @return [WEBrick::HTTPServer]
     attr_reader :server
-    attr_reader :data_store
-    attr_reader :url
 
     include ChefZero::Endpoints
 
-    def start(start_options = {})
-      if start_options[:publish]
-        puts ">> Starting Chef Zero (v#{ChefZero::VERSION})..."
-        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"
+    #
+    # The URL for this Chef Zero server.
+    #
+    # @return [String]
+    #
+    def url
+      "http://#{@options[:host]}:#{@options[:port]}"
+    end
+
+    #
+    # The data store for this server (default is in-memory).
+    #
+    # @return [~ChefZero::DataStore]
+    #
+    def data_store
+      @data_store ||= @options[:data_store] || DataStore::MemoryStore.new
+    end
+
+    #
+    # Boolean method to determine if real Public/Private keys should be
+    # generated.
+    #
+    # @return [Boolean]
+    #   true if real keys should be created, false otherwise
+    #
+    def generate_real_keys?
+      !!@options[:generate_real_keys]
+    end
+
+    #
+    # 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
+    #
+    # @return [nil]
+    #   this method will block the main thread until interrupted
+    #
+    def start(publish = true)
+      publish = publish[:publish] if publish.is_a?(Hash) # Legacy API
+
+      if publish
+        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
+
+        EOH
       end
 
-      begin
-        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
-        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
+      thread = start_background
+
+      %w[INT TERM].each do |signal|
+        Signal.trap(signal) do
+          puts "\n>> Stopping Chef Zero..."
+          @server.shutdown
         end
       end
-    end
 
-    def start_background(wait = 5)
-      @thread = Thread.new {
-        begin
-          start
-        rescue
-          @server_error = $!
-          ChefZero::Log.error("#{$!.message}\n#{$!.backtrace.join("\n")}")
-        end
-      }
+      # Move the background process to the main thread
+      thread.join
+    end
 
-      # Wait x seconds to make sure the server actually started
-      Timeout::timeout(wait) {
-        sleep(0.01) until running? || @server_error
-        raise @server_error if @server_error
-      }
 
-      # Give the user the thread, just in case they want it
+    #
+    # Start a Chef Zero server in a forked process. This method returns the PID
+    # to the forked process.
+    #
+    # @param [Fixnum] wait
+    #   the number of seconds to wait for the server to start
+    #
+    # @return [Thread]
+    #   the thread the background process is running in
+    #
+    def start_background(wait = 5)
+      @server = WEBrick::HTTPServer.new(
+        :BindAddress => @options[:host],
+        :Port        => @options[:port],
+        :AccessLog   => [],
+        :Logger      => WEBrick::Log.new(StringIO.new, 7)
+      )
+      @server.mount('/', Rack::Handler::WEBrick, app)
+
+      @thread = Thread.new { @server.start }
+      @thread.abort_on_exception = true
       @thread
     end
 
+    #
+    # Boolean method to determine if the server is currently ready to accept
+    # requests. This method will attempt to make an HTTP request against the
+    # server. If this method returns true, you are safe to make a request.
+    #
+    # @return [Boolean]
+    #   true if the server is accepting requests, false otherwise
+    #
     def running?
-      case @server_type
-      when :puma
-        !!server.running
-      when :webrick
-        !!(server && server.status == :Running)
+      if @server.nil? || @server.status != :Running
+        return false
       end
+
+      uri     = URI.join(url, 'cookbooks')
+      headers = { 'Accept' => 'application/json' }
+
+      Timeout.timeout(0.1) { !open(uri, headers).nil? }
+    rescue SocketError, Errno::ECONNREFUSED, Timeout::Error
+      false
     end
 
+    #
+    # Gracefully stop the Chef Zero server.
+    #
+    # @param [Fixnum] wait
+    #   the number of seconds to wait before raising force-terminating the
+    #   server
+    #
     def stop(wait = 5)
-      case @server_type
-      when :puma
-        server.stop(true)
-      when :webrick
-        server.shutdown
-        @server
+      Timeout.timeout(wait) do
+        @server.shutdown
+        @thread.join(wait) if @thread
       end
+    rescue Timeout::Error
       if @thread
-        begin
-          @thread.join(wait) if @thread
-        rescue
-          if @thread
-            ChefZero::Log.error "Server did not stop within #{wait} seconds. Killing..."
-            @thread.kill
-          end
-        end
+        ChefZero::Log.error("Chef Zero did not stop within #{wait} seconds! Killing...")
+        @thread.kill
       end
     ensure
+      @server = nil
       @thread = nil
     end
 
@@ -283,9 +303,17 @@ module ChefZero
       @request_handler = block
     end
 
+    def to_s
+      "#<#{self.class} #{url}>"
+    end
+
+    def inspect
+      "#<#{self.class} @url=#{url.inspect}>"
+    end
+
     private
 
-    def make_app
+    def app
       router = RestRouter.new([
         [ '/authenticate_user', AuthenticateUserEndpoint.new(self) ],
         [ '/clients', ActorsEndpoint.new(self) ],
@@ -365,9 +393,5 @@ module ChefZero
       end
       value
     end
-
-    def generate_real_keys?
-      !!@generate_real_keys
-    end
   end
 end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.7.3'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 2.0.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -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
@@ -197,10 +197,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 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: