madscience 0.0.16 → 0.0.17

data/cookbooks/vagrant/libraries/helpers.rb

@@ -32,7 +32,7 @@ def vagrant_platform_package(vers = nil)
     case node['platform_family']
     when 'debian'
       "vagrant_#{vers}_x86_64.deb"
-    when 'redhat', 'fedora'
+    when 'fedora', 'rhel'
       "vagrant_#{vers}_x86_64.rpm"
     end
   end
@@ -48,3 +48,26 @@ end
 def vagrant_package_uri(vers = nil)
   URI.join(vagrant_base_uri, vagrant_platform_package(vers)).to_s
 end
+
+def vagrant_get_home(user)
+  begin
+    # Attempting to get the $HOME of `user`
+    Chef::Log.debug("Attempting to get $HOME of #{user}")
+    home = Etc.getpwnam(user).dir
+  rescue ArgumentError
+    begin
+      # Could not look up `user`, seeing if Chef knows about a
+      # user[`user`] resource
+      Chef::Log.debug("Couldn't find `#{user}`, looking for a resource")
+      home = resources("user[#{user}]").home
+    rescue Chef::Exceptions::ResourceNotFound
+      # Chef does not know about a user[`user`] resource, and that
+      # user does not exist on the system, try using the $HOME of the
+      # user running Chef
+      Chef::Log.debug("No user found, using running process uid, `#{Process.uid}`")
+      home = Etc.getpwuid(Process.uid).dir
+    end
+  end
+
+  home
+end

data/cookbooks/vagrant/metadata.rb

@@ -3,12 +3,14 @@ maintainer       'Joshua Timberman'
 maintainer_email 'cookbooks@housepub.org'
 license          'Apache 2.0'
 description      'Installs/Configures vagrant'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.1'
+version          '0.2.2'
 
 supports 'debian', '>= 6.0'
 supports 'ubuntu', '>= 12.04'
 supports 'redhat', '>= 6.3'
+supports 'centos', '>= 6.4'
+supports 'windows'
+supports 'mac_os_x'
 
-depends "dmg"
-depends "windows"
+depends 'dmg'
+depends 'windows'

data/cookbooks/vagrant/providers/plugin.rb

@@ -1,12 +1,22 @@
+require 'etc'
 require 'chef/mixin/shell_out'
 include Chef::Mixin::ShellOut
 
+use_inline_resources if defined?(:use_inline_resources)
+
 def load_current_resource
   @current_resource = Chef::Resource::VagrantPlugin.new(new_resource)
-  vp = shell_out("vagrant plugin list")
+  vp = shell_out('vagrant plugin list', {
+                                         :user => run_as_user,
+                                         :env => {
+                                                  'VAGRANT_HOME' => vagrant_home
+                                                 }
+                                        })
   if vp.stdout.include?(new_resource.plugin_name)
     @current_resource.installed(true)
-    @current_resource.installed_version(vp.stdout.split[1].gsub(/[\(\)]/, ''))
+    installed_line = vp.stdout.split("\n").detect { |line| line.include? new_resource.plugin_name }
+    installed_version = installed_line.split('(')[1].split(')')[0]
+    @current_resource.installed_version(installed_line.gsub(/[\(\)]/, ''))
   end
   @current_resource
 end
@@ -15,23 +25,43 @@ action :install do
   unless installed?
     plugin_args = ""
     plugin_args += "--plugin-version #{new_resource.version}" if new_resource.version
-    shell_out("vagrant plugin install #{new_resource.plugin_name} #{plugin_args}")
-    new_resource.updated_by_last_action(true)
+
+    unless new_resource.sources.empty?
+      sources = Array(new_resource.sources)
+      sources.each do |source|
+        plugin_args += " --plugin-source #{source}"
+      end
+    end
+
+    execute "installing vagrant plugin #{new_resource.plugin_name}" do
+      command "vagrant plugin install #{new_resource.plugin_name} #{plugin_args}"
+      user new_resource.user
+      environment 'VAGRANT_HOME' => vagrant_home
+    end
   end
 end
 
 action :remove do
   uninstall if @current_resource.installed
