colin-safe 0.1.6 → 0.1.7

data/Rakefile

@@ -9,10 +9,10 @@ begin
     gem.description = "Simple tool to backup MySQL databases and filesystem locally or to Amazon S3 (with optional encryption)"
     gem.email = "we@astrails.com"
     gem.homepage = "http://github.com/astrails/safe"
-    gem.authors  = ["Astrails Ltd."]
+    gem.authors  = ["Astrails Ltd.", "Colin Schlueter"]
     gem.files = FileList["[A-Z]*.*", "{bin,examples,generators,lib,rails,spec,test,templates}/**/*", 'Rakefile', 'LICENSE*']
 
-    gem.add_dependency("aws-s3")
+    gem.add_dependency("right_aws")
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 6
+:patch: 7

data/bin/astrails-safe

@@ -4,7 +4,7 @@
 require 'tempfile'
 require 'rubygems'
 require 'fileutils'
-require "aws/s3"
+require 'right_aws'
 require 'yaml'
 
 #require 'ruby-debug'

data/lib/astrails/safe/s3.rb

@@ -12,42 +12,34 @@ module Astrails
         @prefix ||= expand(config[:s3, :path] || expand(config[:local, :path] || ":kind/:id"))
       end
 
-      def save
-        # needed in cleanup even on dry run
-        AWS::S3::Base.establish_connection!(:access_key_id => key, :secret_access_key => secret, :use_ssl => true) unless $LOCAL
+      def base
+        @base ||= File.basename(filename).split(".").first
+      end
 
+      def save
         file = @parent.open
         puts "Uploading #{bucket}:#{path}" if $_VERBOSE || $DRY_RUN
         unless $DRY_RUN || $LOCAL
-          AWS::S3::Bucket.create(bucket)
-          AWS::S3::S3Object.store(path, file, bucket)
+          s3.create_bucket(bucket)
+          s3.put(bucket, path, file)
           puts "...done" if $_VERBOSE
         end
         file.close if file
-
       end
 
       def cleanup
-
         return if $LOCAL
-
         return unless keep = @config[:keep, :s3]
 
-        bucket = @config[:s3, :bucket]
-
-        base = File.basename(filename).split(".").first
-
         puts "listing files in #{bucket}:#{prefix}/#{base}"
-        files = AWS::S3::Bucket.objects(bucket, :prefix => "#{prefix}/#{base}", :max_keys => keep * 2)
-        puts files.collect {|x| x.key} if $_VERBOSE
+        files = s3.list_bucket(bucket, { 'prefix' => "#{prefix}/#{base}", 'max-keys' => keep * 2 })
+        puts files.collect {|x| x[:key]} if $_VERBOSE
 
-        files = files.
-          collect {|x| x.key}.
-          sort
+        files = files.collect {|x| x[:key]}.sort
 
         cleanup_with_limit(files, keep) do |f|
           puts "removing s3 file #{bucket}:#{f}" if $DRY_RUN || $_VERBOSE
-          AWS::S3::Bucket.find(bucket)[f].delete unless $DRY_RUN || $LOCAL
+          s3.delete(bucket, f) unless $DRY_RUN || $LOCAL
         end
       end
 
@@ -63,6 +55,10 @@ module Astrails
         config[:s3, :secret]
       end
 
+      def s3
+        @s3 ||= RightAws::S3Interface.new(key, secret)
+      end
+
     end
   end
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: colin-safe
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Astrails Ltd.
+- Colin Schlueter
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: astrails-safe
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: right_aws
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -80,9 +81,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Backup filesystem and MySQL to Amazon S3 (with encryption)
 test_files: 
 - examples/example_helper.rb
-- examples/unit/stream_example.rb
 - examples/unit/config_example.rb
+- examples/unit/stream_example.rb