astrails-safe 0.2.5 → 0.2.6

data/README.markdown

@@ -136,6 +136,7 @@ Example configuration
     sftp do
       host "sftp.astrails.com"
       user "astrails"
+      # port 8023
       password "ssh password for sftp"
     end
 
@@ -186,6 +187,7 @@ Example configuration
     end
 
     tar do
+      options "-h" # dereference symlinks
       archive "git-repositories", :files => "/home/git/repositories"
       archive "dot-configs",      :files => "/home/*/.[^.]*"
       archive "etc",              :files => "/etc", :exclude => "/etc/puppet/other"

data/VERSION.yml

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

data/examples/unit/s3_example.rb

@@ -15,14 +15,14 @@ describe Astrails::Safe::S3 do
     }
   end
 
-  def def_backup
+  def def_backup(extra = {})
     {
       :kind      => "_kind",
       :filename  => "/backup/somewhere/_kind-_id.NOW.bar",
       :extension => ".bar",
       :id        => "_id",
       :timestamp => "NOW"
-    }
+    }.merge(extra)
   end
 
   def s3(config = def_config, backup = def_backup)
@@ -104,9 +104,57 @@ describe Astrails::Safe::S3 do
   end
 
   describe :save do
-    it "should establish s3 connection"
-    it "should RuntimeError if no local file (i.e. :local didn't run)"
-    it "should open local file"
-    it "should upload file"
+    def add_stubs(*stubs)
+      stubs.each do |s|
+        case s
+        when :connection
+          stub(AWS::S3::Base).establish_connection!(:access_key_id => "_key", :secret_access_key => "_secret", :use_ssl => true)
+        when :stat
+          stub(File).stat("foo").stub!.size {123}
+        when :create_bucket
+          stub(AWS::S3::Bucket).create
+        when :file_open
+          stub(File).open("foo") {|f, block| block.call(:opened_file)}
+        when :s3_store
+          stub(AWS::S3::S3Object).store(@full_path, :opened_file, "_bucket")
+        end
+      end
+    end
+
+    before(:each) do
+      @s3 = s3(def_config, def_backup(:path => "foo"))
+      @full_path = "_kind/_id/backup/somewhere/_kind-_id.NOW.bar.bar"
+    end
+
+    it "should fail if no backup.file is set" do
+      @s3.backup.path = nil
+      proc {@s3.send(:save)}.should raise_error(RuntimeError)
+    end
+
+    it "should establish s3 connection" do
+      mock(AWS::S3::Base).establish_connection!(:access_key_id => "_key", :secret_access_key => "_secret", :use_ssl => true)
+      add_stubs(:stat, :create_bucket, :file_open, :s3_store)
+      @s3.send(:save)
+    end
+
+    it "should open local file" do
+      add_stubs(:connection, :stat, :create_bucket)
+      mock(File).open("foo")
+      @s3.send(:save)
+    end
+
+    it "should upload file" do
+      add_stubs(:connection, :stat, :create_bucket, :file_open)
+      mock(AWS::S3::S3Object).store(@full_path, :opened_file, "_bucket")
+      @s3.send(:save)
+    end
+
+    it "should fail on files bigger then 5G" do
+      add_stubs(:connection)
+      mock(File).stat("foo").stub!.size {5*1024*1024*1024+1}
+      mock(STDERR).puts(anything)
+      dont_allow(Benchmark).realtime
+      @s3.send(:save)
+    end
   end
 end

data/lib/astrails/safe/s3.rb

@@ -1,6 +1,7 @@
 module Astrails
   module Safe
     class S3 < Sink
+      MAX_S3_FILE_SIZE = 5368709120
 
       protected
 
@@ -20,6 +21,10 @@ module Astrails
 
         puts "Uploading #{bucket}:#{full_path}" if $_VERBOSE || $DRY_RUN
         unless $DRY_RUN || $LOCAL
+          if File.stat(@backup.path).size > MAX_S3_FILE_SIZE
+            STDERR.puts "ERROR: File size exceeds maximum allowed for upload to S3 (#{MAX_S3_FILE_SIZE}): #{@backup.path}"
+            return
+          end
           benchmark = Benchmark.realtime do
             AWS::S3::Bucket.create(bucket)
             File.open(@backup.path) do |file|

data/lib/astrails/safe/sftp.rb

@@ -20,6 +20,7 @@ module Astrails
         unless $DRY_RUN || $LOCAL
           opts = {}
           opts[:password] = password if password
+          opts[:port] = port if port
           Net::SFTP.start(host, user, opts) do |sftp|
             puts "Sending #{@backup.path} to #{full_path}" if $_VERBOSE
             begin
@@ -46,7 +47,10 @@ module Astrails
         return unless keep = @config[:keep, :sftp]
 
         puts "listing files: #{host}:#{base}*" if $_VERBOSE
-        Net::SFTP.start(host, user, :password => password) do |sftp|
+        opts = {}
+        opts[:password] = password if password
+        opts[:port] = port if port
+        Net::SFTP.start(host, user, opts) do |sftp|
           files = sftp.dir.glob(path, File.basename("#{base}*"))
 
           puts files.collect {|x| x.name } if $_VERBOSE
@@ -74,6 +78,11 @@ module Astrails
       def password
         @config[:sftp, :password]
       end
+
+      def port
+        @config[:sftp, :port]
+      end
+
     end
   end
 end

data/templates/script.rb

@@ -28,6 +28,7 @@ safe do
   # sftp do
   #   host "YOUR_REMOTE_HOSTNAME"
   #   user "YOUR_REMOTE_USERNAME"
+  #   # port "NON STANDARD SSH PORT"
   #   password "YOUR_REMOTE_PASSWORD"
   #   path ":kind/:id" # this is the default
   # end
@@ -87,7 +88,7 @@ safe do
   # # uncomment to enable
   # # backup PostgreSQL databases with pg_dump
   # pgdump do
-  #   option "-i -x -O"
+  #   options "-i -x -O"
   #
   #   user "markmansour"
   #   # password "" - leave this out if you have ident setup
@@ -99,6 +100,8 @@ safe do
   # end
 
   tar do
+    # options "-h" # uncomment this to dereference symbolic links
+
     # 'archive' is a collection item, just like 'database'
     # archive "git-repositories" do
     #   # files and directories to backup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrails-safe
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Astrails Ltd.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 +02:00
+date: 2009-12-21 00:00:00 +02:00
 default_executable: astrails-safe
 dependencies: 
 - !ruby/object:Gem::Dependency