encbs 0.2.1.alpha → 0.2.1.beta1

data/VERSION

@@ -1 +1 @@
-0.2.1.alpha
+0.2.1.beta1

data/bin/encbs

@@ -39,12 +39,13 @@ begin
     on :k, :key, "Set API key to access Amazon S3", true
     on :l, :local, "Backup in local directory", true
     on :list, "List of jars"
+    on :p, :purge, "Remove previous backup(s)"
     on :r, :rescue, "Return data from backup (option: jar, path or filter)", true
     on :s, :secret, "Set API secret to access Amazon S3", true
+    on :size, "RSA private key length (default: 4096)", true
     on :t, :to, "Path to recovery (default: /)", true
     on :timeout, "Timeout(sec) to try pushing into cloud (default: 60s)", true
     on :token, "RSA key to encrypt/decrypt backup data", true
-    on :size, "RSA private key length (default: 4096)", true
     on :v, :verbose, "Verbose mode"
 
     banner "Usage:\n    $ encbs [options]\n\nOptions:"
@@ -225,7 +226,7 @@ begin
     exit
   end
 
-  if !!@config.paths or opts.add?
+  if !@config.paths.nil? or opts.add?
     if File.exists? "/var/tmp/encbs.swap"
       meta = YAML::load open("/var/tmp/encbs.swap").read
       jar_path, timestamp = meta[:jar_path], meta[:timestamp]
@@ -258,11 +259,18 @@ begin
     end
 
     paths.each do |path|
-      @backup.create! path, @config.increment || opts.increment?
+      unless opts.increment?
+        purge = @config.purge || opts.purge?
+      else
+        purge = false
+      end
+
+      increment = @config.increment || opts.increment?
+      @backup.create! path, increment, purge
     end
 
     puts "Done!".green
   end
 ensure
   remove_lock
-end
+end

data/encbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.2.1.alpha"
+  s.version = "0.2.1.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Klim"]
-  s.date = %q{2011-05-23}
+  s.date = %q{2011-05-24}
   s.default_executable = %q{encbs}
   s.description = %q{Simple backup system for pushing into cloud}
   s.email = %q{klimtimothy@gmail.com}

data/lib/archive.rb

@@ -22,7 +22,7 @@ class Archive
   attr_reader :type
 
   def initialize type
-    fail "Error" unless [:lzo, :gzip].include? type.downcase
+    puts_fail "Unsupported type" unless [:lzo, :gzip].include? type.downcase
     instance_eval %{@type = #{type.to_s.upcase}}
   end
   

data/lib/backup/file_item/cloud.rb

@@ -14,9 +14,9 @@ module Backup
         end
         @timeout = 60
 
-        try_to_connect_with_cloud 
+        try_to_connect_with_cloud
       end
-      
+
       def timeout=(time)
         @timeout = time
       end
@@ -24,6 +24,26 @@ module Backup
       def create_directory_once(*directories)
       end
 
+      def delete_file path
+        try_to_work_with_cloud do
+          file = delete_slashes(path)
+          @directory.files.get(file).destroy
+        end
+      end
+
+      def delete_dir directory
+        try_to_work_with_cloud do
+          path = delete_slashes(directory)
+
+          files = @directory.files.all(
+            :prefix => path,
+            :max_keys => 30_000
+          ).map do |file|
+            file.destroy
+          end
+        end
+      end
+
       def create_file_once(file, data)
         try_to_work_with_cloud do
           @directory.files.create(
@@ -49,7 +69,7 @@ module Backup
           :prefix => path,
           :max_keys => 30_000
         ).map(&:key)
-        
+
         files.map do |item|
           match = item.match(/^#{path}\/([^\/]+#{mask}).*$/)
           match[1] if match
@@ -93,4 +113,4 @@ module Backup
       end
 		end
   end
-end
+end

data/lib/backup/file_item/local.rb

@@ -9,25 +9,25 @@ module Backup
         @timeout = 0
       end
 
-      def create_directory_once(*directories)
+      def create_directory_once *directories
         directories.each do |path|
           FileUtils.mkdir_p(path) unless Dir.exists?(path)
         end
       end
 
-      def create_file_once(file, data)
+      def create_file_once file, data
         data = data.read if data.is_a? File or data.is_a? StringIO
         File.open(file, "wb").puts(data) unless File.exists?(file)
       end
 
-      def read_file(file)
+      def read_file file
         File.open(file, 'rb').read if File.exists? file
       end
       
-      def timeout=(time)
+      def timeout= time
       end
 
-      def dir(path, mask = "*")
+      def dir path, mask = "*"
         r_mask = mask.gsub('.', '\.').gsub('*', '[^\/]')
 
         Dir["#{path}/#{mask}"].map do |item|
@@ -35,6 +35,14 @@ module Backup
           match[1] if match
         end.compact.uniq
       end
+
+      def delete_file path
+        FileUtils.rm path
+      end
+
+      def delete_dir directory
+        FileUtils.remove_dir directory
+      end
     end
   end
-end
+end

data/lib/backup/jar.rb

@@ -12,7 +12,7 @@ module Backup
       Digest::MD5.hexdigest(@local_path)
     end
 
-    def save increment = false, compression = nil
+    def save increment = false, compression = nil, purge = false
       @meta_index = {}
       @local_files = hash_local_files
 
@@ -118,9 +118,20 @@ module Backup
           "#{meta_jar_path}/#{@timestamp}.yml",
           @meta_index.to_yaml
         )
-      end
 
-      pbar.finish
+        pbar.finish
+
+        if purge
+          puts "Removing previous backups..."
+          previous_versions = Jar.jar_versions @file_item, @root_path, jar_hash, true
+          previous_versions.delete @timestamp
+          
+          previous_versions.each do |version|
+            @file_item.delete_file "#{meta_jar_path}/#{version}.yml"
+            @file_item.delete_dir "#{@root_path}/#{jar_hash}/#{version}"
+          end
+        end
+      end
     end
 
     def hash_local_files

data/lib/backup.rb

@@ -27,26 +27,26 @@ module Backup
       @compression = Archive.new type.to_sym
     end
 
-    def hostname=(host)
+    def hostname= host
       @hostname = host
       @root_path = "#{@_root_path}/#{@hostname}"
     end
 
-    def rsa_key(path, size)
+    def rsa_key path, size
       @key = Crypto::Key.from_file(path, size)
     end
 
-    def create!(local_path, increment = false)
-      jar = Jar.new(@file_item, @root_path, local_path, @key)
-      jar.save(increment, @compression)
+    def create! local_path, increment = false, purge_previous = false
+      jar = Jar.new @file_item, @root_path, local_path, @key
+      jar.save increment, @compression, purge_previous
     end
 
     def jars
-      Jar.all(@file_item, @root_path)
+      Jar.all @file_item, @root_path
     end
 
-    def jar_versions(jar)
-      Jar.jar_versions(@file_item, @root_path, jar, !!jar[/^[0-9a-z]{32}$/])
+    def jar_versions jar
+      Jar.jar_versions @file_item, @root_path, jar, !!jar[/^[0-9a-z]{32}$/]
     end
 
     def restore_jar_to(hash, timestamp, to)

data/lib/encbsconfig.rb

@@ -1,6 +1,6 @@
 class EncbsConfig
   attr_reader :paths, :bucket, :colorize, :compression, :hostname, :increment,
-              :key, :secret, :size, :token, :timeout, :verbose
+              :key, :purge, :secret, :size, :token, :timeout, :verbose
 
   def initialize
     @paths = ""
@@ -62,4 +62,8 @@ class EncbsConfig
   def set_timeout attr
     @timeout = attr
   end
+
+  def purge!
+    @purge = true unless @increment
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: encbs
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.1.alpha
+  version: 0.2.1.beta1
 platform: ruby
 authors: 
 - Timothy Klim
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +04:00
+date: 2011-05-24 00:00:00 +04:00
 default_executable: encbs
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1329306748295830771
+      hash: 3992220995732622958
       segments: 
       - 0
       version: "0"