glacier_on_rails 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fca450bd43aa00111403add1acd3505f4d7775b
-  data.tar.gz: 0c49c3ede142e1d3c9b952f2d8762282a6dce3db
+  metadata.gz: 4b787edca23f9db4ca73cbf890c3cbd953cbdd22
+  data.tar.gz: b72bc1553df28d0006b6d8716fdffd5c1d4feec2
 SHA512:
-  metadata.gz: 3f7da1e401918ff170f0fb66e4d20a1803fa86c3e1202137e67f4e0296130d5762cc680c2ea24b67a640e7011bc080c154ce9e049c6e1a6a4dce836e138e24db
-  data.tar.gz: c968f47766e1485690c3de3653cfde5852487d112eceb147cb86e91f7f767e6fa708aa7ae56c5924cd6d168342f2792f1ee9d5d546e97a99cca5ec0641a9acd4
+  metadata.gz: fbe7502e6960ad4486f06678410c0fa2c6ad0f2f6dd5157bf45c7c67b4dfa32b1cccf7e9de12b0ec3dc456597ba8a07316bb7d8c71ee833b6745c899e765c45a
+  data.tar.gz: b7eefdc7c7d81cff6ba92bc423d80053fc17247fd7d1f559eb61b1e257ef71d28792058080e077d433bce011f02e09750469beadf9fe44972dac15f494468ea9

data/Gemfile.lock

@@ -248,7 +248,7 @@ DEPENDENCIES
   coffee-rails (~> 4.2, >= 4.2.2)
   database_cleaner (~> 1.6, >= 1.6.1)
   glacier_on_rails!
-  haml-rails (~> 1.0.0)
+  haml-rails (~> 1.0)
   jquery-rails
   pg
   poltergeist (~> 1.15)

data/app/models/application_database/postgres_adapter.rb

@@ -2,6 +2,13 @@ class ApplicationDatabase::PostgresAdapter < ApplicationDatabase::BaseAdapter
   class PgDumpCmdMissing < StandardError; end
   class PgRestoreCmdMissing < StandardError; end
   class PgRestoreFileMissing < StandardError; end
+  class PgPassFileMissing < StandardError
+    def initialize
+      message = "~/.pgpass file not found, cannot dump database contents"
+      AwsLog.error "ApplicationDatabase::PostgresAdapter::PgPassFileMissing exception: #{message}"
+      super(message)
+    end
+  end
 
   RestoreExclusions = %w{ application_data_backups
                           glacier_archives
@@ -10,6 +17,7 @@ class ApplicationDatabase::PostgresAdapter < ApplicationDatabase::BaseAdapter
   RestoreList = GlacierArchive::BackupFileDir.join('restore.list')
 
   def contents
+    raise PgPassFileMissing if db_config["password"].present? && !File.exists?("~/.pgpass")
     `#{pg_dump} -w -Fc -U #{db_config['username']} #{db_config['database']}`
   end
 

data/app/models/application_database.rb

@@ -1,8 +1,9 @@
 class ApplicationDatabase
   class MissingConfigurationKeys < StandardError
     def initialize(missing_keys)
-      msg = "#{missing_keys.join(' and ')} must be specified in config/database.yml"
-      super(msg)
+      message = "#{missing_keys.join(' and ')} must be specified in config/database.yml"
+      AwsLog.error "ApplicationDatabase::MissingConfigurationKeys exception: #{message}"
+      super(message)
     end
   end
 

data/app/models/aws_backend.rb

@@ -13,7 +13,7 @@ class AwsBackend
       @client.create_vault({:account_id => "-", :vault_name => ::SITE_NAME})
     end
   rescue => e
-    AwsLog.info "Failed to initialize AwsBackend: #{e.class.name}: #{e.message}"
+    AwsLog.error "Failed to initialize AwsBackend: #{e.class.name}: #{e.message}"
     raise
   end
 

data/app/models/glacier_db_archive.rb

@@ -11,6 +11,8 @@ class GlacierDbArchive < GlacierArchive
 
   def archive_contents
     ApplicationDatabase.new.contents
+  rescue ApplicationDatabase::PostgresAdapter::PgPassFileMissing
+    nil
   rescue ApplicationDatabase::MissingConfigurationKeys
     nil
   end

data/glacier_on_rails.gemspec

@@ -3,11 +3,11 @@
 
 Gem::Specification.new do |s|
   s.name = "glacier_on_rails"
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Nightingill"]
-  s.date = "2017-07-09"
+  s.date = "2017-07-12"
   s.description = "Rails engine for database backup/restore to/from Amazon Glacier, including file attachments."
   s.email = ["codehacker@comcast.net"]
   s.files = Dir.glob("{{app,config,db,lib,script,spec}/**/*,*}").reject{|f| f =~ /(cache|\.log|\.gem$)/}

data/spec/features/application_data_backup_spec.rb

@@ -175,4 +175,19 @@ feature "backup_now", :js => true do
       expect(flash_message).to eq "failed to create backup"
     end
   end
+
+  context "when there is a missing database password file" do
+    before do
+      ActiveRecord::Base.configurations[Rails.env].merge!({"password" => "sekret"})
+      allow(File).to receive(:exists?)
+      allow(File).to receive(:exists?).with("~/.pgpass").and_return(false)
+    end
+
+    it "should not create a new application_data_backup" do
+      expect{page.find('#backup_now').click; wait_for_ajax}.not_to change{ApplicationDataBackup.count}
+      expect(page).not_to have_selector("#application_data_backups .application_data_backup")
+      expect(flash_message).to eq "failed to create backup"
+      expect(aws_log).to match /ApplicationDatabase::PostgresAdapter::PgPassFileMissing exception: ~\/.pgpass file not found, cannot dump database contents/
+    end
+  end
 end

data/spec/models/postgres_adapter_spec.rb

@@ -1,6 +1,51 @@
 require 'spec_helper'
 # helpers are all required in spec helper
 
+describe "PostgresAdapter#contents dependence on password file ~/.pgpass" do
+  before do
+    @config = ActiveRecord::Base.configurations[Rails.env].dup
+  end
+  after do
+    ActiveRecord::Base.configurations[Rails.env] = @config
+  end
+
+  context "password not required in database config" do
+    before do
+      ActiveRecord::Base.configurations[Rails.env].merge!({"password" => nil })
+      allow(File).to receive(:exists?)
+      allow(File).to receive(:exists?).with("~/.pgpass").and_return(false)
+    end
+
+    it "should not raise an exception" do
+      expect{ ApplicationDatabase.new.contents }.not_to raise_exception
+    end
+  end
+
+  context "password is required in database config" do
+    before do
+      ActiveRecord::Base.configurations[Rails.env].merge!({"password" => "sekret"})
+      allow(File).to receive(:exists?)
+      allow(File).to receive(:exists?).with("~/.pgpass").and_return(false)
+    end
+
+    it "should raise an exception" do
+      expect{ ApplicationDatabase.new.contents }.to raise_exception ApplicationDatabase::PostgresAdapter::PgPassFileMissing
+    end
+  end
+
+  context "password is required in database config and .pgpass file is present" do
+    before do
+      ActiveRecord::Base.configurations[Rails.env].merge!({"password" => "sekret"})
+      allow(File).to receive(:exists?)
+      allow(File).to receive(:exists?).with("~/.pgpass").and_return(true)
+    end
+
+    it "should not raise an exception" do
+      expect{ ApplicationDatabase.new.contents }.not_to raise_exception
+    end
+  end
+end
+
 describe "PostgresAdapter#create_object_restoral_list_omitting_exclusions" 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.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Les Nightingill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails