sweety_backy 0.0.15 → 0.0.17

data/Gemfile.lock

@@ -1,20 +1,28 @@
 PATH
   remote: .
   specs:
-    sweety_backy (0.0.13)
-      s3
+    sweety_backy (0.0.15)
+      aws-sdk
 
 GEM
   remote: http://rubygems.org/
   specs:
+    aws-sdk (1.1.1)
+      httparty (~> 0.7)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+      uuidtools (~> 2.1)
     chronic (0.6.2)
+    crack (0.1.8)
     delorean (1.1.0)
       chronic
+    httparty (0.7.8)
+      crack (= 0.1.8)
+    json (1.5.3)
     mocha (0.9.12)
-    proxies (0.2.1)
+    nokogiri (1.5.0)
     rake (0.9.2)
-    s3 (0.3.8)
-      proxies (~> 0.2.0)
+    uuidtools (2.1.2)
 
 PLATFORMS
   ruby

data/lib/sweety_backy.rb

@@ -1,8 +1,8 @@
 begin
-  require 's3'
+  require 'aws-sdk'
 rescue LoadError
   require 'rubygems'
-  require 's3'
+  require 'aws-sdk'
 end
 
 require 'digest/md5'

data/lib/sweety_backy/s3.rb

@@ -1,32 +1,30 @@
 module SweetyBacky
   class S3
-    def self.upload( path, backup_path, opts )
-      SweetyBacky::Utils.log( "S3 uploading: #{path} to #{opts[:bucket]}/#{backup_path}" )
+    def self.upload( path, s3_path, opts )
+      SweetyBacky::Utils.log( "S3 uploading: #{path} to #{opts[:bucket]}/#{s3_path}" )
       
-      s3 = ::S3::Service.new( read_s3_password( opts[:passwd_file] ) )
-      bucket = s3.bucket( opts[:bucket] )
+      s3 = AWS::S3.new( read_s3_password( opts[:passwd_file] ) )
+      bucket = s3.buckets[ opts[:bucket] ]
       
       if !bucket.exists?
-        bucket = s3.buckets.build( opts[:bucket] )
-        bucket.save
+        bucket = s3.buckets.create( opts[:bucket] )
       end
 
-      object = bucket.objects.build( backup_path )
-      object.content = File.open( path )
-      object.save
+      object = bucket.objects.create( s3_path )
+      object.write( :file => path )
     end
     
     def self.object( path, opts )
-      s3 = ::S3::Service.new( read_s3_password( opts[:passwd_file] ) )
-      bucket = s3.buckets.find( opts[:bucket] )
-      object = bucket.objects.find( path )
+      s3 = AWS::S3.new( read_s3_password( opts[:passwd_file] ) )
+      bucket = s3.buckets[ opts[:bucket] ]
+      object = bucket.objects[ path ]
       
-      return object
+      object
     end
     
     def self.paths_in( path, opts )
-      s3 = ::S3::Service.new( read_s3_password( opts[:passwd_file] ) )
-      bucket = s3.buckets.find( opts[:bucket] )
+      s3 = AWS::S3.new( read_s3_password( opts[:passwd_file] ) )
+      bucket = s3.buckets[ opts[:bucket] ]
       
       regex = Regexp.escape( path ).gsub('\*', '.*').gsub('\?', '.')
       
@@ -49,7 +47,7 @@ module SweetyBacky
     end
     
     def self.delete( path, opts )
-      SweetyBacky::S3.object( path, opts ).destroy
+      SweetyBacky::S3.object( path, opts ).delete
     end
     
   end

data/lib/sweety_backy/version.rb

@@ -1,3 +1,3 @@
 module SweetyBacky
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

data/sweety_backy.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "delorean"
   s.add_development_dependency "rake"
   
-  s.add_dependency "s3"
+  s.add_dependency "aws-sdk"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/s3/commander_s3_test.rb

@@ -21,14 +21,13 @@ class CommanderS3Test < Test::Unit::TestCase
       :working_path => @tmp_dir
     }
     
-    s3 = ::S3::Service.new( SweetyBacky::S3.read_s3_password( @opts[:s3_opts][:passwd_file] ) )
+    s3 = AWS::S3.new( SweetyBacky::S3.read_s3_password( @opts[:s3_opts][:passwd_file] ) )
         
-    @bucket = s3.buckets.build( @opts[:s3_opts][:bucket] )
-    @bucket.save
+    @bucket = s3.buckets.create( @opts[:s3_opts][:bucket] )
   end
 
   def teardown
-    @bucket.destroy( true )
+    @bucket.delete!
   end
 
   def test_clean    

data/test/s3/runner_s3_test.rb

@@ -26,13 +26,12 @@ class RunnerS3Test < Test::Unit::TestCase
     @runner = SweetyBacky::Runner.new
     @runner.config( @opts )
     
-    s3 = ::S3::Service.new( SweetyBacky::S3.read_s3_password( @opts[:s3_opts][:passwd_file] ) )
-    @bucket = s3.buckets.build( @opts[:s3_opts][:bucket] )
-    @bucket.save
+    s3 = AWS::S3.new( SweetyBacky::S3.read_s3_password( @opts[:s3_opts][:passwd_file] ) )
+    @bucket = s3.buckets.create( @opts[:s3_opts][:bucket] )
   end
 
   def teardown
-    @bucket.destroy( true )
+    @bucket.delete!
   end
   
   def test_do_backup_daily
@@ -42,30 +41,30 @@ class RunnerS3Test < Test::Unit::TestCase
     
     assert( 
       @bucket.
-        object( 
+        objects[ 
           "test/path/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.#{Date.today.strftime('%Y%m%d')}.daily.tar.gz"
-        ).exists? 
+        ].exists? 
     )
     
     assert( 
       @bucket.
-        object( 
+        objects[ 
           "test/path/databases/test.#{Date.today.strftime('%Y%m%d')}.daily.sql.tar.gz"
-        ).exists? 
+        ].exists? 
     )
     
     assert( 
       @bucket.
-        object( 
+        objects[ 
           "test/path/files/#{SweetyBacky::Utils.namerize( @opts[:paths][0] )}.#{Date.today.strftime('%Y%m%d')}.daily.tar.gz.md5"
-        ).exists? 
+        ].exists? 
     )
     
     assert( 
       @bucket.
-        object( 
+        objects[ 
           "test/path/databases/test.#{Date.today.strftime('%Y%m%d')}.daily.sql.tar.gz.md5"
-        ).exists? 
+        ].exists? 
     )
   end
     

data/test/s3/s3_test.rb

@@ -11,13 +11,12 @@ class S3Test < Test::Unit::TestCase
       :passwd_file        => '~/.s3.passwd'
     }
     
-    s3 = ::S3::Service.new( SweetyBacky::S3.read_s3_password( @opts[:passwd_file] ) )
-    @bucket = s3.buckets.build( @opts[:bucket] )
-    @bucket.save
+    s3 = AWS::S3.new( SweetyBacky::S3.read_s3_password( @opts[:passwd_file] ) )
+    @bucket = s3.buckets.create( @opts[:bucket] )
   end
   
   def teardown
-    @bucket.destroy( true )
+    @bucket.delete!
   end
   
   def test_upload
@@ -29,7 +28,7 @@ class S3Test < Test::Unit::TestCase
     
     assert_equal(
       File.read( "#{FIXTURES_PATH}/file.txt" ),
-      SweetyBacky::S3.object( "test/path/file.txt", @opts ).content
+      SweetyBacky::S3.object( "test/path/file.txt", @opts ).read
     )
   end
   
@@ -54,8 +53,8 @@ class S3Test < Test::Unit::TestCase
     
     SweetyBacky::S3.delete( "test/path/file2.txt", @opts )
     
-    assert( @bucket.object( "test/path/file1.txt" ).exists? )
-    assert( !@bucket.object( "test/path/file2.txt" ).exists? )
+    assert( @bucket.objects[ "test/path/file1.txt" ].exists? )
+    assert( !@bucket.objects[ "test/path/file2.txt" ].exists? )
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sweety_backy
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Fernando Guillen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +02:00
+date: 2011-08-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: s3
+  name: aws-sdk
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false