encbs 0.2.1 → 0.2.2

data/Gemfile

@@ -6,7 +6,7 @@ gem "ruby-progressbar"
 gem "lzoruby"
 
 group :development do
-  gem "rake", "0.8.4"
+  gem "rake", "~> 0.8"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.6.0"
   gem "rcov", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/encbs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Timothy Klim"]
@@ -37,13 +37,17 @@ Gem::Specification.new do |s|
     "lib/crypto.rb",
     "lib/encbsconfig.rb",
     "lib/helpers.rb",
+    "test/cloudrc.yml.example",
+    "test/fixtures/Encbsfile.example",
     "test/fixtures/etc/.hide",
     "test/fixtures/etc/root/file",
     "test/fixtures/rsa_key.private",
     "test/fixtures/rsa_key.public",
     "test/helper.rb",
-    "test/test_backup.rb",
+    "test/test_archive.rb",
+    "test/test_backup_cloud.rb",
     "test/test_backup_file_item.rb",
+    "test/test_backup_local.rb",
     "test/test_backup_timestamp.rb",
     "test/test_config.rb",
     "test/test_crypto.rb"
@@ -51,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/TimothyKlim/encbs}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Simple backup system for pushing into cloud}
 
   if s.respond_to? :specification_version then
@@ -62,7 +66,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<slop>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-progressbar>, [">= 0"])
       s.add_runtime_dependency(%q<lzoruby>, [">= 0"])
-      s.add_development_dependency(%q<rake>, ["= 0.8.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -71,7 +75,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<slop>, [">= 0"])
       s.add_dependency(%q<ruby-progressbar>, [">= 0"])
       s.add_dependency(%q<lzoruby>, [">= 0"])
-      s.add_dependency(%q<rake>, ["= 0.8.4"])
+      s.add_dependency(%q<rake>, ["~> 0.8"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -81,7 +85,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<slop>, [">= 0"])
     s.add_dependency(%q<ruby-progressbar>, [">= 0"])
     s.add_dependency(%q<lzoruby>, [">= 0"])
-    s.add_dependency(%q<rake>, ["= 0.8.4"])
+    s.add_dependency(%q<rake>, ["~> 0.8"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.0"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/archive.rb

@@ -8,7 +8,7 @@ module GZIP
     z.close
     dst
   end
-  
+
   def self.decompress string
     zstream = Zlib::Inflate.new
     buf = zstream.inflate string
@@ -22,11 +22,12 @@ class Archive
   attr_reader :type
 
   def initialize type
-    puts_fail "Unsupported type" unless [:lzo, :gzip].include? type.downcase
-    instance_eval %{@type = #{type.to_s.upcase}}
+    type = type.to_s
+    puts_fail "Unsupported type" unless %w[lzo gzip].include? type.downcase
+    instance_eval %{@type = #{type.upcase}}
   end
-  
+
   def method_missing name, *args
     StringIO.new @type.send(name, *args)
   end
-end
+end

data/lib/backup/file_item/cloud.rb

@@ -53,6 +53,15 @@ module Backup
         end
       end
 
+      def exists? file
+        try_to_work_with_cloud do
+          !@directory.files.all(
+            :prefix => file,
+            :max_keys => 1
+          ).nil?
+        end
+      end
+
       def read_file(file)
         try_to_work_with_cloud do
           file = delete_slashes(file)

data/lib/backup/file_item/local.rb

@@ -15,10 +15,14 @@ module Backup
         end
       end
 
+      def exists? file
+        File.exists? file
+      end
+
       def create_file_once file, data
         data = data.read if data.is_a? File or data.is_a? StringIO
         File.open(file, 'wb') do |f|
-          f.puts(data)
+          f.print(data)
         end unless File.exists?(file)
       end
 

data/lib/backup/jar.rb

@@ -106,7 +106,7 @@ module Backup
           :timestamp => @timestamp
         })
         File.open("/var/tmp/encbs.swap", "w") do |f|
-          f.puts @meta_index.to_yaml
+          f.print @meta_index.to_yaml
         end
 
         puts
@@ -158,7 +158,7 @@ module Backup
 
     class << self
       def hash_to_path(file_item, root_path, hash)
-        file_item.read_file("#{root_path}/meta/jars/#{hash}").chomp
+        file_item.read_file("#{root_path}/meta/jars/#{hash}")
       rescue Errno::ENOENT
         ""
       end

data/lib/backup.rb

@@ -111,13 +111,13 @@ module Backup
               remote_path += "/#{@file_item.file_hash file}"
 
               data = @file_item.read_file(remote_path)
-              data = @key.decrypt_from_stream data.chomp if @key
+              data = @key.decrypt_from_stream data if @key
 
               unless compression.nil?
-                data = compression.decompress(data.chomp).read
+                data = compression.decompress(data).read
               end
 
-              f.puts data
+              f.print data
             end
 
             file_ok = @file_item.stat(restore_file)[restore_file]

data/lib/encbsconfig.rb

@@ -34,7 +34,7 @@ class EncbsConfig
   def increment!
     @increment = true
   end
-  
+
   def use_compression attr
     @compression = attr
   end
@@ -58,7 +58,7 @@ class EncbsConfig
   def verbose!
     @verbose = true
   end
-  
+
   def set_timeout attr
     @timeout = attr
   end

data/lib/helpers.rb

@@ -34,7 +34,7 @@ end
 
 def create_lock
   open("/tmp/encbs.lock", "w") do |f|
-    f.puts Process.pid
+    f.print Process.pid
   end
 end
 

data/test/cloudrc.yml.example

@@ -0,0 +1,4 @@
+bucket: "encbs"
+directory: "encbs_test_backups"
+key: "Amazon API Key"
+secret: "Amazon Secret Key"

data/test/fixtures/Encbsfile.example

@@ -0,0 +1,14 @@
+add "~/.oh-my-zsh"
+add "~/.zshrc"
+aws_bucket "encbs"
+aws_key "AWS_KEY"
+aws_secret "AWS_SECRET"
+colorize!
+increment!
+key_size 2048
+public_key "~/rsa_key.pub"
+purge!
+set_timeout 1000
+use_compression "gzip"
+use_hostname "Yeah"
+verbose!

data/test/helper.rb

@@ -13,7 +13,9 @@ require 'base64'
 require 'lzoruby'
 require 'zlib'
 
+require 'fog'
 require 'backup'
+require 'encbsconfig'
 
 def puts_fail msg
   raise msg

data/test/test_archive.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestArchive < Test::Unit::TestCase
+  def setup
+    @original = "Yeah" * 100
+  end
+
+  def test_gzip
+    gzip = Archive.new :gzip
+
+    compressed = (gzip.compress @original, 9).read
+    decompressed = (gzip.decompress compressed).read
+
+    assert compressed.length < @original.length
+
+    assert_equal @original, decompressed
+
+    assert_not_nil compressed
+    assert_not_nil decompressed
+
+    assert_not_equal @original, compressed
+    assert_not_equal decompressed, compressed
+  end
+
+  def test_lzo
+    lzo = Archive.new :lzo
+
+    compressed = (lzo.compress @original, 9).read
+    decompressed = (lzo.decompress compressed).read
+
+    assert compressed.length < @original.length
+
+    assert_equal @original, decompressed
+
+    assert_not_nil compressed
+    assert_not_nil decompressed
+
+    assert_not_equal @original, compressed
+    assert_not_equal decompressed, compressed
+  end
+end

data/test/test_backup_cloud.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../helper', __FILE__)
+require File.expand_path('../test_backup_local', __FILE__)
+
+class TestCloudBackup < TestLocalBackup
+  def setup
+    @restore_path = File.expand_path("../fixtures/restore", __FILE__)
+    @hostname = Socket.gethostname
+
+    cloud_rc = YAML::load open(
+      File.expand_path "../cloudrc.yml", __FILE__
+    ).read
+
+    @backups_path = cloud_rc["directory"]
+    @backup = Backup::Instance.new(
+      @backups_path,
+      true,
+      :key => cloud_rc["key"],
+      :secret => cloud_rc["secret"],
+      :bucket => cloud_rc["bucket"]
+    )
+  end
+
+  def teardown
+    FileUtils.rm_r @restore_path, :force => true
+    FileUtils.mkdir_p @restore_path
+
+    File.open(File.expand_path('../fixtures/etc/root/file', __FILE__), 'w') do |f|
+      f.puts "Root file\n"
+    end
+
+    @backup.file_item.delete_dir @backups_path
+  end
+
+  def test_backup_attributes
+    assert_equal(
+      @backup.root_path,
+      "#{@backups_path}/#{@hostname}"
+    )
+    assert_equal @backup.hostname, @hostname
+    assert_equal @backup.file_item.class, Backup::FileItem::Cloud
+    assert_not_nil @backup.timestamp
+  end
+end

data/test/{test_backup.rb → test_backup_local.rb}

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-class TestBackup < Test::Unit::TestCase
+class TestLocalBackup < Test::Unit::TestCase
   def setup
     @backups_path = File.expand_path("../fixtures/backups", __FILE__)
     @restore_path = File.expand_path("../fixtures/restore", __FILE__)
@@ -25,11 +25,11 @@ class TestBackup < Test::Unit::TestCase
     end
   end
 
-  def create_backup! increment = false
+  def create_backup! increment = false, purge = false
     @local_path = File.expand_path('../fixtures/etc', __FILE__)
     @local_path_hash = Digest::MD5.hexdigest @local_path
 
-    @timestamp = @backup.create! @local_path, increment, false
+    @timestamp = @backup.create! @local_path, increment, purge
     @back_path = "#{@backups_path}/#{@hostname}"
   end
 
@@ -46,28 +46,55 @@ class TestBackup < Test::Unit::TestCase
   def test_create
     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}")
+    assert @backup.file_item.exists?("#{@back_path}/meta/#{@local_path_hash}/#{@timestamp}.yml")
+    assert @backup.file_item.exists?("#{@back_path}/meta/jars/#{@local_path_hash}")
+    assert @backup.file_item.exists?("#{@back_path}/#{@local_path_hash}")
 
-    assert_equal "#{@local_path}/", open(
+    assert_equal "#{@local_path}/", @backup.file_item.read_file(
       "#{@back_path}/meta/jars/#{@local_path_hash}"
-    ).read.chomp
+    )
 
-    meta_index = YAML::load open(
+    meta_index = YAML::load @backup.file_item.read_file(
       "#{@back_path}/meta/#{@local_path_hash}/#{@timestamp}.yml"
-    ).read
+    )
 
     assert meta_index.has_key? @local_path
 
     root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
-    assert_equal open(root_file).read, open(
+    assert_equal open(root_file).read, @backup.file_item.read_file(
       "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
-    ).read
+    )
+  end
+
+  def test_create_with_compress
+    @backup.compression = "gzip"
+    create_backup!
+
+    meta_index = YAML::load @backup.file_item.read_file(
+      "#{@back_path}/meta/#{@local_path_hash}/#{@timestamp}.yml"
+    )
+
+    assert meta_index.has_key? :compression
+    assert_equal meta_index[:compression], 'GZIP'
+
+    root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
+    assert_not_equal open(root_file).read, @backup.file_item.read_file(
+      "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
+    )
+  end
+
+  def test_create_with_purge_previous
+    create_backup!
+    previous_timestamp = @timestamp.dup
+
+    sleep 1
+    create_backup! false, true
+
+    versions = @backup.jar_versions @local_path
+
+    assert_equal versions.length, 1
+    assert_equal versions.first, @timestamp
+    assert_not_equal @timestamp, previous_timestamp
   end
 
   def test_create_with_crypt
@@ -85,13 +112,13 @@ class TestBackup < Test::Unit::TestCase
     root_file = File.expand_path '../fixtures/etc/root/file', __FILE__
     root_file_content = open(root_file).read
 
-    root_file_crypt_content = open(
+    root_file_crypt_content = @backup.file_item.read_file(
       "#{@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
+      root_file_crypt_content
     )
   end
 
@@ -167,8 +194,8 @@ class TestBackup < Test::Unit::TestCase
     root_file_content = open(root_file).read
 
     assert_equal root_file_content, "Changed file\n"
-    assert_equal root_file_content, open(
+    assert_equal root_file_content, @backup.file_item.read_file(
       "#{@back_path}/#{@local_path_hash}/#{@timestamp}/#{Digest::MD5.hexdigest root_file}"
-    ).read
+    )
   end
 end

data/test/test_config.rb

@@ -1,4 +1,27 @@
 require File.expand_path('../helper', __FILE__)
 
 class TestConfig < Test::Unit::TestCase
+  def setup
+    @config = EncbsConfig.new
+    @config.load File.expand_path('../fixtures/Encbsfile.example', __FILE__)
+  end
+
+  def test_load
+    assert @config.colorize
+    assert @config.increment
+    assert @config.paths.include?('~/.oh-my-zsh')
+    assert @config.paths.include?('~/.zshrc')
+    assert @config.verbose
+
+    assert_nil @config.purge
+
+    assert_equal @config.bucket, 'encbs'
+    assert_equal @config.compression, 'gzip'
+    assert_equal @config.hostname, 'Yeah'
+    assert_equal @config.key, 'AWS_KEY'
+    assert_equal @config.secret, 'AWS_SECRET'
+    assert_equal @config.size, 2048
+    assert_equal @config.timeout, 1000
+    assert_equal @config.token, '~/rsa_key.pub'
+  end
 end

metadata

@@ -1,114 +1,150 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: encbs
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Timothy Klim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-04 00:00:00.000000000 +04:00
+
+date: 2011-06-04 00:00:00 +04:00
 default_executable: encbs
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: fog
-  requirement: &2155354360 !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155354360
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: slop
-  requirement: &2155353860 !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155353860
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: ruby-progressbar
-  requirement: &2155353340 !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155353340
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: lzoruby
-  requirement: &2155352820 !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155352820
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: &2155352300 !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-  type: :development
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155352300
-- !ruby/object:Gem::Dependency
+  type: :development
   name: bundler
-  requirement: &2155351700 !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155351700
-- !ruby/object:Gem::Dependency
+  type: :development
   name: jeweler
-  requirement: &2155351100 !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-  type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *2155351100
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rcov
-  requirement: &2155350480 !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2155350480
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id008
 description: Simple backup system for pushing into cloud
 email: klimtimothy@gmail.com
-executables:
+executables: 
 - encbs
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -127,43 +163,53 @@ files:
 - lib/crypto.rb
 - lib/encbsconfig.rb
 - lib/helpers.rb
+- test/cloudrc.yml.example
+- test/fixtures/Encbsfile.example
 - test/fixtures/etc/.hide
 - test/fixtures/etc/root/file
 - test/fixtures/rsa_key.private
 - test/fixtures/rsa_key.public
 - test/helper.rb
-- test/test_backup.rb
+- test/test_archive.rb
+- test/test_backup_cloud.rb
 - test/test_backup_file_item.rb
+- test/test_backup_local.rb
 - test/test_backup_timestamp.rb
 - test/test_config.rb
 - test/test_crypto.rb
 has_rdoc: true
 homepage: http://github.com/TimothyKlim/encbs
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 59491317708756896
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simple backup system for pushing into cloud
 test_files: []
+