baptize 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE5NTg0ZDU5MmZmMDAzNWQzM2E4NDc5OTUwYjVlNGYyNjRhZWUzNQ==
+    NDJjNzBjYWM3MDg4MTQ3ODNjOTE1NGJhNTg5ZDE1ZWIxMDkzYTBiYw==
   data.tar.gz: !binary |-
-    ZDM3MWI1OTQyMzQ1ZjJjMmU5ZDQzNzViOGYzNTg4ZWFiODY2ZmRlNQ==
+    MzQ5MzNmM2I1OTcwZTQ3N2RiMGZiMWYwYjUxNDdjNGQ3ZTU4MGQyZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDJjNTA5YjI1MzZmNmYzZWQwZDE3M2FiMmIyOGEyYzk0ODE5NWFkZGU3MjU4
-    OTM0NDZjYWQwMjgyZTE0NzM3NjhjZmExODE0MjNkY2NlOWE0MGZlYmJmNzU4
-    ODdkYWQ2MTc3ZmI4Y2VhOWMxOTY5ODBkODE2ZmM1N2E4OGY2ZjM=
+    MTIwNWE0ZGI5MWZkODJhNWEzNTAyMmMwMzFlNmI0Mzc0NjgzNmU5Y2ZjYzZj
+    MWZjZDI5MDBiZjkzMjhhZTI5OTVmZjliYjRhMzVmOWQ2M2UwZGExN2IyYzA5
+    OGI3MDJlMGZkZDFiOGRmYzA4YTEyZGY0MjY1Mzc4YTcwOWQ1NmY=
   data.tar.gz: !binary |-
-    OGQwZjFmOTE4ODE1N2NlNzEzMGNhNzdiNTFjNjY5NTYyNzIzMTNlMzcxMzMw
-    M2IxMjY2Njk2MTg5YzkyMjU5YjE1MTlkMmVmNzA3ZWM5ZWY2YmIyYTM1NjVk
-    ZmY1NmRkMTcxZmYzYTMzYmVhNjQxNDg1MDQzZWQ2NDQyNjZhMDA=
+    ZDZlNTA2NjIwZmZlZjYyM2FhNWRhNGQ5ODdlMDViYzZkNmVjOTYwZDQzMDI3
+    MzRkMGViOGU1NTQzYWUyMzM5ZjhhMjRjMTVmNGQxOWM5Yjk5MTJkZTE2ODk0
+    ZGRmODgxY2E1YjQxNjZlMzJjOTk4NmQ4MWJkMThkZDAxMWRiYTY=

data/lib/baptize/dsl.rb

@@ -123,15 +123,14 @@ module Capistrano
                 desc "Configures #{policy.role}"
                 task policy.role do
                   logger.info "Applying policy #{policy.role}"
-                  old_env_roles = ENV['ROLES']
                   # TODO: This is maybe not ideal, as multiple roles would be applied in sequence, not parallel.
                   # Also, I'm not sure if they would be skipped for later roles, if already run for an earlier one
                   Capistrano::Baptize::DSL.packages_installed = []
-                  ENV['ROLES'] = policy.role.to_s
-                  policy.dependencies.each do |task_name|
-                    find_and_execute_task(task_name)
+                  for_roles policy.role do
+                    policy.dependencies.each do |task_name|
+                      find_and_execute_task(task_name)
+                    end
                   end
-                  ENV['ROLES'] = old_env_roles
                 end
               end
             end

data/lib/baptize/helpers.rb

@@ -2,6 +2,16 @@ module Capistrano
   module Baptize
 
     module Helpers
+
+      def for_roles(*roles, &block)
+        old_env_roles = ENV['ROLES']
+        ENV['ROLES'] = Array(roles).flatten.map(&:to_s).join(",")
+        logger.info "Invoking for roles: #{ENV['ROLES']}"
+        block.call
+      ensure
+        ENV['ROLES'] = old_env_roles
+      end
+
       def asset_path(asset)
         File.join("#{capistrano_path}/assets", asset)
       end

data/lib/baptize/install.rb

@@ -4,8 +4,8 @@ module Capistrano
     # Defines all baptize top-level tasks
     def self.install(scope)
       scope.instance_eval do
-        set :root_path { File.expand_path(Dir.pwd) }
-        set :capistrano_path { "#{root_path}/capistrano" }
+        set(:root_path) { File.expand_path(Dir.pwd) }
+        set(:capistrano_path) { "#{root_path}/capistrano" }
 
         # Can't run this here, since Capfile might want to redefine
         # load_configuration :roles

data/lib/baptize/plugins/pecl.rb

@@ -22,7 +22,13 @@ module Capistrano
             if ini_file.is_a?(Hash) && ini_file[:path]
               path = ini_file[:path]
             else
-              path = "/etc/php5/conf.d/#{package_name}.ini"
+              folder = "/etc/php5/conf.d"
+              invoke_command("php --ini") do |ch, stream, out|
+                if /Scan for additional .ini files in: (.*)/.match(out)
+                  folder = $1
+                end
+              end
+              path = "#{folder}/#{package_name}.ini"
             end
             put(text, path)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baptize
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Troels Knak-Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Baptize is an extension for Capistrano, that allows for server provisioning