fezzik 0.8.0.beta1 → 0.8.0.beta2

data/bin/fez

@@ -102,9 +102,6 @@ def run_fezzik_tasks
       puts Fezzik.color_string("[fail]", :red)
       exit e.status
     end
-  rescue Fezzik::CommandFailedError => e
-    puts Fezzik.color_string("[fail]", :red)
-    exit 1
   rescue StandardError => e
     puts e.message
     puts e.backtrace

data/lib/fezzik/base.rb

@@ -24,6 +24,10 @@ module Fezzik
     @@settings[name]
   end
 
+  # TODO(caleb): Private method?
+  def self.clear(name) @@settings.delete(name) end
+
+  # TODO: add deprecation warning for remote_task
   def self.remote_task(*args, &block)
     roles = (Hash === args.last && args.last[:roles]) ? args.pop[:roles] : []
     name, args, deps = Rake.application.resolve_args(args)
@@ -36,6 +40,7 @@ module Fezzik
       :deps => [],
       :roles => []
     }.merge(options)
+    options.each { |key, value| options[key] = Array(value) }
     t = HostTask.define_task(name, { options[:args] => options[:deps] }, &block)
     t.roles += options[:roles]
   end
@@ -62,6 +67,4 @@ module Fezzik
   def self.destinations
     @destinations ||= Set.new
   end
-
-  class CommandFailedError < StandardError; end
 end

data/lib/fezzik/role.rb

@@ -6,21 +6,28 @@ module Fezzik
 
   def self.roles() @roles ||= {} end
 
-  # TODO: Consider allowing roles that don't override an existing setting.
-  # Right now you have to do: set :foo nil; role :foo_role {:foo => :bar}
   def self.with_role(role_name, &block)
     return block.call if roles[role_name].nil?
 
-    old_settings = Hash[roles[role_name].map { |setting, value| [setting, self.send(setting)] }]
+    overridden_settings = {}
+    new_settings = []
+    roles[role_name].each_key do |name|
+      if @@settings.has_key? name
+        overridden_settings[name] = Fezzik.get(name)
+      else
+        new_settings << name
+      end
+    end
     override_settings(roles[role_name])
     begin
       block.call
     ensure
-      override_settings(old_settings)
+      override_settings(overridden_settings, new_settings)
     end
   end
 
-  def self.override_settings(settings)
-    settings.each { |setting, value| Fezzik.set setting, value }
+  def self.override_settings(to_set, to_clear = [])
+    to_clear.each { |setting| Fezzik.clear setting }
+    to_set.each { |setting, value| Fezzik.set setting, value }
   end
 end

data/lib/fezzik/version.rb

@@ -1,3 +1,3 @@
 module Fezzik
-  VERSION = "0.8.0.beta1"
+  VERSION = "0.8.0.beta2"
 end

data/tasks/command.rake

@@ -23,9 +23,6 @@ namespace :fezzik do
       else
         begin
           Rake::Task["fezzik:command_execute"].invoke command
-        rescue Fezzik::CommandFailedError => e
-          puts e.message
-          puts e.backtrace
         ensure
           Rake::Task["fezzik:command_execute"].reenable
         end
@@ -34,6 +31,6 @@ namespace :fezzik do
   end
 
   desc "run a single command on destination servers"
-  remote_task(:command_execute, :command) { |t, args| run args[:command] }
+  remote_task(:command_execute, :command) { |t, args| run args[:command], :continue_on_failure => true }
 end
 

data/weave_todo.md

@@ -8,6 +8,14 @@
 
 * Call `warn` for deprecation notices
 * document --trace and --dry-run passthrough flags
-* puts is not thread-safe; instead, use print "" + "\n"
+* puts is not thread-safe; instead, use print "" + "\n" (NOTE: Caleb -- this isn't actually true; the `puts`
+  you get in a `remote_task` is a Weave wrapper, which is thread-safe. However, if you use `STDERR.puts` or
+  `STDOUT.puts` or `print` or anything else, it's not going to be threadsafe. This may be worth pointing out
+  in the docs.)
 * capture_output captures the host prefix on each line. Instead pass :capture => :output to `run`.
   You can also use capture_output and pass :capture => raw
+* We no longer provide `current_path`, which is a RRT-ism. However, this was kind of a convention anyway --
+  RRT sets it to "current" and we generally leave that alone. In fact, if you look at the default deploy task
+  (https://github.com/dmacdougall/fezzik/blob/master/tasks/deploy.rake) you'll see that we use `current_path`
+  in some places and the string "current" in others. The new convention should just be `set :current_path,
+  "#{get :deploy_to}/current"` and then use `current_path` as a normal setting.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fezzik
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta1
+  version: 0.8.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,3 +138,4 @@ summary: Fezzik adds remote ssh capabilities to Rake. It simplifies running comm
   on remote servers and can be used for anything from deploying code to installing
   libraries remotely.
 test_files: []
+has_rdoc: