chef 0.9.0.a10 → 0.9.0.a90

data/lib/chef/knife.rb

@@ -243,9 +243,17 @@ class Chef
       end
     end
 
-    def load_from_file(klass, from_file) 
-      from_file = @name_args[0]
-      relative_file = File.expand_path(File.join(Dir.pwd, 'roles', from_file))
+    def load_from_file(klass, from_file, bag=nil) 
+      relative_path = ""
+      if klass == Chef::Role
+        relative_path = "roles"
+      elsif klass == Chef::Node
+        relative_path = "nodes"
+      elsif klass == Chef::DataBagItem
+        relative_path = "data_bags/#{bag}"
+      end
+
+      relative_file = File.expand_path(File.join(Dir.pwd, relative_path, from_file))
       filename = nil
 
       if file_exists_and_is_readable?(from_file)

data/lib/chef/knife/bootstrap.rb

@@ -42,6 +42,10 @@ class Chef
         :long => "--node-name NAME",
         :description => "The Chef node name for your new node"
 
+      option :prerelease,
+        :long => "--prerelease",
+        :description => "Install the pre-release chef gems"
+
 
       def h
         @highline ||= HighLine.new
@@ -67,7 +71,7 @@ if [ ! -f /usr/bin/chef-client ]; then
   cd rubygems-1.3.6
   ruby setup.rb
   cp /usr/bin/gem1.8 /usr/bin/gem
-  gem install chef ohai --no-rdoc --no-ri --verbose
+  gem install ohai chef --no-rdoc --no-ri --verbose #{"--prerelease" if config[:prerelease]}
 fi
 
 mkdir -p /etc/chef

data/lib/chef/knife/data_bag_from_file.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Adam Jacob (<adam@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/knife'
+require 'chef/data_bag'
+require 'chef/data_bag_item'
+
+class Chef
+  class Knife
+    class DataBagFromFile < Knife
+
+      banner "Sub-Command: data bag from file BAG FILE (options)"
+
+      def run 
+        updated = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])
+        dbag = Chef::DataBagItem.new
+        dbag.data_bag(@name_args[0])
+        dbag.raw_data = updated
+        dbag.save
+        Chef::Log.info("Updated data_bag_item[#{@name_args[1]}]")
+      end
+    end
+  end
+end
+
+
+
+

data/lib/chef/provider.rb

@@ -67,13 +67,13 @@ class Chef
       # TODO: timh,cw: 2010-5-14: This means that the resources within
       # this block cannot interact with resources outside, e.g.,
       # manipulating notifies.
-      saved_run_context = run_context
-      self.run_context = Chef::RunContext.new(saved_run_context.node, saved_run_context.cookbook_collection)
-      
+      saved_run_context = @run_context
+      @run_context = @run_context.dup
+      @run_context.resource_collection = Chef::ResourceCollection.new
       instance_eval(&block)
-      Chef::Runner.new(run_context).converge
+      Chef::Runner.new(@run_context).converge
       
-      self.run_context = saved_run_context
+      @run_context = saved_run_context
     end
     
     public

data/lib/chef/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 class Chef
-  VERSION = '0.9.0.a10'
+  VERSION = '0.9.0.a90'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 829723527
   prerelease: true
   segments: 
   - 0
   - 9
   - 0
-  - a10
-  version: 0.9.0.a10
+  - a90
+  version: 0.9.0.a90
 platform: ruby
 authors: 
 - Adam Jacob
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -59,7 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -75,7 +71,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -91,7 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -107,7 +101,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -115,7 +108,6 @@ dependencies:
         version: 1.0.4
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -131,7 +123,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
@@ -147,7 +138,6 @@ dependencies:
     requirements: 
     - - <=
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 4
@@ -163,7 +153,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -177,7 +166,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -191,7 +179,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -205,7 +192,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -219,7 +205,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -338,6 +323,7 @@ files:
 - lib/chef/knife/data_bag_create.rb
 - lib/chef/knife/data_bag_delete.rb
 - lib/chef/knife/data_bag_edit.rb
+- lib/chef/knife/data_bag_from_file.rb
 - lib/chef/knife/data_bag_list.rb
 - lib/chef/knife/data_bag_show.rb
 - lib/chef/knife/ec2_instance_data.rb
@@ -552,7 +538,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -561,7 +546,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3