chef 11.18.12 → 12.0.0.alpha.0

data/lib/chef/knife/bootstrap/chef-aix.erb

@@ -42,7 +42,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -52,7 +52,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/bootstrap/chef-full.erb

@@ -57,7 +57,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -67,7 +67,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 echo "Starting first Chef Client run..."

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -28,7 +28,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -38,7 +38,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -28,7 +28,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -47,7 +47,7 @@ echo 'https_proxy "knife_config[:bootstrap_proxy]"' >> /etc/chef/client.rb
 <% end -%>
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -32,7 +32,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -42,7 +42,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb

@@ -30,7 +30,7 @@ mkdir -p /etc/chef/ohai/hints
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 cat > /etc/chef/ohai/hints/<%= name %>.json <<'EOP'
-<%= Chef::JSONCompat.to_json(hash) %>
+<%= hash.to_json %>
 EOP
 <% end -%>
 <% end -%>
@@ -40,7 +40,7 @@ cat > /etc/chef/client.rb <<'EOP'
 EOP
 
 cat > /etc/chef/first-boot.json <<'EOP'
-<%= Chef::JSONCompat.to_json(first_boot) %>
+<%= first_boot.to_json %>
 EOP
 
 <%= start_chef %>'

data/lib/chef/knife/cookbook_site_download.rb

@@ -58,7 +58,7 @@ class Chef
 
       private
       def cookbooks_api_url
-        'https://supermarket.getchef.com/api/v1/cookbooks'
+        'http://cookbooks.opscode.com/api/v1/cookbooks'
       end
 
       def current_cookbook_data

data/lib/chef/knife/cookbook_site_install.rb

@@ -17,11 +17,11 @@
 #
 
 require 'chef/knife'
-require 'chef/exceptions'
 require 'shellwords'
 
 class Chef
   class Knife
+
     class CookbookSiteInstall < Knife
 
       deps do
@@ -107,8 +107,11 @@ class Chef
           end
         end
 
+
         unless config[:no_deps]
-          preferred_metadata.dependencies.each do |cookbook, version_list|
+          md = Chef::Cookbook::Metadata.new
+          md.from_file(File.join(@install_path, @cookbook_name, "metadata.rb"))
+          md.dependencies.each do |cookbook, version_list|
             # Doesn't do versions.. yet
             nv = self.class.new
             nv.config = config
@@ -141,7 +144,6 @@ class Chef
 
       def extract_cookbook(upstream_file, version)
         ui.info("Uncompressing #{@cookbook_name} version #{version}.")
-        # FIXME: Detect if we have the bad tar from git on Windows: https://github.com/opscode/chef/issues/1753
         shell_out!("tar zxvf #{convert_path upstream_file}", :cwd => @install_path)
       end
 
@@ -151,37 +153,11 @@ class Chef
       end
 
       def convert_path(upstream_file)
-        # converts a Windows path (C:\foo) to a mingw path (/c/foo)
-        if ENV['MSYSTEM'] == 'MINGW32'
-          return upstream_file.sub(/^([[:alpha:]]):/, '/\1')
-        else
-          return Shellwords.escape upstream_file
-        end
-      end
-
-      # Get the preferred metadata path on disk. Chef prefers the metadata.rb
-      # over the metadata.json.
-      #
-      # @raise if there is no metadata in the cookbook
-      #
-      # @return [Chef::Cookbook::Metadata]
-      def preferred_metadata
-        md = Chef::Cookbook::Metadata.new
-
-        rb   = File.join(@install_path, @cookbook_name, "metadata.rb")
-        if File.exist?(rb)
-          md.from_file(rb)
-          return md
-        end
-
-        json = File.join(@install_path, @cookbook_name, "metadata.json")
-        if File.exist?(json)
-          json = IO.read(json)
-          md.from_json(json)
-          return md
-        end
-
-        raise Chef::Exceptions::MetadataNotFound.new(@install_path, @cookbook_name)
+      	if ENV['MSYSTEM'] == 'MINGW32'
+      	  return upstream_file.sub(/^([[:alpha:]]):/, '/\1')
+	      else
+      	  return Shellwords.escape upstream_file
+      	end
       end
     end
   end

data/lib/chef/knife/cookbook_site_list.rb

@@ -41,7 +41,7 @@ class Chef
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_search.rb

@@ -29,7 +29,7 @@ class Chef
       end
 
       def search_cookbook(query, items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/search?q=#{query}&items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_share.rb

@@ -54,7 +54,7 @@ class Chef
         cl = Chef::CookbookLoader.new(config[:cookbook_path])
         if cl.cookbook_exists?(cookbook_name)
           cookbook = cl[cookbook_name]
-          Chef::CookbookUploader.new(cookbook,config[:cookbook_path]).validate_cookbooks
+          Chef::CookbookUploader.new(cookbook).validate_cookbooks
           tmp_cookbook_dir = Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
           begin
             Chef::Log.debug("Temp cookbook directory is #{tmp_cookbook_dir.inspect}")
@@ -85,9 +85,9 @@ class Chef
       end
 
       def do_upload(cookbook_filename, cookbook_category, user_id, user_secret_filename)
-         uri = "https://supermarket.getchef.com/api/v1/cookbooks"
+         uri = "http://cookbooks.opscode.com/api/v1/cookbooks"
 
-         category_string = Chef::JSONCompat.to_json({ 'category'=>cookbook_category })
+         category_string = { 'category'=>cookbook_category }.to_json
 
          http_resp = Chef::CookbookSiteStreamingUploader.post(uri, user_id, user_secret_filename, {
            :tarball => File.open(cookbook_filename),

data/lib/chef/knife/cookbook_site_show.rb

@@ -31,14 +31,14 @@ class Chef
       def get_cookbook_data
         case @name_args.length
         when 1
-          noauth_rest.get_rest("https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}")
+          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}")
         when 2
-          noauth_rest.get_rest("https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
+          noauth_rest.get_rest("http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}/versions/#{name_args[1].gsub('.', '_')}")
         end
       end
 
       def get_cookbook_list(items=10, start=0, cookbook_collection={})
-        cookbooks_url = "https://supermarket.getchef.com/api/v1/cookbooks?items=#{items}&start=#{start}"
+        cookbooks_url = "http://cookbooks.opscode.com/api/v1/cookbooks?items=#{items}&start=#{start}"
         cr = noauth_rest.get_rest(cookbooks_url)
         cr["items"].each do |cookbook|
           cookbook_collection[cookbook["cookbook_name"]] = cookbook

data/lib/chef/knife/cookbook_site_unshare.rb

@@ -41,7 +41,7 @@ class Chef
         confirm "Do you really want to unshare the cookbook #{@cookbook_name}"
 
         begin
-          rest.delete_rest "https://supermarket.getchef.com/api/v1/cookbooks/#{@name_args[0]}"
+          rest.delete_rest "http://cookbooks.opscode.com/api/v1/cookbooks/#{@name_args[0]}"
         rescue Net::HTTPServerException => e
           raise e unless e.message =~ /Forbidden/
           ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."

data/lib/chef/knife/cookbook_upload.rb

@@ -240,7 +240,7 @@ WARNING
           check_for_broken_links!(cb)
           check_for_dependencies!(cb)
         end
-        Chef::CookbookUploader.new(cookbooks, config[:cookbook_path], :force => config[:force], :concurrency => config[:concurrency]).upload_cookbooks
+        Chef::CookbookUploader.new(cookbooks, :force => config[:force], :concurrency => config[:concurrency]).upload_cookbooks
       rescue Chef::Exceptions::CookbookFrozen => e
         ui.error e
         raise

data/lib/chef/knife/core/subcommand_loader.rb

@@ -21,9 +21,6 @@ class Chef
   class Knife
     class SubcommandLoader
 
-      MATCHES_CHEF_GEM = %r{/chef-[\d]+\.[\d]+\.[\d]+}.freeze
-      MATCHES_THIS_CHEF_GEM = %r{/chef-#{Chef::VERSION}/}.freeze
-
       attr_reader :chef_config_dir
       attr_reader :env
 
@@ -124,14 +121,6 @@ class Chef
         subcommand_files = {}
         files.each do |file|
           rel_path = file[/(#{Regexp.escape File.join('chef', 'knife', '')}.*)\.rb/, 1]
-
-          # When not installed as a gem (ChefDK/appbundler in particular), AND
-          # a different version of Chef is installed via gems, `files` will
-          # include some files from the 'other' Chef install. If this contains
-          # a knife command that doesn't exist in this version of Chef, we will
-          # get a LoadError later when we try to require it.
-          next if from_different_chef_version?(file)
-
           subcommand_files[rel_path] = file
         end
 
@@ -195,19 +184,6 @@ class Chef
 
         Dir[glob].map { |f| f.untaint }
       end
-
-      def from_different_chef_version?(path)
-        matches_any_chef_gem?(path) && !matches_this_chef_gem?(path)
-      end
-
-      def matches_any_chef_gem?(path)
-        path =~ MATCHES_CHEF_GEM
-      end
-
-      def matches_this_chef_gem?(path)
-        path =~ MATCHES_THIS_CHEF_GEM
-      end
-
     end
   end
 end

data/lib/chef/knife/core/ui.rb

@@ -73,10 +73,8 @@ class Chef
         end
       end
 
-      alias :info :msg
-
-      # Prints a msg to stderr. Used for warn, error, and fatal.
-      def err(message)
+      # Prints a msg to stderr. Used for info, warn, error, and fatal.
+      def log(message)
         begin
           stderr.puts message
         rescue Errno::EPIPE => e
@@ -85,19 +83,22 @@ class Chef
         end
       end
 
+      alias :info :log
+      alias :err :log
+
       # Print a warning message
       def warn(message)
-        err("#{color('WARNING:', :yellow, :bold)} #{message}")
+        log("#{color('WARNING:', :yellow, :bold)} #{message}")
       end
 
       # Print an error message
       def error(message)
-        err("#{color('ERROR:', :red, :bold)} #{message}")
+        log("#{color('ERROR:', :red, :bold)} #{message}")
       end
 
       # Print a message describing a fatal error.
       def fatal(message)
-        err("#{color('FATAL:', :red, :bold)} #{message}")
+        log("#{color('FATAL:', :red, :bold)} #{message}")
       end
 
       def color(string, *colors)

data/lib/chef/knife/deps.rb

@@ -9,7 +9,6 @@ class Chef
 
       deps do
         require 'chef/chef_fs/file_system'
-        require 'chef/json_compat'
         require 'chef/run_list'
       end
 
@@ -78,7 +77,7 @@ class Chef
             return entry.chef_object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}" }
 
           elsif entry.parent && entry.parent.path == '/nodes'
-            node = Chef::JSONCompat.parse(entry.read, :create_additions => false)
+            node = JSON.parse(entry.read, :create_additions => false)
             result = []
             if node['chef_environment'] && node['chef_environment'] != '_default'
               result << "/environments/#{node['chef_environment']}.json"
@@ -89,7 +88,7 @@ class Chef
             result
 
           elsif entry.parent && entry.parent.path == '/roles'
-            role = Chef::JSONCompat.parse(entry.read, :create_additions => false)
+            role = JSON.parse(entry.read, :create_additions => false)
             result = []
             if role['run_list']
               dependencies_from_runlist(role['run_list']).each do |dependency|

data/lib/chef/knife/serve.rb

@@ -1,4 +1,5 @@
 require 'chef/knife'
+require 'chef/local_mode'
 
 class Chef
   class Knife
@@ -30,8 +31,8 @@ class Chef
       end
 
       def run
+        server = Chef::LocalMode.chef_zero_server
         begin
-          server = Chef::Application.chef_zero_server
           output "Serving files from:\n#{server.options[:data_store].chef_fs.fs_description}"
           server.stop
           server.start(stdout) # to print header

data/lib/chef/local_mode.rb

@@ -0,0 +1,105 @@
+#
+# Author:: John Keiser (<jkeiser@getchef.com>)
+# Copyright:: Copyright (c) 2013 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/config'
+
+class Chef
+  module LocalMode
+    # Create a chef local server (if the configuration requires one) for the
+    # duration of the given block.
+    #
+    #     # This ...
+    #     with_server_connectivity { stuff }
+    #
+    #     # Is exactly equivalent to this ...
+    #     Chef::LocalMode.setup_server_connectivity
+    #     begin
+    #       stuff
+    #     ensure
+    #       Chef::LocalMode.destroy_server_connectivity
+    #     end
+    #
+    def self.with_server_connectivity
+      setup_server_connectivity
+      begin
+        yield
+      ensure
+        destroy_server_connectivity
+      end
+    end
+
+    # If Chef::Config.chef_zero.enabled is true, sets up a chef-zero server
+    # according to the Chef::Config.chef_zero and path options, and sets
+    # chef_server_url to point at it.
+    def self.setup_server_connectivity
+      if Chef::Config.chef_zero.enabled
+        destroy_server_connectivity
+
+        require 'chef_zero/server'
+        require 'chef/chef_fs/chef_fs_data_store'
+        require 'chef/chef_fs/config'
+
+        chef_fs = Chef::ChefFS::Config.new.local_fs
+        chef_fs.write_pretty_json = true
+        data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+        server_options = {}
+        server_options[:data_store] = data_store
+        server_options[:log_level] = Chef::Log.level
+        server_options[:host] = Chef::Config.chef_zero.host
+        server_options[:port] = parse_port(Chef::Config.chef_zero.port)
+        @chef_zero_server = ChefZero::Server.new(server_options)
+        @chef_zero_server.start_background
+        Chef::Log.info("Started chef-zero at #{@chef_zero_server.url} with #{chef_fs.fs_description}")
+        Chef::Config.chef_server_url = @chef_zero_server.url
+      end
+    end
+
+    # Return the current chef-zero server set up by setup_server_connectivity.
+    def self.chef_zero_server
+      @chef_zero_server
+    end
+
+    # If chef_zero_server is non-nil, stop it and remove references to it.
+    def self.destroy_server_connectivity
+      if @chef_zero_server
+        @chef_zero_server.stop
+        @chef_zero_server = nil
+      end
+    end
+
+    def self.parse_port(port)
+      if port.is_a?(String)
+        parts = port.split(',')
+        if parts.size == 1
+          a,b = parts[0].split('-',2)
+          if b
+            a.to_i.upto(b.to_i)
+          else
+            [ a.to_i ]
+          end
+        else
+          array = []
+          parts.each do |part|
+            array += parse_port(part).to_a
+          end
+          array
+        end
+      else
+        port
+      end
+    end
+  end
+end