doo 0.5.0 → 0.6.0

data/Rakefile

@@ -1,21 +1,3 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.version
-    gem.name            = "doo"
-    gem.summary         = %Q{Doo - a stacked-context approach to deployment scripting }
-    gem.description     = %Q{Doo is a deployment scripting tool in the vein of capistrano and sprinkle that uses stacked contexts and a aspect-ish data model}
-    gem.homepage        = "http://github.com/mtrudel/doo"
-    gem.authors         = [ "Mat Trudel" ]
-    gem.email           = [ "mat@geeky.net" ]
-    gem.executables     = %W(doo)
-    gem.files           = FileList["[A-Z]*", "{bin,examples,lib,spec}/**/*", 'lib/jeweler/templates/.gitignore']
-    gem.add_dependency  "highline"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 require 'rspec/core/rake_task'
 desc "Run all tests"
 RSpec::Core::RakeTask.new('spec') do |t|

data/lib/doo/base.rb

@@ -30,7 +30,7 @@ module Doo
       obj.instance_eval &block if block_given?
       obj
     end
-    
+
     private
     def singleton_class
       class << self
@@ -38,4 +38,4 @@ module Doo
       end
     end
   end
-end
+end

data/lib/doo/stock/common.rb

@@ -1,12 +1,48 @@
+require 'highline'
+require 'colorize'
+
 Doo::Base.class_eval do
   SEPARATORS = %w( / @ : | _ - # ^ ? )
-
-  def replace(file, src, replace, options = {})
+  
+  def replace(file, src, replace, opts = {})
     sep = SEPARATORS.detect { |x| !src.include?(x) && !replace.include?(x) }
-    sudo "sed -i -e 's#{sep}#{src}#{sep}#{replace}#{sep}g' #{file}"
+    run "sed -i -e 's#{sep}#{src}#{sep}#{replace}#{sep}g' #{file}", opts
+  end
+  
+  def append(file, text, opts = {})
+    run "grep '#{text}' #{file} || echo '#{text}' >> #{file}", opts
+  end
+  
+  def sudo(cmd, opts = {})
+    run(cmd, opts.merge(:sudo => true))
+  end
+  
+  private
+  def sudoize(cmd)
+    "sudo sh -c \"#{cmd.gsub(/\"/, "\\\"")}\""
   end
   
-  def append(file, text, options = {})
-    sudo "grep '#{text}' #{file} || echo '#{text}' >> #{file}"
+  def run!(cmd, opts = {})
+    with_clone(opts) do
+      if confirm
+        return false unless HighLine.new.agree("Run \"#{cmd}\"? ")
+      elsif verbose
+        puts "Running \"#{cmd}\"".green
+      end
+      unless dry_run
+        if defined?(capture) && capture
+          return `#{cmd}`
+        else
+          system cmd
+          if $? != 0 && (!defined? just_return_failure || !just_return_failure)
+            puts "Error code #{$?} running #{cmd}".red 
+            raise
+          end
+          return $?.exitstatus
+        end
+      else
+        true
+      end
+    end
   end
 end

data/lib/doo/stock/prereqs.rb

@@ -1,9 +1,9 @@
 Doo::Base.class_eval do
   def if_passes(test, &block)
-    yield if run "#{test}"
+    yield unless run "#{test}", :just_return_failure => true
   end
   
   def if_fails(test, &block)
-    yield unless run "#{test}"
-  end
+    yield if run "#{test}", :just_return_failure => true
+  end  
 end

data/lib/doo/stock/run_locally.rb

@@ -1,17 +1,11 @@
-require 'highline'
-
 Doo::Base.class_eval do
   def run_locally(variables = {}, &block)
     with_clone(variables) do
-      def run(cmd)
-        if confirm
-          return false unless HighLine.new.agree("Run \"#{cmd}\"? ")
-        elsif verbose
-          puts "Running \"#{cmd}\""
-        end
-        system cmd unless dry_run
-        $?
+      def run(cmd, opts = {})
+        cmd = sudoize(cmd) if opts[:sudo]
+        run! cmd, opts
       end
+      
       instance_eval &block if block_given?
     end
   end

data/lib/doo/stock/run_on_server.rb

@@ -1,51 +1,47 @@
-require 'highline'
-
 Doo::Base.class_eval do
   def run_on_server(servers, variables = {}, &block)
     servers.each do |host, params|
       with_clone(variables.merge({:host => host}).merge(params || {})) do