-  new_resource.updated_by_last_action(true)
 end
 
 action :uninstall do
   uninstall if @current_resource.installed
-  new_resource.updated_by_last_action(true)
 end
 
 def uninstall
-  shell_out("vagrant plugin uninstall #{new_resource.plugin_name}")
+  execute "vagrant plugin uninstall #{new_resource.plugin_name}" do
+    user new_resource.user
+    environment 'VAGRANT_HOME' => vagrant_home
+  end
+end
+
+def run_as_user
+  new_resource.user || Etc.getpwuid(Process.uid).name
+end
+
+def vagrant_home
+  ::File.join(vagrant_get_home(run_as_user), '.vagrant.d')
 end
 
 def installed?
@@ -42,7 +72,7 @@ def version_match
   # if the version is specified, we need to check if it matches what
   # is installed already
   if new_resource.version
-    @current_resource.installed_version == new_resource.version
+    @current_resource.installed_version == "#{new_resource.plugin_name} #{new_resource.version}"
   else
     # the version matches otherwise because it's installed
     true

data/cookbooks/vagrant/recipes/default.rb

@@ -18,17 +18,4 @@
 #
 
 include_recipe "vagrant::#{node['platform_family']}"
-
-node['vagrant']['plugins'].each do |plugin|
-  if plugin.respond_to?(:keys)
-
-    vagrant_plugin plugin['name'] do
-      version plugin['version']
-    end
-
-  else
-
-    vagrant_plugin plugin
-
-  end
-end
+include_recipe 'vagrant::install_plugins' if node['vagrant']['plugins'].length > 0

data/cookbooks/vagrant/recipes/install_plugins.rb

@@ -0,0 +1,35 @@
+#
+# Cookbook Name:: vagrant
+# Recipe:: default
+#
+# Copyright 2013, Joshua Timberman
+#
+# 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.
+#
+
+node['vagrant']['plugins'].each do |plugin|
+  if plugin.respond_to?(:keys)
+
+    vagrant_plugin plugin['name'] do
+      user node['vagrant']['user']
+      version plugin['version']
+    end
+
+  else
+
+    vagrant_plugin plugin do
+      user node['vagrant']['user']
+    end
+
+  end
+end

data/cookbooks/vagrant/recipes/mac_os_x.rb

@@ -1,19 +1,3 @@
-execute "uninstall Vagrant" do
-  # This is the recommended way to uninstall Vagrant on Mac OS X:
-  # https://docs.vagrantup.com/v2/installation/uninstallation.html
-  command <<-CMD
-    rm -rf /Applications/Vagrant /usr/bin/vagrant &&
-    pkgutil --forget com.vagrant.vagrant
-  CMD
-  not_if {
-    # Do not uninstall if Vagrant isn't installed.
-    # Do not uninstall if there is no specified version,
-    # or if the version requested matches the one installed.
-    ver = node['vagrant']['version']
-    !File.exists?('/usr/bin/vagrant') || !ver || `vagrant --version`[ver]
-  }
-end
-
 dmg_package "Vagrant" do
   source node['vagrant']['url']
   checksum node['vagrant']['checksum']

data/cookbooks/vagrant/resources/plugin.rb

@@ -6,3 +6,5 @@ attribute :plugin_name, :name_attribute => true
 attribute :version, :kind_of => [String]
 attribute :installed, :kind_of => [TrueClass, FalseClass]
 attribute :installed_version, :kind_of => [String]
+attribute :user, :kind_of => [String], :default => nil
+attribute :sources, :kind_of => [String, Array], :default => ''

data/cookbooks/vagrant/test/fixtures/cookbooks/test/README.md

@@ -0,0 +1,4 @@
+# test
+
+This cookbook is used for testing the `vagrant` cookbook.
+

data/cookbooks/vagrant/test/fixtures/cookbooks/test/metadata.rb

@@ -0,0 +1,2 @@
+name             'test'
+version          '0.1.0'

data/cookbooks/vagrant/test/fixtures/cookbooks/test/recipes/default.rb

@@ -0,0 +1,18 @@
+# How meta...
+vagrant_plugin 'vagrant-aws' do
+  user 'vagrant'
+end
+
+# A user that doesn't exist...
+user 'donuts' do
+  shell '/bin/bash'
+  home '/home/donuts'
+  supports :manage_home => true
+end
+
+# And a version of vagrant-aws not used previously in this run, just
+# to be sure.
+vagrant_plugin 'vagrant-aws' do
+  version '0.4.1'
+  user 'donuts'
+end

data/cookbooks/virtualbox/recipes/default.rb

@@ -25,7 +25,7 @@ when 'mac_os_x'
   dmg_package 'VirtualBox' do
     source node['virtualbox']['url']
     checksum sha256sum
-    type 'mpkg'
+    type 'pkg'
   end
 
 when 'windows'

data/cookbooks/windows/CHANGELOG.md

@@ -2,36 +2,57 @@ windows Cookbook CHANGELOG
 =======================
 This file is used to list changes made in each version of the windows cookbook.
 
+v1.36.6 (2014-12-18)
+--------------------
+- reverting all chef_gem compile_time work
+
+v1.36.5 (2014-12-18)
+--------------------
+- Fix zipfile provider
+
+v1.36.4 (2014-12-18)
+--------------------
+- Fix Chef chef_gem with Chef::Resource::ChefGem.method_defined?(:compile_time)
+
+v1.36.3 (2014-12-18)
+--------------------
+- Fix Chef chef_gem below 12.1.0
+
+v1.36.2 (2014-12-17)
+--------------------
+- Being explicit about usage of the chef_gem's compile_time property.
+- Eliminating future deprecation warnings in Chef 12.1.0
+
 v1.36.1 (2014-12-17)
 --------------------
