chef 0.9.8.beta.1 → 0.9.8.beta.2

data/lib/chef/shef/model_wrapper.rb

@@ -0,0 +1,120 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/mixin/convert_to_class_name'
+require 'chef/mixin/language'
+
+module Shef
+  class ModelWrapper
+
+    include Chef::Mixin::ConvertToClassName
+
+    attr_reader :model_symbol
+
+    def initialize(model_class, symbol=nil)
+      @model_class = model_class
+      @model_symbol = symbol || convert_to_snake_case(model_class.name, "Chef").to_sym
+    end
+
+    def search(query)
+      return all if query.to_s == "all"
+      results = []
+      Chef::Search::Query.new.search(@model_symbol, format_query(query)) do |obj|
+        if block_given?
+          results << yield(obj)
+        else
+          results << obj
+        end
+      end
+      results
+    end
+
+    alias :find :search
+
+    def all(&block)
+      all_objects = list_objects
+      block_given? ? all_objects.map(&block) : all_objects
+    end
+
+    alias :list :all
+
+    def show(obj_id)
+      @model_class.load(obj_id)
+    end
+
+    alias :load :show
+
+    def transform(what_to_transform, &block)
+      if what_to_transform == :all
+        objects_to_transform = list_objects
+      else
+        objects_to_transform = search(what_to_transform)
+      end
+      objects_to_transform.each do |obj|
+        if result = yield(obj)
+          obj.save
+        end
+      end
+    end
+
+    alias :bulk_edit :transform
+
+    private
+
+    # paper over inconsistencies in the model classes APIs, and return the objects
+    # the user wanted instead of the URI=>object stuff
+    def list_objects
+      objects = @model_class.method(:list).arity == 0? @model_class.list : @model_class.list(true)
+      objects.map { |obj| Array(obj).find {|o| o.kind_of?(@model_class)} }
+    end
+
+    def format_query(query)
+      if query.respond_to?(:keys)
+        query.map { |key, value| "#{key}:#{value}" }.join(" AND ")
+      else
+        query
+      end
+    end
+  end
+
+  class NamedDataBagWrapper < ModelWrapper
+
+    def initialize(databag_name)
+      @model_symbol = @databag_name = databag_name
+    end
+
+
+    alias :list :all
+
+    def show(item)
+      Chef::DataBagItem.load(@databag_name, item)
+    end
+
+    private
+
+    def list_objects
+      all_items = []
+      Chef::Search::Query.new.search(@databag_name) do |item|
+        all_items << item
+      end
+      all_items
+    end
+
+  end
+
+end

data/lib/chef/shef/shef_rest.rb

@@ -0,0 +1,28 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shef
+  class ShefREST < Chef::REST
+
+    alias :get    :get_rest
+    alias :put    :put_rest
+    alias :post   :post_rest
+    alias :delete :delete_rest
+
+  end
+end

data/lib/chef/shef/shef_session.rb

@@ -26,6 +26,11 @@ module Shef
   class ShefSession
     include Singleton
     
+    def self.session_type(type=nil)
+      @session_type = type if type
+      @session_type
+    end
+
     attr_accessor :node, :compile, :recipe, :run_context
     attr_reader :node_attributes, :client
     def initialize
@@ -40,10 +45,12 @@ module Shef
       loading do 
         rebuild_node
         @node = client.node
+        shorten_node_inspect
+        Shef::Extensions.extend_context_node(@node)
         rebuild_context
         node.consume_attributes(node_attributes) if node_attributes
-        shorten_node_inspect
         @recipe = Chef::Recipe.new(nil, nil, run_context)
+        Shef::Extensions.extend_context_recipe(@recipe)
         @node_built = true
       end
     end
@@ -122,6 +129,8 @@ module Shef
   end
   
   class StandAloneSession < ShefSession
+
+    session_type :standalone
     
     def rebuild_context
       @run_context = Chef::RunContext.new(@node, {}) # no recipes
@@ -133,12 +142,14 @@ module Shef
       Chef::Config[:solo] = true
       @client = Chef::Client.new
       @client.run_ohai
