madscience 0.0.4 → 0.0.5

data/cookbooks/yum/templates/default/main.erb

@@ -149,10 +149,10 @@ mirrorlist_expire=<%= @config.mirrorlist_expire %>
 <% if @config.multilib_policy %>
 multilib_policy=<%= @config.multilib_policy %>
 <% end %>
-<% if @config.obsoletes %>
-obsoletes=1
-<% else %>
+<% if @config.obsoletes == false %>
 obsoletes=0
+<% else %>
+obsoletes=1
 <% end %>
 <% if @config.overwrite_groups %>
 overwrite_groups=<%= @config.overwrite_groups %>
@@ -222,7 +222,7 @@ sslclientcert=<%= @config.sslclientcert %>
 <% if @config.sslclientkey %>
 sslclientkey=<%= @config.sslclientkey %>
 <% end %>
-<% if @config.sslverify %>
+<% unless @config.sslverify.nil? %>
 sslverify=<%= @config.sslverify %>
 <% end %>
 <% if @config.syslog_device %>
@@ -249,3 +249,18 @@ tsflags=<%= @config.tsflags %>
 <% if @config.username %>
 username=<%= @config.username %>
 <% end %>
+<% if @config.options -%>
+<%   @config.options.each do |key, value| -%>
+<%= key %>=<%= 
+       case value
+       when Array
+         value.join("\n       ")
+       when TrueClass
+         '1'
+       when FalseClass
+         '0'
+       else
+         value
+       end %>
+<%   end -%>
+<% end -%>

data/cookbooks/yum/templates/default/repo.erb

@@ -99,11 +99,24 @@ sslclientcert=<%= @config.sslclientcert %>
 <% if @config.sslclientkey %>
 sslclientkey=<%= @config.sslclientkey %>
 <% end %>
-<% if @config.sslverify %>
-sslverify=1
-<% else %>
-sslverify=0
+<% unless @config.sslverify.nil? %>
+sslverify=<%= @config.sslverify %>
 <% end %>
 <% if @config.timeout %>
 timeout=<%= @config.timeout %>
 <% end %>
+<% if @config.options -%>
+<%   @config.options.each do |key, value| -%>
+<%= key %>=<%=
+       case value
+       when Array
+         value.join("\n       ")
+       when TrueClass
+         '1'
+       when FalseClass
+         '0'
+       else
+         value
+       end %>
+<%   end -%>
+<% end -%>

data/lib/madscience/version.rb

@@ -1,3 +1,3 @@
 module MadScience
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/site-cookbooks/madscience-vagrant-cookbook/recipes/default.rb

@@ -12,41 +12,42 @@
 # Default attributes in a cookbook override default
 # attributes in an attributes file, like the one
 # in vagrant-cookbook/attributes/default.rb.
+node.default['vagrant']['version'] = '1.7.1'
 node.default['vagrant']['plugins'] = [ 'vagrant-omnibus', 'vagrant-librarian-chef' ]
 
 case node['platform_family']
 when 'fedora'
   if node['kernel']['machine'] == 'x86_64'
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.rpm'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.rpm'
   else
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_32.rpm'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_32.rpm'
   end
 when 'rhel'
   if node['kernel']['machine'] == 'x86_64'
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.rpm'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.rpm'
   else
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_32.rpm'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_32.rpm'
   end
 when 'debian'
   if node['kernel']['machine'] == 'x86_64'
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_64.deb'
   else
-    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_32.deb'
+    node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1_x86_32.deb'
   end
 when 'windows'
   # TODO: find real MSI version
-  node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3.msi'
+  node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1.msi'
 when 'mac_os_x'
-  node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3.dmg'
+  node.default['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.1.dmg'
 else
   raise "Don't recognize OS family: #{node['platform_family'].inspect}!"
 end
 
 case node['platform_family']
 when 'mac_os_x'
-  node.default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.3.12/VirtualBox-4.3.12-93733-OSX.dmg'
+  node.default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20-93733-OSX.dmg'
 when 'windows'
-  node.default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.3.12/VirtualBox-4.3.12-93733-Win.exe'
+  node.default['virtualbox']['url'] = 'http://download.virtualbox.org/virtualbox/4.3.20/VirtualBox-4.3.20-93733-Win.exe'
   node.default['virtualbox']['version'] = Vbox::Helpers.vbox_version(node['virtualbox']['url'])
 when 'debian', 'rhel'
   node.default['virtualbox']['version'] = '4.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madscience
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Noah Gibbs
@@ -185,11 +185,15 @@ files:
 - cookbooks/apt/recipes/cacher-client.rb
 - cookbooks/apt/recipes/cacher-ng.rb
 - cookbooks/apt/recipes/default.rb
+- cookbooks/apt/recipes/unattended-upgrades.rb
 - cookbooks/apt/resources/preference.rb
 - cookbooks/apt/resources/repository.rb
 - cookbooks/apt/templates/debian-6.0/acng.conf.erb
 - cookbooks/apt/templates/default/01proxy.erb
+- cookbooks/apt/templates/default/20auto-upgrades.erb
+- cookbooks/apt/templates/default/50unattended-upgrades.erb
 - cookbooks/apt/templates/default/acng.conf.erb
+- cookbooks/apt/templates/default/unattended-upgrades.seed.erb
 - cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
 - cookbooks/chef_handler/CHANGELOG.md
 - cookbooks/chef_handler/README.md
@@ -205,6 +209,7 @@ files:
 - cookbooks/dmg/CHANGELOG.md
 - cookbooks/dmg/README.md
 - cookbooks/dmg/attributes/default.rb
+- cookbooks/dmg/libraries/matchers.rb
 - cookbooks/dmg/metadata.json
 - cookbooks/dmg/metadata.rb
 - cookbooks/dmg/providers/package.rb
@@ -215,6 +220,7 @@ files:
 - cookbooks/vagrant/README.md
 - cookbooks/vagrant/TESTING.md
 - cookbooks/vagrant/attributes/default.rb
+- cookbooks/vagrant/libraries/helpers.rb
 - cookbooks/vagrant/metadata.rb
 - cookbooks/vagrant/providers/plugin.rb
 - cookbooks/vagrant/recipes/debian.rb
@@ -242,9 +248,15 @@ files:
 - cookbooks/virtualbox/templates/ubuntu/config.erb
 - cookbooks/virtualbox/templates/ubuntu/config.php.erb
 - cookbooks/virtualbox/templates/ubuntu/vbox.cfg.erb
+- cookbooks/windows/Berksfile
 - cookbooks/windows/CHANGELOG.md
+- cookbooks/windows/CONTRIBUTING
+- cookbooks/windows/Gemfile
+- cookbooks/windows/LICENSE
 - cookbooks/windows/README.md
+- cookbooks/windows/TODO.md
 - cookbooks/windows/attributes/default.rb
+- cookbooks/windows/chefignore
 - cookbooks/windows/files/default/handlers/windows_reboot_handler.rb
 - cookbooks/windows/libraries/feature_base.rb
 - cookbooks/windows/libraries/matchers.rb
@@ -254,7 +266,9 @@ files:
 - cookbooks/windows/libraries/version.rb
 - cookbooks/windows/libraries/windows_architecture_helper.rb
 - cookbooks/windows/libraries/windows_helper.rb
+- cookbooks/windows/libraries/windows_package.rb
 - cookbooks/windows/libraries/windows_privileged.rb
+- cookbooks/windows/libraries/wmi_helper.rb
 - cookbooks/windows/metadata.json
 - cookbooks/windows/metadata.rb
 - cookbooks/windows/providers/auto_run.rb
@@ -262,7 +276,7 @@ files:
 - cookbooks/windows/providers/feature_dism.rb
 - cookbooks/windows/providers/feature_powershell.rb
 - cookbooks/windows/providers/feature_servermanagercmd.rb
-- cookbooks/windows/providers/package.rb
+- cookbooks/windows/providers/font.rb
 - cookbooks/windows/providers/pagefile.rb
 - cookbooks/windows/providers/path.rb
 - cookbooks/windows/providers/printer.rb
@@ -277,7 +291,7 @@ files:
 - cookbooks/windows/resources/auto_run.rb
 - cookbooks/windows/resources/batch.rb
 - cookbooks/windows/resources/feature.rb
-- cookbooks/windows/resources/package.rb
+- cookbooks/windows/resources/font.rb
 - cookbooks/windows/resources/pagefile.rb
 - cookbooks/windows/resources/path.rb
 - cookbooks/windows/resources/printer.rb

data/cookbooks/windows/providers/package.rb

@@ -1,252 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Cookbook Name:: windows
-# Provider:: package
-#
-# Copyright:: 2011, Opscode, Inc.
-#
-# 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.
-#
-
-if RUBY_PLATFORM =~ /mswin|mingw32|windows/
-  require 'win32/registry'
-end
-
-require 'chef/mixin/shell_out'
-require 'chef/mixin/language'
-
-include Chef::Mixin::ShellOut
-include Windows::Helper
-
-# the logic in all action methods mirror that of
-# the Chef::Provider::Package which will make
-# refactoring into core chef easy
-
-action :install do
-  # If we specified a version, and it's not the current version, move to the specified version
-  if @new_resource.version != nil && @new_resource.version != @current_resource.version
-    install_version = @new_resource.version
-  # If it's not installed at all, install it
-  elsif @current_resource.version == nil
-    install_version = candidate_version
-  end
-
-  if install_version
-    Chef::Log.info("Installing #{@new_resource} version #{install_version}")
-    status = install_package(@new_resource.package_name, install_version)
-    if status
-      @new_resource.updated_by_last_action(true)
-    end
-  end
-end
-
-action :upgrade do
-  if @current_resource.version != candidate_version
-    orig_version = @current_resource.version || "uninstalled"
-    Chef::Log.info("Upgrading #{@new_resource} version from #{orig_version} to #{candidate_version}")
-    status = upgrade_package(@new_resource.package_name, candidate_version)
-    if status
-      @new_resource.updated_by_last_action(true)
-    end
-  end
-end
-
-action :remove do
-  if removing_package?
-    Chef::Log.info("Removing #{@new_resource}")
-    remove_package(@current_resource.package_name, @new_resource.version)
-    @new_resource.updated_by_last_action(true)
-  else
-  end
-end
-
-def removing_package?
-  if @current_resource.version.nil?
-    false # nothing to remove
-  elsif @new_resource.version.nil?
-    true # remove any version of a package
-  elsif @new_resource.version == @current_resource.version
-    true # remove the version we have
-  else
-    false # we don't have the version we want to remove
-  end
-end
-
-def expand_options(options)
-  options ? " #{options}" : ""
-end
-
-# these methods are the required overrides of
-# a provider that extends from Chef::Provider::Package
-# so refactoring into core Chef should be easy
-
-def load_current_resource
-  @current_resource = Chef::Resource::WindowsPackage.new(@new_resource.name)
-  @current_resource.package_name(@new_resource.package_name)
-  @current_resource.version(nil)
-
-  unless current_installed_version.nil?
-    @current_resource.version(current_installed_version)
-  end
-
-  @current_resource
-end
-
-def current_installed_version
-  @current_installed_version ||= begin
-    if installed_packages.include?(@new_resource.package_name)
-      installed_packages[@new_resource.package_name][:version]
-    end
-  end
-end
-
-def candidate_version
-  @candidate_version ||= begin
-    @new_resource.version || 'latest'
-  end
-end
-
-def install_package(name,version)
-  Chef::Log.debug("Processing #{@new_resource} as a #{installer_type} installer.")
-  install_args = [cached_file(@new_resource.source, @new_resource.checksum), expand_options(unattended_installation_flags), expand_options(@new_resource.options)]
-  Chef::Log.info("Starting installation...this could take awhile.")
-  Chef::Log.debug "Install command: #{ sprintf(install_command_template, *install_args) }"
-  shell_out!(sprintf(install_command_template, *install_args), {:timeout => @new_resource.timeout, :returns => @new_resource.success_codes})
-end
-
-def remove_package(name, version)
-  uninstall_string = installed_packages[@new_resource.package_name][:uninstall_string]
-  Chef::Log.info("Registry provided uninstall string for #{@new_resource} is '#{uninstall_string}'")
-  uninstall_command = begin
-    if uninstall_string =~ /msiexec/i
-      "#{uninstall_string} /qn"
-    else
-      uninstall_string.gsub!('"','')
-      "start \"\" /wait /d\"#{::File.dirname(uninstall_string)}\" #{::File.basename(uninstall_string)}#{expand_options(@new_resource.options)} /S"
-    end
-  end
-  Chef::Log.info("Removing #{@new_resource} with uninstall command '#{uninstall_command}'")
-  shell_out!(uninstall_command, {:returns => @new_resource.success_codes})
-end
-
-private
-
-def install_command_template
-  case installer_type
-  when :msi
-    "msiexec%2$s \"%1$s\"%3$s"
-  else
-    "start \"\" /wait \"%1$s\"%2$s%3$s"
-  end
-end
-
-def uninstall_command_template
-  case installer_type
-  when :msi
-    "msiexec %2$s %1$s"
-  else
-    "start \"\" /wait /d%1$s %2$s %3$s"
-  end
-end
-
-# http://unattended.sourceforge.net/installers.php
-def unattended_installation_flags
-  case installer_type
-  when :msi
-    # this is no-ui
-    "/qn /i"
-  when :installshield
-    "/s /sms"
-  when :nsis
-    "/S /NCRC"
-  when :inno
-    #"/sp- /silent /norestart"
-    "/verysilent /norestart"
-  when :wise
-    "/s"
-  else
-  end
-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
-
-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
-
-def installer_type
-  @installer_type || begin
-    if @new_resource.installer_type
-      @new_resource.installer_type
-    else
-      basename = ::File.basename(cached_file(@new_resource.source, @new_resource.checksum))
-      if basename.split(".").last.downcase == "msi" # Microsoft MSI
-        :msi
-      else
-        # search the binary file for installer type
-        contents = ::Kernel.open(::File.expand_path(cached_file(@new_resource.source)), "rb") {|io| io.read } # TODO limit data read in
-        case contents
-        when /inno/i # Inno Setup
-          :inno
-        when /wise/i # Wise InstallMaster
-          :wise
-        when /nsis/i # Nullsoft Scriptable Install System
-          :nsis
-        else
-          # if file is named 'setup.exe' assume installshield
-          if basename == "setup.exe"
-            :installshield
-          else
-            raise Chef::Exceptions::AttributeNotFound, "installer_type could not be determined, please set manually"
-          end
-        end
-      end
-    end
-  end
-end

data/cookbooks/windows/resources/package.rb

@@ -1,46 +0,0 @@
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Cookbook Name:: windows
-# Resource:: package
-#
-# Copyright:: 2011, Opscode, Inc.
-#
-# 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.
-#
-
-actions :install, :remove
-
-default_action :install
-
-attribute :package_name, :kind_of => String, :name_attribute => true
-attribute :source, :kind_of => String, :required => true
-attribute :version, :kind_of => String
-attribute :options, :kind_of => String
-attribute :installer_type, :kind_of => Symbol, :default => nil, :equal_to => [:msi, :inno, :nsis, :wise, :installshield, :custom]
-attribute :checksum, :kind_of => String
-attribute :timeout, :kind_of => Integer, :default => 600
-attribute :success_codes, :kind_of => Array, :default => [0, 42, 127]
-
-# TODO
-
-# add preseeding support
-#attribute :response_file
-
-# allow target dirtory of installation to be set
-#attribute :target_dir
-
-# Covers 0.10.8 and earlier
-def initialize(*args)
-  super
-  @action = :install
-end