-- [PR 160](https://github.com/opscode-cookbooks/windows/pull/160) - Fix Chef 11.10 / versions without windows_package in core
+- [PR 160](https://github.com/chef-cookbooks/windows/pull/160) - Fix Chef 11.10 / versions without windows_package in core
 
 v1.36.0 (2014-12-16)
 --------------------
-- [PR 145](https://github.com/opscode-cookbooks/windows/pull/145) - do not fail on non-existant task
-- [PR 144](https://github.com/opscode-cookbooks/windows/pull/144) - Add a zip example to the README
-- [PR 110](https://github.com/opscode-cookbooks/windows/pull/110) - More zip documentation
-- [PR 148](https://github.com/opscode-cookbooks/windows/pull/148) - Add an LWRP for font installation
-- [PR 151](https://github.com/opscode-cookbooks/windows/pull/151) - Fix windows_package on Chef 12, add integration tests
-- [PR 129](https://github.com/opscode-cookbooks/windows/pull/129) - Add enable/disable actions to task LWRP
-- [PR 115](https://github.com/opscode-cookbooks/windows/pull/115) - require Chef::Mixin::PowershellOut before using it
-- [PR 88](https://github.com/opscode-cookbooks/windows/pull/88) - Code 1003 from servermanagercmd.exe is valid
+- [PR 145](https://github.com/chef-cookbooks/windows/pull/145) - do not fail on non-existant task
+- [PR 144](https://github.com/chef-cookbooks/windows/pull/144) - Add a zip example to the README
+- [PR 110](https://github.com/chef-cookbooks/windows/pull/110) - More zip documentation
+- [PR 148](https://github.com/chef-cookbooks/windows/pull/148) - Add an LWRP for font installation
+- [PR 151](https://github.com/chef-cookbooks/windows/pull/151) - Fix windows_package on Chef 12, add integration tests
+- [PR 129](https://github.com/chef-cookbooks/windows/pull/129) - Add enable/disable actions to task LWRP
+- [PR 115](https://github.com/chef-cookbooks/windows/pull/115) - require Chef::Mixin::PowershellOut before using it
+- [PR 88](https://github.com/chef-cookbooks/windows/pull/88) - Code 1003 from servermanagercmd.exe is valid
 
 v1.34.8 (2014-10-31)
 --------------------
-- [Issue 137](https://github.com/opscode-cookbooks/windows/issues/137) - windows_path resource breaks with ruby 2.x
+- [Issue 137](https://github.com/chef-cookbooks/windows/issues/137) - windows_path resource breaks with ruby 2.x
 
 v1.34.6 (2014-09-22)
 --------------------
-- [Chef-2009](https://github.com/opscode/chef/issues/2009) - Patch to work around a regression in [Chef](https://github.com/opscode/chef)
+- [Chef-2009](https://github.com/chef/chef/issues/2009) - Patch to work around a regression in [Chef](https://github.com/chef/chef)
 
 v1.34.2 (2014-08-12)
 --------------------
-- [Issue 99](https://github.com/opscode-cookbooks/windows/issues/99) - Remove rubygems / Internet wmi-lite dependency (PR #108)
+- [Issue 99](https://github.com/chef-cookbooks/windows/issues/99) - Remove rubygems / Internet wmi-lite dependency (PR #108)
 
 v1.34.0 (2014-08-04)
 --------------------
-- [Issue 99](https://github.com/opscode-cookbooks/windows/issues/99) - Use wmi-lite to fix Chef 11.14.2 break in rdp-ruby-wmi dependency
+- [Issue 99](https://github.com/chef-cookbooks/windows/issues/99) - Use wmi-lite to fix Chef 11.14.2 break in rdp-ruby-wmi dependency
 
 v1.32.1 (2014-07-15)
 --------------------
@@ -73,33 +94,33 @@ Fixing depend/depends typo in metadata.rb
 v1.12.2
 -------
 ### Bug
-- **[COOK-4110](https://tickets.opscode.com/browse/COOK-4110)** - feature_servermanager installed? method regex bug
+- **[COOK-4110](https://tickets.chef.io/browse/COOK-4110)** - feature_servermanager installed? method regex bug
 
 
 v1.12.0
 -------
 ### Bug
-- **[COOK-3793](https://tickets.opscode.com/browse/COOK-3793)** - parens inside parens of README.md don't render
+- **[COOK-3793](https://tickets.chef.io/browse/COOK-3793)** - parens inside parens of README.md don't render
 
 ### New Feature
-- **[COOK-3714](https://tickets.opscode.com/browse/COOK-3714)** - Powershell features provider and delete support.
+- **[COOK-3714](https://tickets.chef.io/browse/COOK-3714)** - Powershell features provider and delete support.
 
 
 v1.11.0
 -------
 ### Improvement
-- **[COOK-3724](https://tickets.opscode.com/browse/COOK-3724)** - Rrecommend built-in resources over cookbook resources
-- **[COOK-3515](https://tickets.opscode.com/browse/COOK-3515)** - Remove unprofessional comment from library
-- **[COOK-3455](https://tickets.opscode.com/browse/COOK-3455)** - Add Windows Server 2012R2 to windows cookbook version helper
+- **[COOK-3724](https://tickets.chef.io/browse/COOK-3724)** - Rrecommend built-in resources over cookbook resources
+- **[COOK-3515](https://tickets.chef.io/browse/COOK-3515)** - Remove unprofessional comment from library
+- **[COOK-3455](https://tickets.chef.io/browse/COOK-3455)** - Add Windows Server 2012R2 to windows cookbook version helper
 
 ### Bug
-- **[COOK-3542](https://tickets.opscode.com/browse/COOK-3542)** - Fix an issue where `windows_zipfile` fails with LoadError
-- **[COOK-3447](https://tickets.opscode.com/browse/COOK-3447)** - Allow Overriding Of The Default Reboot Timeout In windows_reboot_handler
-- **[COOK-3382](https://tickets.opscode.com/browse/COOK-3382)** - Allow windows_task to create `on_logon` tasks
-- **[COOK-2098](https://tickets.opscode.com/browse/COOK-2098)** - Fix and issue where the `windows_reboot` handler is ignoring the reboot time
+- **[COOK-3542](https://tickets.chef.io/browse/COOK-3542)** - Fix an issue where `windows_zipfile` fails with LoadError
+- **[COOK-3447](https://tickets.chef.io/browse/COOK-3447)** - Allow Overriding Of The Default Reboot Timeout In windows_reboot_handler
+- **[COOK-3382](https://tickets.chef.io/browse/COOK-3382)** - Allow windows_task to create `on_logon` tasks
+- **[COOK-2098](https://tickets.chef.io/browse/COOK-2098)** - Fix and issue where the `windows_reboot` handler is ignoring the reboot time
 
 ### New Feature
-- **[COOK-3458](https://tickets.opscode.com/browse/COOK-3458)** - Add support for `start_date` and `start_time` in `windows_task`
+- **[COOK-3458](https://tickets.chef.io/browse/COOK-3458)** - Add support for `start_date` and `start_time` in `windows_task`
 
 
 v1.10.0

data/cookbooks/windows/README.md

@@ -18,7 +18,7 @@ Version 1.3.0+ of this cookbook requires Chef 0.10.10+.
 The `windows_task` LWRP requires Windows Server 2008 due to its API usage.
 
 ### Cookbooks
-The following cookbooks provided by Opscode are required as noted:
+The following cookbooks provided by Chef Software are required as noted:
 
 * chef_handler (`windows::reboot_handler` leverages the chef_handler LWRP)
 
@@ -53,7 +53,7 @@ end
 ```
 
 ### windows_batch
-(Chef 11.6.0 includes a built-in [batch](http://docs.opscode.com/resource_batch.html) resource, so use that in preference to `windows_batch` if possible.)
+(Chef 11.6.0 includes a built-in [batch](http://docs.chef.io/resource_batch.html) resource, so use that in preference to `windows_batch` if possible.)
 
 Execute a batch script using the cmd.exe interpreter (much like the script resources for bash, csh, powershell, perl, python and ruby). A temporary file is created and executed like other script resources, rather than run inline. By their nature, Script resources are not idempotent, as they are completely up to the user's imagination. Use the `not_if` or `only_if` meta parameters to guard the resource for idempotence.
 
@@ -116,7 +116,7 @@ servermanagercmd -query
 #### Providers
 - **Chef::Provider::WindowsFeature::DISM**: Uses Deployment Image Servicing and Management (DISM) to manage roles/features.
 - **Chef::Provider::WindowsFeature::ServerManagerCmd**: Uses Server Manager to manage roles/features.
-- **Chef::Provider::WindowsFeaturePowershell**: Uses Powershell to manage roles/features. (see [COOK-3714](https://tickets.opscode.com/browse/COOK-3714)
+- **Chef::Provider::WindowsFeaturePowershell**: Uses Powershell to manage roles/features. (see [COOK-3714](https://tickets.chef.io/browse/COOK-3714)
 
 #### Examples
 Enable the node as a DHCP Server
@@ -375,7 +375,7 @@ Sets required data in the node's run_state to notify `WindowsRebootHandler` a re
 
 #### Attribute Parameters
 - :timeout: Name attribute. timeout delay in seconds to wait before proceeding with the requested reboot. default is 60 seconds
-- :reason: comment on the reason for the reboot. default is 'Opscode Chef initiated reboot'
+- :reason: comment on the reason for the reboot. default is 'Chef Software Chef initiated reboot'
 
 #### Examples
 If the package installs, schedule a reboot at end of chef run
@@ -399,7 +399,7 @@ end
 ```
 
 ### windows_registry
-(Chef 11.6.0 includes a built-in [registry_key](http://docs.opscode.com/resource_registry_key.html) resource, so use that in preference to `windows_registry` if possible.)
+(Chef 11.6.0 includes a built-in [registry_key](http://docs.chef.io/resource_registry_key.html) resource, so use that in preference to `windows_registry` if possible.)
 
 Creates and modifies Windows registry keys.
 
@@ -602,6 +602,45 @@ windows_zipfile 'c:/foo/baz/the_codez.zip' do
 end
 ```
 
+Libraries
+-------------------------
+### WindowsHelper
+
+Helper that allows you to use helpful functions in windows
+
+#### installed_packages
+Returns a hash of all DisplayNames installed
+```ruby
+# usage in a recipe
+::Chef::Recipe.send(:include, Windows::Helper)
+hash_of_installed_packages = installed_packages
+```
+
+#### is_package_installed?
+- `package_name`: The name of the package you want to query to see if it is installed
+- `returns`: true if the package is installed, false if it the package is not installed
+
+Download a file if a package isn't installed
+```ruby
+# usage in a recipe to not download a file if package is already installed
+::Chef::Recipe.send(:include, Windows::Helper)
+is_win_sdk_installed = is_package_installed?('Windows Software Development Kit')
+
+remote_file 'C:\windows\temp\windows_sdk.zip' do
+  source 'http://url_to_download/windows_sdk.zip'
+  action :create_if_missing
+  not_if {is_win_sdk_installed}
+end
+```
+Do something if a package is installed
+```ruby
+# usage in a provider
+include Windows::Helper
+if is_package_installed?('Windows Software Development Kit')
+  # do something if package is installed
+end
+```
+
 Exception/Report Handlers
 -------------------------
 ### WindowsRebootHandler
@@ -610,7 +649,7 @@ Required reboots are a necessary evil of configuring and managing Windows nodes.
 ### Initialization Arguments
 - `allow_pending_reboots`: indicator on whether the handler should act on a the Window's 'pending reboot' state. default is true
 - `timeout`: timeout delay in seconds to wait before proceeding with the reboot. default is 60 seconds
-- `reason`:  comment on the reason for the reboot. default is 'Opscode Chef initiated reboot'
+- `reason`:  comment on the reason for the reboot. default is 'Chef Software Chef initiated reboot'
 
 
 Windows ChefSpec Matchers
@@ -685,13 +724,13 @@ By default, the handler will only be registered as a report handler, meaning tha
 
 License & Authors
 -----------------
-- Author:: Seth Chisamore (<schisamo@opscode.com>)
+- Author:: Seth Chisamore (<schisamo@chef.io>)
 - Author:: Doug MacEachern (<dougm@vmware.com>)
 - Author:: Paul Morton (<pmorton@biaprotect.com>)
 - Author:: Doug Ireton (<doug.ireton@nordstrom.com>)
 
 ```text
-Copyright 2011-2013, Opscode, Inc.
+Copyright 2011-2013, Chef Software, Inc.
 Copyright 2010, VMware, Inc.
 Copyright 2011, Business Intelligence Associates, Inc
 Copyright 2012, Nordstrom, Inc.

data/cookbooks/windows/attributes/default.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
 # Cookbook Name:: windows
 # Attribute:: default
 #
-# Copyright 2011, Opscode, Inc
+# Copyright 2011, Chef Software, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,4 +21,4 @@
 default['windows']['allow_pending_reboots'] = true
 default['windows']['allow_reboot_on_failure'] = false
 default['windows']['rubyzipversion'] = nil
-default['windows']['reboot_timeout'] = 60
+default['windows']['reboot_timeout'] = 60

data/cookbooks/windows/files/default/handlers/windows_reboot_handler.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright (c) 2011 Chef Software, Inc
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 class WindowsRebootHandler < Chef::Handler
   include Chef::Mixin::ShellOut
 
-  def initialize(allow_pending_reboots = true, timeout = 60, reason = "Opscode Chef initiated reboot")
+  def initialize(allow_pending_reboots = true, timeout = 60, reason = "Chef Software Chef initiated reboot")
     @allow_pending_reboots = allow_pending_reboots
     @timeout = timeout
     @reason = reason
@@ -73,4 +73,4 @@ class WindowsRebootHandler < Chef::Handler
   def reason
     node.run_state[:reboot_reason] || @reason
   end
-end
+end

data/cookbooks/windows/libraries/feature_base.rb

@@ -56,4 +56,4 @@ class Chef
     end
   end
 end
-      
+      

data/cookbooks/windows/libraries/powershell_helper.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
 # Cookbook Name:: windows
 # Library:: helper
 #
-# Copyright:: 2011, Opscode, Inc.
+# Copyright:: 2011, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/cookbooks/windows/libraries/registry_helper.rb

@@ -1,12 +1,12 @@
 #
 # Author:: Doug MacEachern (<dougm@vmware.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
 # Author:: Paul Morton (<pmorton@biaprotect.com>)
 # Cookbook Name:: windows
 # Provider:: registry
 #
 # Copyright:: 2010, VMware, Inc.
-# Copyright:: 2011, Opscode, Inc.
+# Copyright:: 2011, Chef Software, Inc.
 # Copyright:: 2011, Business Intelligence Associates, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/cookbooks/windows/libraries/version.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
 # Cookbook Name:: windows
 # Library:: version
 #
-# Copyright:: 2011, Opscode, Inc.
+# Copyright:: 2011, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/cookbooks/windows/libraries/windows_helper.rb

@@ -1,9 +1,9 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
 # Cookbook Name:: windows
 # Library:: helper
 #
-# Copyright:: 2011, Opscode, Inc.
+# Copyright:: 2011, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -96,6 +96,52 @@ module Windows
       buf.strip
     end
 
+    def is_package_installed?(package_name)
+      installed_packages.include?(package_name)
+    end
+
+    def installed_packages
+      @installed_packages || begin
+        installed_packages = {}
+        # Computer\HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall
+        installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE)) #rescue nil
+        # 64-bit registry view
+        # Computer\HKEY_LOCAL_MACHINE\Software\Wow6464Node\Microsoft\Windows\CurrentVersion\Uninstall
+        installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0100))) #rescue nil
+        # 32-bit registry view
+        # Computer\HKEY_LOCAL_MACHINE\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall
+        installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_LOCAL_MACHINE, (::Win32::Registry::Constants::KEY_READ | 0x0200))) #rescue nil
+        # Computer\HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Uninstall
+        installed_packages.merge!(extract_installed_packages_from_key(::Win32::Registry::HKEY_CURRENT_USER)) #rescue nil
+        installed_packages
+      end
+    end
+
+    private
+    def extract_installed_packages_from_key(hkey = ::Win32::Registry::HKEY_LOCAL_MACHINE, desired = ::Win32::Registry::Constants::KEY_READ)
+      uninstall_subkey = 'Software\Microsoft\Windows\CurrentVersion\Uninstall'
+      packages = {}
+      begin
+        ::Win32::Registry.open(hkey, uninstall_subkey, desired) do |reg|
+          reg.each_key do |key, wtime|
+            begin
+              k = reg.open(key, desired)
+              display_name = k["DisplayName"] rescue nil
+              version = k["DisplayVersion"] rescue "NO VERSION"
+              uninstall_string = k["UninstallString"] rescue nil
+              if display_name
+                packages[display_name] = {:name => display_name,
+                                          :version => version,
+                                          :uninstall_string => uninstall_string}
+              end
+            rescue ::Win32::Registry::Error
+            end
+          end
+        end
+      rescue ::Win32::Registry::Error
+      end
+      packages
+    end
   end
 end