capistrano-paratrooper-chef 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be49d11e9096a30c6363fa3daa051b40d4bfa71
-  data.tar.gz: 5461510219f83df619f33eff2083ee187ed47d1f
+  metadata.gz: 1709b90a60e5e58f7b058244cb5e984ee5b3d6c0
+  data.tar.gz: 706ca5d5aa700e596b6a83957747f7306db6de46
 SHA512:
-  metadata.gz: 74d4152dc6aa3cecbc7b912989b50791c2a75014faf15c6af2da844a6bf39684df870a1ac3a49b84b39632c70fa8745bd043582d12873d5f30b49f1c6449066a
-  data.tar.gz: ec0dc64c7224733f945ba13546746ae3c6b14a9367f47769f0f357b0c6f79ef23539e01413d2febc7dbd1f5c373ff5f8914acbd29cd3512a5f72381557434aac
+  metadata.gz: f7691d026c82465560421fbccbfd2db1e964a1716824be9ec631ae2566e3f78530a7cac017ebb57a25647e6aa8bed27cba9080000e081d7a84f47f66ec186565
+  data.tar.gz: 1a362311ae34da0fa56ed2c64c7be8bf0a3b084072f54449034b86871ce33a82421da27ca4d63ae04c225229ef0ab0f927688fd76f09d06ae528f4aa8fd4ffd1

data/README.md

@@ -123,7 +123,8 @@ Following options are available.
     * `:chef_cookbooks_path` - cookbooks directories list. use `["cookbooks", "site-cookbooks"]` by default.
     * `:chef_nodes_path` - nodes directory. use `nodes` by default.
     * `:chef_roles_path` - roles directory. use `roles` by default.
-    * `:chef_environments_path` - environments directory. use `environments` by default.
+    * `:chef_environment` - environment setting. empty by default.
+    * `:chef_environment_path` - environments directory. use `environments` by default.
     * `:chef_databags_path` - data bags directory. use `data_bags` by default.
     * `:chef_databag_secret` - path of secret-key for data bags. use `data_bag_key` by default.
 

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

@@ -28,7 +28,8 @@ Capistrano::Configuration.instance.load do
     set :chef_nodes_path, "nodes"
     set :chef_cookbooks_path, ["cookbooks", "site-cookbooks"]
     set :chef_roles_path, "roles"
-    set :chef_environments_path, "environments"
+    set :chef_environment, nil
+    set :chef_environment_path, "environments"
     set :chef_databags_path, "data_bags"
     set :chef_databag_secret, "data_bag_key"
 
@@ -93,8 +94,8 @@ Capistrano::Configuration.instance.load do
       File.exist?(File.join(roles_path, name.to_s + ".rb"))
     end
 
-    def environments_path
-      File.join(fetch(:chef_kitchen_path), fetch(:chef_environments_path))
+    def environment_path
+      File.join(fetch(:chef_kitchen_path), fetch(:chef_environment_path))
     end
 
     def databags_path
@@ -111,33 +112,36 @@ Capistrano::Configuration.instance.load do
 
 
     namespace :run_list do
-      def solo_json_path_for(name)
-        path = File.join(nodes_path, name.to_s + ".json")
-        if File.exist?(path)
-          path
-        else
-          File.join(fetch(:chef_kitchen_path), fetch(:chef_default_solo_json_path))
-        end
+      def solo_json_paths_for(name)
+        [File.join(nodes_path, name.to_s + ".json"),
+         File.join(fetch(:chef_kitchen_path), fetch(:chef_default_solo_json_path))]
       end
 
       def discover
         find_servers_for_task(current_task).each do |server|
-          begin
-            open(solo_json_path_for(server.host)) do |fd|
-              server.options[:chef_attributes] = JSON.load(fd)
+          solo_json_paths = solo_json_paths_for(server.host)
+          solo_json_paths.each do |path|
+            next  if not File.exist?(path)
+
+            begin
+              open(path) do |fd|
+                server.options[:chef_attributes] = JSON.load(fd)
 
-              if server.options[:chef_attributes]["run_list"].nil?
-                server.options[:chef_attributes]["run_list"] = []
+                if server.options[:chef_attributes]["run_list"].nil?
+                  server.options[:chef_attributes]["run_list"] = []
+                end
               end
+              break
+            rescue JSON::ParserError
+              logger.important("Could not parse JSON file: %s" % path)
+            rescue => e
+              logger.important("Could not read JSON file: %s" % e)
             end
-          rescue JSON::ParserError
-            logger.important("Could not parse JSON file: %s" % solo_json_path_for(server.host))
-          rescue
-            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 server.options[:chef_attributes].nil?
+            logger.important("any JSON file not found: %s" % solo_json_paths.inspect)
+            server.options[:chef_attributes] = {"run_list" => []}
           end
 
           if fetch(:chef_roles_auto_discovery)
@@ -193,7 +197,8 @@ Capistrano::Configuration.instance.load do
           file_cache_path #{fetch(:chef_cache_dir).inspect}
           cookbook_path #{kitchen.cookbooks_paths.inspect}.collect{|dir| File.join(root, dir)}
           role_path File.join(root, #{kitchen.roles_path.inspect})
-          environments_path File.join(root, #{kitchen.environments_path.inspect})
+          environment #{fetch(:chef_environment).to_s.inspect}
+          environment_path File.join(root, #{kitchen.environment_path.inspect})
           data_bag_path File.join(root, #{kitchen.databags_path.inspect})
           verbose_logging #{fetch(:chef_verbose_logging)}
         CONF
@@ -264,7 +269,7 @@ Capistrano::Configuration.instance.load do
 
       def ensure_cookbooks
         abort "No cookbooks found in #{fetch(:cookbooks_directory).inspect}" if kitchen.cookbooks_paths.empty?
-        abort "Multiple cookbook definitions found: Cheffile, Berksfile" if File.exist? 'Cheffile' and File.exsit? 'Berksfile'
+        abort "Multiple cookbook definitions found: Cheffile, Berksfile" if File.exist? 'Cheffile' and File.exist? 'Berksfile'
       end
 
       def ensure_working_dir
@@ -279,7 +284,7 @@ Capistrano::Configuration.instance.load do
 
         stream = StringIO.new
         TarWriter.new(stream) do |writer|
-          paths = [cookbooks_paths, roles_path, environments_path, databags_path, databag_secret_path]
+          paths = [cookbooks_paths, roles_path, environment_path, databags_path, databag_secret_path]
           kitchen_paths = paths.flatten.compact.select{|d| File.exists?(d)}
           Find.find(*kitchen_paths) do |path|
             writer.add(path)

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

@@ -16,7 +16,7 @@
 module Capistrano
   module Paratrooper
     module Chef
-      VERSION = "0.3.0"
+      VERSION = "0.4.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-paratrooper-chef
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Takeshi KOMIYA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano