remove DSL magic from recipes to be compatible with Chef 12.4.0 (chef…

…/chef#3269)

cookbooks/default/ack/recipes/default.rb

@@ -1,4 +1,6 @@
 apt_package 'ack-grep'
 
-user_cookbook_file '.ackrc'
+cookbook_file Helper.home('.ackrc') do
+  owner Helper.user
+end
 

cookbooks/default/chruby/recipes/default.rb

@@ -1,20 +1,25 @@
-zsh_file 'chruby'
+cookbook_file Helper.home('.zsh/chruby.zsh') do
+  owner Helper.user
+end
 
-chruby_version = '0.3.8'
-chruby_url = "https://github.com/postmodern/chruby/archive/v#{chruby_version}.tar.gz"
-chruby_tar = Helper.home("v#{chruby_tar}.tar.gz")
+chruby_version       = '0.3.9'
+chruby_url           = "https://github.com/postmodern/chruby/archive/v#{chruby_version}.tar.gz"
+chruby_tar           = Helper.home("v#{chruby_tar}.tar.gz")
 chruby_unpacked_path = Helper.home("chruby-#{chruby_version}")
 
-user_remote_file chruby_tar do
+remote_file chruby_tar do
+  owner Helper.user
   source chruby_url
   mode '0644'
 end
 
-user_bash 'unpack chruby' do
+bash 'unpack chruby' do
+  user Helper.user
   code "tar -xzvf #{chruby_tar} -C #{Helper.home}"
 end
 
-user_file chruby_tar do
+file chruby_tar do
+  owner Helper.user
   action :delete
 end
 
@@ -25,6 +30,7 @@
   EOH
 end
 
-user_bash 'touch ~/.ruby-version' do
+bash 'touch ~/.ruby-version' do
+  user Helper.user
   code 'touch ~/.ruby-version'
 end

cookbooks/default/clojure/recipes/default.rb

@@ -1,30 +1,39 @@
-lein_dir = Helper.home('.lein')
-lein_bin_dir = File.join(lein_dir, 'bin')
+lein_dir              = Helper.home('.lein')
+lein_bin_dir          = File.join(lein_dir, 'bin')
 lein_self_install_dir = File.join(lein_dir, 'self-installs')
-lein_bin = File.join(lein_dir, 'bin', 'lein')
+lein_bin              = File.join(lein_dir, 'bin', 'lein')
 
-user_directory lein_bin_dir do
+directory lein_bin_dir do
+  owner Helper.user
   recursive true
 end
 
-user_file lein_bin do
+file lein_bin do
+  owner Helper.user
   action :delete
 end
 
-user_directory lein_self_install_dir do
+directory lein_self_install_dir do
+  owner Helper.user
   action :delete
   recursive true
 end
 
-user_directory lein_self_install_dir
+directory lein_self_install_dir do
+  owner Helper.user
+end
 
-user_remote_file lein_bin do
+remote_file lein_bin do
+  owner Helper.user
   mode 0755
   source 'https://raw.github.com/technomancy/leiningen/stable/bin/lein'
 end
 
-user_bash 'install leiningen' do
+bash 'install leiningen' do
+  user Helper.user
   code "#{lein_bin} self-install"
 end
 
-zsh_file 'leiningen'
+cookbook_file Helper.home('.zsh/leiningen.zsh') do
+  owner Helper.user
+end

cookbooks/default/elasticsearch/recipes/default.rb

@@ -1,32 +1,39 @@
-elasticsearch_package = 'elasticsearch-1.1.0'
-elasticsearch_url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/#{elasticsearch_package}.tar.gz"
-elasticsearch_tar = Helper.home('elasticsearch.tar.gz')
-elasticsearch_home = Helper.home('.elasticsearch')
+elasticsearch_package       = 'elasticsearch-1.1.0'
+elasticsearch_url           = "https://download.elasticsearch.org/elasticsearch/elasticsearch/#{elasticsearch_package}.tar.gz"
+elasticsearch_tar           = Helper.home('elasticsearch.tar.gz')
+elasticsearch_home          = Helper.home('.elasticsearch')
 elasticsearch_unpacked_path = Helper.home(elasticsearch_package)
 
-user_remote_file elasticsearch_tar do
+remote_file elasticsearch_tar do
+  owner Helper.user
   source elasticsearch_url
   mode '0644'
 end
 
-user_directory elasticsearch_home do
+directory elasticsearch_home do
+  owner Helper.user
   action :delete
   recursive true
 end
 
-user_bash 'unpack elasticsearch' do
+bash 'unpack elasticsearch' do
+  user Helper.user
   code "tar -xzvf #{elasticsearch_tar} -C #{Helper.home}"
 end
 
-user_bash 'move elasticsearch' do
+bash 'move elasticsearch' do
+  user Helper.user
   code "mv #{elasticsearch_unpacked_path} #{elasticsearch_home}"
 end
 
-user_file elasticsearch_tar do
+file elasticsearch_tar do
+  owner Helper.user
   action :delete
 end
 
-zsh_file 'elasticsearch'
+cookbook_file Helper.home('.zsh/elasticsearch.zsh') do
+  owner Helper.user
+end
 
 cookbook_file File.join(elasticsearch_home, 'elasticsearch.yml') do
   owner Helper.user

cookbooks/default/git/recipes/default.rb

@@ -1 +1,3 @@
-user_cookbook_file '.gitconfig'
+cookbook_file Helper.home('.gitconfig') do
+  owner Helper.user
+end

cookbooks/default/helper/recipes/cleanup.rb

@@ -9,12 +9,14 @@
   .sudo_as_admin_successful
   .zlogin
 ).each do |f|
