astrails-safe 0.2.7 → 0.3.0

data/{examples/unit/config_example.rb → spec/unit/config_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Config do
   it "should parse example config" do

data/{examples/unit/gpg_example.rb → spec/unit/gpg_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Gpg do
   def def_backup
@@ -145,4 +145,4 @@ describe Astrails::Safe::Gpg do
       File.read(file).should == "foo"
     end
   end
-end
+end

data/{examples/unit/gzip_example.rb → spec/unit/gzip_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Gzip do
 
@@ -43,22 +43,22 @@ describe Astrails::Safe::Gzip do
 
     describe "when already compressed" do
 
-      before(:each) { @gzip = gzip({}, :compressed => true) }
+      before(:each) { @gzip = gzip({}, :extension => ".foo", :command => "foobar", :compressed => true) }
 
       it "should not touch extension" do
-        dont_allow(@backup.extension).<< anything
         @gzip.process
+        @backup.extension.should == ".foo"
       end
 
       it "should not touch command" do
-        dont_allow(@backup.command).<< anything
         @gzip.process
+        @backup.command.should == "foobar"
       end
 
       it "should not touch compressed" do
-        dont_allow(@backup).compressed = anything
         @gzip.process
+        @backup.compressed.should == true
       end
     end
   end
-end
+end

data/{examples/unit/local_example.rb → spec/unit/local_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Local do
   def def_config
@@ -87,7 +87,7 @@ describe Astrails::Safe::Local do
 
   describe :cleanup do
     before(:each) do
-      @files = [4,1,3,2].to_a.map { |i| "/mysqldump~blog~NoW/qweqwe.#{i}" }
+      @files = [4,1,3,2].map { |i| "/mysqldump~blog~NoW/qweqwe.#{i}" }
       stub(File).file?(anything) {true}
       stub(File).size(anything) {1}
       stub(File).unlink

data/{examples/unit/mysqldump_example.rb → spec/unit/mysqldump_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Mysqldump do
 
@@ -80,4 +80,4 @@ port = 7777
       PWD
     end
   end
-end
+end

data/{examples/unit/pgdump_example.rb → spec/unit/pgdump_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Pgdump do
 
@@ -42,4 +42,4 @@ describe Astrails::Safe::Pgdump do
 
   end
 
-end
+end

data/{examples/unit/s3_example.rb → spec/unit/s3_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::S3 do
 
@@ -37,10 +37,10 @@ describe Astrails::Safe::S3 do
     before(:each) do
       @s3 = s3
 
-      @files = [4,1,3,2].to_a.map { |i| stub(o = {}).key {"aaaaa#{i}"}; o }
+      @files = [4,1,3,2].map { |i| stub(o = {}).key {"aaaaa#{i}"}; o }
 
       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
+      stub(AWS::S3::Bucket).objects("_bucket", :prefix => anything).stub![0].stub!.delete
     end
 
     it "should check [:keep, :s3]" do
@@ -50,8 +50,8 @@ describe Astrails::Safe::S3 do
     end
 
     it "should delete extra files" do
-      mock(AWS::S3::Bucket).find("_bucket").mock!["aaaaa1"].mock!.delete
-      mock(AWS::S3::Bucket).find("_bucket").mock!["aaaaa2"].mock!.delete
+      mock(AWS::S3::Bucket).objects("_bucket", :prefix => "aaaaa1").mock![0].mock!.delete
+      mock(AWS::S3::Bucket).objects("_bucket", :prefix => "aaaaa2").mock![0].mock!.delete
       @s3.send :cleanup
     end
 
@@ -112,6 +112,7 @@ describe Astrails::Safe::S3 do
         when :stat
           stub(File).stat("foo").stub!.size {123}
         when :create_bucket
+          stub(AWS::S3::Bucket).find('_bucket') { raise_error AWS::S3::NoSuchBucket }
           stub(AWS::S3::Bucket).create
         when :file_open
           stub(File).open("foo") {|f, block| block.call(:opened_file)}
@@ -156,5 +157,12 @@ describe Astrails::Safe::S3 do
       dont_allow(Benchmark).realtime
       @s3.send(:save)
     end
+    
+    it 'should not create a bucket that already exists' do
+      add_stubs(:connection, :stat, :file_open, :s3_store)
+      stub(AWS::S3::Bucket).find('_bucket') { true }
+      dont_allow(AWS::S3::Bucket).create
+      @s3.send(:save)
+    end
   end
 end

data/{examples/unit/svndump_example.rb → spec/unit/svndump_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../example_helper')
+require 'spec_helper'
 
 describe Astrails::Safe::Svndump do
   def def_config
@@ -36,4 +36,4 @@ describe Astrails::Safe::Svndump do
     end
 
   end
-end
+end

data/templates/script.rb

@@ -79,7 +79,7 @@ safe do
 
     # database is a 'collection' element. it must have a hash or block parameter
     # it will be 'collected' in a 'databases', with database id (1st arg) used as hash key
-    # the following code will create mysqldump/databases/blog and mysqldump/databases/mysql ocnfiguration 'nodes'
+    # the following code will create mysqldump/databases/blog and mysqldump/databases/mysql configuration 'nodes'
 
     # backup database with default values
     # database :blog

metadata

@@ -1,78 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: astrails-safe
-version: !ruby/object:Gem::Version 
-  version: 0.2.7
+version: !ruby/object:Gem::Version
+  prerelease: 
+  version: 0.3.0
 platform: ruby
-authors: 
-- Astrails Ltd.
+authors:
+- Vitaly Kushner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-01-21 00:00:00 +02:00
-default_executable: astrails-safe
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: aws-s3
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   name: cloudfiles
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
   name: net-sftp
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: |
-  Astrails-Safe is a simple tool to backup databases (MySQL and PostgreSQL), Subversion repositories (with svndump) and just files.
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: bundler
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rake
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rspec
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: rr
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    none: false
+  prerelease: false
+description: ! 'Astrails-Safe is a simple tool to backup databases (MySQL and PostgreSQL),
+  Subversion repositories (with svndump) and just files.
+
   Backups can be stored locally or remotely and can be enctypted.
+
   Remote storage is supported on Amazon S3, Rackspace Cloud Files, or just plain SFTP.
 
-email: we@astrails.com
-executables: 
+'
+email:
+- we@astrails.com
+executables:
 - astrails-safe
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-files: 
-- LICENSE
+extra_rdoc_files: []
+files:
+- .document
+- .gitignore
+- .rspec
+- CHANGELOG
+- Gemfile
+- LICENSE.txt
 - README.markdown
 - Rakefile
-- VERSION.yml
+- TODO
+- astrails-safe.gemspec
 - bin/astrails-safe
-- examples/example_helper.rb
-- examples/integration/archive_integration_example.rb
-- examples/integration/cleanup_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
 - lib/astrails/safe.rb
 - lib/astrails/safe/archive.rb
 - lib/astrails/safe/backup.rb
@@ -92,46 +168,65 @@ files:
 - lib/astrails/safe/stream.rb
 - lib/astrails/safe/svndump.rb
 - lib/astrails/safe/tmp_file.rb
+- lib/astrails/safe/version.rb
 - lib/extensions/mktmpdir.rb
+- spec/integration/archive_integration_spec.rb
+- spec/integration/cleanup_spec.rb
+- spec/spec_helper.rb
+- spec/unit/archive_spec.rb
+- spec/unit/cloudfiles_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/gpg_spec.rb
+- spec/unit/gzip_spec.rb
+- spec/unit/local_spec.rb
+- spec/unit/mysqldump_spec.rb
+- spec/unit/pgdump_spec.rb
+- spec/unit/s3_spec.rb
+- spec/unit/svndump_spec.rb
 - templates/script.rb
-has_rdoc: true
-homepage: http://blog.astrails.com/astrails-safe
-licenses: []
-
+homepage: http://astrails.com/astrails-safe
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1115506129816519000
+      version: '0'
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 1115506129816519000
+      version: '0'
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Backup filesystem and databases (MySQL and PostgreSQL) locally or to a remote server/service (with encryption)
-test_files: 
-- examples/example_helper.rb
-- examples/integration/archive_integration_example.rb
-- examples/integration/cleanup_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
+summary: Backup filesystem and databases (MySQL and PostgreSQL) locally or to a remote
+  server/service (with encryption)
+test_files:
+- spec/integration/archive_integration_spec.rb
+- spec/integration/cleanup_spec.rb
+- spec/spec_helper.rb
+- spec/unit/archive_spec.rb
+- spec/unit/cloudfiles_spec.rb
+- spec/unit/config_spec.rb
+- spec/unit/gpg_spec.rb
+- spec/unit/gzip_spec.rb
+- spec/unit/local_spec.rb
+- spec/unit/mysqldump_spec.rb
+- spec/unit/pgdump_spec.rb
+- spec/unit/s3_spec.rb
+- spec/unit/svndump_spec.rb