baptize 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJjNzBjYWM3MDg4MTQ3ODNjOTE1NGJhNTg5ZDE1ZWIxMDkzYTBiYw==
+    MzU2MjAxMzk0MmY0MjFmNmU2NTkxYTI0ZTA4NGJmOGYwNjAyYzE3Nw==
   data.tar.gz: !binary |-
-    MzQ5MzNmM2I1OTcwZTQ3N2RiMGZiMWYwYjUxNDdjNGQ3ZTU4MGQyZA==
+    OWY5ZjY4NDAyNWEzMGIwMmU1ZThjYTMxMzIwZGFhMGRlNTRlZDVmMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTIwNWE0ZGI5MWZkODJhNWEzNTAyMmMwMzFlNmI0Mzc0NjgzNmU5Y2ZjYzZj
-    MWZjZDI5MDBiZjkzMjhhZTI5OTVmZjliYjRhMzVmOWQ2M2UwZGExN2IyYzA5
-    OGI3MDJlMGZkZDFiOGRmYzA4YTEyZGY0MjY1Mzc4YTcwOWQ1NmY=
+    MGE5ZDk0NzU0ZGQxYThmY2NhZGVmNmNmMmJiMmM3M2ViNDNiMzI1MjA0ZDZj
+    N2E3MTRhYTdjYzc1N2U5MTQ3YjZhMmEwNzk4ZDhlMTg4NDQ3NzEzYzE5NTY0
+    YzQ4ZWQ1ODUzMmExZTY2ZDM1Y2QwOWFkOGM3N2VmNGNhMDY5MmI=
   data.tar.gz: !binary |-
-    ZDZlNTA2NjIwZmZlZjYyM2FhNWRhNGQ5ODdlMDViYzZkNmVjOTYwZDQzMDI3
-    MzRkMGViOGU1NTQzYWUyMzM5ZjhhMjRjMTVmNGQxOWM5Yjk5MTJkZTE2ODk0
-    ZGRmODgxY2E1YjQxNjZlMzJjOTk4NmQ4MWJkMThkZDAxMWRiYTY=
+    NTA2MDA5ODliMWM4OTNjOTRhNjJjZTg0OTFkMmU0YjY1ODQ5ZDIwZTIxYzM4
+    OWU5N2I3YTYwOGRlM2FjMjlkNDU3ODk4ZTg5MjBlMDBjNzY4NmE2MjUzZDEw
+    M2RhMzQ4MDYxNGYwOWE3YmQ0MGUwYTg0YzRkYTYwMGU5NTc1ZDQ=

data/lib/baptize/helpers.rb

@@ -25,6 +25,23 @@ module Capistrano
         results.all?
       end
 
+      # Runs a rake command remotely
+      def remote_rake(rake_command, options = {})
+        options = {:bundle_cmd => fetch(:bundle_cmd, "bundle"), :current_path => current_path, :rails_env => rails_env, :env => {}}.merge(options)
+        command = ""
+        command << "cd #{options[:current_path]} && " if options[:current_path]
+        command << "RAILS_ENV=#{options[:rails_env]} " if options[:rails_env]
+        options[:env].each do |k,v|
+          command << "#{k}=#{v.shellescape} "
+        end
+        if options[:bundle_cmd]
+          command << "#{options[:bundle_cmd]} exec rake #{rake_command}"
+        else
+          command << "rake #{rake_command}"
+        end
+        options[:norun] ? command : run(command)
+      end
+
       # logs the command then executes it locally.
       # returns the command output as a string
       def run_locally(cmd)
@@ -61,6 +78,11 @@ module Capistrano
               load(conf)
             end
           end
+          if fetch(:use_sudo, true)
+            default_run_options[:shell] = 'sudo bash'
+          else
+            default_run_options[:shell].gsub!(/^sudo /, "")
+          end
         end
       end
 
@@ -79,7 +101,7 @@ module Capistrano
       def render(path, locals = {})
         require 'erb'
         require 'ostruct'
-        ERB.new(File.read(path)).result(OpenStruct.new(locals).instance_eval { binding })
+        ERB.new(File.read(path)).result(locals.kind_of?(Binding) ? locals : OpenStruct.new(locals).instance_eval { binding })
       end
 
     end

data/lib/baptize/install.rb

@@ -14,19 +14,17 @@ module Capistrano
 
           desc "Loads baptize configuration files"
           task :load_configuration do
-            top.instance_eval do
-              top.load_configuration :baptize
-              default_run_options[:shell] = 'sudo bash' if fetch(:use_sudo, true)
-            end
+            top.load_configuration :baptize
           end
 
           task :default do
-            load_configuration
             install
           end
 
           desc "Configures all available policies"
-          task :install do ; end
+          task :install do
+            load_configuration
+          end
 
           namespace :policies do
             desc "List available policies"
@@ -49,11 +47,41 @@ module Capistrano
                 end
               end
             end
-          end
+          end # end namespace policies
 
-        end
+          namespace :ssh do
+            desc "Describe available ssh connections"
+            task :default do
+              load_configuration
+              count = 1
+              roles.each do |name,servers|
+                servers.each do |host|
+                  puts "cap baptize:ssh:#{count} (#{name}) #{host}"
+                  count = count + 1
+                end
+              end
+            end
+
+            1.upto(10).each do |num|
+              task num.to_s.to_sym do
+                load_configuration
+                count = 1
+                roles.each do |name,servers|
+                  servers.each do |host|
+                    if count == num
+                      command = "ssh -i #{ssh_options[:keys]} #{user}@#{host}"
+                      puts "ssh -i #{ssh_options[:keys]} #{user}@#{host}"
+                      exec command
+                    end
+                    count = count + 1
+                  end
+                end
+              end
+            end
+          end # end namespace ssh
+        end # end namespace baptize
       end
-    end
 
+    end
   end
 end

data/lib/baptize/plugins/base.rb

@@ -2,20 +2,23 @@ module Capistrano
   module Baptize
     module Plugins
       module Base
+        def fail_verification(message = "Assertion failed")
+          raise VerificationFailure, message
+        end
 
         def has_file(path)
-          raise VerificationFailure, "Remote file #{path} does not exist" unless remote_assert("test -e #{path.shellescape}")
+          remote_assert("test -e #{path.shellescape}") or fail_verification("Remote file #{path} does not exist")
         end
 
         def has_directory(path)
-          raise VerificationFailure, "Remote directory #{path} does not exist" unless remote_assert("test -d #{path.shellescape}")
+          remote_assert("test -d #{path.shellescape}") or fail_verification("Remote directory #{path} does not exist")
         end
 
         def matches_local(local_path, remote_path)
           raise VerificationFailure, "Couldn't find local file #{local_path}" unless ::File.exists?(local_path)
           require 'digest/md5'
           local_md5 = Digest::MD5.hexdigest(::File.read(local_path))
-          raise VerificationFailure, "Remote file #{remote_path} doesn't match local file #{local_path}" unless md5_of_file(remote_path, local_md5)
+          md5_of_file(remote_path, local_md5) or fail_verification("Remote file #{remote_path} doesn't match local file #{local_path}")
         end
 
         def file_contains(path, text, options = {})
@@ -31,11 +34,11 @@ module Capistrano
         end
 
         def has_executable(path)
-          raise VerificationFailure, "No executable #{path} found" unless remote_assert "which #{path.shellescape}"
+          remote_assert("which #{path.shellescape}") or fail_verification("No executable #{path} found")
         end
 
         def has_user(name)
-          raise VerificationFailure, "No user #{name}" unless remote_assert "id -u #{name.to_s.shellescape}"
+          remote_assert("id -u #{name.to_s.shellescape}") or fail_verification("No user #{name}")
         end
       end
     end

data/lib/baptize/plugins/transfer.rb

@@ -19,7 +19,7 @@ module Capistrano
           if use_tarball
             raise "Can't tarball streaming upload" if from.kind_of?(IO)
             exclude = use_tarball[:exclude] if (use_tarball.kind_of?(Hash) && use_tarball[:exclude])
-            tar_options = exclude.map {|glob| "--exclude \"#{glob}\" " }.join('')
+            tar_options = Array(exclude).flatten.map {|glob| "--exclude \"#{glob}\" " }.join('')
             tempfile = Dir::Tmpname.make_tmpname(['/tmp/baptize-', '.tar.gz'], nil)
             local_command = "cd #{from.shellescape} ; #{local_tar_bin} -zcf #{tempfile.shellescape} #{tar_options}."
             raise "Unable to tar #{from}" unless run_locally(local_command)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baptize
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Troels Knak-Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano