astrails-safe 0.1.9 → 0.1.10

data/Rakefile

@@ -28,7 +28,7 @@ end
 
 Micronaut::RakeTask.new(:rcov) do |examples|
   examples.pattern = 'examples/**/*_example.rb'
-  examples.rcov_opts = '-Ilib -Iexamples'
+  examples.rcov_opts = '-Ilib -Iexamples -iastrails -x\/gems\/'
   examples.rcov = true
 end
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 9
+:patch: 10

data/examples/unit/local_example.rb

@@ -5,6 +5,9 @@ describe Astrails::Safe::Local do
     {
       :local => {
         :path => "/:kind~:id~:timestamp"
+      },
+      :keep => {
+        :local => 2
       }
     }
   end
@@ -34,15 +37,15 @@ describe Astrails::Safe::Local do
     end
   end
 
-  describe :prefix do
+  describe :path do
     it "should raise RuntimeError when no path" do
       lambda {
-        local({}).send :prefix
+        local({}).send :path
       }.should raise_error(RuntimeError, "missing :local/:path")
     end
 
     it "should use local/path" do
-      local.send(:prefix).should == "/mysqldump~blog~NoW"
+      local.send(:path).should == "/mysqldump~blog~NoW"
     end
   end
 
@@ -50,7 +53,7 @@ describe Astrails::Safe::Local do
     before(:each) do
       @local = local
       stub(@local).system
-      stub(@local).path {"file-path"}
+      stub(@local).full_path {"file-path"}
       stub(FileUtils).mkdir_p
     end
 
@@ -77,6 +80,25 @@ describe Astrails::Safe::Local do
   end
 
   describe :cleanup do
-    it "should have test"
+    before(:each) do
+      @local = local
+      @files = [4,1,3,2].to_a.map { |i| "aaaaa#{i}" }
+      stub(Dir).[](anything) {@files}
+      stub(File).file?(anything) {true}
+      stub(File).size(anything) {1}
+      stub(File).unlink
+    end
+
+    it "should check [:keep, :local]" do
+      @local.config[:keep][:local] = nil
+      dont_allow(Dir).[]
+      @local.send :cleanup
+    end
+
+    it "should delete extra files" do
+      mock(File).unlink("aaaaa1")
+      mock(File).unlink("aaaaa2")
+      @local.send :cleanup
+    end
   end
 end

data/examples/unit/s3_example.rb

@@ -8,7 +8,6 @@ describe Astrails::Safe::S3 do
         :bucket => "_bucket",
         :key    => "_key",
         :secret => "_secret",