-  home_file f do
+  file Helper.home(f) do
+    owner Helper.user
     action :delete
   end
 end
 
-home_directory 'tmp' do
+directory Helper.home('tmp') do
+  owner Helper.user
   action :delete
   recursive true
 end

cookbooks/default/helper/recipes/setup.rb

@@ -26,88 +26,3 @@ def self.apt_key(trusted_key_url)
 end
 
 ENV['HOME'] = Helper.home
-
-class ::Chef
-  class Resource
-    class UserBash < Bash
-      def initialize(name, run_context=nil)
-        super(name, run_context)
-	      user(Helper.user)
-      end
-    end
-
-    class UserFile < File
-      def initialize(name, run_context=nil)
-        super(name, run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class HomeFile < UserFile
-      def initialize(name, run_context=nil)
-        super(Helper.home(name), run_context)
-      end
-    end
-
-    class UserRemoteFile < RemoteFile
-      def initialize(name, run_context=nil)
-        super(name, run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class UserCookbookFile < CookbookFile
-      def initialize(name, run_context=nil)
-        super(Helper.home(name), run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class UserTemplate < Template
-      def initialize(name, run_context=nil)
-        super(Helper.home(name), run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class UserDirectory < Directory
-      def initialize(name, run_context=nil)
-        super(name, run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class UserRemoteDirectory < RemoteDirectory
-      def initialize(name, run_context=nil)
-        super(name, run_context)
-        owner(Helper.user)
-      end
-    end
-
-    class HomeDirectory < UserDirectory
-      def initialize(name, run_context=nil)
-        super(Helper.home(name), run_context)
-      end
-    end
-
-    class AptSourcesListFile < CookbookFile
-      def initialize(name, run_context=nil)
-        super("/etc/apt/sources.list.d/#{name}", run_context)
-      end
-    end
-
-    class ZshFile < UserCookbookFile
-      def initialize(name, run_context=nil)
-        super(::File.join('.zsh', "#{name}.zsh"), run_context)
-      end
-    end
-
-    class ZshTemplate < UserTemplate
-      def initialize(name, run_context=nil)
-        super(::File.join('.zsh', "#{name}.zsh"), run_context)
-        owner(Helper.user)
-      end
-    end
-  end
-end
-

cookbooks/default/node/recipes/default.rb

@@ -1,4 +1,4 @@
-apt_sources_list_file 'nodejs.list'
+cookbook_file '/etc/apt/sources.list.d/nodejs.list'
 
 bash 'apt key/apt-get update' do
   code Helper.apt_key('http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0xB9316A7BC7917B12')
@@ -12,6 +12,10 @@
   action :upgrade
 end
 
-user_cookbook_file '.npmrc'
+cookbook_file Helper.home('.npmrc') do
+  owner Helper.user
+end
 
-zsh_file 'npm'
+cookbook_file Helper.home('.zsh/npm.zsh') do
+  owner Helper.user
+end

cookbooks/default/phantomjs/recipes/default.rb

@@ -1,31 +1,38 @@
 apt_package 'libfontconfig1-dev'
 
-phantom_package = 'phantomjs-1.9.7-linux-x86_64'
-phantom_url = "https://bitbucket.org/ariya/phantomjs/downloads/#{phantom_package}.tar.bz2"
-phantom_tar = Helper.home('phantomjs.tar.bz2')
-phantom_home = Helper.home('.phantomjs')
+phantom_package       = 'phantomjs-1.9.7-linux-x86_64'
+phantom_url           = "https://bitbucket.org/ariya/phantomjs/downloads/#{phantom_package}.tar.bz2"
+phantom_tar           = Helper.home('phantomjs.tar.bz2')
+phantom_home          = Helper.home('.phantomjs')
 phantom_unpacked_path = Helper.home(phantom_package)
 
-user_remote_file phantom_tar do
+remote_file phantom_tar do
+  owner Helper.user
   source phantom_url
   mode '0644'
 end
 
-user_directory phantom_home do
+directory phantom_home do
+  owner Helper.user
   action :delete
   recursive true
 end
 
-user_bash 'unpack phantomjs' do
+bash 'unpack phantomjs' do
+  user Helper.user
   code "tar -xvjf #{phantom_tar} -C #{Helper.home}"
 end
 
-user_bash 'move phantomjs' do
+bash 'move phantomjs' do
+  user Helper.user
   code "mv #{phantom_unpacked_path} #{phantom_home}"
 end
 
-user_file phantom_tar do
+file phantom_tar do
+  owner Helper.user
   action :delete
 end
 
-zsh_file 'phantomjs'
+cookbook_file Helper.home('.zsh/phantomjs.zsh') do
+  owner Helper.user
+end

cookbooks/default/postgres/recipes/default.rb

@@ -1,4 +1,4 @@
-apt_sources_list_file 'postgresql.list'
+cookbook_file '/etc/apt/sources.list.d/postgresql.list'
 
 bash 'apt key/apt-get update' do
   code Helper.apt_key('https://www.postgresql.org/media/keys/ACCC4CF8.asc')
@@ -31,4 +31,6 @@
   code 'sudo /etc/init.d/postgresql restart'
 end
 
-zsh_file 'postgresql'
+cookbook_file Helper.home('.zsh/postgresql.zsh') do
+  owner Helper.user
+end

cookbooks/default/rabbitmq/recipes/default.rb

@@ -1,4 +1,4 @@
-apt_sources_list_file 'rabbitmq.list'
+cookbook_file '/etc/apt/sources.list.d/rabbitmq.list'
 
 bash 'apt key/apt-get update' do
   code Helper.apt_key('http://www.rabbitmq.com/rabbitmq-signing-key-public.asc')

cookbooks/default/redis/recipes/default.rb

@@ -1,32 +1,38 @@
-redis_package = 'redis-2.8.8'
-redis_url = "http://download.redis.io/releases/#{redis_package}.tar.gz"
-redis_tar = Helper.home('redis.tar.gz')
-redis_home = Helper.home('.redis')
+redis_package       = 'redis-2.8.8'
+redis_url           = "http://download.redis.io/releases/#{redis_package}.tar.gz"
+redis_tar           = Helper.home('redis.tar.gz')
+redis_home          = Helper.home('.redis')
 redis_unpacked_path = Helper.home(redis_package)
 
-user_remote_file redis_tar do
+remote_file redis_tar do
+  owner Helper.user
   source redis_url
   mode '0644'
 end
 
-user_directory redis_home do
+directory redis_home do
+  owner Helper.user
   action :delete
   recursive true
 end
 
-user_bash 'unpack redis' do
+bash 'unpack redis' do
+  user Helper.user
   code "tar -xzvf #{redis_tar} -C #{Helper.home}"
 end
 
-user_bash 'move redis' do
+bash 'move redis' do
+  user Helper.user
   code "mv #{redis_unpacked_path} #{redis_home}"
 end
 
-user_file redis_tar do
+file redis_tar do
+  owner Helper.user
   action :delete
 end
 
-user_bash 'install redis' do
+bash 'install redis' do
+  user Helper.user
   code <<-EOH
   cd #{redis_home}/
   make