chef 11.14.0.alpha.2-x86-mingw32 → 11.14.0.alpha.3-x86-mingw32

data/lib/chef/resource/lwrp_base.rb

@@ -37,14 +37,14 @@ class Chef
       def self.build_from_file(cookbook_name, filename, run_context)
         rname = filename_to_qualified_string(cookbook_name, filename)
 
-        # Add log entry if we override an existing light-weight resource.
+        # Add log entry if we override an existing lightweight resource.
         class_name = convert_to_class_name(rname)
         if Resource.strict_const_defined?(class_name)
           old_class = Resource.send(:remove_const, class_name)
           # CHEF-3432 -- Chef::Resource keeps a list of subclasses; need to
           # remove old ones from the list when replacing.
           resource_classes.delete(old_class)
-          Chef::Log.info("#{class_name} light-weight resource already initialized -- overriding!")
+          Chef::Log.info("#{class_name} lightweight resource already initialized -- overriding!")
         end
 
         resource_class = Class.new(self)

data/lib/chef/resource/mount.rb

@@ -81,16 +81,17 @@ class Chef
       end
 
       def options(arg=nil)
-        if arg.is_a?(String)
-          converted_arg = arg.gsub(/,/, ' ').split(/ /)
+        ret = set_or_return(
+                            :options,
+                            arg,
+                            :kind_of => [ Array, String ]
+                            )
+
+        if ret.is_a? String
+          ret.gsub(/,/, ' ').split(/ /)
         else
-          converted_arg = arg
+          ret
         end
-        set_or_return(
-          :options,
-          converted_arg,
-          :kind_of => [ Array ]
-        )
       end
 
       def dump(arg=nil)
@@ -162,4 +163,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/util/threaded_job_queue.rb

@@ -0,0 +1,61 @@
+# Copyright:: Copyright (c) 2014 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 'thread'
+
+class Chef
+  class Util
+    # A simple threaded job queue
+    #
+    # Create a queue:
+    #
+    #     queue = ThreadedJobQueue.new
+    #
+    # Add jobs:
+    #
+    #     queue << lambda { |lock| foo.the_bar }
+    #
+    # A job is a callable that optionally takes a Mutex instance as its only
+    # parameter.
+    #
+    # Then start processing jobs with +n+ threads:
+    #
+    #     queue.process(n)
+    #
+    class ThreadedJobQueue
+      def initialize
+        @queue = Queue.new
+        @lock = Mutex.new
+      end
+
+      def <<(job)
+        @queue << job
+      end
+
+      def process(concurrency = 10)
+        workers = (1..concurrency).map do
+          Thread.new do
+            loop do
+              fn = @queue.pop
+              fn.arity == 1 ? fn.call(@lock) : fn.call
+            end
+          end
+        end
+        workers.each { |worker| self << Thread.method(:exit) }
+        workers.each { |worker| worker.join }
+      end
+    end
+  end
+end

data/lib/chef/version.rb

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

data/lib/chef/version/platform.rb

@@ -31,6 +31,8 @@ class Chef
             [ $1.to_i, $2.to_i, 0 ]
           when /^(\d+)$/
             [ $1.to_i, 0, 0 ]
+          when /^(\d+).(\d+)-[a-z]+\d?(-p(\d+))?$/i   # Match FreeBSD
+            [ $1.to_i, $2.to_i, ($4 ? $4.to_i : 0)]
           else
             msg = "'#{str.to_s}' does not match 'x.y.z', 'x.y' or 'x'"
             raise Chef::Exceptions::InvalidPlatformVersion.new( msg )

data/lib/chef/whitelist.rb

@@ -0,0 +1,82 @@
+
+require 'chef/exceptions'
+
+class Chef
+  class Whitelist
+
+    # filter takes two arguments - the data you want to filter, and a whitelisted array
+    # of keys you want included. You can capture a subtree of the data to filter by
+    # providing a "/"-delimited string of keys. If some key includes "/"-characters,
+    # you must provide an array of keys instead.
+    #
+    # Whitelist.filter(
+    #   { "filesystem" => {
+    #       "/dev/disk" => {
+    #         "size" => "10mb"
+    #       },
+    #       "map - autohome" => {
+    #         "size" => "10mb"
+    #       }
+    #     },
+    #     "network" => {
+    #       "interfaces" => {
+    #         "eth0" => {...},
+    #         "eth1" => {...}
+    #       }
+    #     }
+    #   },
+    #   ["network/interfaces/eth0", ["filesystem", "/dev/disk"]])
+    # will capture the eth0 and /dev/disk subtrees.
+    def self.filter(data, whitelist=nil)
+      return data if whitelist.nil?
+
+      new_data = {}
+      whitelist.each do |item|
+        self.add_data(data, new_data, item)
+      end
+      new_data
+    end
+
+    private
+
+    # Walk the data has according to the keys provided by the whitelisted item
+    # and add the data to the whitelisting result.
+    def self.add_data(data, new_data, item)
+      parts = self.to_array(item)
+
+      all_data = data
+      filtered_data = new_data
+      parts[0..-2].each do |part|
+        unless all_data[part]
+          Chef::Log.warn("Could not find whitelist attribute #{item}.")
+          return nil
+        end
+
+        filtered_data[part] ||= {}
+        filtered_data = filtered_data[part]
+        all_data = all_data[part]
+      end
+
+      unless all_data[parts[-1]]
+        Chef::Log.warn("Could not find whitelist attribute #{item}.")
+        return nil
+      end
+
+      filtered_data[parts[-1]] = all_data[parts[-1]]
+      new_data
+    end
+
+    # Accepts a String or an Array, and returns an Array of String keys that
+    # are used to traverse the data hash. Strings are split on "/", Arrays are
+    # assumed to contain exact keys (that is, Array elements will not be split
+    # by "/").
+    def self.to_array(item)
+      return item if item.kind_of? Array
+
+      parts = item.split("/")
+      parts.shift if !parts.empty? && parts[0].empty?
+      parts
+    end
+
+  end
+end

data/lib/chef/win32/registry.rb

@@ -20,7 +20,6 @@ require 'chef/reserved_names'
 
 if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   require 'win32/registry'
-  require 'ruby-wmi'
   require 'win32/api'
 end
 

data/lib/chef/win32/version.rb

@@ -18,6 +18,7 @@
 
 require 'chef/win32/api'
 require 'chef/win32/api/system'
+require 'wmi-lite/wmi'
 
 class Chef
   module ReservedNames::Win32
@@ -114,7 +115,6 @@ class Chef
         # version numbers on Windows Server 2012 R2 and Windows 8.1 --
         # WMI always returns the truth. See article at
         # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx
-        require 'ruby-wmi'
 
         # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0
         # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db
@@ -122,8 +122,9 @@ class Chef
 
         WIN32OLE.ole_initialize
 
-        os_info = WMI::Win32_OperatingSystem.find(:first)
-        os_version = os_info.send('Version')
+        wmi = WmiLite::Wmi.new
+        os_info = wmi.first_of('Win32_OperatingSystem')
+        os_version = os_info['version']
 
         WIN32OLE.ole_uninitialize
 

data/spec/functional/win32/versions_spec.rb

@@ -19,13 +19,13 @@
 require 'spec_helper'
 if Chef::Platform.windows?
   require 'chef/win32/version'
-  require 'ruby-wmi'
 end
 
 describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on_win2k3 do
   before do
 
-    host = WMI::Win32_OperatingSystem.find(:first)
+    wmi = WmiLite::Wmi.new
+    host = wmi.first_of('Win32_OperatingSystem')
 
     # Use WMI to determine current OS version.
     # On Win2k8R2 and later, we can dynamically obtain marketing
@@ -44,7 +44,7 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on
       # The name from WMI is actually what we want in Win2k8R2+.
       # So this expectation sould continue to hold without modification
       # as new versions of Windows are released.
-      @current_os_version = host.caption
+      @current_os_version = host['caption']
     end
 
     @version = Chef::ReservedNames::Win32::Version.new
@@ -98,7 +98,7 @@ describe "Chef::ReservedNames::Win32::Version", :windows_only, :not_supported_on
   def is_windows_server_2008?(wmi_host)
     is_win2k8 = false
 
-    os_version = wmi_host.send('Version')
+    os_version = wmi_host['version']
 
     # The operating system version is a string in the following form
     # that can be split into components based on the '.' delimiter:

data/spec/integration/client/ipv6_spec.rb

@@ -62,7 +62,7 @@ END_VALIDATION_PEM
 
   let(:basic_config_file) do
     <<-END_CLIENT_RB
-chef_server_url "http://[::1]:8889"
+chef_server_url "http://[::1]:8900"
 validation_key '#{path_to('config/validator.pem')}'
 cache_path '#{cache_path}'
 client_key '#{cache_path}/client.pem'

data/spec/integration/knife/chef_fs_data_store_spec.rb

@@ -22,7 +22,7 @@ require 'chef/knife/show'
 require 'chef/knife/raw'
 require 'chef/knife/cookbook_upload'
 
-describe 'knife raw -z' do
+describe 'ChefFSDataStore tests' do
   extend IntegrationSupport
   include KnifeSupport
 

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'support/shared/integration/integration_helper'
+require 'support/shared/context/config'
 require 'chef/knife/list'
 require 'chef/knife/show'
 
@@ -101,7 +102,7 @@ EOM
 /users/
 /users/user3.json
 EOM
-        end        
+        end
 
         context 'when cwd is at the top level' do
           cwd '.'
@@ -801,6 +802,8 @@ EOM
       end
 
       context 'when data_bag_path is set and nothing else' do
+        include_context "default config options"
+
         before :each do
           %w(client cookbook  environment node role user).each do |object_name|
             Chef::Config.delete("#{object_name}_path".to_sym)

data/spec/integration/knife/common_options_spec.rb

@@ -37,16 +37,16 @@ describe 'knife common options' do
         Chef::Config.chef_zero.enabled = true
       end
 
-      it 'knife raw /nodes/x should retrieve the role' do
+      it 'knife raw /nodes/x should retrieve the node' do
         knife('raw /nodes/x').should_succeed /"name": "x"/
       end
 
       context 'And chef_zero.port is 9999' do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
- 
-        it 'knife raw /nodes/x should retrieve the role' do
+
+        it 'knife raw /nodes/x should retrieve the node' do
           knife('raw /nodes/x').should_succeed /"name": "x"/
-          Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+          Chef::Config.chef_server_url.should == 'http://localhost:9999'
         end
       end
 
@@ -81,23 +81,23 @@ syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
 -----END RSA PRIVATE KEY-----
 EOM
 
-        it 'knife raw /nodes/x should retrieve the role' do
+        it 'knife raw /nodes/x should retrieve the node' do
           knife('raw /nodes/x').should_succeed /"name": "x"/
         end
       end
     end
 
-    it 'knife raw -z /nodes/x retrieves the role' do
+    it 'knife raw -z /nodes/x retrieves the node' do
       knife('raw -z /nodes/x').should_succeed /"name": "x"/
     end
 
-    it 'knife raw --local-mode /nodes/x retrieves the role' do
+    it 'knife raw --local-mode /nodes/x retrieves the node' do
       knife('raw --local-mode /nodes/x').should_succeed /"name": "x"/
     end
 
-    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the role' do
+    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
       knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
-      Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+      Chef::Config.chef_server_url.should == 'http://localhost:9999'
     end
   end
 end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -74,7 +74,7 @@ END_VALIDATION_PEM
 
         let(:knife_rb_content) do
           <<-END_CLIENT_RB
-chef_server_url "http://[::1]:8889"
+chef_server_url "http://[::1]:8900"
 syntax_check_cache_path '#{cache_path}'
 client_key '#{path_to('config/knifeuser.pem')}'
 node_name 'whoisthisis'
@@ -89,7 +89,7 @@ END_CLIENT_RB
 
         it "successfully uploads a cookbook" do
           shell_out!("knife cookbook upload apache2 #{knife_config_flag}", :cwd => chef_dir)
-          versions_list_json = Chef::HTTP::Simple.new("http://[::1]:8889").get("/cookbooks/apache2", "accept" => "application/json")
+          versions_list_json = Chef::HTTP::Simple.new("http://[::1]:8900").get("/cookbooks/apache2", "accept" => "application/json")
           versions_list = Chef::JSONCompat.from_json(versions_list_json)
           versions_list["apache2"]["versions"].should_not be_empty
         end

data/spec/integration/knife/deps_spec.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'support/shared/integration/integration_helper'
+require 'support/shared/context/config'
 require 'chef/knife/deps'
 
 describe 'knife deps' do
@@ -340,6 +341,8 @@ EOM
   end
 
   context 'remote' do
+    include_context "default config options"
+    
     when_the_chef_server 'has a role with no run_list' do
       role 'starring', {}
       it 'knife deps reports no dependencies' do

data/spec/integration/knife/list_spec.rb

@@ -16,12 +16,15 @@
 # limitations under the License.
 
 require 'support/shared/integration/integration_helper'
+require 'support/shared/context/config'
 require 'chef/knife/list'
 
 describe 'knife list' do
   extend IntegrationSupport
   include KnifeSupport
 
+  include_context "default config options"
+
   when_the_chef_server "is empty" do
     it "knife list / returns all top level directories" do
       knife('list /').should_succeed <<EOM

data/spec/integration/knife/raw_spec.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'support/shared/integration/integration_helper'
+require 'support/shared/context/config'
 require 'chef/knife/raw'
 require 'chef/knife/show'
 
@@ -24,6 +25,8 @@ describe 'knife raw' do
   include KnifeSupport
   include AppServerSupport
 
+  include_context "default config options"
+
   when_the_chef_server "has one of each thing" do
     client 'x', '{}'
     cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
@@ -166,7 +169,7 @@ EOM
 
     context 'When a server returns raw json' do
       before :each do
-        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
           [200, {'Content-Type' => 'application/json' }, ['{ "x": "y", "a": "b" }'] ]
         end
@@ -196,7 +199,7 @@ EOM
 
     context 'When a server returns text' do
       before :each do
-        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        Chef::Config.chef_server_url = "http://localhost:9018"
         app = lambda do |env|
           [200, {'Content-Type' => 'text' }, ['{ "x": "y", "a": "b" }'] ]
         end