microwave 0.1004.2 → 0.1004.3

data/lib/chef/application/solo.rb

@@ -64,12 +64,6 @@ class Chef::Application::Solo < Chef::Application
     :description => "Group to set privilege to",
     :proc => nil
 
-  option :json_attribs,
-    :short => "-j JSON_ATTRIBS",
-    :long => "--json-attributes JSON_ATTRIBS",
-    :description => "Load attributes from a JSON file or URL",
-    :proc => nil
-
   option :node_name,
     :short => "-N NODE_NAME",
     :long => "--node-name NODE_NAME",
@@ -82,12 +76,6 @@ class Chef::Application::Solo < Chef::Application
     :description => "The splay time for running at intervals, in seconds",
     :proc => lambda { |s| s.to_i }
 
-  option :recipe_url,
-      :short => "-r RECIPE_URL",
-      :long => "--recipe-url RECIPE_URL",
-      :description => "Pull down a remote gzipped tarball of recipes and untar it to the cookbook cache.",
-      :proc => nil
-
   option :version,
     :short        => "-v",
     :long         => "--version",
@@ -103,53 +91,13 @@ class Chef::Application::Solo < Chef::Application
     :boolean      => true,
     :proc         => lambda {|n| $testrun = true }
 
-  attr_reader :chef_solo_json
-
   def initialize
     super
     @chef_solo = nil
-    @chef_solo_json = nil
   end
 
   def reconfigure
     super
-
-    if Chef::Config[:json_attribs]
-      begin
-        json_io = open(Chef::Config[:json_attribs])
-      rescue SocketError => error
-        Chef::Application.fatal!("I cannot connect to #{Chef::Config[:json_attribs]}", 2)
-      rescue Errno::ENOENT => error
-        Chef::Application.fatal!("I cannot find #{Chef::Config[:json_attribs]}", 2)
-      rescue Errno::EACCES => error
-        Chef::Application.fatal!("Permissions are incorrect on #{Chef::Config[:json_attribs]}. Please chmod a+r #{Chef::Config[:json_attribs]}", 2)
-      rescue Exception => error
-        Chef::Application.fatal!("Got an unexpected error reading #{Chef::Config[:json_attribs]}: #{error.message}", 2)
-      end
-
-      begin
-        @chef_solo_json = Chef::JSONCompat.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)
-      end
-    end
-
-    if Chef::Config[:recipe_url]
-      cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| e =~ /\/cookbooks\/*$/ }
-      recipes_path = File.expand_path(File.join(cookbooks_path, '..'))
-      target_file = File.join(recipes_path, 'recipes.tgz')
-
-      Chef::Log.debug "Creating path #{recipes_path} to extract recipes into"
-      FileUtils.mkdir_p recipes_path
-      path = File.join(recipes_path, 'recipes.tgz')
-      File.open(path, 'wb') do |f|
-        open(Chef::Config[:recipe_url]) do |r|
-          f.write(r.read)
-        end
-      end
-      Chef::Mixin::Command.run_command(:command => "tar zxvfC #{path} #{recipes_path}")
-    end
   end
 
   def setup_application
@@ -164,7 +112,7 @@ class Chef::Application::Solo < Chef::Application
           sleep splay
         end
 
-        @chef_solo = Chef::Client.new(@chef_solo_json)
+        @chef_solo = Chef::Client.new
         @chef_solo.run
         @chef_solo = nil
         Chef::Application.exit! "Exiting", 0

data/lib/chef/client.rb

@@ -113,15 +113,10 @@ class Chef
     attr_accessor :rest
     attr_accessor :runner
 
-    #--
-    # TODO: timh/cw: 5-19-2010: json_attribs should be moved to RunContext?
-    attr_reader :json_attribs
-
     attr_reader :run_status
 
     # Creates a new Chef::Client.
-    def initialize(json_attribs=nil)
-      @json_attribs = json_attribs
+    def initialize
       @node = nil
       @run_status = nil
       @runner = nil
@@ -222,11 +217,14 @@ class Chef
         @node.chef_environment(Chef::Config[:environment])
       end
 
+      # tom: no longer using json_attribs with consume_external_attrs,
+      # preferring to load from a node.rb
+      #
       # consume_external_attrs may add items to the run_list. Save the
       # expanded run_list, which we will pass to the server later to
       # determine which versions of cookbooks to use.
       @node.reset_defaults_and_overrides
-      @node.consume_external_attrs(ohai.data, @json_attribs)
+      @node.find_file(node_name)
       @run_list_expansion = @node.expand!('disk')
 
       # @run_list_expansion is a RunListExpansion.

data/lib/chef/config.rb

@@ -103,7 +103,6 @@ class Chef
     http_retry_count 5
     http_retry_delay 5
     interval nil
-    json_attribs nil
     log_level :info
     log_location STDOUT
     verbose_logging nil
@@ -130,9 +129,6 @@ class Chef
     # Where should chef-solo look for role files?
     role_path "/var/chef/roles"
 
-    # Where should chef-solo download recipes from?
-    recipe_url nil
-
     # Report Handlers
     report_handlers []
 

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.1004.2'
+  VERSION = '0.1004.3'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: microwave
 version: !ruby/object:Gem::Version 
-  hash: 4011
+  hash: 4009
   prerelease: 
   segments: 
   - 0
   - 1004
-  - 2
-  version: 0.1004.2
+  - 3
+  version: 0.1004.3
 platform: ruby
 authors: 
 - Tom Bombadil