chef 12.0.0.alpha.2-x86-mingw32 → 12.0.0.rc.0-x86-mingw32

data/distro/redhat/etc/logrotate.d/chef-server

@@ -1,8 +0,0 @@
-/var/log/chef/server.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-server condrestart >/dev/null || :
-  endscript
-}

data/distro/redhat/etc/logrotate.d/chef-server-webui

@@ -1,8 +0,0 @@
-/var/log/chef/server-webui.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-server-webui condrestart >/dev/null || :
-  endscript
-}

data/distro/redhat/etc/logrotate.d/chef-solr

@@ -1,8 +0,0 @@
-/var/log/chef/solr.log {
-  rotate 12
-  weekly
-  compress
-  postrotate
-    /etc/init.d/chef-solr condrestart >/dev/null || :
-  endscript
-}

data/distro/redhat/etc/sysconfig/chef-client

@@ -1,15 +0,0 @@
-# Configuration file for the chef-client service
-
-#CONFIG=/etc/chef/client.rb
-#PIDFILE=/var/run/chef/client.pid
-#LOCKFILE=/var/lock/subsys/chef-client
-#LOGFILE=/var/log/chef/client.log
-# Sleep interval between runs.
-# This value is in seconds.
-#INTERVAL=1800
-# Maximum amount of random delay before starting a run. Prevents every client
-# from contacting the server at the exact same time.
-# This value is in seconds.
-#SPLAY=20
-# Any additional chef-client options.
-#OPTIONS=

data/distro/redhat/etc/sysconfig/chef-expander

@@ -1,7 +0,0 @@
-# Configuration file for the chef-expander service
-
-#PIDFILE=/var/run/chef/expander.pid
-#CONFIG=/etc/chef/expander.rb
-#LOGFILE=/var/log/chef/expander.log
-# Any additional chef-expander options.
-OPTIONS="-n 1 -i 1"

data/distro/redhat/etc/sysconfig/chef-server

@@ -1,14 +0,0 @@
-# Configuration file for the chef-server service
-
-#CONFIG=/etc/chef/server.rb
-#PIDFILE=/var/run/chef/server.pid
-#LOCKFILE=/var/lock/subsys/chef-server
-#LOGFILE=/var/log/chef/server.log
-#PORT=4000
-#ENVIRONMENT=production
-#ADAPTER=thin
-#CHILDPIDFILES=/var/run/chef/server.%s.pid
-#SERVER_USER=chef
-#SERVER_GROUP=chef
-# Any additional chef-server options.
-#OPTIONS=

data/distro/redhat/etc/sysconfig/chef-server-webui

@@ -1,14 +0,0 @@
-# Configuration file for the chef-server-webui service
-
-#CONFIG=/etc/chef/webui.rb
-#PIDFILE=/var/run/chef/server-webui.pid
-#LOCKFILE=/var/lock/subsys/chef-server-webui
-#LOGFILE=/var/log/chef/server-webui.log
-#PORT=4040
-#ENVIRONMENT=production
-#ADAPTER=thin
-#CHILDPIDFILES=/var/run/chef/server-webui.%s.pid
-#SERVER_USER=chef
-#SERVER_GROUP=chef
-# Any additional chef-server-webui options.
-#OPTIONS=

data/distro/redhat/etc/sysconfig/chef-solr

@@ -1,8 +0,0 @@
-# Configuration file for the chef-solr service
-
-#CONFIG=/etc/chef/solr.rb
-#PIDFILE=/var/run/chef/solr.pid
-#LOCKFILE=/var/lock/subsys/chef-solr
-#LOGFILE=/var/log/chef/solr.log
-# Options for Java. Need to start with -j followed by options.
-#OPTIONS="-j "

data/distro/windows/service_manager.rb

@@ -1,20 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 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.
-#
-
-$stderr.puts "WARNING: service_manager.rb is changed to: chef-service-manager"
-$stderr.puts "Please use chef-service-manager instead of service_manager.rb to install and manage chef-client as a windows service."

data/lib/chef/resource_platform_map.rb

