Update cookbooks

* Replace old nginx cookbook with new chef_nginx cookbooks
* Update application cookbook

cookbooks/dmg/resources/package.rb

@@ -1,8 +1,9 @@
-# Encoding: utf-8
+#
+# Author:: Joshua Timberman (<jtimberman@chef.io>)
 # Cookbook:: dmg
 # Resource:: package
 #
-# Copyright:: 2011-2016, Joshua Timberman
+# Copyright:: 2011-2017, 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.
@@ -16,24 +17,82 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-actions :install
 
-attribute :app, kind_of: String, name_attribute: true
-attribute :source, kind_of: String, default: nil
-attribute :file, kind_of: String, default: nil
-attribute :owner, kind_of: String, default: nil
-attribute :destination, kind_of: String, default: '/Applications'
-attribute :checksum, kind_of: String, default: nil
-attribute :volumes_dir, kind_of: String, default: nil
-attribute :dmg_name, kind_of: String, default: nil
-attribute :type, kind_of: String, default: 'app'
-attribute :installed, kind_of: [TrueClass, FalseClass], default: false
-attribute :package_id, kind_of: String, default: nil
-attribute :dmg_passphrase, kind_of: String, default: nil
-attribute :accept_eula, kind_of: [TrueClass, FalseClass], default: false
-attribute :headers, kind_of: Hash, default: nil
+property :app, String, name_property: true
+property :source, String
+property :file, String
+property :owner, String
+property :destination, String, default: '/Applications'
+property :checksum, String
+property :volumes_dir, String
+property :dmg_name, String
+property :type, String, default: 'app'
+property :installed, [true, false], default: false, desired_state: false
+property :package_id, String
+property :dmg_passphrase, String
+property :accept_eula, [true, false], default: false
+property :headers, [Hash, nil], default: nil
 
-def initialize(name, run_context = nil)
-  super
-  @action = :install
+load_current_value do |new_resource|
+  if ::File.directory?("#{new_resource.destination}/#{new_resource.app}.app")
+    Chef::Log.info "Already installed; to upgrade, remove \"#{new_resource.destination}/#{new_resource.app}.app\""
+    installed true
+  elsif shell_out("pkgutil --pkgs='#{new_resource.package_id}'").exitstatus == 0
+    Chef::Log.info "Already installed; to upgrade, try \"sudo pkgutil --forget '#{new_resource.package_id}'\""
+    installed true
+  else
+    installed false
+  end
+end
+
+action :install do
+  unless current_resource.installed
+
+    volumes_dir = new_resource.volumes_dir ? new_resource.volumes_dir : new_resource.app
+    dmg_name = new_resource.dmg_name ? new_resource.dmg_name : new_resource.app
+
+    dmg_file = if new_resource.file.nil?
+                 "#{Chef::Config[:file_cache_path]}/#{dmg_name}.dmg"
+               else
+                 new_resource.file
+               end
+
+    remote_file "#{dmg_file} - #{new_resource.name}" do
+      path dmg_file
+      source new_resource.source
+      headers new_resource.headers if new_resource.headers
+      checksum new_resource.checksum if new_resource.checksum
+    end if new_resource.source
+
+    passphrase_cmd = new_resource.dmg_passphrase ? "-passphrase #{new_resource.dmg_passphrase}" : ''
+    ruby_block "attach #{dmg_file}" do
+      block do
+        cmd = shell_out("hdiutil imageinfo #{passphrase_cmd} '#{dmg_file}' | grep -q 'Software License Agreement: true'")
+        software_license_agreement = cmd.exitstatus == 0
+        raise "Requires EULA Acceptance; add 'accept_eula true' to package resource" if software_license_agreement && !new_resource.accept_eula
+        accept_eula_cmd = new_resource.accept_eula ? 'echo Y | PAGER=true' : ''
+        shell_out!("#{accept_eula_cmd} hdiutil attach #{passphrase_cmd} '#{dmg_file}' -mountpoint '/Volumes/#{volumes_dir}' -quiet")
+      end
+      not_if "hdiutil info #{passphrase_cmd} | grep -q 'image-path.*#{dmg_file}'"
+    end
+
+    case new_resource.type
+    when 'app'
+      execute "rsync --force --recursive --links --perms --executability --owner --group --times '/Volumes/#{volumes_dir}/#{new_resource.app}.app' '#{new_resource.destination}'" do
+        user new_resource.owner if new_resource.owner
+      end
+
+      declare_resource(:file, "#{new_resource.destination}/#{new_resource.app}.app/Contents/MacOS/#{new_resource.app}") do
+        mode '755'
+        ignore_failure true
+      end
+    when 'mpkg', 'pkg'
+      execute "installation_file=$(ls '/Volumes/#{volumes_dir}' | grep '.#{new_resource.type}$') && sudo installer -pkg \"/Volumes/#{volumes_dir}/$installation_file\" -target /" do
+        # Prevent cfprefsd from holding up hdiutil detach for certain disk images
+        environment('__CFPREFERENCES_AVOID_DAEMON' => '1')
+      end
+    end
+
+    execute "hdiutil detach '/Volumes/#{volumes_dir}' || hdiutil detach '/Volumes/#{volumes_dir}' -force"
+  end
 end