doo 0.1.0 → 0.1.2

data/README.md

@@ -4,7 +4,7 @@ Doo is an experiment in taking a relentlessly polymorphic approach to deployment
 
 Because executable blocks are also polymorphic, you can mix and match provider blocks into your recipes. Want to have one deployment recipe for local and remote targets? No problem. Want to abstract away the particulars of your server's OS? We can do that, too.
  
-Doo layers a thin DSL on top of bare Ruby that facilitates polymorphic behaviour, and leans on a small number of built-in (and optional) deployment recipes to provide useful functionality.
+Doo layers a thin DSL that facilitates polymorphic behaviour on top of bare Ruby, and leans on a small number of built-in (and optional) deployment recipes to provide useful functionality.
 
 ## Play With It
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/examples/sample.rb

@@ -1,5 +1,7 @@
 # You can set options like so
-set :web, { :server => "example.com", :production => true }
+set :servers, {
+  "example.com" => { :role => [:web, :db], :ip => "10.11.12.13" },
+}
 set :arg, "foo"
 
 # options can also be blocks, in which case they become callable
@@ -7,9 +9,6 @@ set :show_uptime do
   run "uptime"
 end
 
-# You can bind a variable's content into the current context like so
-using web # Now 'server' and 'production' will be top-level variables
-
 # You can run local commands inside a block
 run_locally do
   run "echo #{arg}" # Will output 'foo'
@@ -20,12 +19,18 @@ run_locally :arg => "bar" do
   run "echo #{arg}"# Will output 'bar'
 end
 
-# You can run a set of commands on a remote server like so
-run_on_server web do
+# You can run a set of commands on all remote server like so
+run_on_server servers do
   run "whoami"  
 end
-# You can define servers as hashes or bare hostnames...
-run_on_server [web, "otherhost.com"] do
+
+# You can run a set of commands based on roles like so
+run_on_server servers.with_role(:web) do
+  run "whoami"
+end
+
+# You can also define servers as bare hostnames...
+run_on_server "otherhost.com" do
   run "hostname"
   # This runs the show_uptime block with the current set of variables
   show_uptime  

data/lib/doo/stock/run_on_server.rb

@@ -1,38 +1,37 @@
 SshCommand = "ssh -S '~/.ssh/master-%l-%r@%h:%p'"
 Doo::Base.class_eval do
   def run_on_server(servers, variables = {}, &block)
-    [servers].flatten.each do |server|
-      with_clone(server.is_a?(Hash)? variables.merge(server) : variables) do
-        @host = server.is_a?(Hash)? server[:server] : server
+    servers.each do |host, params|
+      with_clone(variables.merge({:host => host}).merge(params || {})) do
         def run(cmd, opt = {})
-          puts "Running ssh #{(!opt.include? :pty || opt[:pty])? '-t' : ''} #{@host} \"#{cmd}\"" if verbose
-          system("#{SshCommand} #{(!opt.include? :pty || opt[:pty])? '-t' : ''} #{@host} \"#{cmd}\"") || raise("SSH Error") unless dry_run
+          puts "Running ssh #{(!opt.include? :pty || opt[:pty])? '-t' : ''} #{host} \"#{cmd}\"" if verbose
+          system("#{SshCommand} #{(!opt.include? :pty || opt[:pty])? '-t' : ''} #{host} \"#{cmd}\"") || raise("SSH Error") unless dry_run
           $?
         end
       
         def put(local, remote)
-          puts "scp -r \"#{local}\" \"#{@host}:#{remote}\"" if verbose
-          system("scp -r \"#{local}\" \"#{@host}:#{remote}\"") || raise("SSH Error") unless dry_run
+          puts "scp -r \"#{local}\" \"#{host}:#{remote}\"" if verbose
+          system("scp -r \"#{local}\" \"#{host}:#{remote}\"") || raise("SSH Error") unless dry_run
           $?
         end
       
         begin
-          system("#{SshCommand} -MNf #{@host}") || raise("SSH Error") unless dry_run
+          system("#{SshCommand} -MNf #{host}") || raise("SSH Error") unless dry_run
           instance_eval &block if block_given?
         ensure
-          system("#{SshCommand} -Oexit #{@host}") || raise("SSH Error") unless dry_run
+          system("#{SshCommand} -Oexit #{host}") || raise("SSH Error") unless dry_run
         end
       end
     end
   end
 end
 
-Array.class_eval do
+Hash.class_eval do
   def with_role(role)
-    select { |obj| [obj[:role]].flatten.member? role }
+    reject { |k,v| ! [v[:role]].flatten.member? role }
   end
   
   def except_role(role)
-    reject { |obj| [obj[:role]].flatten.member? role }
+    reject { |k,v| [v[:role]].flatten.member? role }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mat Trudel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -04:00
+date: 2010-09-16 00:00:00 -04:00
 default_executable: doo
 dependencies: []