-        def run(remote_cmd, opt = {})
+        def run(remote_cmd, opts = {})
           cmdopts = ["-S \"~/.ssh/master-%l-%r@%h:%p\""]
-          cmdopts << "-t" if !opt.include? :pty || opt[:pty]          
+          cmdopts << "-t" if !opts.include? :pty || opts[:pty]
           cmdopts << "-p#{ssh_port}" if defined? ssh_port
-          cmd = "ssh #{cmdopts.join(' ')} #{user}@#{host} \"#{remote_cmd.gsub(/\"/, "\\\"")}\""
-          if confirm
-            return false unless HighLine.new.agree("Run \"#{cmd}\"? ")
-          elsif verbose
-            puts "Running \"#{cmd}\""
-          end
-          system(cmd) || raise("SSH Error") unless dry_run
-          $?
+          remote_cmd = sudoize(remote_cmd) if opts[:sudo]
+          run! "ssh #{cmdopts.join(' ')} #{user}@#{host} \"#{remote_cmd.gsub(/\"/, "\\\"")}\"", opts
         end
 
-        def put(local, remote, opt = {})
+        def put(local, remote, opts = {})
+          if defined?(opts[:sudo]) && opts[:sudo]
+            tmp_loc = run("mktemp -d -t dooXXXXX", :capture => true).chomp
+            real_remote = remote
+            remote = File.join(tmp_loc, remote)
+            run "mkdir -p #{File.dirname(remote)}"
+          end
           cmdopts = ["-r"]
           cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined?(gateway) && gateway
-          cmd = "scp #{cmdopts.join(' ')} #{local} #{user}@#{host}:#{remote}"
-          if confirm
-            return false unless HighLine.new.agree("Run \"#{cmd}\"? ")
-          elsif verbose
-            puts "Running \"#{cmd}\""
+          cmdopts << "-P#{ssh_port}" if defined? ssh_port
+          result = run! "scp #{cmdopts.join(' ')} #{local} #{user}@#{host}:#{remote}"
+          run "chmod #{opts[:mode]} #{remote}" if defined?(opts[:mode]) && opts[:mode]
+          sudo "chown -R #{opts[:owner]} #{remote}" if defined?(opts[:owner]) && opts[:owner]
+          sudo "chgrp -R #{opts[:group]} #{remote}" if defined?(opts[:group]) && opts[:group]
+          if defined?(opts[:sudo]) && opts[:sudo]
+            sudo "mv #{remote} #{real_remote}"
+            run "rm -rf #{tmp_loc}"
           end
-          system(cmd) || raise("Scp Error") unless dry_run
-          result = $?
-          run("chmod #{opt[:mode]} #{remote}") if defined? opt[:mode]
           result
         end
 
         begin
           cmdopts = ["-MNf -S \"~/.ssh/master-%l-%r@%h:%p\""]
           cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined?(gateway) && gateway
-          command = "ssh #{cmdopts.join(' ')} #{user}@#{host}"
-          puts "Running #{command}" if verbose
-          system(command) || raise("SSH Error") unless dry_run
-          
+          cmdopts << "-p#{ssh_port}" if defined? ssh_port
+          run! "ssh #{cmdopts.join(' ')} #{user}@#{host}"
+
+          # Now run the actual commands
           instance_eval &block if block_given?
         ensure
           cmdopts = ["-Oexit -S \"~/.ssh/master-%l-%r@%h:%p\""]
-          command = "ssh #{cmdopts.join(' ')} #{user}@#{host}"
-          puts "Running #{command}" if verbose
-          system(command) || raise("SSH Error") unless dry_run
+          run! "ssh #{cmdopts.join(' ')} #{user}@#{host}"
         end
       end
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doo
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mat Trudel
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -05:00
+date: 2010-12-16 00:00:00 -05:00
 default_executable: doo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +26,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: colorize
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Doo is a deployment scripting tool in the vein of capistrano and sprinkle that uses stacked contexts and a aspect-ish data model
 email: 
 - mat@geeky.net
@@ -42,7 +58,6 @@ extra_rdoc_files:
 files: 
 - README.md
 - Rakefile
-- VERSION
 - bin/doo
 - examples/sample.rb
 - lib/doo.rb
@@ -69,6 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -77,6 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/VERSION

@@ -1 +0,0 @@
-0.5.0