backupgem 0.0.2 → 0.0.3

data/CHANGELOG

@@ -4,3 +4,9 @@
 
 * First stable code in place.
 * Packaged in an gem format
+
+== Version 0.0.3
+
+* Fixed a critical bug that did not allow re-defining the :delivery or :rotate
+  methods. Thanks to James Healy for pointing this out.
+

data/README

@@ -218,9 +218,9 @@ or your own:
 ====Action====
 Delivery is supported via <tt>scp</tt>, <tt>ftp</tt>, and <tt>mv</tt>
 
-  action :delivery, :method => :scp
-  action :delivery, :method => :ftp
-  action :delivery, :method => :mv
+  action :deliver, :method => :scp
+  action :deliver, :method => :ftp
+  action :deliver, :method => :mv
 
 The <tt>:mv</tt> action is defined like any user-defined action:
 
@@ -338,7 +338,7 @@ Thankfully, this is incredibly simple:
     dump # make sure you return the name of the file
   end
 
-  action :delivery, :method => :scp
+  action :deliver, :method => :scp
   action :rotate,   :method => :via_ssh
 
   set :servers,           %w{ my.server.com }

data/doc/index.html

@@ -324,9 +324,9 @@ or your own:
 	<p><i>Full <span class="caps">FTP</span> support is <a href="#Known_Bugs_and_Limitations_TODO">unfinished</a>. Currently, only <code><span class="ident">scp</span></code> and <code><span class="ident">mv</span></code> fully support rotation</i></p>
 
 
-<div class='example'><pre><code>  <span class="ident">action</span> <span class="symbol">:delivery</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:scp</span>
-  <span class="ident">action</span> <span class="symbol">:delivery</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:ftp</span>
-  <span class="ident">action</span> <span class="symbol">:delivery</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:mv</span></code></pre></div>
+<div class='example'><pre><code>  <span class="ident">action</span> <span class="symbol">:deliver</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:scp</span>
+  <span class="ident">action</span> <span class="symbol">:deliver</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:ftp</span>
+  <span class="ident">action</span> <span class="symbol">:deliver</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:mv</span></code></pre></div>
 The <code><span class="symbol">:mv</span></code> action is defined (in <code><span class="ident">backup</span><span class="punct">/</span><span class="ident">recipes</span><span class="punct">/</span><span class="ident">standard</span><span class="punct">.</span><span class="ident">rb</span></code>) like any user-defined action:
 <div class='example'><pre><code>  <span class="ident">action</span><span class="punct">(</span><span class="symbol">:mv</span><span class="punct">)</span> <span class="keyword">do</span>
     <span class="ident">sh</span> <span class="punct">&quot;</span><span class="string">mv <span class="expr">#{last_result}</span> <span class="expr">#{c[:backup_path]}</span>/</span><span class="punct">&quot;</span> 
@@ -482,7 +482,7 @@ Thankfully, this is incredibly simple:
     <span class="ident">dump</span> <span class="comment"># make sure you return the name of the file</span>
   <span class="keyword">end</span>
 
-  <span class="ident">action</span> <span class="symbol">:delivery</span><span class="punct">,</span> <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:scp</span>
+  <span class="ident">action</span> <span class="symbol">:deliver</span><span class="punct">,</span>  <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:scp</span>
   <span class="ident">action</span> <span class="symbol">:rotate</span><span class="punct">,</span>   <span class="symbol">:method</span> <span class="punct">=&gt;</span> <span class="symbol">:via_ssh</span>
 
   <span class="ident">set</span> <span class="symbol">:servers</span><span class="punct">,</span>           <span class="punct">%w{</span><span class="string"> my.server.com </span><span class="punct">}</span>
@@ -705,7 +705,7 @@ Thankfully, this is incredibly simple:
 
 <div id="footer">
   <p>
- &copy; 2006 <a href="mailto:nate+backupgem@natemurray.com">Nate Murray</a>. <span class="last_updated">Last updated Fri Oct 06 15:11:51 PDT 2006</span>
+ &copy; 2006 <a href="mailto:nate+backupgem@natemurray.com">Nate Murray</a>. <span class="last_updated">Last updated Tue Oct 10 09:20:53 PDT 2006</span>
 </p>
 
 </div>

data/examples/mediawiki.rb

@@ -13,7 +13,7 @@ action(:content) do
 end
 
 # action :compress, :method => :tar_bz2   # could be set in global
-# action :delivery, :method => :scp       # could be set in global
+# action :deliver,  :method => :scp       # could be set in global
 
 # settings for backup servers are global unless specified otherwise
 # rotate settings are global unless specified herer

data/lib/backup/actor.rb

@@ -71,7 +71,7 @@ module Backup
     def define_action(name, options={}, &block)
       @action[name] = (options[:action_class] || Action).new(name, self, options)
 
-      if self.respond_to?(name) && !block_given? 
+      if self.respond_to?(name) && !( block_given? || options[:method] )
         # if it was already defined and we aren't trying to re-define it then
         # what we are trying to do is define it the same way it is defined now
         # only with options being sent to it. 

data/lib/backup/configuration.rb

@@ -130,7 +130,6 @@ module Backup
         options = options.merge(:desc => @next_description)
         @next_description = nil
       end
-
       actor.define_action(name, options, &block)
     end
 

data/tests/ssh_test.rb

@@ -4,7 +4,7 @@ class SSHTest < Test::Unit::TestCase
   def setup
     @config = Backup::Configuration.new
     @config.load "standard"
-    @config.action :deliver, :method => :via_ssh 
+    @config.action :deliver, :method => :ssh 
     @actor = Backup::SshActor.new(@config) 
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: backupgem
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-10-06 00:00:00 -07:00
+  version: 0.0.3
+date: 2006-10-10 00:00:00 -07:00
 summary: Beginning-to-end solution for backups and rotation.
 require_paths: 
 - lib