capistrano-paratrooper-chef 0.0.2 → 0.0.3

data/lib/capistrano-paratrooper-chef/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Paratrooper
     module Chef
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/lib/capistrano-paratrooper-chef.rb

@@ -15,7 +15,9 @@ Capistrano::Configuration.instance.load do
 
     # remote chef settings
     set :chef_solo_path, "chef-solo"
-    set :chef_working_dir, "chef-solo"
+    set(:chef_working_dir) {
+      capture("echo $HOME").strip + "/chef-solo"
+    }
     set :chef_cache_dir, "/var/chef/cache"
 
     # chef settings
@@ -94,8 +96,14 @@ Capistrano::Configuration.instance.load do
                 server.options[:chef_attributes]["run_list"] = []
               end
             end
+          rescue JSON::ParserError
+            logger.important("Could not parse JSON file: %s" % solo_json_path_for(server.host))
           rescue
-            server.options[:chef_attributes] = attrs = {"run_list" => []}
+            logger.important("Could not read JSON file: %s" % solo_json_path_for(server.host))
+          ensure
+            if server.options[:chef_attributes].nil?
+              server.options[:chef_attributes] = {"run_list" => []}
+            end
           end
 
           if fetch(:chef_roles_auto_discovery)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-paratrooper-chef
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano