pgbackups-archive 0.0.4 → 0.1.0

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 *.gem
+coverage

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode
+env:
+  - CI=true RAILS_ENV=test JRUBY_OPTS=--1.9 RBXOPT=-X19
+before_script: "./test/ci/before_script.sh"
+script: "./test/ci/ci_runner.sh"
+notifications:
+  flowdock: 1ec5c0efa5a264c67c6ba3b2e6574a70

data/Gemfile

@@ -3,8 +3,5 @@ source :rubygems
 gemspec
 
 group :test do
-  gem "fuubar",      "~> 1.0.0"
-  gem "growl",       "~> 1.0.3"
-  gem "guard-rspec", "~> 1.2.0"
-  gem "rspec",       "~> 2.11.0"
+  gem "thincloud-test", "~> 1.0.0.pre"
 end

data/Gemfile.lock

@@ -1,21 +1,23 @@
 PATH
   remote: .
   specs:
-    pgbackups-archive (0.0.4)
-      bundler (~> 1.2.1)
+    pgbackups-archive (0.1.0)
+      bundler (>= 1.2.3)
       fog (>= 1.4.0)
-      heroku (~> 2.32.14)
+      heroku (~> 2.34.0)
       rake (>= 0.9.2.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.3.2)
+    ansi (1.4.3)
     builder (3.1.4)
+    cane (2.5.2)
+      parallel
     coderay (1.0.8)
-    diff-lcs (1.1.3)
-    excon (0.16.7)
-    fog (1.6.0)
+    excon (0.16.10)
+    fog (1.9.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -25,67 +27,82 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    formatador (0.2.3)
-    fuubar (1.0.0)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 0.0.10)
-    growl (1.0.3)
-    guard (1.5.0)
-      listen (>= 0.4.2)
+    formatador (0.2.4)
+    guard (1.6.2)
+      listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (1.2.1)
-      guard (>= 1.1)
-    heroku (2.32.14)
-      heroku-api (~> 0.3.5)
+    guard-minitest (0.5.0)
+      guard (>= 0.4)
+    hashie (1.2.0)
+    heroku (2.34.0)
+      heroku-api (~> 0.3.7)
       launchy (>= 0.3.2)
       netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.3.5)
-      excon (~> 0.16.1)
+    heroku-api (0.3.7)
+      excon (~> 0.16.10)
     launchy (2.1.2)
       addressable (~> 2.3)
-    listen (0.5.3)
+    listen (0.7.2)
     lumberjack (1.0.2)
+    metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.19)
+    mime-types (1.20.1)
+    minitest (4.5.0)
+    minitest-reporters (0.14.7)
+      ansi
+      builder
+      minitest (>= 2.12, < 5.0)
+      powerbar
+    mocha (0.13.2)
+      metaclass (~> 0.0.1)
     multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.1)
+    net-ssh (2.6.3)
     netrc (0.7.7)
