glacier_on_rails 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d041c35dfaf1909f44aa6692052b92cc4ae114d6
-  data.tar.gz: caafb290a9dfa988677685f3181e5697c3ff8eda
+  metadata.gz: 4fca450bd43aa00111403add1acd3505f4d7775b
+  data.tar.gz: 0c49c3ede142e1d3c9b952f2d8762282a6dce3db
 SHA512:
-  metadata.gz: 38d0fe97e6ee3045d7b93152f4889577d95cfe1fa7ea32b4d4837496edb99c43c808d78036501a58ea480c706d5be220dedda948cac3eef6b39ec0e4a9b36ae6
-  data.tar.gz: 2d08b5f9f515a6b8b3d3976cb56c08a6981a615cad1fdd52dd16ab183bf11206d36616985b2170bad638ba6dd1d4f7ac4539dde070ee8acb8e890db7ca879379
+  metadata.gz: 3f7da1e401918ff170f0fb66e4d20a1803fa86c3e1202137e67f4e0296130d5762cc680c2ea24b67a640e7011bc080c154ce9e049c6e1a6a4dce836e138e24db
+  data.tar.gz: c968f47766e1485690c3de3653cfde5852487d112eceb147cb86e91f7f767e6fa708aa7ae56c5924cd6d168342f2792f1ee9d5d546e97a99cca5ec0641a9acd4

data/Gemfile

@@ -17,5 +17,9 @@ gem "pg"
 # To use debugger
 # gem 'debugger'
 gem 'webmock', :git => 'https://github.com/lazylester/webmock.git' # contains a patch... use this fork until the primary sources merges the patch
-
+gem 'rspec-rails', :git => "https://github.com/rspec/rspec-rails.git", :ref => "ac759a3" # contains a patch which solves a problem surfacing with rails 5.1
+gem 'rspec-core', :git => "https://github.com/rspec/rspec-core.git", :ref => "0e0584f" # required by the rspec-rails version, above
+gem 'rspec-mocks', :git => "https://github.com/rspec/rspec-mocks.git", :ref => "4847ef0" # ditto
+gem 'rspec-expectations', :git => "https://github.com/rspec/rspec-expectations.git", :ref => "5c4ca95" # ditto
+gem 'rspec-support', :git => "https://github.com/rspec/rspec-support.git", :ref => "491e723" # ditto
 gem "aws-sdk", "~> 2"

data/Gemfile.lock

@@ -7,12 +7,59 @@ GIT
       crack (>= 0.3.2)
       hashdiff
 
