Deploy airprint-generate script

and avoid usage of git cookbook dependency

README.md

@@ -23,13 +23,6 @@ Attributes
 | ['cups']['server_aliases']         | array   | []          | List of allowed domains for remote administration |
 | ['cups']['require_authentication'] | boolean | false       | Specifies whether authentication is required to access the CUPS website and printers. |
 
-### cups::airprint
-
-| Key                                           | Type    | Default     | Description                                |
-| --------------------------------------------- | ------- | ----------- | ------------------------------------------ |
-| ['cups']['airprint_generate']['git_url']      | string  | https://github.com/tjfontaine/airprint-generate.git | URL to the airprint file generator repo. |
-| ['cups']['airprint_generate']['git_revision'] | string | master | Git repo tag/version to pull. |
-
 ### cups::default_printer
 
 | Key                                | Type    | Default     | Description                                |

attributes/default.rb

@@ -28,6 +28,3 @@
 
 # specify whether authentication is required to access the website and printers
 default['cups']['require_authentication'] = false
-
-default['cups']['airprint']['airprint_generate']['git_url'] = 'https://github.com/tjfontaine/airprint-generate.git'
-default['cups']['airprint']['airprint_generate']['git_revision'] = 'master'

metadata.rb

@@ -10,8 +10,6 @@
 
 chef_version '>= 12.5' if respond_to?(:chef_version)
 
-depends 'git', '~> 6.0'
-
 %w[ubuntu debian redhat centos amazon scientific smartos].each do |os|
   supports os
 end

recipes/airprint.rb

@@ -28,8 +28,6 @@
   )
 end
 
-include_recipe 'git::default'
-
 if node['platform_family'] == 'rhel'
   package 'avahi'
   package 'python-lxml'
@@ -64,17 +62,22 @@
 
 # Generate Avahi AirPrint service definition XML files
 #
-# 1. Checkout airprint-generate.py git repo
+# 1. Deploy airprint-generate.py script
 # 2. Run airprint-generate.py script
 # 3. Copy `.service` files to /etc/avahi/services/
-git "#{Chef::Config[:file_cache_path]}/airprint-generate" do
-  repository node['cups']['airprint']['airprint_generate']['git_url']
-  revision node['cups']['airprint']['airprint_generate']['git_revision']
-  action :sync
+
+cookbook_cache = File.join(Chef::Config[:file_cache_path], cookbook_name)
+airprint_generate_script = File.join(cookbook_cache, 'airprint-generate.py')
+
+directory cookbook_cache
+
+cookbook_file airprint_generate_script do
+  source 'airprint-generate.py'
+  mode '0644'
 end
 
 execute 'generate_airprint_service_definitions' do
-  cwd "#{Chef::Config[:file_cache_path]}/airprint-generate"
+  cwd cookbook_cache
   if node['platform_family'] == 'debian'
     # sleep is necessary here to ensure cups reload is finished before
     # execution during initial run
@@ -90,7 +93,7 @@
 end
 
 bash 'copy_airprint_service_definitions' do
-  cwd "#{Chef::Config[:file_cache_path]}/airprint-generate"
+  cwd cookbook_cache
   code 'cp *.service /etc/avahi/services/'
   umask '0022'
   user 'root'