-    nokogiri (1.5.5)
-    pry (0.9.10)
+    nokogiri (1.5.6)
+    parallel (0.6.2)
+    powerbar (1.0.11)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rake (0.9.2.2)
+      slop (~> 3.4)
+    rake (10.0.3)
+    rb-fsevent (0.9.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-instafail (0.2.4)
-    rspec-mocks (2.11.3)
     ruby-hmac (0.4.0)
-    ruby-progressbar (0.0.10)
     rubyzip (0.9.9)
-    slop (3.3.3)
-    thor (0.16.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.3)
+    terminal-notifier-guard (1.5.3)
+    terminal-table (1.4.5)
+    thincloud-test (1.0.0.pre)
+      cane (~> 2.5.2)
+      guard (~> 1.6.1)
+      guard-minitest (~> 0.5.0)
+      minitest (~> 4.5.0)
+      minitest-reporters (~> 0.14.7)
+      mocha (~> 0.13.2)
+      rb-fsevent (~> 0.9.1)
+      simplecov (~> 0.7.1)
+      terminal-notifier-guard (~> 1.5.3)
+      thor (~> 0.17.0)
+    thor (0.17.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fuubar (~> 1.0.0)
-  growl (~> 1.0.3)
-  guard-rspec (~> 1.2.0)
   pgbackups-archive!
-  rspec (~> 2.11.0)
+  thincloud-test (~> 1.0.0.pre)

data/Guardfile

@@ -1,4 +1,17 @@
-guard "rspec", cli: "--color --format Fuubar", all_on_start: false, all_after_pass: false do
-  watch(%r{^spec/(.*)_spec\.rb$})
-  watch(%r{^lib/(.*)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard "minitest" do
+  # with Minitest::Spec
+  watch(%r|^test/(.*)_test\.rb|)
+  watch(%r|^lib/(.*)([^/]+)\.rb|)      { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r|^test/minitest_helper\.rb|) { "test" }
+  watch(%r|^test/support/|)            { "test" }
+
+  # Rails 3.2
+  watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
+  watch(%r|^app/mailers/(.*)\.rb|)     { |m| "test/mailers/#{m[1]}_test.rb" }
+  watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
+  watch(%r|^app/models/(.*)\.rb|)      { |m| "test/models/#{m[1]}_test.rb" }
 end
+

data/README.md

@@ -19,11 +19,9 @@ Add the gem to your Gemfile and bundle:
 
 Install Heroku addons:
 
-    heroku addons:add pgbackups:plus
+    heroku addons:add pgbackups
     heroku addons:add scheduler:standard
 
-Note: You can use paid-for versions of pgbackups if you'd like, however the dev and basic database offerings only support the free (plus) version.
-
 Apply environment variables:
 
     heroku config:add PGBACKUPS_AWS_ACCESS_KEY_ID="XXX"
@@ -31,6 +29,11 @@ Apply environment variables:
     heroku config:add PGBACKUPS_BUCKET="myapp-backups"
     heroku config:add PGBACKUPS_REGION="us-west-2"
 
+Optionally set the database to perform backups on.  Defaults to DATABASE_URL.
+
+    heroku config:add PGBACKUPS_DATABASE="HEROKU_POSTGRESQL_GOLD_URL"
+
+
 Note: A good security measure would be to use a dedicated set of AWS credentials with a security policy only allowing access to the bucket you're specifying.  See this Pro Tip on [Assigning an AWS IAM user access to a single S3 bucket](http://coderwall.com/p/dwhlma).
 
 Add the rake task to scheduler:
@@ -67,8 +70,10 @@ Many thanks go to the following who have contributed to making this gem even bet
   * Autoload rake task into Rails 2.x once the gem has been loaded.
 * [Daniel Morrison (@danielmorrison)](https://github.com/danielmorrison)
   * Ruby 1.8-compatible hash syntax.
+* [Karl Baum (@kbaum)](https://github.com/kbaum)
+  * Custom setting for database to backup.
 
 ## License
 
 * Freely distributable and licensed under the [MIT license](http://kjohnston.mit-license.org/license.html).
-* Copyright (c) 2012 Kenny Johnston [![endorse](http://api.coderwall.com/kjohnston/endorsecount.png)](http://coderwall.com/kjohnston)
+* Copyright (c) 2012-2013 Kenny Johnston [![endorse](http://api.coderwall.com/kjohnston/endorsecount.png)](http://coderwall.com/kjohnston)

data/lib/pgbackups-archive/heroku/client/pgbackups_archive.rb

@@ -12,7 +12,7 @@ class Heroku::Client::PgbackupsArchive
   end
 
   def capture
-    @backup = @client.create_transfer ENV["DATABASE_URL"], ENV["DATABASE_URL"], nil, "BACKUP", :expire => true
+    @backup = @client.create_transfer database_url, database_url, nil, "BACKUP", :expire => true
 
     until @backup["finished_at"]
       print "."
@@ -23,6 +23,10 @@ class Heroku::Client::PgbackupsArchive
     @backup
   end
 
+  def database_url
+    ENV["PGBACKUPS_DATABASE_URL"] || ENV["DATABASE_URL"]
+  end
+
   def file
     open @backup["public_url"]
   end

data/lib/pgbackups-archive/railtie.rb

@@ -4,7 +4,6 @@ if defined?(Rails)
   else
     module PgbackupsArchive
       class Railtie < Rails::Railtie
-        railtie_name :pgbackups_archive
         rake_tasks do
           load "tasks/pgbackups_archive.rake"
         end

data/lib/pgbackups-archive/version.rb

@@ -1,3 +1,3 @@
 module PgbackupsArchive
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/lib/tasks/test.rake

@@ -0,0 +1,10 @@
+require "rake/testtask"
+
+task default: :test
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = false
+end

data/pgbackups-archive.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{A means of automating Heroku's pgbackups and archiving them to Amazon S3 via the fog gem.}
   s.description = %q{A means of automating Heroku's pgbackups and archiving them to Amazon S3 via the fog gem.}
 
-  s.add_dependency "bundler", "~> 1.2.1"
-  s.add_dependency "fog",    ">= 1.4.0"
-  s.add_dependency "heroku", "~> 2.32.14"
-  s.add_dependency "rake",   ">= 0.9.2.2"
+  s.add_dependency "bundler", ">= 1.2.3"
+  s.add_dependency "fog",     ">= 1.4.0"
+  s.add_dependency "heroku",  "~> 2.34.0"
+  s.add_dependency "rake",    ">= 0.9.2.2"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/ci/before_script.sh

@@ -0,0 +1,6 @@
+# Add instructions to execute before your CI run here.
+#
+# The following is used for testing a Rails Engine with a dummy test app.
+#
+# cd test/dummy
+# RAILS_ENV=test bundle exec rake db:setup

data/test/ci/ci_runner.sh

@@ -0,0 +1,8 @@
+engine=$(ruby -e 'puts RUBY_ENGINE')
+
+case $engine in
+  "ruby" )
+    bundle exec rake test && bundle exec cane;;
+  * )
+    bundle exec rake test;;
+esac

data/test/lib/pgbackups-archive/heroku/client/pgbackups_archive_test.rb

@@ -0,0 +1,64 @@
+require "minitest_helper"
+require "heroku/client"
+
+describe Heroku::Client::PgbackupsArchive do
+  let(:archive) {
+    Heroku::Client::PgbackupsArchive.new(
+      :pgbackups_url => "https://ip:password@pgbackups.heroku.com/client"
+    )
+  }
+  let(:backup) { { "finished_at" => "some timestamp" } }
+
+  it "should use a pgbackup client" do
+    archive.client.class.must_equal Heroku::Client::Pgbackups
+  end
+
+  describe "given a finished_at timestamp" do
+    before { archive.client.stubs(:create_transfer).returns(backup) }
+
+    it "should capture the backup" do
+      archive.capture.must_equal backup
+    end
+
+    it "should store the backup" do
+      archive.stubs(:key).returns("key")
+      archive.stubs(:file).returns("file")
+      archive.store.class.must_equal Fog::Storage::AWS::File
+    end
+  end
+
+  describe "configure the backup database" do
+
+    describe "backup database is not configured" do
+      before do
+        ENV["PGBACKUPS_DATABASE_URL"] = nil
+        ENV["DATABASE_URL"] = "db_url"
+      end
+
+      it "defaults to using the DATABASE_URL" do
+        archive.client.expects(:create_transfer)
+        .with("db_url", "db_url", nil, "BACKUP", :expire => true)
+        .returns(backup)
+
+        archive.capture
+      end
+    end
+
+    describe "backup database is configured" do
+      before do
+        ENV["PGBACKUPS_DATABASE_URL"] = "backup_db"
+        ENV["DATABASE_URL"] = "db_url"
+      end
+
+      it "defaults to using the DATABASE_URL" do
+        archive.client.expects(:create_transfer)
+        .with("backup_db", "backup_db", nil, "BACKUP", :expire => true)
+        .returns(backup)
+
+        archive.capture
+      end
+    end
+
+  end
+
+end

data/test/lib/pgbackups-archive/storage_test.rb

@@ -0,0 +1,33 @@
+require "minitest_helper"
+
+describe PgbackupsArchive::Storage do
+  let(:connection) {
+    Fog::Storage.new(
+      :provider              => "AWS",
+      :aws_access_key_id     => "XXX",
+      :aws_secret_access_key => "YYY")
+  }
+  let(:bucket)     { connection.directories.create(:key => "someapp-backups") }
+  let(:key)        { "pgbackups/test/2012-08-02-12-00-00.dump" }
+  let(:file)       { "test" }
+  let(:storage)    { PgbackupsArchive::Storage.new(key, file) }
+
+  before do
+    Fog.mock!
+    storage.stubs(:connection).returns(connection)
+    storage.stubs(:bucket).returns(bucket)
+  end
+
+  it "should create a fog connection" do
+    storage.connection.class.must_equal Fog::Storage::AWS::Mock
+  end
+
+  it "should create a fog directory" do
+    storage.bucket.class.must_equal Fog::Storage::AWS::Directory
+  end
+
+  it "should create a fog file" do
+    storage.store.class.must_equal Fog::Storage::AWS::File
+  end
+
+end

data/test/minitest_helper.rb

@@ -0,0 +1,22 @@
+Dir[File.dirname(__FILE__) + "/../lib/**/*.rb"].each { |f| require f }
+
+if RUBY_ENGINE == "ruby"
+  begin
+    require "simplecov"
+    SimpleCov.start do
+      add_filter "test"
+      add_filter "config"
+      command_name "MiniTest"
+    end
+  rescue LoadError
+    warn "unable to load SimpleCov"
+  end
+end
+
+require "thincloud/test"
+
+
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join("./test/support/**/*.rb")].sort.each { |f| require f }

data/test/support/minitest_reporters.rb

@@ -0,0 +1,4 @@
+unless ENV["CI"]
+  require "minitest/reporters"
+  MiniTest::Reporters.use! MiniTest::Reporters::ProgressReporter.new
+end

data/test/support/mocha.rb

@@ -0,0 +1 @@
+require "mocha/setup"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbackups-archive
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.32.14
+        version: 2.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.32.14
+        version: 2.34.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +85,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -96,10 +97,15 @@ files:
 - lib/pgbackups-archive/storage.rb
 - lib/pgbackups-archive/version.rb
 - lib/tasks/pgbackups_archive.rake
+- lib/tasks/test.rake
 - pgbackups-archive.gemspec
-- spec/lib/pgbackups-archive/heroku/client/pgbackups_archive_spec.rb
-- spec/lib/pgbackups-archive/storage_spec.rb
-- spec/spec_helper.rb
+- test/ci/before_script.sh
+- test/ci/ci_runner.sh
+- test/lib/pgbackups-archive/heroku/client/pgbackups_archive_test.rb
+- test/lib/pgbackups-archive/storage_test.rb
+- test/minitest_helper.rb
+- test/support/minitest_reporters.rb
+- test/support/mocha.rb
 homepage: http://github.com/kjohnston/pgbackups-archive
 licenses: []
 post_install_message: 
@@ -112,26 +118,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -749794191267838677
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -749794191267838677
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A means of automating Heroku's pgbackups and archiving them to Amazon S3
   via the fog gem.
 test_files:
-- spec/lib/pgbackups-archive/heroku/client/pgbackups_archive_spec.rb
-- spec/lib/pgbackups-archive/storage_spec.rb
-- spec/spec_helper.rb
+- test/ci/before_script.sh
+- test/ci/ci_runner.sh
+- test/lib/pgbackups-archive/heroku/client/pgbackups_archive_test.rb
+- test/lib/pgbackups-archive/storage_test.rb
+- test/minitest_helper.rb
+- test/support/minitest_reporters.rb
+- test/support/mocha.rb

data/spec/lib/pgbackups-archive/heroku/client/pgbackups_archive_spec.rb

@@ -1,26 +0,0 @@
-require "spec_helper"
-require "heroku/client"
-
-describe Heroku::Client::PgbackupsArchive do
-  let(:archive) { Heroku::Client::PgbackupsArchive.new(:pgbackups_url => "https://ip:password@pgbackups.heroku.com/client") }
-  let(:backup) { { "finished_at" => "some timestamp" } }
-
-  it "should use a pgbackup client" do
-    archive.client.class.should eq Heroku::Client::Pgbackups
-  end
-
-  context "given a finished_at timestamp" do
-    before { archive.client.stub(:create_transfer).and_return(backup) }
-
-    it "should capture the backup" do
-      archive.capture.should eq backup
-    end
-
-    it "should store the backup" do
-      archive.stub(:key).and_return("key")
-      archive.stub(:file).and_return("file")
-      archive.store.class.should eq Fog::Storage::AWS::File
-    end
-  end
-
-end

data/spec/lib/pgbackups-archive/storage_spec.rb

@@ -1,28 +0,0 @@
-require "spec_helper"
-
-describe PgbackupsArchive::Storage do
-  let(:connection) { Fog::Storage.new(:provider => "AWS", :aws_access_key_id => "XXX", :aws_secret_access_key => "YYY") }
-  let(:bucket)     { connection.directories.create(:key => "someapp-backups") }
-  let(:key)        { "pgbackups/test/2012-08-02-12-00-00.dump" }
-  let(:file)       { "test" }
-  let(:storage)    { PgbackupsArchive::Storage.new(key, file) }
-
-  before do
-    Fog.mock!
-    storage.stub(:connection).and_return(connection)
-    storage.stub(:bucket).and_return(bucket)
-  end
-
-  it "should create a fog connection" do
-    storage.connection.class.should eq Fog::Storage::AWS::Mock
-  end
-
-  it "should create a fog directory" do
-    storage.bucket.class.should eq Fog::Storage::AWS::Directory
-  end
-
-  it "should create a fog file" do
-    storage.store.class.should eq Fog::Storage::AWS::File
-  end
-
-end

data/spec/spec_helper.rb

@@ -1 +0,0 @@
-Dir[File.dirname(__FILE__) + "/../lib/**/*.rb"].each { |f| require f }