rehabilitate 0.4.2 → 0.4.4

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    rehabilitate (0.4.0)
+    rehabilitate (0.4.3)
       commander
       fog
       log4r
       net-scp
       net-ssh
       pluginfactory
-      rehabilitate
 
 GEM
   remote: http://rubygems.org/

data/bin/rehabilitate

@@ -12,11 +12,16 @@
 #
 # example: rehabilitate save --driver postgresql --type scp --location user:pass@ftp.example.com
 
-require "bundler/setup"
+begin
+  require "bundler/setup"
+rescue LoadError
+  require "rubygems"
+end
 
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib/rehabilitate"
 
+require "pluginfactory"
 require 'rehabilitate'
 require 'commander/import'
 require 'log4r'

data/lib/rehabilitate/plugin.rb

@@ -1,13 +1,13 @@
-require "pluginfactory"
-
-class Plugin
-  include PluginFactory
+module Rehabilitate
+  class Plugin
+    include ::PluginFactory
     
-  def self::derivative_dirs
-     ["plugins"]
-  end
+    def self::derivative_dirs
+       ["plugins"]
+    end
   
-  def log(message)
-    $LOGGER.info message
+    def log(message)
+      $LOGGER.info message
+    end
   end
 end

data/lib/rehabilitate/plugins/lzop.rb

@@ -1,6 +1,6 @@
 require 'rehabilitate/plugin'
 
-class Lzop < Plugin
+class Lzop < Rehabilitate::Plugin
   def compress(options)
     options._backup_files.collect! do |backup_file|
       new_backup_name = "#{backup_file}.tar.lzop"

data/lib/rehabilitate/plugins/postgresql.rb

@@ -1,6 +1,6 @@
 require 'rehabilitate/plugin'
 
-class Postgresql < Plugin
+class Postgresql < Rehabilitate::Plugin
   def backup(options)
     options._backup_files.collect! do |backup_file|
       new_backup_name = "#{backup_file}.sql"

data/lib/rehabilitate/plugins/s3.rb

@@ -2,7 +2,7 @@ require 'rehabilitate/plugin'
 require 'fog'
 require 'yaml'
 
-class S3 < Plugin
+class S3 < Rehabilitate::Plugin
   def list(options)
     location = parse_upload_string(options.location)
     s3 = setup_fog(location)

data/lib/rehabilitate/plugins/scp.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'net/ssh'
 require 'net/scp'
 
-class Scp < Plugin
+class Scp < Rehabilitate::Plugin
   def upload(options)
     location = parse_upload_string(options.location)
     remote_dir = "#{location[:dir]}/#{options._base_backup_name}"

data/lib/rehabilitate/plugins/splitter.rb

@@ -1,11 +1,11 @@
 require 'rehabilitate/plugin'
 
-class Splitter < Plugin
+class Splitter < Rehabilitate::Plugin
   MAX_FILE_SIZE = (4.5*1024*1024*1024*1024*10).to_i #4.5TB
 
   def join(files)
-    log %[ cat #{files.join(" ")} > #{files[0].split("-")[0..-2].join("-")} ]
-    log %x[ cat #{files.join(" ")} > #{files[0].split("-")[0..-2].join("-")} ]
+    log %[ cat #{files.reverse.join(" ")} > #{files[0].split("-")[0..-2].join("-")} ]
+    log %x[ cat #{files.reverse.join(" ")} > #{files[0].split("-")[0..-2].join("-")} ]
     files[0].split("-")[0..-2].join("-")
   end
 

data/lib/rehabilitate/version.rb

@@ -1,3 +1,3 @@
-class Rehabilitate
-  VERSION = "0.4.2"
+module Rehabilitate
+  VERSION = "0.4.4" unless const_defined?("VERSION")
 end

data/lib/rehabilitate.rb

@@ -1,7 +1,6 @@
 require 'rehabilitate/plugin'
-require 'rehabilitate/plugins/splitter'
 
-class Rehabilitate  
+module Rehabilitate  
   def self.backup(options)
     driver = Plugin::create( options.driver )
     driver.backup(options)

metadata

@@ -2,7 +2,7 @@
 name: rehabilitate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jamie van Dyke