encbs 0.2.1.beta1 → 0.2.1.beta2

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
-gem "fog"
+gem "fog", :git => "git://github.com/TimothyKlim/fog.git"
 gem "slop"
 gem "ruby-progressbar"
 gem "lzoruby"
 
 group :development do
   gem "rake", "0.8.4"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.0"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.6.0"
   gem "rcov", ">= 0"
-end
+end

data/VERSION

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

data/encbs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{encbs}
-  s.version = "0.2.1.beta1"
+  s.version = "0.2.1.beta2"
 
   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-24}
+  s.date = %q{2011-06-03}
   s.default_executable = %q{encbs}
   s.description = %q{Simple backup system for pushing into cloud}
   s.email = %q{klimtimothy@gmail.com}
@@ -61,8 +61,8 @@ Gem::Specification.new do |s|
       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<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      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"])
     else
       s.add_dependency(%q<fog>, [">= 0"])
@@ -70,8 +70,8 @@ Gem::Specification.new do |s|
       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<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
@@ -80,8 +80,8 @@ Gem::Specification.new do |s|
     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<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/lib/backup/file_item/base.rb

@@ -2,7 +2,7 @@ module Backup
 	module FileItem
   	class Base
       def semantic_path(path)
-        if Dir.exists? path
+        if File.directory? path
           path += '/'
         else
           path
@@ -18,7 +18,7 @@ module Backup
           :gid => stat.gid,
           :mode => stat.mode
         }
-        unless Dir.exists?(file)
+        unless File.directory? file
           files[file][:checksum] = Digest::MD5.hexdigest File.open(file, 'rb').read
         end
 

data/lib/backup/file_item/local.rb

@@ -11,17 +11,21 @@ module Backup
 
       def create_directory_once *directories
         directories.each do |path|
-          FileUtils.mkdir_p(path) unless Dir.exists?(path)
+          FileUtils.mkdir_p(path) unless File.directory? path
         end
       end
 
       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)
+        File.open(file, 'wb') do |f|
+          f.puts(data)
+        end unless File.exists?(file)
       end
 
       def read_file file
-        File.open(file, 'rb').read if File.exists? file
+        File.open(file, 'rb') do |f|
+          f.read
+        end if File.exists? file
       end
       
       def timeout= time

data/lib/backup/jar.rb

@@ -80,7 +80,7 @@ module Backup
       begin
         @local_files.keys.each do |file|
           if @meta_index[file].nil?
-            unless Dir.exists?(file)
+            unless File.directory? file
               data = StringIO.new File.open(file, 'rb').read
               checksum = Digest::MD5.hexdigest(data.read)
 
@@ -132,12 +132,14 @@ module Backup
           end
         end
       end
+
+      @timestamp
     end
 
     def hash_local_files
       files = {}
 
-      if Dir.exists? @local_path
+      if File.directory? @local_path
         matches = Dir.glob(File.join(@local_path, "/**/*"), File::FNM_DOTMATCH)
 
         matches = matches.select do |match|

data/lib/helpers.rb

@@ -14,7 +14,7 @@ end
 
 def try_create_dir(dir)
   begin
-    FileUtils.mkdir_p dir unless Dir.exists? dir
+    FileUtils.mkdir_p dir unless File.directory? dir
   rescue Errno::EACCES
     puts_fail "Permission denied for #{dir.dark_green}"
   end

data/test/test_backup.rb

@@ -1,35 +1,61 @@
 require File.expand_path("../helper.rb", __FILE__)
 
 class TestBackup < Test::Unit::TestCase
-	def setup
+  def setup
+    @backups_path = File.expand_path("../fixtures/backups", __FILE__)
+
+    FileUtils.rm_r @backups_path, :force => true
+    FileUtils.mkdir_p @backups_path
+
+    @hostname = Socket.gethostname
+
     @backup = Backup::Instance.new(
-      File.expand_path("../fixtures/backups", __FILE__),
+      @backups_path,
       false
     )
   end
-  
+
   def test_backup_attributes
-    hostname = Socket.gethostname
-    file = File.expand_path("../fixtures/backups", __FILE__)
-    
     assert_equal(
       @backup.root_path,
-      "#{file}/#{hostname}"
+      "#{@backups_path}/#{@hostname}"
     )
-    assert_equal @backup.hostname, Socket.gethostname
+    assert_equal @backup.hostname, @hostname
     assert_equal @backup.file_item.class, Backup::FileItem::Local
     assert_not_nil @backup.timestamp
   end
-  
+
   def test_create
+    local_path = File.expand_path('../fixtures/etc', __FILE__)
+    local_path_hash = Digest::MD5.hexdigest local_path
+
+    timestamp = @backup.create! local_path, false, false
+    back_path = "#{@backups_path}/#{@hostname}"
+
+    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_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
+
+    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}"
+    ).read
   end
-  
-  def test_show_jars
-  end
-  
-  def test_jar_versions
-  end
-  
-  def test_restore
-  end
-end
+
+  #def test_show_jars
+  #end
+
+  #def test_jar_versions
+  #end
+
+  #def test_restore
+  #end
+end

metadata

@@ -1,116 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: encbs
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1.beta2
   prerelease: 6
-  version: 0.2.1.beta1
 platform: ruby
-authors: 
+authors:
 - Timothy Klim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-24 00:00:00 +04:00
+date: 2011-06-03 00:00:00.000000000 +04:00
 default_executable: encbs
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fog
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2159701080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159701080
+- !ruby/object:Gem::Dependency
   name: slop
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2159700480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159700480
+- !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2159699880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159699880
+- !ruby/object:Gem::Dependency
   name: lzoruby
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2159699300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159699300
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2159698720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159698720
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2159698140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159698140
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2159697600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2159697600
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2159697080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *2159697080
 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
@@ -139,34 +137,31 @@ files:
 - test/test_jar.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 
-      hash: 3992220995732622958
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2054393209983335340
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple backup system for pushing into cloud
 test_files: []
-