Merge pull request #10 from joevartuli/master

Fixing compile vs converge bug

.gitignore

@@ -1,4 +1,22 @@
 *~
-#~
-.rbx
-*.class
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+pkg/
+
+# Berkshelf
+.vagrant
+/cookbooks
+Berksfile.lock
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.berkshelf
+.chef
+.kitchen/
+.kitchen.local.yml

.kitchen.yml

@@ -0,0 +1,25 @@
+---
+
+driver:
+  name: vagrant
+
+provisioner:
+  name: chef_zero
+  require_chef_omnibus: latest
+
+platforms:
+  - name: centos-7.0
+    driver:
+      box: opscode-centos-7.0
+      box_url: http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-7.0_chef-provisionerless.box
+
+suites:
+  - name: default
+    run_list:
+      - recipe[gradle::tarball]
+  - name: override
+    run_list:
+      - recipe[gradle::tarball]
+    attributes:
+      gradle:
+        version: '2.6'

Berksfile

@@ -0,0 +1,5 @@
+source 'https://api.berkshelf.com'
+
+metadata
+
+cookbook 'ark'

attributes/default.rb

@@ -1,4 +1,5 @@
-default[:gradle][:name]              = "gradle"
-default[:gradle][:version]           = "2.8"
-default[:gradle][:home_dir]          = "/usr/local"
-default[:gradle][:release_url]       = "http://services.gradle.org/distributions/gradle-#{node[:gradle][:version]}-bin.zip"
+default['gradle']['name'] = 'gradle'
+default['gradle']['version'] = '2.8'
+default['gradle']['home_dir'] = '/usr/local'
+default['gradle']['release_url_prefix'] = 'http://services.gradle.org/distributions/gradle-'
+default['gradle']['release_url_suffix'] = '-bin.zip'

metadata.rb

@@ -1,9 +1,10 @@
-name             "gradle"
-maintainer       "Michael S. Klishin"
-maintainer_email "michael@clojurewerkz.org"
-license          "MIT"
+name 'gradle'
+maintainer 'Michael S. Klishin'
+maintainer_email 'michael@clojurewerkz.org'
+license 'MIT'
+description 'Installs Gradle'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "1.0.0"
-description      "Installs Gradle"
-recipe           "gradle::tarball",              "installs gradle from tarball"
+recipe 'gradle::tarball', 'installs gradle from tarball'
+version '1.0.0'
 
+depends 'ark', '>= 0.0.0'

recipes/tarball.rb

@@ -22,19 +22,20 @@
 
 include_recipe 'ark'
 
-ark node[:gradle][:name] do
-   url          node[:gradle][:release_url]
-   version      node[:gradle][:version]
-   prefix_home  node[:gradle][:home_dir]
-   prefix_root  node[:gradle][:home_dir]
-   prefix_bin   "#{node[:gradle][:home_dir]}/bin"
-   action       :install
- end
+release_url = "#{node['gradle']['release_url_prefix']}#{node['gradle']['version']}#{node['gradle']['release_url_suffix']}"
 
-cookbook_file "/etc/profile.d/gradle.sh" do
-  owner "root"
-  group "root"
-  mode 0644
+ark node['gradle']['name'] do
+  url release_url
+  version node['gradle']['version']
+  prefix_home node['gradle']['home_dir']
+  prefix_root node['gradle']['home_dir']
+  prefix_bin "#{node['gradle']['home_dir']}/bin"
+  action :install
+end
 
-  source "etc/profile.d/gradle.sh"
+cookbook_file '/etc/profile.d/gradle.sh' do
+  owner 'root'
+  group 'root'
+  mode 0644
+  source 'etc/profile.d/gradle.sh'
 end