pgbackups-archive 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66159d34051e8b3601dd2e6127efa3fabfc8fed8
-  data.tar.gz: 4887b601937eac8dbb67cb6eef1f11bc32136498
+  metadata.gz: 774d65d6b5f6cca33840b124e025b4420bfb176b
+  data.tar.gz: 172dffa43d082e1642ffef17937283ef88a6336c
 SHA512:
-  metadata.gz: 3606f30de997bf25e907b15d3acfc8dffeced918ce196cc049425faa26cea98f5fda77705039f2e32790ea1c38d7c423de14d0bf780f272d45860b1eef994c2a
-  data.tar.gz: 553b6b98e34b0cacfad4f296b20756dec5504ec2264a4ec79642e25075864d323140aaaa24cb469c7deb678f735a7058a9905220e30c4422b74ffc9d2962e440
+  metadata.gz: 8e46f20796e4339a10b697383229938bbf9af0fd5e98f47ff55f79d334cd9db7e711e06319dd6ff168bc8077815126d4107090896c9e3b0d1184decd12126009
+  data.tar.gz: 43d3c389031cdfe4b4aa5dc0735948fa450f82db392a22984b97cdcc1e3a625161a64395decdd7e3cb78b8c3084c7fc1720b7f4c444fa6916da9974b9f14a223

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2014 Kenny Johnston
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -92,6 +92,8 @@ Many thanks go to the following who have contributed to making this gem even bet
 * [Karl Baum (@kbaum)](https://github.com/kbaum)
   * Custom setting for database to backup.
   * Streaming support to handle large backup files.
+* [Conroy Whitney (@conroywhitney)](https://github.com/conroywhitney)
+  * Use S3 server-side encryption by default
 
 ## License
 

data/Rakefile

@@ -3,3 +3,14 @@
 require "bundler/gem_tasks"
 
 load "tasks/pgbackups_archive.rake"
+
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = false
+end
+
+task default: :test

data/lib/pgbackups-archive/storage.rb

@@ -23,7 +23,7 @@ class PgbackupsArchive::Storage
   end
 
   def store
-    bucket.files.create :key => @key, :body => @file, :public => false
+    bucket.files.create :key => @key, :body => @file, :public => false, :encryption => "AES256"
   end
 
 end

data/lib/pgbackups-archive/version.rb

@@ -1,3 +1,3 @@
 module PgbackupsArchive
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

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

@@ -1,4 +1,4 @@
-require "minitest_helper"
+require "test_helper"
 require "heroku/client"
 
 describe Heroku::Client::PgbackupsArchive do
@@ -90,10 +90,9 @@ describe Heroku::Client::PgbackupsArchive do
       before do
         backup.instance_eval do
           @pgbackup = {
-            "public_url" => "https://raw.github.com/kjohnston/pgbackups-archive/master/pgbackups-archive.gemspec"
+            "public_url" => "https://raw.githubusercontent.com/kjohnston/pgbackups-archive/master/pgbackups-archive.gemspec"
           }
         end
-
         backup.download
       end
 
@@ -130,28 +129,6 @@ describe Heroku::Client::PgbackupsArchive do
       end
     end
 
-    describe "#environment" do
-      describe "when Rails is not present" do
-        it "should default to nil" do
-          backup.send(:environment).must_equal nil
-        end
-      end
-
-      describe "when Rails is present" do
-        before do
-          class Rails
-            def self.env
-              "test"
-            end
-          end
-        end
-
-        it "should use Rails.env" do
-          backup.send(:environment).must_equal "test"
-        end
-      end
-    end
-
     describe "#file" do
       let(:temp_file) { "temp-file" }
 
@@ -173,7 +150,9 @@ describe Heroku::Client::PgbackupsArchive do
       end
 
       it "should be composed properly" do
-        backup.send(:key).must_equal "pgbackups/test/timestamp.dump"
+        path = ["pgbackups", backup.send(:environment), "timestamp.dump"]
+          .compact.join("/")
+        backup.send(:key).must_equal path
       end
     end
 

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

@@ -1,4 +1,4 @@
-require "minitest_helper"
+require "test_helper"
 
 describe PgbackupsArchive::Storage do
   let(:connection) {

data/test/test_helper.rb

@@ -0,0 +1,17 @@
+Dir[File.dirname(__FILE__) + "/../lib/**/*.rb"].each { |f| require f }
+
+IS_RAKE_TASK = (!! ($0 =~ /rake/))
+
+if IS_RAKE_TASK
+  require "simplecov"
+  SimpleCov.start "rails" do
+    add_filter "db"
+    add_filter "test"
+    add_filter "config"
+  end
+end
+
+require "minitest/autorun"
+require "minitest/pride"
+
+Dir[File.join("./test/support/**/*.rb")].sort.each { |f| require f }

metadata

@@ -1,71 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: pgbackups-archive
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kenny Johnston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: heroku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.34'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.34'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.34.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: minitest-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: A means of automating Heroku's pgbackups and archiving them to Amazon
   S3 via the fog gem.
 email:
@@ -74,13 +178,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
-- Gemfile
-- Gemfile.lock
-- Guardfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - lib/pgbackups-archive.rb
@@ -90,16 +188,15 @@ files:
 - lib/pgbackups-archive/version.rb
 - lib/tasks/pgbackups_archive.rake
 - lib/tasks/test.rake
-- pgbackups-archive.gemspec
 - 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
+- test/test_helper.rb
 homepage: http://github.com/kjohnston/pgbackups-archive
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -107,26 +204,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A means of automating Heroku's pgbackups and archiving them to Amazon S3
-  via the fog gem.
+summary: Automates archival of Heroku's pgbackups to S3
 test_files:
 - 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
+- test/test_helper.rb

data/.gitignore

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

data/.ruby-gemset

@@ -1 +0,0 @@
-pgbackups-archive

data/.ruby-version

@@ -1 +0,0 @@
-ruby-1.9.3

data/.travis.yml

@@ -1,12 +0,0 @@
-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

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :test do
-  gem "thincloud-test", github: "newleaders/thincloud-test", branch: "rails4"
-  gem "minitest-reporters", "~> 1.0.0"
-end

data/Gemfile.lock

@@ -1,125 +0,0 @@
-GIT
-  remote: git://github.com/newleaders/thincloud-test.git
-  revision: 98a0dc247ef25b85379514309f8ff1cf1be239ac
-  branch: rails4
-  specs:
-    thincloud-test (2.0.0.alpha2)
-      cane (~> 2.6.0)
-      guard (~> 1.8.0)
-      guard-minitest (~> 1.0.0.rc.2)
-      minitest (>= 4.2)
-      mocha (~> 0.14.0)
-      simplecov (~> 0.8.0.pre)
-      terminal-notifier-guard (~> 1.5.3)
-      thor (~> 0.18.1)
-
-PATH
-  remote: .
-  specs:
-    pgbackups-archive (0.2.1)
-      bundler (>= 1.2.3)
-      fog (>= 1.4.0)
-      heroku (>= 2.34.0)
-      rake (>= 0.9.2.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.5)
-    ansi (1.4.3)
-    builder (3.2.2)
-    cane (2.6.1)
-      parallel
-    coderay (1.1.0)
-    docile (1.1.1)
-    excon (0.25.3)
-    ffi (1.9.3)
-    fog (1.15.0)
-      builder
-      excon (~> 0.25.0)
-      formatador (~> 0.2.0)
-      mime-types
-      multi_json (~> 1.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
-    formatador (0.2.4)
-    guard (1.8.3)
-      formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-minitest (1.0.1)
-      guard (>= 1.8)
-      minitest (>= 2.1)
-    hashie (2.0.5)
-    heroku (3.1.0)
-      heroku-api (~> 0.3.7)
-      launchy (>= 0.3.2)
-      netrc (~> 0.7.7)
-      rest-client (~> 1.6.1)
-      rubyzip
-    heroku-api (0.3.15)
-      excon (~> 0.25.1)
-    launchy (2.4.2)
-      addressable (~> 2.3)
-    listen (1.3.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    metaclass (0.0.1)
-    method_source (0.8.2)
-    mime-types (2.0)
-    mini_portile (0.5.2)
-    minitest (5.1.0)
-    minitest-reporters (1.0.0)
-      ansi
-      builder
-      minitest (>= 5.0)
-      powerbar
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.7.0)
-    netrc (0.7.7)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    parallel (0.9.1)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    ruby-hmac (0.4.0)
-    rubyzip (1.1.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    slop (3.4.7)
-    terminal-notifier-guard (1.5.3)
-    thor (0.18.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest-reporters (~> 1.0.0)
-  pgbackups-archive!
-  thincloud-test!

data/Guardfile

@@ -1,17 +0,0 @@
-# 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/pgbackups-archive.gemspec

@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "pgbackups-archive/version"
-
-Gem::Specification.new do |s|
-  s.name        = "pgbackups-archive"
-  s.version     = PgbackupsArchive::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Kenny Johnston"]
-  s.email       = ["kjohnston.ca@gmail.com"]
-  s.homepage    = "http://github.com/kjohnston/pgbackups-archive"
-  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.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")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/test/minitest_helper.rb

@@ -1,22 +0,0 @@
-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

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