+GIT
+  remote: https://github.com/rspec/rspec-core.git
+  revision: 0e0584f5c0624f244c9800f4a66b1256e496d14a
+  ref: 0e0584f
+  specs:
+    rspec-core (3.7.0.pre)
+      rspec-support (= 3.7.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-expectations.git
+  revision: 5c4ca95b030788e2f62ee82335ed5836bd83c8e8
+  ref: 5c4ca95
+  specs:
+    rspec-expectations (3.7.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.7.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-mocks.git
+  revision: 4847ef067b60e3725a9e4819b9d0ee0f5c5262eb
+  ref: 4847ef0
+  specs:
+    rspec-mocks (3.7.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.7.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-rails.git
+  revision: ac759a3691242b971ee8388ea77a8051d6fe15b4
+  ref: ac759a3
+  specs:
+    rspec-rails (3.7.0.pre)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (= 3.7.0.pre)
+      rspec-expectations (= 3.7.0.pre)
+      rspec-mocks (= 3.7.0.pre)
+      rspec-support (= 3.7.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-support.git
+  revision: 491e7236856d93103718a8e30e8b9a415fbad28b
+  ref: 491e723
+  specs:
+    rspec-support (3.7.0.pre)
+
 PATH
   remote: .
   specs:
-    glacier_on_rails (0.9.4)
-      httparty
-      rails (~> 5.1.0)
+    glacier_on_rails (0.9.5)
+      httparty (~> 0.15.5)
+      rails (~> 5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -128,7 +175,6 @@ GEM
     mini_portile2 (2.2.0)
     minitest (5.10.2)
     multi_xml (0.6.0)
-    mysql2 (0.4.7)
     nio4r (2.1.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
@@ -165,23 +211,6 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
     rubyzip (1.2.1)
@@ -214,18 +243,21 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk (~> 2)
-  byebug
-  capybara (~> 2.4.0)
-  coffee-rails
-  database_cleaner
+  byebug (~> 9.0, >= 9.0.6)
+  capybara (~> 2.4)
+  coffee-rails (~> 4.2, >= 4.2.2)
+  database_cleaner (~> 1.6, >= 1.6.1)
   glacier_on_rails!
-  haml-rails
+  haml-rails (~> 1.0.0)
   jquery-rails
-  mysql2
   pg
-  poltergeist
-  rspec-rails
-  selenium-webdriver
+  poltergeist (~> 1.15)
+  rspec-core!
+  rspec-expectations!
+  rspec-mocks!
+  rspec-rails!
+  rspec-support!
+  selenium-webdriver (~> 3.4, >= 3.4.3)
   webmock!
 
 BUNDLED WITH

data/README.md

@@ -94,5 +94,7 @@ aws_secret_access_key = your_aws_secret_access_key
 
 ```
 
+Note that the test suite assumes that such a credentials file is available on the machine on which it's being run.
+
 ## Database access parameters
 The pg_restore command depends on the existence of a file called ~/.pgpass, containing access parameters for the database. (See [Postgres documentation](https://www.postgresql.org/docs/9.3/static/libpq-pgpass.html) for format details).

data/app/models/application_data_backup.rb

@@ -28,6 +28,8 @@ class ApplicationDataBackup < ActiveRecord::Base
     # don't bother creating the file archives if the db archive fails
     self.glacier_file_archives = GlacierFileArchive.all!  if glacier_db_archive.persisted?
     # if any of them fail, we have errors
+  rescue RuntimeError => e
+    errors.add(:base, "Create archive failed: #{e.class.name}, #{e.message}")
   end
 
   def initiate_retrieval

data/app/models/aws_backend.rb

@@ -12,6 +12,9 @@ class AwsBackend
     unless vault_list.map(&:vault_name).include?(::SITE_NAME)
       @client.create_vault({:account_id => "-", :vault_name => ::SITE_NAME})
     end
+  rescue => e
+    AwsLog.info "Failed to initialize AwsBackend: #{e.class.name}: #{e.message}"
+    raise
   end
 
   def self.credentials

data/glacier_on_rails.gemspec

@@ -3,28 +3,25 @@
 
 Gem::Specification.new do |s|
   s.name = "glacier_on_rails"
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Nightingill"]
-  s.date = "2017-07-07"
+  s.date = "2017-07-09"
   s.description = "Rails engine for database backup/restore to/from Amazon Glacier, including file attachments."
   s.email = ["codehacker@comcast.net"]
-  #s.files = ["app/assets", "app/assets/images", "app/assets/images/glacier_on_rails", "app/assets/javascripts", "app/assets/javascripts/glacier_on_rails", "app/assets/javascripts/glacier_on_rails/application.js", "app/assets/stylesheets", "app/assets/stylesheets/glacier_on_rails", "app/assets/stylesheets/glacier_on_rails/application.css", "app/controllers", "app/controllers/glacier_on_rails", "app/controllers/glacier_on_rails/application_controller.rb", "app/controllers/glacier_on_rails/backups_controller.rb", "app/helpers", "app/helpers/glacier_on_rails", "app/helpers/glacier_on_rails/application_helper.rb", "app/models", "app/models/application_database.rb", "app/models/db_backup.rb", "app/models/backup_mailer.rb", "app/views", "app/views/glacier_on_rails", "app/views/glacier_on_rails/backup_mailer", "app/views/glacier_on_rails/backup_mailer/db_backup.html.erb", "app/views/glacier_on_rails/backups", "app/views/glacier_on_rails/backups/index.html.haml", "config/initializers", "config/initializers/time_formats.rb", "config/routes.rb", "lib/glacier_on_rails", "lib/glacier_on_rails/engine.rb", "lib/glacier_on_rails/version.rb", "lib/glacier_on_rails.rb", "lib/tasks", "lib/tasks/backup.rake", "lib/tasks/email_backup.rake", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.files = Dir.glob("{{app,config,db,lib,script,spec}/**/*,*}").reject{|f| f =~ /(cache|\.log|\.gem$)/}
   s.require_paths = ["lib"]
   s.rubygems_version = "2.1.11"
   s.summary = "database backup/restore utilities"
 
-  s.add_runtime_dependency("rails", "~> 5.1.0")
-  s.add_runtime_dependency("httparty")
-  s.add_development_dependency("mysql2")
-  s.add_development_dependency("rspec-rails")
-  s.add_development_dependency("byebug")
-  s.add_development_dependency("capybara", "~> 2.4.0")
-  s.add_development_dependency 'selenium-webdriver'
-  s.add_development_dependency 'poltergeist'
-  s.add_development_dependency 'haml-rails'
-  s.add_development_dependency 'coffee-rails'
-  s.add_development_dependency 'database_cleaner'
+  s.add_runtime_dependency "rails", "~> 5.1"
+  s.add_runtime_dependency "httparty", "~> 0.15.5"
+  s.add_development_dependency "byebug", "~> 9.0", ">= 9.0.6"
+  s.add_development_dependency("capybara", "~> 2.4")
+  s.add_development_dependency 'selenium-webdriver', "~>3.4", ">=3.4.3"
+  s.add_development_dependency 'poltergeist', "~> 1.15"
+  s.add_development_dependency 'haml-rails', "~> 1.0"
+  s.add_development_dependency 'coffee-rails', "~> 4.2", ">= 4.2.2"
+  s.add_development_dependency 'database_cleaner', "~> 1.6", ">= 1.6.1"
 end

data/spec/features/application_data_backup_spec.rb

@@ -151,6 +151,18 @@ feature "backup_now", :js => true do
     end
   end
 
+  context "when AWS sdk responds with an error" do
+    before do
+      allow_any_instance_of(Aws::Plugins::RequestSigner::Handler).to receive(:missing_credentials?).and_return(true)
+    end
+
+    it "should not create a new application_data_backup" do
+      page.find('#backup_now').click
+      wait_for_ajax
+      expect(flash_message).to eq "failed to create backup"
+    end
+  end
+
   context "when there is a database configuration error" do
     before do
       allow(ActiveRecord::Base).to receive(:configurations).and_return({"test"=> {"host" => "bosh"}})

data/spec/models/application_data_backup_spec.rb

@@ -24,6 +24,18 @@ describe "ApplicationDataBackup#create" do
   end
 end
 
+describe "ApplicationDataBackup#create with AWS sdk error" do
+  before do
+    allow_any_instance_of(Aws::Plugins::RequestSigner::Handler).to receive(:missing_credentials?).and_return(true)
+  end
+
+  it "should create an unpersisted instance with errors" do
+    @application_data_backup = ApplicationDataBackup.create
+    expect(@application_data_backup).not_to be_persisted
+    expect(@application_data_backup.errors.full_messages).to include "Create archive failed: Aws::Errors::MissingCredentialsError, unable to sign request without credentials set"
+  end
+end
+
 describe "ApplicationDataBackup#initiate_retrieval" do
   include HttpMockHelpers
   include DummyAppDb

data/spec/models/glacier_db_archive_spec.rb

@@ -20,7 +20,7 @@ describe 'GlacierDbArchive.create' do
   end
 end
 
-describe 'GlacierDbArchive.create with error' do
+describe 'GlacierDbArchive.create with error response from server' do
   include HttpMockHelpers
   include AwsHelper
 
@@ -38,6 +38,16 @@ describe 'GlacierDbArchive.create with error' do
   end
 end
 
+describe 'GlacierDbArchive.create with error response from AWS sdk' do
+  before do
+    allow_any_instance_of(Aws::Plugins::RequestSigner::Handler).to receive(:missing_credentials?).and_return(true)
+  end
+
+  it "should fail to create archive" do
+    expect{GlacierDbArchive.create}.to raise_exception( Aws::Errors::MissingCredentialsError,"unable to sign request without credentials set")
+  end
+end
+
 describe GlacierOnRails::AwsSnsSubscriptionsController, :type => :controller do
   include HttpMockHelpers
   include AwsHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glacier_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Les Nightingill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,154 +16,150 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.5
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 9.0.6
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 description: Rails engine for database backup/restore to/from Amazon Glacier, including
   file attachments.
 email: