cfbackup 0.8.0 → 0.8.1

data/CHANGELOG.markdown

@@ -1,6 +1,10 @@
 CFBackup ChangeLog
 ==================
 
+0.8.1 2010-0719
+-----------------
+* Bugfix: Files not in working directory can't be uploaded [bug #17] props kaerast
+
 0.8.0 2010-01-20
 -----------------
 * Code documented

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:patch: 1
 :major: 0
-:minor: 8
-:patch: 0
 :build: 
+:minor: 8

data/cfbackup.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cfbackup}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jon Stacey"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-07-19}
   s.default_executable = %q{cfbackup}
   s.description = %q{A simple ruby program intended to serve as a useful tool for automated backups to Mosso Cloud Files.}
   s.email = %q{jon@jonsview.com}
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
      "temp/README",
      "test/cfbackup_test.rb",
      "test/cfconfig.yml",
+     "test/data/cwd_bug_17/bug_17.txt",
      "test/data/data.txt",
      "test/data/folder_1/file1.txt",
      "test/data/folder_1/file2.txt",
@@ -47,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jmstacey/cfbackup}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple ruby program intended to serve as a useful tool for automated backups to Mosso Cloud Files.}
   s.test_files = [
     "test/cfbackup_test.rb",
@@ -58,7 +59,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<cloudfiles>, [">= 1.4.4"])
       s.add_runtime_dependency(%q<gemcutter>, [">= 0.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])

data/lib/cfbackup.rb

@@ -182,7 +182,8 @@ class CFBackup
     pwd  = Dir.getwd # Save current directory so we can come back
     
     if FileTest::file?(path)
-      glob_options = File.join(File::basename(path))
+      Dir.chdir(File.dirname(path))
+      glob_options = File.basename(path)
     elsif @opts.options.recursive
       Dir.chdir(path)
       glob_options = File.join("**", "*")

data/test/cfbackup_test.rb

@@ -2,6 +2,10 @@
 
 require 'test_helper'
 
+# todo: finish bug 17 tests
+# Assert everything by creating a Cloudfiles object and verifying file
+# integrity
+
 # CFBackup test class
 class CfbackupTest < Test::Unit::TestCase
   TEST_DIR = 'test/tmp' # Test directory
@@ -55,6 +59,25 @@ class CfbackupTest < Test::Unit::TestCase
       end
     end
     
+    context "with a single file push not in CWD [Bug #17]" do
+      setup do
+        File.copy('test/data/cwd_bug_17/bug_17.txt', '/tmp/cfbackup_bug_17.txt')
+        assert File.exist?('/tmp/cfbackup_bug_17.txt')
+        
+        mock_ARGV = ['--action', 'push', '--local_path', '/tmp/cfbackup_bug_17.txt', '--container', 'test', '--config_file', 'test/cfconfig.yml', '-v']
+        @backup = CFBackup.new(mock_ARGV)
+      end
+
+      should "return true when file sucessfully sent" do
+        assert @backup.run
+      end
+      
+      # should "result in file being pushed" do
+      #   # Assert file uploaded
+      # end
+      
+    end
+    
     context "with a recursive directory push" do
       setup do
         mock_ARGV = ['--action', 'push', '-r', '--local_path', 'test/data', '--container', 'test', '--config_file', 'test/cfconfig.yml', '-v']
@@ -82,23 +105,36 @@ class CfbackupTest < Test::Unit::TestCase
         @backup = CFBackup.new(mock_ARGV)
       end
   
-      should "return true when file succesfully pulled" do
+      should "return true and cause the file to exist" do
         assert @backup.run
+        assert File.exist?(filepath)
       end
   
-      # I don't know why this doesn't work. It's like File is caching results
-      # and not updating until the applicaiton exists. Overcoming by
-      # asserting the file deletion during teardown at the loss of shoulda
-      #
-      # should "result in test/tmp/#{file} existing" do      
-      #   assert File.exist?(filepath)
-      # end
-  
       teardown do
         assert File.delete(filepath)
       end
     end
     
+    context "with a single file pull not in CWD [Bug #17]" do
+      file     = 'folder_1/folder_3/file1.txt';
+      filepath = File.join(TEST_DIR, File::basename(file))
+      
+      setup do
+        mock_ARGV = ['--action', 'pull', '--container', "test:#{file}", '--local_path', "#{filepath}", '--config_file', 'test/cfconfig.yml', '-v']
+        @backup = CFBackup.new(mock_ARGV)
+      end
+      
+      should "return true and cause the file to exist" do
+        assert @backup.run
+        assert File.exist?(filepath)
+      end
+      
+      teardown do
+        assert File.delete(filepath)
+      end
+      
+    end
+    
     context "with a recursive pull" do    
       setup do
         mock_ARGV = ['--action', 'pull', '--container', "test", '--local_path', "test/tmp", '--config_file', 'test/cfconfig.yml', '-v']

data/test/data/cwd_bug_17/bug_17.txt

@@ -0,0 +1,5 @@
+Test file
+for
+bug #17:
+
+Single file pushes of files outside of the CWD don't work

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfbackup
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  hash: 61
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jon Stacey
@@ -9,49 +15,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -06:00
+date: 2010-07-19 00:00:00 -05:00
 default_executable: cfbackup
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cloudfiles
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 description: A simple ruby program intended to serve as a useful tool for automated backups to Mosso Cloud Files.
 email: jon@jonsview.com
 executables: 
@@ -79,6 +105,7 @@ files:
 - temp/README
 - test/cfbackup_test.rb
 - test/cfconfig.yml
+- test/data/cwd_bug_17/bug_17.txt
 - test/data/data.txt
 - test/data/folder_1/file1.txt
 - test/data/folder_1/file2.txt
@@ -96,21 +123,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple ruby program intended to serve as a useful tool for automated backups to Mosso Cloud Files.