encbs 0.2.1.beta2 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.1.beta2
+0.2.1

data/bin/encbs

@@ -168,21 +168,29 @@ begin
     exit
   end
 
-  #TODO: Support rescue option as hash
   if opts.rescue?
     paths = opts[:rescue].split(" ")
     jars_list = @backup.jars
+    puts jars_list
 
-    include_path = lambda {|path| jars_list.keys.include? path}
+    include_path = lambda {|path| jars_list.has_key?(path)}
 
     jars_hashes = paths.map do |path|
-      path = File.expand_path path
+      unless path.length == 32 and path.match /[0-9a-f]{32}/
+        path = File.expand_path path
 
-      unless include_path[path] or include_path["#{path}/"]
-        puts_fail "Jar \"#{path}\" not exists." 
-      end
+        unless include_path[path] or include_path["#{path}/"]
+          puts_fail "Jar \"#{path}\" not exists."
+        end
 
-      jars_list[path] || jars_list["#{path}/"]
+        jars_list[path] || jars_list["#{path}/"]
+      else
+        unless jars_list.has_value? path
+          puts_fail "Jar with hash \"#{path}\" not exists."
+        else
+          path
+        end
+      end
     end
 
     if opts.to?
@@ -192,14 +200,10 @@ begin
       @to = "/"
     end
 
-    #TODO: Confirm flag
-    #TODO: Empty destination directory
-
     @index = {}
 
     jars_hashes.each do |hash|
       versions = @backup.jar_versions(hash)
-      # puts "Versions: #{versions}" #FIXME
 
       last_version = Backup::Timestamp.last_from(versions, @end_date, @start_date)
 
@@ -231,7 +235,7 @@ begin
       meta = YAML::load open("/var/tmp/encbs.swap").read
       jar_path, timestamp = meta[:jar_path], meta[:timestamp]
       dirs = @backup.file_item.dir File.expand_path("../", jar_path)
-      
+
       if dirs.include? File.basename(jar_path)
         meta.delete :timestamp
         meta.delete :jar_path
@@ -240,11 +244,11 @@ begin
           "#{jar_path}/#{timestamp}.yml",
           meta.to_yaml
         )
-        
+
         FileUtils.rm "/var/tmp/encbs.swap"
       end
     end
-    
+
     if opts.add?
       paths = opts[:add].split(" ")
     else

data/encbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.2.1.beta2"
+  s.version = "0.2.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Klim"]
-  s.date = %q{2011-06-03}
+  s.date = %q{2011-06-04}
   s.default_executable = %q{encbs}
   s.description = %q{Simple backup system for pushing into cloud}
   s.email = %q{klimtimothy@gmail.com}
@@ -39,12 +39,14 @@ Gem::Specification.new do |s|
     "lib/helpers.rb",
     "test/fixtures/etc/.hide",
     "test/fixtures/etc/root/file",
-    "test/fixtures/test_crypto.rb",
+    "test/fixtures/rsa_key.private",
+    "test/fixtures/rsa_key.public",
     "test/helper.rb",
     "test/test_backup.rb",
     "test/test_backup_file_item.rb",
     "test/test_backup_timestamp.rb",
-    "test/test_jar.rb"
+    "test/test_config.rb",
+    "test/test_crypto.rb"
   ]
   s.homepage = %q{http://github.com/TimothyKlim/encbs}
   s.licenses = ["MIT"]

data/lib/backup/file_item/local.rb

@@ -4,7 +4,7 @@ module Backup
   module FileItem
     class Local < Backup::FileItem::Base
       attr_reader :timeout
-      
+
       def initialize
         @timeout = 0
       end
@@ -27,7 +27,7 @@ module Backup
           f.read
         end if File.exists? file
       end
-      
+
       def timeout= time
       end
 

data/lib/backup/jar.rb

@@ -28,14 +28,14 @@ module Backup
         @local_files.keys.each do |file|
           current = @local_files[file].dup
           current.delete(:timestamp)
-        
+
           unless @last_index[file].nil?
             backup = @last_index[file].dup
             backup.delete(:timestamp)
-        
+
             if (current == backup) or
                (!current[:checksum].nil? and current[:checksum] == backup[:checksum])
-        
+
               @meta_index[file] = @local_files[file]
               @meta_index[file][:timestamp] = @last_index[file][:timestamp]
             end
@@ -72,10 +72,8 @@ module Backup
           @local_files.keys.count
         )
       end
-      
-      pbar.bar_mark = '*'
 
-      #@local_files = @meta_index.select {|k, v| v[:timestamp] == @timestamp if v.is_a? Hash}
+      pbar.bar_mark = '*'
 
       begin
         @local_files.keys.each do |file|
@@ -88,15 +86,15 @@ module Backup
               data = compression.compress(data.read, 3) unless compression.nil?
 
               data = @key.encrypt_to_stream(data) if @key
-              
+
               @file_item.create_file_once(
                 "#{jar_data_path}/#{@file_item.file_hash file}",
                 data
               )
-          
+
               pbar.inc
             end
-        
+
             @meta_index[file] = @local_files[file]
             @meta_index[file][:checksum] = checksum
             @meta_index[file][:timestamp] = @timestamp
@@ -110,7 +108,7 @@ module Backup
         File.open("/var/tmp/encbs.swap", "w") do |f|
           f.puts @meta_index.to_yaml
         end
-        
+
         puts
         puts_fail "Index file has been saved that to allow upload into cloud in next run."
       else
@@ -125,7 +123,7 @@ module Backup
           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}"

data/lib/backup/timestamp.rb

@@ -16,7 +16,7 @@ module Backup
         sec = 59 if sec.nil?
       end
 
-      time = Time.new(year + 2000, month, day, hour, min, sec, 0)
+      time = Time.utc(year + 2000, month, day, hour, min, sec, 0)
     end
 
     def self.last_from(list, end_date, start_date = nil)

data/lib/backup.rb

@@ -33,7 +33,11 @@ module Backup
     end
 
     def rsa_key path, size
-      @key = Crypto::Key.from_file(path, size)
+      if File.exists? path
+        @key = Crypto::Key.from_file(path, size)
+      else
+        @key = nil
+      end
     end
 
     def create! local_path, increment = false, purge_previous = false
@@ -51,6 +55,7 @@ module Backup
 
     def restore_jar_to(hash, timestamp, to)
       files = Jar.fetch_index_for(@file_item, @root_path, hash, timestamp)
+      puts_fail "Jar doesn't exists" if files.nil?
 
       unless files[:checksum].nil?
         if @key.nil? or
@@ -85,7 +90,7 @@ module Backup
           File.chown current_file[:uid], current_file[:gid], restore_file
 
           file_ok = @file_item.stat(restore_file)[restore_file]
-          
+
           check_mode(restore_file, file_ok[:mode], current_file[:mode])
           check_rights(
             restore_file,
@@ -106,7 +111,7 @@ module Backup
               remote_path += "/#{@file_item.file_hash file}"
 
               data = @file_item.read_file(remote_path)
-              data = @key.decrypt_from_stream data if @key
+              data = @key.decrypt_from_stream data.chomp if @key
 
               unless compression.nil?
                 data = compression.decompress(data.chomp).read
@@ -116,7 +121,7 @@ module Backup
             end
 
             file_ok = @file_item.stat(restore_file)[restore_file]
-          
+
             check_mode(restore_file, file_ok[:mode], current_file[:mode])
             check_rights(
               restore_file,

data/lib/crypto.rb

@@ -2,42 +2,42 @@ require 'openssl'
 require 'base64'
 
 module Crypto
-  
   def self.create_keys(priv, pub, bits)
     private_key = OpenSSL::PKey::RSA.new(bits)
     File.open(priv, "w+") { |fp| fp << private_key.to_s }
-    File.open(pub,  "w+") { |fp| fp << private_key.public_key.to_s }    
+    File.open(pub,  "w+") { |fp| fp << private_key.public_key.to_s }
     private_key
   end
-  
+
   class Key
     def initialize(data, size)
       @public = (data =~ /^-----BEGIN (RSA|DSA) PRIVATE KEY-----$/).nil?
       @key = OpenSSL::PKey::RSA.new(data)
       @size = (size == 4096 ? 512 : 256)
     end
-  
+
     def self.from_file(filename, size = 4096)
       self.new(File.read(filename), size)
     end
 
     def encrypt_to_stream(data)
       encrypt_data = StringIO.new
+      data = data.read if data.is_a? StringIO
       i = 0
-  
+
       while buf = data[i..(i+=117)] do
         encrypt_data << encrypt(buf)
       end
-  
+
       encrypt_data.seek 0
       encrypt_data
     end
 
     def decrypt_from_stream(data)
-      encrypt_data = StringIO.new(data.chomp)
+      encrypt_data = StringIO.new data
       encrypt_data.seek 0
       decrypt_data = ""
-  
+
       while buf = encrypt_data.read(@size) do
         decrypt_data += decrypt(buf)
       end
@@ -50,23 +50,23 @@ module Crypto
     rescue Exception => e
       puts_fail "RSA encrypt error: #{e.message}"
     end
-    
+
     def decrypt(text)
       @key.send("#{key_type}_decrypt", text)
      rescue Exception => e
        puts_fail "RSA decrypt error: #{e.message}"
     end
-  
+
     def private?
       !@public
     end
-  
+
     def public?
       @public
     end
-    
+
     def key_type
       @public ? :public : :private
     end
   end
-end
+end

data/test/fixtures/rsa_key.private

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAsSCSU+4EkDC6wGiOOOQ8g5un1/6NRupxXFljghEDzOiNJklL
+yY27EAsmFYw8+Z3KWl2WM9qTB/VxqbXn3CSzjh0bG/cpw8S35d5pARZFbKHGYut+
+K3bl7x8dJ4lQukuNJe8Z8MgNjwm16T2M0DCPTGroHpJducuk/vOH5C1udPvAndpO
+o2Nt28gSqaP2bduQ6aAX5bMKuD2ArW3b5jLMEEuoPPG1w1GNxVfcwO5ggsBy7IJk
+2t4yh42VGkGJ5BbWRnM7zOy6nXxQ7sDZtWAxxOpA4N2l1S9mVk2EsfAco6G/QR3X
+Tyid2yOj+yAfwyhuF+u5K35CbU+7jI47vZGXJwIDAQABAoIBAQCEvDvr2Xph86J/
+fdrWl3MhzQvCuWd1tUquQe5oEggfDkZ4YoUAzc1ZAIHRs/4dsTlq7qcYxLtaQ3yi
+CUdvmbFU1krycg5CPrDw+fMGdYIhHjpk9sTeHYPB5jca4bQ1Z1inDL8LyV8fyc8g
+spdLjJhWU+cOwfCqwwkqZaV4QPN9hcxh8xyMzh7vhAkOGI/1DNNqh3Bk81hWmulF
+wuWCiUetuhl1kbVuFSx68jDEVEp2B2sap6VmNBas+IYCyi7fUvFahRDGaZrHFIZK
+4wSBwMlmOr4qjMUbq/OYgN4jh5VNMZJfZ1drb5XR/Qxj9/Ih9bnk7TLxJld2ShPd
+FI2eTUWBAoGBANlYhMgeiwU9ij5h2c8u/d8XO8yA3+DgOphe4PlybgyvNQ5DFiGM
+gyl31QWoclfsjkxhq1sKqjD2qkQUOKbgaFs5kQVmokYW2YMTP1T3JqVgXXdnn+Tv
+GsnDxQj+An78F9f82aynfz+lXpPP5bT9hftlTrbDa9Q0K+EB+A5Ug/H5AoGBANCg
+8/QxI2iWuE0IxYjhDnCwWWU5r9tvvi98e4/QpGBZR/ABjkrHyR/Jvn6Srr9uh2F0
+WVo5J+Mz0P6QcCD5PzhNBwRXOXoRi1cjjshQm6dLd18ms08tzM6XA3ciclgysxBr
+ihAebhra+P0l6NxQFNANMRbD2SwlMvrSb0G0JBofAoGBAIUCmggKQRPM7Ixuv6f+
+XxknE858VAY/0zwqXE3sDJMwqix3O9T+M8qt7izPQGK0fwUZhI9rwGnEmsCdC2p8
+zQB/A1Ql0ktIcoa3wbtSoVD1311SilTFS0SMzUlKgeaKimEA+Ymi28nsfyvAQBh6
+SoNmJTzN7XBpGS1TUiYa7MCpAoGAasYFNLO1YIDKwDo+BqjQICJRDjpw40iUOG9o
+OZlZlyn6ZD4XmfQX3hn9UYA2ySiDRwAp/sADxwcs7iv0BxwpG+JoNfOCKhQykR1U
+pPaEQyGfbWY8HMje6dhl4KITjUodVMkE9uzsAviQt9agD6k4jaZCuljvm+VJ6w6p
+/CF63JcCgYEAhMRz0pr4OeI5yF2Qyx4EjCLLHSobCYjad0euR0b9hdOBMahHMUrM
+pjqZ7MOOKPUGsJNe1jBmwvSn//GqERa1vBa1VY2E27mtVV51AMTy21lyF2Z6CTqp
+qDf8d1SozgCkK+v9v4DiQmDAHQsGW+1YSH4tu9FFP78tXxTOfYP+Qsg=
+-----END RSA PRIVATE KEY-----

data/test/fixtures/rsa_key.public

@@ -0,0 +1,8 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAsSCSU+4EkDC6wGiOOOQ8g5un1/6NRupxXFljghEDzOiNJklLyY27
+EAsmFYw8+Z3KWl2WM9qTB/VxqbXn3CSzjh0bG/cpw8S35d5pARZFbKHGYut+K3bl
+7x8dJ4lQukuNJe8Z8MgNjwm16T2M0DCPTGroHpJducuk/vOH5C1udPvAndpOo2Nt
+28gSqaP2bduQ6aAX5bMKuD2ArW3b5jLMEEuoPPG1w1GNxVfcwO5ggsBy7IJk2t4y
+h42VGkGJ5BbWRnM7zOy6nXxQ7sDZtWAxxOpA4N2l1S9mVk2EsfAco6G/QR3XTyid
+2yOj+yAfwyhuF+u5K35CbU+7jI47vZGXJwIDAQAB
+-----END RSA PUBLIC KEY-----

data/test/test_backup.rb

@@ -1,11 +1,9 @@
-require File.expand_path("../helper.rb", __FILE__)
+require File.expand_path('../helper', __FILE__)
 
 class TestBackup < Test::Unit::TestCase
   def setup
     @backups_path = File.expand_path("../fixtures/backups", __FILE__)
-
-    FileUtils.rm_r @backups_path, :force => true
-    FileUtils.mkdir_p @backups_path
+    @restore_path = File.expand_path("../fixtures/restore", __FILE__)
 
     @hostname = Socket.gethostname
 
@@ -15,6 +13,26 @@ class TestBackup < Test::Unit::TestCase
     )
   end
 
+  def teardown
+    FileUtils.rm_r @backups_path, :force => true
+    FileUtils.rm_r @restore_path, :force => true
+
+    FileUtils.mkdir_p @backups_path
+    FileUtils.mkdir_p @restore_path
+
+    File.open(File.expand_path('../fixtures/etc/root/file', __FILE__), 'w') do |f|
+      f.puts "Root file\n"
+    end
+  end
+
+  def create_backup! increment = false
+    @local_path = File.expand_path('../fixtures/etc', __FILE__)
+    @local_path_hash = Digest::MD5.hexdigest @local_path
+
+    @timestamp = @backup.create! @local_path, increment, false
+    @back_path = "#{@backups_path}/#{@hostname}"
+  end
+
   def test_backup_attributes
     assert_equal(
       @backup.root_path,
@@ -26,36 +44,131 @@ class TestBackup < Test::Unit::TestCase
   end
 
   def test_create
-    local_path = File.expand_path('../fixtures/etc', __FILE__)
-    local_path_hash = Digest::MD5.hexdigest local_path
+    create_backup!
+
+    assert File.exists?("#{@back_path}")
+    assert File.exists?("#{@back_path}/meta")
+    assert File.exists?("#{@back_path}/meta/#{@local_path_hash}")
+    assert File.exists?("#{@back_path}/meta/#{@local_path_hash}/#{@timestamp}.yml")
+    assert File.exists?("#{@back_path}/meta/jars")
+    assert File.exists?("#{@back_path}/meta/jars/#{@local_path_hash}")
+    assert File.exists?("#{@back_path}/#{@local_path_hash}")
 
-    timestamp = @backup.create! local_path, false, false
-    back_path = "#{@backups_path}/#{@hostname}"
+    assert_equal "#{@local_path}/", open(
+      "#{@back_path}/meta/jars/#{@local_path_hash}"
+    ).read.chomp
 
-    assert File.exists?("#{back_path}")
-    assert File.exists?("#{back_path}/meta")
-    assert File.exists?("#{back_path}/meta/#{local_path_hash}")
-    assert File.exists?("#{back_path}/meta/#{local_path_hash}/#{timestamp}.yml")
-    assert File.exists?("#{back_path}/meta/jars")
-    assert File.exists?("#{back_path}/meta/jars/#{local_path_hash}")
-    assert File.exists?("#{back_path}/#{local_path_hash}")
+    meta_index = YAML::load open(
+      "#{@back_path}/meta/#{@local_path_hash}/#{@timestamp}.yml"
+    ).read
 
-    assert_equal "#{local_path}/", open("#{back_path}/meta/jars/#{local_path_hash}").read.chomp
-    meta_index = YAML::load open("#{back_path}/meta/#{local_path_hash}/#{timestamp}.yml").read
-    assert meta_index.has_key? local_path
+    assert meta_index.has_key? @local_path
 
     root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
     assert_equal open(root_file).read, open(
-      "#{back_path}/#{local_path_hash}/#{timestamp}/#{Digest::MD5.hexdigest root_file}"
+      "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
+    ).read
+  end
+
+  def test_create_with_crypt
+    @backup.rsa_key(
+      File.expand_path('../fixtures/rsa_key.public', __FILE__),
+      2048
+    )
+    private_key = Crypto::Key.from_file(
+      File.expand_path('../fixtures/rsa_key.private', __FILE__),
+      2048
+    )
+
+    create_backup!
+
+    root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
+    root_file_content = open(root_file).read
+
+    root_file_crypt_content = open(
+      "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
+    ).read
+
+    assert_not_equal root_file_content, root_file_crypt_content
+    assert_equal root_file_content, private_key.decrypt_from_stream(
+      root_file_crypt_content.chomp
+    )
+  end
+
+  def test_show_jars
+    create_backup!
+
+    jars = @backup.jars
+
+    assert jars.has_key? "#{@local_path}/"
+    assert_equal jars["#{@local_path}/"], Digest::MD5.hexdigest(@local_path)
+  end
+
+  def test_jar_versions
+    create_backup!
+
+    jar_timestamp = @backup.jar_versions @local_path
+
+    assert_equal @timestamp, jar_timestamp.first
+  end
+
+  def test_restore
+    create_backup!
+    restore_path = File.expand_path '../fixtures/restore', __FILE__
+
+    @backup.restore_jar_to @local_path_hash, @timestamp, restore_path
+
+    assert "#{@restore_path}/#{@local_path}"
+    assert "#{@restore_path}/#{@local_path}/etc/root/file"
+
+    root_file_content = open(
+      File.expand_path '../fixtures/etc/root/file', __FILE__
+    ).read
+    assert_equal root_file_content, open(
+      "#{@restore_path}/#{@local_path}/root/file"
     ).read
   end
 
-  #def test_show_jars
-  #end
+  def test_restore_with_decrypt
+    @backup.rsa_key(
+      File.expand_path('../fixtures/rsa_key.public', __FILE__),
+      2048
+    )
+    create_backup!
 
-  #def test_jar_versions
-  #end
+    restore_path = File.expand_path '../fixtures/restore', __FILE__
+    @backup.rsa_key(
+      File.expand_path('../fixtures/rsa_key.private', __FILE__),
+      2048
+    )
+    @backup.restore_jar_to @local_path_hash, @timestamp, restore_path
+
+    root_file_content = open(
+      File.expand_path '../fixtures/etc/root/file', __FILE__
+    ).read
+    root_file_decrypt_content = open(
+      "#{@restore_path}/#{@local_path}/root/file"
+    ).read
+
+    assert_equal root_file_content, root_file_decrypt_content
+  end
+
+  def test_increment_backup
+    create_backup!
 
-  #def test_restore
-  #end
+    File.open(File.expand_path('../fixtures/etc/root/file', __FILE__), 'w') do |f|
+      f.puts "Changed file\n"
+    end
+
+    sleep 1
+    create_backup! true
+
+    root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
+    root_file_content = open(root_file).read
+
+    assert_equal root_file_content, "Changed file\n"
+    assert_equal root_file_content, open(
+      "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
+    ).read
+  end
 end

data/test/test_backup_file_item.rb

@@ -4,7 +4,7 @@ class BackupFileItemTest < Test::Unit::TestCase
   def setup
     @file_item = Backup::FileItem.for :local
   end
-  
+
   def test_semantic_path
     assert_equal __FILE__, @file_item.semantic_path(__FILE__)
     assert_equal File.dirname(__FILE__) + '/',

data/test/test_backup_timestamp.rb

@@ -1,29 +1,29 @@
-require File.expand_path("../helper", __FILE__)
+require File.expand_path('../helper', __FILE__)
 
 class BackupTimestampTest < Test::Unit::TestCase
   def test_parse_timestamp
     assert_equal Backup::Timestamp.parse_timestamp("110102201130"),
-                 Time.new(2011, 01, 02, 20, 11, 30, 0)
+                 Time.utc(2011, 01, 02, 20, 11, 30, 0)
 
     assert_equal Backup::Timestamp.parse_timestamp("11.01.02. 20:11:30"),
-                 Time.new(2011, 01, 02, 20, 11, 30, 0)
+                 Time.utc(2011, 01, 02, 20, 11, 30, 0)
 
     assert_equal Backup::Timestamp.parse_timestamp("1101022011"),
-                 Time.new(2011, 01, 02, 20, 11, 0, 0)
+                 Time.utc(2011, 01, 02, 20, 11, 0, 0)
     assert_equal Backup::Timestamp.parse_timestamp("11010220"),
-                 Time.new(2011, 01, 02, 20, 0, 0, 0)
+                 Time.utc(2011, 01, 02, 20, 0, 0, 0)
     assert_equal Backup::Timestamp.parse_timestamp("110102"),
-                 Time.new(2011, 01, 02, 0, 0, 0, 0)
+                 Time.utc(2011, 01, 02, 0, 0, 0, 0)
 
     assert_equal Backup::Timestamp.parse_timestamp("1101022011", true),
-                 Time.new(2011, 01, 02, 20, 11, 59, 0)
+                 Time.utc(2011, 01, 02, 20, 11, 59, 0)
     assert_equal Backup::Timestamp.parse_timestamp("11010220", true),
-                 Time.new(2011, 01, 02, 20, 59, 59, 0)
+                 Time.utc(2011, 01, 02, 20, 59, 59, 0)
     assert_equal Backup::Timestamp.parse_timestamp("110102", true),
-                 Time.new(2011, 01, 02, 23, 59, 59, 0)
+                 Time.utc(2011, 01, 02, 23, 59, 59, 0)
 
     assert_not_equal Backup::Timestamp.parse_timestamp("110102201130"),
-                     Time.new(2011, 01, 02, 20, 11, 31, 0)
+                     Time.utc(2011, 01, 02, 20, 11, 31, 0)
 
     assert_raise(RuntimeError) { Backup::Timestamp.parse_timestamp("11d10.,130") }
   end
@@ -57,15 +57,15 @@ class BackupTimestampTest < Test::Unit::TestCase
   end
 
   def test_create_timestamp
-    time = Time.new(2011, 01, 02, 23, 59, 59, 0)
+    time = Time.utc(2011, 01, 02, 23, 59, 59, 0)
 
     assert_equal(Backup::Timestamp.create.length, 12)
     assert_equal(Backup::Timestamp.create(time), "110102235959")
   end
-  
+
   def test_formatted_timestamp
-    time = Time.new(2011, 01, 02, 23, 59, 30, 0)
-    
+    time = Time.utc(2011, 01, 02, 23, 59, 30, 0)
+
     assert_equal Backup::Timestamp.to_s(time), "11.01.02 23:59:30"
     assert_equal Backup::Timestamp.to_s(51), nil
     assert_equal Backup::Timestamp.to_str("110102235930"), "11.01.02 23:59:30"

data/test/test_config.rb

@@ -0,0 +1,4 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestConfig < Test::Unit::TestCase
+end

data/test/test_crypto.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestCrypto < Test::Unit::TestCase
+  def setup
+    @fixtures = File.expand_path('../fixtures/rsa_keys', __FILE__)
+
+    FileUtils.rm_r @fixtures, :force => true
+    FileUtils.mkdir_p @fixtures
+  end
+
+  def create_keys!(bits = 4096)
+    Crypto.create_keys("#{@fixtures}/rsa_key", "#{@fixtures}/rsa_key.pub", bits)
+  end
+
+  def load_keys
+    @priv_key = Crypto::Key.from_file("#{@fixtures}/rsa_key")
+    @pub_key =  Crypto::Key.from_file("#{@fixtures}/rsa_key.pub")
+	end
+
+  def test_create_keys
+    create_keys!
+
+    assert_not_nil File.open("#{@fixtures}/rsa_key").read
+    assert_not_nil File.open("#{@fixtures}/rsa_key.pub").read
+  end
+end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: encbs
 version: !ruby/object:Gem::Version
-  version: 0.2.1.beta2
-  prerelease: 6
+  version: 0.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Timothy Klim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-03 00:00:00.000000000 +04:00
+date: 2011-06-04 00:00:00.000000000 +04:00
 default_executable: encbs
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2159701080 !ruby/object:Gem::Requirement
+  requirement: &2155354360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159701080
+  version_requirements: *2155354360
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &2159700480 !ruby/object:Gem::Requirement
+  requirement: &2155353860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159700480
+  version_requirements: *2155353860
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &2159699880 !ruby/object:Gem::Requirement
+  requirement: &2155353340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159699880
+  version_requirements: *2155353340
 - !ruby/object:Gem::Dependency
   name: lzoruby
-  requirement: &2159699300 !ruby/object:Gem::Requirement
+  requirement: &2155352820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159699300
+  version_requirements: *2155352820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159698720 !ruby/object:Gem::Requirement
+  requirement: &2155352300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2159698720
+  version_requirements: *2155352300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2159698140 !ruby/object:Gem::Requirement
+  requirement: &2155351700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2159698140
+  version_requirements: *2155351700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2159697600 !ruby/object:Gem::Requirement
+  requirement: &2155351100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *2159697600
+  version_requirements: *2155351100
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2159697080 !ruby/object:Gem::Requirement
+  requirement: &2155350480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159697080
+  version_requirements: *2155350480
 description: Simple backup system for pushing into cloud
 email: klimtimothy@gmail.com
 executables:
@@ -129,12 +129,14 @@ files:
 - lib/helpers.rb
 - test/fixtures/etc/.hide
 - test/fixtures/etc/root/file
-- test/fixtures/test_crypto.rb
+- test/fixtures/rsa_key.private
+- test/fixtures/rsa_key.public
 - test/helper.rb
 - test/test_backup.rb
 - test/test_backup_file_item.rb
 - test/test_backup_timestamp.rb
-- test/test_jar.rb
+- test/test_config.rb
+- test/test_crypto.rb
 has_rdoc: true
 homepage: http://github.com/TimothyKlim/encbs
 licenses:
@@ -151,13 +153,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2054393209983335340
+      hash: 59491317708756896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2

data/test/fixtures/test_crypto.rb

@@ -1,23 +0,0 @@
-require File.expand_path('../helper', __FILE__)
-
-class TestCrypto < Test::Unit::TestCase
-  def fixtures
-    File.expand_path('../fixtures/rsa_keys', __FILE__)
-	end
-
-  def create_keys!(bits = 4096)
-    Crypto.create_keys("#{fixtures}/rsa_key", "#{fixtures}/rsa_key.pub", bits)
-  end
-
-  def load_keys
-    @priv_key = Crypto::Key.from_file("#{fixtures}/rsa_key")
-    @pub_key =  Crypto::Key.from_file("#{fixtures}/rsa_key.pub")
-	end
-
-  def test_create_keys
-    create_keys!
-
-    assert_not_nil File.open("#{fixtures}/rsa_key").read
-    assert_not_nil File.open("#{fixtures}/rsa_key.pub").read
-  end
-end