-        :path   => "s3_path"
       },
       :keep => {
         :s3 => 2
@@ -40,12 +39,12 @@ describe Astrails::Safe::S3 do
 
       @files = [4,1,3,2].to_a.map { |i| stub(o = {}).key {"aaaaa#{i}"}; o }
 
-      stub(AWS::S3::Bucket).objects("_bucket", :prefix => "s3_path/_kind-_id", :max_keys => 4) {@files}
+      stub(AWS::S3::Bucket).objects("_bucket", :prefix => "_kind/_id/_kind-_id", :max_keys => 4) {@files}
       stub(AWS::S3::Bucket).find("_bucket").stub![anything].stub!.delete
     end
 
     it "should check [:keep, :s3]" do
-      mock(@s3.config).[](:keep, :s3) {nil}
+      @s3.config[:keep][:s3] = nil
       dont_allow(@s3.backup).filename
       @s3.send :cleanup
     end
@@ -56,21 +55,52 @@ describe Astrails::Safe::S3 do
       @s3.send :cleanup
     end
 
-    it "should have more tests"
-
   end
 
   describe :active do
-    it "should be true when all params are set"
-    it "should be false if bucket is missing"
-    it "should be false if key is missing"
-    it "should be false if secret is missing"
+    before(:each) do
+      @s3 = s3
+    end
+
+    it "should be true when all params are set" do
+      @s3.should be_active
+    end
+
+    it "should be false if bucket is missing" do
+      @s3.config[:s3][:bucket] = nil
+      @s3.should_not be_active
+    end
+
+    it "should be false if key is missing" do
+      @s3.config[:s3][:key] = nil
+      @s3.should_not be_active
+    end
+
+    it "should be false if secret is missing" do
+      @s3.config[:s3][:secret] = nil
+      @s3.should_not be_active
+    end
   end
 
-  describe :prefix do
-    it "should use s3/path 1st"
-    it "should use local/path 2nd"
-    it "should use constant 3rd"
+  describe :path do
+    before(:each) do
+      @s3 = s3
+    end
+    it "should use s3/path 1st" do
+      @s3.config[:s3][:path] = "s3_path"
+      @s3.config[:local] = {:path => "local_path"}
+      @s3.send(:path).should == "s3_path"
+    end
+
+    it "should use local/path 2nd" do
+      @s3.config[:local] = {:path => "local_path"}
+      @s3.send(:path).should == "local_path"
+    end
+
+    it "should use constant 3rd" do
+      @s3.send(:path).should == "_kind/_id"
+    end
+
   end
 
   describe :save do

data/lib/astrails/safe/local.rb

@@ -10,16 +10,16 @@ module Astrails
         true
       end
 
-      def prefix
-        @prefix ||= File.expand_path(expand(@config[:local, :path] || raise(RuntimeError, "missing :local/:path")))
+      def path
+        @path ||= File.expand_path(expand(@config[:local, :path] || raise(RuntimeError, "missing :local/:path")))
       end
 
       def save
         puts "command: #{@backup.command}" if $_VERBOSE
 
         unless $DRY_RUN
-          FileUtils.mkdir_p(prefix) unless File.directory?(prefix)
-          system "#{@backup.command}>#{@backup.path = path}"
+          FileUtils.mkdir_p(path) unless File.directory?(path)
+          system "#{@backup.command}>#{@backup.path = full_path}"
         end
 
       end
@@ -27,11 +27,9 @@ module Astrails
       def cleanup
         return unless keep = @config[:keep, :local]
 
-        base = File.basename(@backup.filename).split(".").first
+        puts "listing files #{base}" if $_VERBOSE
 
-        pattern = File.join(prefix, "#{base}*")
-        puts "listing files #{pattern.inspect}" if $_VERBOSE
-        files = Dir[pattern] .
+        files = Dir["#{base}*"] .
           select{|f| File.file?(f) && File.size(f) > 0} .
           sort
 

data/lib/astrails/safe/s3.rb

@@ -8,8 +8,8 @@ module Astrails
         bucket && key && secret
       end
 
-      def prefix
-        @prefix ||= expand(config[:s3, :path] || config[:local, :path] || ":kind/:id")
+      def path
+        @path ||= expand(config[:s3, :path] || config[:local, :path] || ":kind/:id")
       end
 
       def save
@@ -18,11 +18,11 @@ module Astrails
         # 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
 
-        puts "Uploading #{bucket}:#{path}" if $_VERBOSE || $DRY_RUN
+        puts "Uploading #{bucket}:#{full_path}" if $_VERBOSE || $DRY_RUN
         unless $DRY_RUN || $LOCAL
           AWS::S3::Bucket.create(bucket)
           File.open(@backup.path) do |file|
-            AWS::S3::S3Object.store(path, file, bucket)
+            AWS::S3::S3Object.store(full_path, file, bucket)
           end
           puts "...done" if $_VERBOSE
         end
@@ -33,10 +33,9 @@ module Astrails
 
         return unless keep = @config[:keep, :s3]
 
-        base = File.basename(@backup.filename).split(".").first
 
-        puts "listing files in #{bucket}:#{prefix}/#{base}"
-        files = AWS::S3::Bucket.objects(bucket, :prefix => "#{prefix}/#{base}", :max_keys => keep * 2)
+        puts "listing files in #{bucket}:#{base}" if $_VERBOSE
+        files = AWS::S3::Bucket.objects(bucket, :prefix => base, :max_keys => keep * 2)
         puts files.collect {|x| x.key} if $_VERBOSE
 
         files = files.

data/lib/astrails/safe/sink.rb

@@ -11,9 +11,13 @@ module Astrails
 
       protected
 
-      # prefix is defined in subclass
-      def path
-        @path ||= File.join(prefix, @backup.filename) + @backup.extension
+      # path is defined in subclass
+      def base
+        @base ||= File.join(path, File.basename(@backup.filename).split(".").first)
+      end
+
+      def full_path
+        @full_path ||= File.join(path, @backup.filename) + @backup.extension
       end
 
       # call block on files to be removed (all except for the LAST 'limit' files

data/templates/script.rb

@@ -7,7 +7,7 @@ safe do
   #   :timestamp -> current run timestamp (same for all the backups in the same 'run')
   # you can set separate :path for all backups (or once globally here)
   local do
-    path "/backup/:kind/"
+    path "/backup/:kind"
   end
 
   ## uncomment to enable uploads to Amazon S3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astrails-safe
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors: 
 - Astrails Ltd.
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 -07:00
+date: 2009-05-27 00:00:00 -07:00
 default_executable: astrails-safe
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,16 +30,16 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - LICENSE
+- README.markdown
 files: 
+- LICENSE
 - README.markdown
+- Rakefile
 - VERSION.yml
 - bin/astrails-safe
 - examples/example_helper.rb
-- examples/integration
 - examples/integration/archive_integration_example.rb
-- examples/unit
 - examples/unit/archive_example.rb
 - examples/unit/config_example.rb
 - examples/unit/gpg_example.rb
@@ -49,11 +49,9 @@ files:
 - examples/unit/pgdump_example.rb
 - examples/unit/s3_example.rb
 - examples/unit/svndump_example.rb
-- lib/astrails
-- lib/astrails/safe
+- lib/astrails/safe.rb
 - lib/astrails/safe/archive.rb
 - lib/astrails/safe/backup.rb
-- lib/astrails/safe/config
 - lib/astrails/safe/config/builder.rb
 - lib/astrails/safe/config/node.rb
 - lib/astrails/safe/gpg.rb
@@ -68,17 +66,12 @@ files:
 - lib/astrails/safe/stream.rb
 - lib/astrails/safe/svndump.rb
 - lib/astrails/safe/tmp_file.rb
-- lib/astrails/safe.rb
-- lib/extensions
 - lib/extensions/mktmpdir.rb
 - templates/script.rb
-- Rakefile
-- LICENSE
 has_rdoc: true
 homepage: http://github.com/astrails/safe
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -101,5 +94,15 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Backup filesystem and databases (MySQL and PostgreSQL) to Amazon S3 (with encryption)
-test_files: []
-
+test_files: 
+- examples/example_helper.rb
+- examples/integration/archive_integration_example.rb
+- examples/unit/archive_example.rb
+- examples/unit/config_example.rb
+- examples/unit/gpg_example.rb
+- examples/unit/gzip_example.rb
+- examples/unit/local_example.rb
+- examples/unit/mysqldump_example.rb
+- examples/unit/pgdump_example.rb
+- examples/unit/s3_example.rb
+- examples/unit/svndump_example.rb