chef 0.9.12 → 0.9.14.beta.1

data/distro/common/markdown/knife.mkd

@@ -538,10 +538,43 @@ Show a specific role.
 
 The next sections describe sub-commands to work with various Cloud Computing APIs to launch server instances with validation and run-time configuration that Chef knows about. These sub-commands require the fog Ruby library. On Debian and Ubuntu systems with Opscode's apt repository (apt.opscode.com), this is the package `libfog-ruby`. It is also available as a RubyGem, `fog`.
 
-The Rackspace and Terremark server creation sub-commands are at an early stage of development. They do not yet use the `bootstrap` sub-command to install Chef, and make a few assumptions to be aware. Right now when creating instances of these types, knife will assume an Ubuntu image, install Ruby from packages, RubyGems from source and Chef as a RubyGem. As these commands are developed further, they will utilize the `bootstrap` sub-command.
+The Blue Box, Rackspace and Terremark server creation sub-commands are at an early stage of development. They do not yet use the `bootstrap` sub-command to install Chef, and make a few assumptions to be aware. Right now when creating instances of these types, knife will assume an Ubuntu image, install Ruby from packages, RubyGems from source and Chef as a RubyGem. As these commands are developed further, they will utilize the `bootstrap` sub-command.
 
 In order to use knife with the various __CLOUD COMPUTING SUB-COMMANDS__, credentials need to be added to the configuration file. See __CONFIGURATION__.
 
+## BLUE BOX SUB-COMMANDS
+
+__bluebox server create [RUN LIST...]__ _(options)_
+
+  * `-f`, `--flavor FLAVOR`:
+    This is the product type (Block size) you're requesting to deploy.  Requires the UUID of the image.
+
+  * `-i`, `--image IMAGE`:
+    The image (or OS distribution) to deploy.  This can be a pre-built Blue Box template, or this can be a template you've archived previously.  Requires the UUID of the image.
+
+  * `-U`, `--username USERNAME`:
+    Username created on the deployed server.  Defaults to "deploy".
+
+  * `-P`, `--password PASSWORD`:
+    Password installed for the created user on the deployed server.  Can be bypassed by defining a SSH key in your knife configuration ( Chef::Config[:knife][:ssh_key] ).
+
+  * `--bootstrap true/false`:
+    Allows you to enable or disable the bootstrap process.
+
+Creates a new Blue Box Group Blocks instance and bootstraps it by checking out a github repo and installs a bare minimum installation of chef on the instance; it then executes the specified run list.
+
+__bluebox server delete BLOCK-HOSTNAME__
+
+Deletes a running Blue Box Group Blocks server.
+
+__bluebox server list__
+
+Lists running Blue Box Group Blocks servers.
+
+__bluebox images list__
+
+Lists the available Blue Box Group Blocks server images to boot.
+
 ## EC2 SUB-COMMANDS
 
 Chef is commonly used with Amazon AWS EC2 nodes. This sub-command will generate instance metadata that can be used to automatically configure an EC2 instance with Chef. This requires an AMI that has Chef preinstalled with a configuration file that can parse the metadata at run-time. At this time this is the only sub-command for EC2, but more may be added later similar to __RACKSPACE__ and __TERREMARK__ below.

data/distro/debian/etc/default/chef-solr

@@ -5,3 +5,4 @@ GROUP=chef
 # Sleep to give daemon enough time to fully start or stop.
 DIETIME=5
 STARTTIME=5
+MAXTRIES=20

data/distro/debian/etc/init.d/chef-client

@@ -30,7 +30,7 @@ if [ ! -d /var/run/chef ]; then
   mkdir /var/run/chef
 fi
 