@@ -1,151 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 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/params_validate'
-require 'chef/mixin/convert_to_class_name'
-
-class Chef
-  class Resource
-    class PlatformMap
-
-      include Chef::Mixin::ParamsValidate
-      include Chef::Mixin::ConvertToClassName
-
-      attr_reader :map
-
-      def initialize(map={:default => {}})
-        @map = map
-      end
-
-      def filter(platform, version)
-        resource_map = map[:default].clone
-        platform_sym = platform
-        if platform.kind_of?(String)
-          platform.downcase!
-          platform.gsub!(/\s/, "_")
-          platform_sym = platform.to_sym
-        end
-
-        if map.has_key?(platform_sym)
-          if map[platform_sym].has_key?(version)
-            if map[platform_sym].has_key?(:default)
-              resource_map.merge!(map[platform_sym][:default])
-            end
-            resource_map.merge!(map[platform_sym][version])
-          elsif map[platform_sym].has_key?(:default)
-            resource_map.merge!(map[platform_sym][:default])
-          end
-        end
-        resource_map
-      end
-
-      def set(args)
-        validate(
-          args,
-          {
-            :platform => {
-              :kind_of => Symbol,
-              :required => false
-            },
-            :version => {
-              :kind_of => String,
-              :required => false
-            },
-            :short_name => {
-              :kind_of => Symbol,
-              :required => true
-            },
-            :resource => {
-              :kind_of => [ String, Symbol, Class ],
-              :required => true
-            }
-          }
-        )
-        if args.has_key?(:platform)
-          if args.has_key?(:version)
-            if map.has_key?(args[:platform])
-              if map[args[:platform]].has_key?(args[:version])
-                map[args[:platform]][args[:version]][args[:short_name].to_sym] = args[:resource]
-              else
-                map[args[:platform]][args[:version]] = {
-                  args[:short_name].to_sym => args[:resource]
-                }
-              end
-            else
-              map[args[:platform]] = {
-                args[:version] => {
-                  args[:short_name].to_sym => args[:resource]
-                }
-              }
-            end
-          else
-            if map.has_key?(args[:platform])
-              if map[args[:platform]].has_key?(:default)
-                map[args[:platform]][:default][args[:short_name].to_sym] = args[:resource]
-              else
-                map[args[:platform]] = { :default => { args[:short_name].to_sym => args[:resource] } }
-              end
-            else
-              map[args[:platform]] = {
-                :default => {
-                  args[:short_name].to_sym => args[:resource]
-                }
-              }
-            end
-          end
-        else
-          if map.has_key?(:default)
-            map[:default][args[:short_name].to_sym] = args[:resource]
-          else
-            map[:default] = {
-              args[:short_name].to_sym => args[:resource]
-            }
-          end
-        end
-      end
-
-      def get(short_name, platform=nil, version=nil)
-        resource_klass = platform_resource(short_name, platform, version) ||
-                         resource_matching_short_name(short_name)
-
-        raise Exceptions::NoSuchResourceType, "Cannot find a resource for #{short_name} on #{platform} version #{version}" if resource_klass.nil?
-
-        resource_klass
-      end
-
-      private
-
-      def platform_resource(short_name, platform, version)
-        pmap = filter(platform, version)
-        rtkey = short_name.kind_of?(Chef::Resource) ? short_name.resource_name.to_sym : short_name
-
-        pmap.has_key?(rtkey) ? pmap[rtkey] : nil
-      end
-
-      def resource_matching_short_name(short_name)
-        begin
-          rname = convert_to_class_name(short_name.to_s)
-          Chef::Resource.const_get(rname)
-        rescue NameError
-          nil
-        end
-      end
-
-    end
-  end
-end

data/spec/support/shared/matchers.rb

@@ -1,17 +0,0 @@
-
-require 'rspec/expectations'
-require 'spec/support/platform_helpers'
-
-RSpec::Matchers.define :match_environment_variable do |varname|
-  match do |actual|
-    expected = if windows? && ENV[varname].nil?
-      # On Windows, if an environment variable is not set, the command
-      # `echo %VARNAME%` outputs %VARNAME%
-      "%#{varname}%"
-    else
-      ENV[varname].to_s
-    end
-
-    actual == expected
-  end
-end

data/spec/unit/resource_platform_map_spec.rb