-      @client.build_node #(@client.node_name, true)
+      @client.build_node
     end
     
   end
   
   class SoloSession < ShefSession
+
+    session_type :solo
     
     def definitions
       @run_context.definitions
@@ -155,12 +166,14 @@ module Shef
       Chef::Config[:solo] = true
       @client = Chef::Client.new
       @client.run_ohai
-      @client.build_node #(@client.node_name, true)
+      @client.build_node
     end
     
   end
   
   class ClientSession < SoloSession
+
+    session_type :solo
     
     def save_node
       @client.save_node
@@ -174,10 +187,84 @@ module Shef
       @client = Chef::Client.new
       @client.run_ohai
       @client.register
-      @client.build_node #(@client.node_name, false)
+      @client.build_node
       
       @client.sync_cookbooks({})
     end
 
   end
+
+  class DoppelGangerClient < Chef::Client
+
+    attr_reader :node_name
+
+    def initialize(node_name)
+      @node_name = node_name
+      @ohai = Ohai::System.new
+    end
+
+    # Run the very smallest amount of ohai we can get away with and still
+    # hope to have things work. Otherwise we're not very good doppelgangers
+    def run_ohai
+      @ohai.require_plugin('os')
+    end
+
+    # DoppelGanger implementation of build_node. preserves as many of the node's
+    # attributes, and does not save updates to the server
+    def build_node
+      Chef::Log.debug("Building node object for #{@node_name}")
+
+      @node = Chef::Node.find_or_create(node_name)
+
+      ohai_data = @ohai.data.merge(@node.automatic_attrs)
+
+      @node.process_external_attrs(ohai_data,nil)
+      @node.reset_defaults_and_overrides
+
+      @node
+    end
+
+    def register
+      @rest = Chef::REST.new(Chef::Config[:chef_server_url], Chef::Config[:node_name], Chef::Config[:client_key])
+    end
+
+  end
+
+  class DoppelGangerSession < ClientSession
+
+    session_type "doppelganger client"
+
+    def save_node
+      puts "A doppelganger should think twice before saving the node"
+    end
+
+    def assume_identity(node_name)
+      Chef::Config[:doppelganger] = @node_name = node_name
+      reset!
+    rescue Exception => e
+      puts "#{e.class.name}: #{e.message}"
+      puts Array(e.backtrace).join("\n")
+      puts
+      puts "* " * 40
+      puts "failed to assume the identity of node '#{node_name}', resetting"
+      puts "* " * 40
+      puts
+      Chef::Config[:doppelganger] = false
+      @node_built = false
+      Shef.session
+    end
+
+    def rebuild_node
+      # Make sure the client knows this is not chef solo
+      Chef::Config[:solo] = false
+      @client = DoppelGangerClient.new(@node_name)
+      @client.run_ohai
+      @client.register
+      @client.build_node
+
+      @client.sync_cookbooks({})
+    end
+
+  end
+
 end

data/lib/chef/version.rb

@@ -17,5 +17,5 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.9.8.beta.1'
+  VERSION = '0.9.8.beta.2'
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 9
   - 8
   - beta
-  - 1
-  version: 0.9.8.beta.1
+  - 2
+  version: 0.9.8.beta.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -308,6 +308,7 @@ files:
 - lib/chef/index_queue.rb
 - lib/chef/knife/bootstrap/centos5-gems.erb
 - lib/chef/knife/bootstrap/fedora13-gems.erb
+- lib/chef/knife/bootstrap/ubuntu10.04-apt.erb
 - lib/chef/knife/bootstrap/ubuntu10.04-gems.erb
 - lib/chef/knife/bootstrap.rb
 - lib/chef/knife/client_bulk_delete.rb
@@ -539,6 +540,8 @@ files:
 - lib/chef/sandbox.rb
 - lib/chef/search/query.rb
 - lib/chef/shef/ext.rb
+- lib/chef/shef/model_wrapper.rb
+- lib/chef/shef/shef_rest.rb
 - lib/chef/shef/shef_session.rb
 - lib/chef/shef.rb
 - lib/chef/shell_out.rb