Inject postgres admin into appliance console

.rspec_ci

@@ -1,4 +1,6 @@
+--require ci_helper
 --require spec_helper
 --color
 --order random
 --profile
+--format documentation

.travis.yml

@@ -4,6 +4,8 @@ rvm:
 - 2.5.8
 - 2.6.6
 cache: bundler
+addons:
+  postgresql: '10'
 env:
   global:
   - RUBY_GC_HEAP_GROWTH_MAX_SLOTS=300000

Gemfile

@@ -3,5 +3,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in manageiq-appliance_console.gemspec
 gemspec
-
-gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending", :branch => "master"

Rakefile

@@ -1,6 +1,25 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+desc "Run RSpec code examples (skip postgres required ones)"
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+# In CI, as part of the .rspec_ci, load a helper that sets the configuration
+# setting to allow the postgres specs to run.
+desc "Run RSpec code examples (assumes ci dependencies)"
+RSpec::Core::RakeTask.new("spec:ci") do |t|
+  t.rspec_opts = "--options #{File.expand_path(".rspec_ci", __dir__)}"
+end
+
+desc "Run RSpec code examples (with local postgres dependencies)"
+RSpec::Core::RakeTask.new("spec:dev") do |t|
+  # Load the PostgresRunner helper to facilitate a clean postgres environment
+  # for testing locally (not necessary for CI), and enables the postgres test
+  # via the helper.
+  pg_runner = File.join("spec", "postgres_runner_helper.rb")
+  t.rspec_opts = "-r #{File.expand_path(pg_runner, __dir__)}"
+end
+
+task :default do
+  Rake::Task["spec#{':ci' if ENV['CI']}"].invoke
+end

bin/appliance_console

@@ -13,7 +13,7 @@ require 'highline/system_extensions'
 require 'rubygems'
 require 'bcrypt'
 require 'linux_admin'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 require 'awesome_spawn'
 include HighLine::SystemExtensions
 

lib/manageiq-appliance_console.rb

@@ -20,7 +20,6 @@ def self.logger
 require 'manageiq/appliance_console/logging'
 require 'manageiq/appliance_console/prompts'
 
-require 'manageiq-gems-pending'
 require 'highline'
 
 require 'manageiq/appliance_console/auth_utilities'

lib/manageiq/appliance_console/certificate_authority.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'tempfile'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 
 module ManageIQ
 module ApplianceConsole

lib/manageiq/appliance_console/database_replication.rb

@@ -1,6 +1,6 @@
 require 'pg'
 require 'English'
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 
 module ManageIQ
 module ApplianceConsole

lib/manageiq/appliance_console/database_replication_standby.rb

@@ -1,4 +1,4 @@
-require 'util/postgres_admin'
+require 'manageiq/appliance_console/postgres_admin'
 require 'fileutils'
 require 'linux_admin'
 

lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -1,5 +1,5 @@
 require "pathname"
-require "util/postgres_admin"
+require "manageiq/appliance_console/postgres_admin"
 require "pg"
 require "linux_admin"