@@ -1,164 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 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 'spec_helper'
-
-describe Chef::Resource::PlatformMap do
-
-  before(:each) do
-    @platform_map = Chef::Resource::PlatformMap.new({
-      :windows => {
-        "6.1" => {
-          :file => "softiefile",
-          :else => "thing"
-        },
-        :default => {
-          :file => Chef::Resource::File,
-          :ping => "pong",
-          :cat => "nice"
-        }
-      },
-      :pop_tron => {
-      },
-      :default => {
-        :soundwave => "lazerbeak",
-        :directory => Chef::Resource::Directory,
-      }
-    })
-  end
-
-  describe 'filtering the map' do
-    it "returns resources for platform and version" do
-      pmap = @platform_map.filter("Windows", "6.1")
-      pmap.should be_a_kind_of(Hash)
-      pmap[:file].should eql("softiefile")
-    end
-
-    it "returns platform default resources if version does not exist" do
-      pmap = @platform_map.filter("windows", "1")
-      pmap.should be_a_kind_of(Hash)
-      pmap[:file].should eql(Chef::Resource::File)
-    end
-
-    it "returns global default resources if none exist for plaform" do
-      pmap = @platform_map.filter("pop_tron", "1")
-      pmap.should be_a_kind_of(Hash)
-      pmap[:directory].should eql(Chef::Resource::Directory)
-    end
-
-    it "returns global default resources if platform does not exist" do
-      pmap = @platform_map.filter("BeOS", "1")
-      pmap.should be_a_kind_of(Hash)
-      pmap[:soundwave].should eql("lazerbeak")
-    end
-
-    it "returns a merged map of platform version and plaform default resources" do
-      pmap = @platform_map.filter("Windows", "6.1")
-      pmap[:file].should eql("softiefile")
-      pmap[:ping].should eql("pong")
-    end
-
-    it "returns a merged map of platform specific version and global defaults" do
-      pmap = @platform_map.filter("Windows", "6.1")
-      pmap[:file].should eql("softiefile")
-      pmap[:soundwave].should eql("lazerbeak")
-    end
-  end
-
-  describe 'finding a resource' do
-    it "returns a resource for a platform directly by short name" do
-      @platform_map.get(:file, "windows", "6.1").should eql("softiefile")
-    end
-
-    it "returns a default resource if platform and version don't exist" do
-      @platform_map.get(:remote_file).should eql(Chef::Resource::RemoteFile)
-    end
-
-    it "raises an exception if a resource cannot be found" do
-      lambda { @platform_map.get(:coffee, "windows", "6.1")}.should raise_error(NameError)
-    end
-
-    it "returns a resource with a Chef::Resource object" do
-      kitty = Chef::Resource::Cat.new("loulou")
-      @platform_map.get(kitty, "windows", "6.1").should eql("nice")
-    end
-  end
-
-  describe 'building the map' do
-    it "allows passing of a resource map at creation time" do
-      @new_map = Chef::Resource::PlatformMap.new({:the_dude => {:default => 'abides'}})
-      @new_map.map[:the_dude][:default].should eql("abides")
-    end
-
-    it "defaults to a resource map with :default key" do
-      @new_map = Chef::Resource::PlatformMap.new
-      @new_map.map.has_key?(:default)
-    end
-
-    it "updates the resource map with a map" do
-      @platform_map.set(
-       :platform => :darwin,
-       :version => "9.2.2",
-       :short_name => :file,
-       :resource => "masterful"
-      )
-      @platform_map.map[:darwin]["9.2.2"][:file].should eql("masterful")
-
-      @platform_map.set(
-       :platform => :darwin,
-       :short_name => :file,
-       :resource => "masterful"
-      )
-      @platform_map.map[:darwin][:default][:file].should eql("masterful")
-
-      @platform_map.set(
-       :short_name => :file,
-       :resource => "masterful"
-      )
-      @platform_map.map[:default][:file].should eql("masterful")
-
-      @platform_map.set(
-       :platform => :hero,
-       :version => "9.2.2",
-       :short_name => :file,
-       :resource => "masterful"
-      )
-      @platform_map.map[:hero]["9.2.2"][:file].should eql("masterful")
-
-      @platform_map.set(
-        :short_name => :file,
-        :resource => "masterful"
-      )
-      @platform_map.map[:default][:file].should eql("masterful")
-
-      @platform_map.set(
-       :short_name => :file,
-       :resource => "masterful"
-      )
-      @platform_map.map[:default][:file].should eql("masterful")
-
-      @platform_map.set(
-        :platform => :neurosis,
-        :short_name => :package,
-        :resource => "masterful"
-      )
-      @platform_map.map[:neurosis][:default][:package].should eql("masterful")
-    end
-  end
-
-end