-DAEMON_OPTS="-L $LOGFILE -d -c $CONFIG -i $INTERVAL -s $SPLAY"
+DAEMON_OPTS="-d -P $PIDFILE -L $LOGFILE -c $CONFIG -i $INTERVAL -s $SPLAY"
 
 running_pid() {                                                                 
   pid=$1

data/distro/debian/etc/init.d/chef-solr

@@ -15,7 +15,7 @@
 # description: starts up chef-solr in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/chef-solr
+DAEMON=/usr/bin/chef-solr
 DAEMON_NAME=java
 NAME=chef-solr
 DESC=chef-solr
@@ -32,57 +32,57 @@ if [ ! -d /var/run/chef ]; then
   chown $USER:$GROUP /var/run/chef
 fi
 
+if [ ! -f $LOGFILE ]; then
+  touch $LOGFILE
+  chown $USER:$GROUP $LOGFILE
+fi
+
 DAEMON_OPTS="-d -P $PIDFILE -c $CONFIG -L $LOGFILE -u $USER -g $GROUP"
 
-running_pid() {                                                                 
+running_pid() {
   pid=$1
-  name=$2                                                                     
-  [ -z "$pid" ] && return 1                                                   
-  [ ! -d /proc/$pid ] &&  return 1                                            
+  name=$2
+  [ -z "$pid" ] && return 1
+  [ ! -d /proc/$pid ] &&  return 1
   cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | head -1`
-  [ "$cmd" != "$name" ] &&  return 1                                          
-  return 0 
-}   
+  [ "$cmd" != "$name" ] &&  return 1
+  return 0
+}
 
-running() {                                                                     
+running() {
   [ ! -f "$PIDFILE" ] && return 1
   pid=`cat $PIDFILE`
-  running_pid $pid $DAEMON_NAME || return 1                                        
+  running_pid $pid $DAEMON_NAME || return 1
   return 0
-}   
+}
 
-start_server() {                                                                
-  if [ -z "$DAEMONUSER" ] ; then                                          
-    start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS                       
+start_server() {
+  start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
   errcode=$?
-  else
-    start-stop-daemon --start --quiet --pidfile $PIDFILE \              
-      --chuid $DAEMONUSER \ 
-      --exec $DAEMON -- $DAEMON_OPTS                          
-    errcode=$?  
-  fi  
-  return $errcode                                                         
-}       
+  for i in `seq 0 $MAXTRIES`
+  do
+    if running; then
+      errcode=0
+      break
+    else
+      [ -n "$STARTTIME" ] && sleep $STARTTIME
+    fi
+  done
+  return $errcode
+}
 
-stop_server() {                                                                 
-   if [ -z "$DAEMONUSER" ] ; then                                          
-     killproc -p $PIDFILE $DAEMON                                        
-     errcode=$?
-   else
-     start-stop-daemon --stop --quiet --pidfile $PIDFILE \               
-       --user $DAEMONUSER \ 
-       --exec $DAEMON
-     errcode=$?  
-   fi  
-   return $errcode                                                         
-}       
+stop_server() {
+   killproc -p $PIDFILE $DAEMON
+   errcode=$?
+   return $errcode
+}
 
-reload_server() {                                                               
-  [ ! -f "$PIDFILE" ] && return 1                                             
-  pid=pidofproc $PIDFILE # This is the daemon's pid                           
+reload_server() {
+  [ ! -f "$PIDFILE" ] && return 1
+  pid=pidofproc $PIDFILE # This is the daemon's pid
   /bin/kill -1 $pid
   return $?
-}   
+}
 
 force_stop() {
   [ ! -e "$PIDFILE" ] && return
@@ -110,7 +110,7 @@ case "$1" in
         exit 3
     fi
     if start_server ; then
-        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+        [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
         if  running ;  then
             log_end_msg 0
         else
@@ -174,4 +174,3 @@ case "$1" in
 esac
 
 exit 0
-

data/distro/debian/etc/init.d/chef-solr-indexer

@@ -15,7 +15,7 @@
 # description: starts up chef-solr-indexer in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/chef-solr-indexer
+DAEMON=/usr/bin/chef-solr-indexer
 NAME=chef-solr-indexer
 DESC=chef-solr-indexer
 PIDFILE=/var/run/chef/solr-indexer.pid

data/distro/redhat/etc/init.d/chef-client

@@ -35,7 +35,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon chef-client -d -c "$config" -L "$logfile" -p "$pidfile" -i "$interval" -s "$splay" "$options"
+    daemon chef-client -d -c "$config" -L "$logfile" -P "$pidfile" -i "$interval" -s "$splay" "$options"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

data/lib/chef.rb

@@ -37,3 +37,4 @@ require 'chef/handler/json_file'
 require 'chef/monkey_patches/tempfile'
 require 'chef/monkey_patches/dir'
 require 'chef/monkey_patches/string'
+require 'chef/monkey_patches/numeric'

data/lib/chef/api_client.rb

@@ -24,7 +24,7 @@ require 'chef/couchdb'
 require 'chef/certificate'
 require 'chef/index_queue'
 require 'extlib'
-require 'json'
+require 'chef/json'
 
 class Chef
   class ApiClient 

data/lib/chef/application/agent.rb

@@ -15,4 +15,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/application'
+require 'chef/application'

data/lib/chef/application/client.rb

@@ -181,7 +181,7 @@ class Chef::Application::Client < Chef::Application
       end
 
       begin
-        @chef_client_json = JSON.parse(json_io.read)
+        @chef_client_json = Chef::JSON.from_json(json_io.read)
         json_io.close unless json_io.closed?
       rescue JSON::ParserError => error
         Chef::Application.fatal!("Could not parse the provided JSON file (#{Chef::Config[:json_attribs]})!: " + error.message, 2)

data/lib/chef/application/solo.rb

@@ -145,7 +145,7 @@ class Chef::Application::Solo < Chef::Application
       end
 
       begin
-        @chef_solo_json = JSON.parse(json_io.read)
+        @chef_solo_json = Chef::JSON.from_json(json_io.read)
         json_io.close unless json_io.closed?
       rescue JSON::ParserError => error
         Chef::Application.fatal!("Could not parse the provided JSON file (#{Chef::Config[:json_attribs]})!: " + error.message, 2)

data/lib/chef/cookbook/metadata.rb

@@ -430,12 +430,12 @@ class Chef
       end
 
       def self.from_json(string)
-        o = JSON.parse(string)
+        o = Chef::JSON.from_json(string)
         self.from_hash(o)
       end
 
       def from_json(string)
-        o = JSON.parse(string)
+        o = Chef::JSON.from_json(string)
         from_hash(o)
       end
 

data/lib/chef/cookbook/syntax_check.rb

@@ -133,4 +133,4 @@ class Chef
       
     end
   end
-end
+end

data/lib/chef/cookbook_version.rb

@@ -24,6 +24,7 @@ require 'chef/node'
 require 'chef/resource_definition_list'
 require 'chef/recipe'
 require 'chef/cookbook/file_vendor'
+require 'chef/checksum'
 
 class Chef
   # == Chef::CookbookVersion
@@ -809,7 +810,10 @@ class Chef
     # checksum documents 
     def purge
       checksums.keys.each do |checksum|
-        Chef::Checksum.cdb_load(checksum, couchdb).purge
+        begin
+          Chef::Checksum.cdb_load(checksum, couchdb).purge
+        rescue Chef::Exceptions::CouchDBNotFound
+        end
       end
       cdb_destroy
     end

data/lib/chef/couchdb.rb

@@ -21,7 +21,7 @@ require 'chef/config'
 require 'chef/rest'
 require 'chef/log'
 require 'digest/sha2'
-require 'json'
+require 'chef/json'
 
 # We want to fail on create if uuidtools isn't installed
 begin

data/lib/chef/data_bag.rb

@@ -25,7 +25,7 @@ require 'chef/couchdb'
 require 'chef/data_bag_item'
 require 'chef/index_queue'
 require 'extlib'
-require 'json'
+require 'chef/json'
 
 class Chef
   class DataBag 

data/lib/chef/data_bag_item.rb

@@ -18,6 +18,8 @@
 # limitations under the License.
 #
 
+require 'forwardable'
+
 require 'chef/config'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
@@ -25,10 +27,12 @@ require 'chef/couchdb'
 require 'chef/index_queue'
 require 'chef/data_bag'
 require 'extlib'
-require 'json'
+require 'chef/json'
 
 class Chef
   class DataBagItem
+
+    extend Forwardable
     
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
@@ -59,6 +63,9 @@ class Chef
       }
     }
 
+    # Define all Hash's instance methods as delegating to @raw_data
+    def_delegators(:@raw_data, *(Hash.instance_methods - Object.instance_methods))
+
     attr_accessor :couchdb_rev, :couchdb_id, :couchdb
     attr_reader :raw_data
     
@@ -134,7 +141,13 @@ class Chef
       result["_rev"] = @couchdb_rev if @couchdb_rev
       result.to_json(*a)
     end
-    
+
+    def self.from_hash(h)
+      item = new
+      item.raw_data = h
+      item
+    end
+
     # Create a Chef::DataBagItem from JSON
     def self.json_create(o)
       bag_item = new
@@ -156,11 +169,6 @@ class Chef
       bag_item
     end
 
-    # The Data Bag Item behaves like a hash - we pass all that stuff along to @raw_data.
-    def method_missing(method_symbol, *args, &block) 
-      self.raw_data.send(method_symbol, *args, &block)
-    end
-    
     # Load a Data Bag Item by name from CouchDB
     def self.cdb_load(data_bag, name, couchdb=nil)
       (couchdb || Chef::CouchDB.new).load("data_bag_item", object_name(data_bag, name))
@@ -168,7 +176,14 @@ class Chef
     
     # Load a Data Bag Item by name via RESTful API
     def self.load(data_bag, name)
-      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{data_bag}/#{name}")
+      item = Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data/#{data_bag}/#{name}")
+      if item.kind_of?(DataBagItem)
+        item
+      else
+        item = from_hash(item)
+        item.data_bag(data_bag)
+        item
+      end
     end
     
     # Remove this Data Bag Item from CouchDB
@@ -208,12 +223,23 @@ class Chef
     def self.create_design_document(couchdb=nil)
       (couchdb || Chef::CouchDB.new).create_design_document("data_bag_items", DESIGN_DOCUMENT)
     end
-    
+
+    def ==(other)
+      other.respond_to?(:to_hash) &&
+      other.respond_to?(:data_bag) &&
+      (other.to_hash == to_hash) &&
+      (other.data_bag.to_s == data_bag.to_s)
+    end
+
     # As a string
     def to_s
       "data_bag_item[#{id}]"
     end
 
+    def inspect
+      "data_bag_item[#{data_bag.inspect}, #{raw_data['id'].inspect}, #{raw_data.inspect}]"
+    end
+
     def pretty_print(pretty_printer)
       pretty_printer.pp({"data_bag_item('#{data_bag}', '#{id}')" => self.to_hash})
     end

data/lib/chef/exceptions.rb

@@ -62,5 +62,7 @@ class Chef
     class InvalidResourceSpecification < ArgumentError; end
     class SolrConnectionError < RuntimeError; end
     class IllegalChecksumRevert < RuntimeError; end
+    class MissingParentDirectory < RuntimeError; end
+    class UnresolvableGitReference < RuntimeError; end
   end
 end

data/lib/chef/file_cache.rb

@@ -18,7 +18,7 @@
 require 'chef/mixin/params_validate'
 require 'chef/mixin/create_path'
 require 'chef/exceptions'
-require 'json'
+require 'chef/json'
 require 'fileutils'
 
 class Chef

data/lib/chef/handler/json_file.rb

@@ -41,7 +41,7 @@ class Chef
         build_report_dir
         savetime = Time.now.strftime("%Y%m%d%H%M%S")
         File.open(File.join(config[:path], "chef-run-report-#{savetime}.json"), "w") do |file|
-          file.puts JSON.pretty_generate(data)
+          file.puts Chef::JSON.to_json_pretty(data)
         end
       end
 

data/lib/chef/index_queue/amqp_client.rb

@@ -76,7 +76,7 @@ class Chef
       def send_action(action, data)
         retries = 0
         begin
-          exchange.publish({"action" => action.to_s, "payload" => data}.to_json)
+          exchange.publish(Chef::JSON.to_json({"action" => action.to_s, "payload" => data}))
         rescue Bunny::ServerDownError, Bunny::ConnectionError, Errno::ECONNRESET
           disconnected!
           if (retries += 1) < 2
@@ -110,4 +110,4 @@ class Chef
 
     end
   end
-end
+end

data/lib/chef/index_queue/consumer.rb

@@ -56,7 +56,7 @@ class Chef
       alias :start :run
       
       def call_action_for_message(message)
-        amqp_payload  = JSON.parse(message[:payload], :create_additions => false, :max_nesting => false)
+        amqp_payload  = Chef::JSON.from_json(message[:payload], :create_additions => false, :max_nesting => false)
         action        = amqp_payload["action"].to_sym
         app_payload   = amqp_payload["payload"]
         assert_method_whitelisted(action)
@@ -73,4 +73,4 @@ class Chef
       
     end
   end
-end
+end