doo 0.2.1 → 0.2.3

data/Rakefile

@@ -10,6 +10,7 @@ begin
     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"
@@ -21,4 +22,4 @@ Spec::Rake::SpecTask.new('spec') do |t|
   t.spec_files = FileList['spec/**/*.rb']
 end
 
-task :default => :spec
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/lib/doo/cli.rb

@@ -14,6 +14,11 @@ module Doo
             options[:verbose] = true
           end
           
+          options[:confirm] = false
+          opts.on( '-c', '--confirm', 'Confirm every command before it gets run' ) do
+            options[:confirm] = true
+          end
+          
           opts.on( '-s', '--set key=value', 'Set runtime values' ) do |arg|            
             options[arg.split('=')[0]] = arg.split('=')[1]
           end
@@ -52,4 +57,4 @@ module Doo
       end
     end
   end
-end
+end

data/lib/doo/stock/render_to_file.rb

@@ -4,7 +4,7 @@ Doo::Base.class_eval do
       with_clone(variables) do
         @file = file
         def run(cmd)
-          puts "Rendering #{cmd}" if verbose
+          puts "Rendering \"#{cmd}\"" if verbose
           @file.puts cmd
         end
         check_prereqs do

data/lib/doo/stock/run_locally.rb

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

data/lib/doo/stock/run_on_server.rb

@@ -1,22 +1,32 @@
+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(cmd, opt = {})
+        def run(remote_cmd, opt = {})
           cmdopts = ["-S \"~/.ssh/master-%l-%r@%h:%p\""]
           cmdopts << "-t" if !opt.include? :pty || opt[:pty]
-          command = "ssh #{cmdopts.join(' ')} #{user}@#{host} #{cmd}"
-          puts "Running #{command}" if verbose
-          system(command) || raise("SSH Error") unless dry_run
+          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
           $?
         end
 
         def put(local, remote, opt = {})
           cmdopts = ["-r"]
           cmdopts << "-oProxyCommand=\"ssh #{gateway} exec nc %h %p\"" if defined?(gateway) && gateway
-          command = "scp #{cmdopts.join(' ')} #{local} #{user}@#{host}:#{remote}"
-          puts "Putting file #{local} to #{remote} via #{command}" if verbose
-          system(command) || raise("Scp Error") unless dry_run
+          cmd = "scp #{cmdopts.join(' ')} #{local} #{user}@#{host}:#{remote}"
+          if confirm
+            return false unless HighLine.new.agree("Run \"#{cmd}\"? ")
+          elsif verbose
+            puts "Running \"#{cmd}\""
+          end
+          system(cmd) || raise("Scp Error") unless dry_run
           $?
         end
 

data/spec/doo/base_spec.rb

@@ -70,4 +70,14 @@ describe Doo::Base do
     end
     @inst.should_not respond_to :extra
   end
+  
+  it "understands namespaces" do
+    @inst.should respond_to :namespace
+    @inst.extra.should == "bologna"
+  end    
+
+  it "namespaces should take a block" do
+    raise
+  end    
+    
 end

data/spec/doo/cli_spec.rb

@@ -17,6 +17,10 @@ describe Doo::CLI::Options do
     Doo::CLI::Options.parse!(["-v", "foo"]).member?(:verbose).should == true
   end
 
+  it "should set on --confirm" do
+    Doo::CLI::Options.parse!(["-c", "foo"]).member?(:confirm).should == true
+  end
+
   it "should set variables" do
     Doo::CLI::Options.parse!(["-swoz=bar", "foo"])["woz"].should == "bar"
   end
@@ -35,4 +39,4 @@ describe Doo::CLI::Options do
     inst.should_receive(:load).with("bar")        
     Doo::CLI.start
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: doo
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mat Trudel
@@ -15,10 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -04:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: doo
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 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
@@ -49,8 +60,8 @@ homepage: http://github.com/mtrudel/doo
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -58,7 +69,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -67,7 +77,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -79,6 +88,6 @@ signing_key:
 specification_version: 3
 summary: Doo - an stacked-cotnext approach to deployment scripting
 test_files: 
+- examples/sample.rb
 - spec/doo/base_spec.rb
 - spec/doo/cli_spec.rb
-- examples/sample.rb