storey 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89dc451e50d3e25bfa3e2f4028f1718059cd28f8aafab7aaf87a1815837f9121
-  data.tar.gz: 3f32de0842a1c7d05b91fc7b715fbb1710d8452e0fe7db00eb740994d35cb80e
+  metadata.gz: 4d868102f5a1ce14a7d937639ab4cda6b59ed9d10be52bee5ce219d46cadddfc
+  data.tar.gz: b6d1ae7e3276463d5fed292024f5d2ea19be909d5fa9075bc4e731a5d1127fda
 SHA512:
-  metadata.gz: 73992092bc15f428a45bea3b4a9de2794f9eeb72f0aaec6d3eee7b36b2cf6c4030ae10d6b9f869702589acc724b3c92dabb4597373541926be2e01fe05b5ba7c
-  data.tar.gz: 0617b1dd0a58fe4bf1d8dacfcd8a1cddd8efcf8ef5ff7f384edbbffd950a905525529f3de1e005a133d647a2806d365be3b5a12c07855f9f81a1c9c234f3e9d3
+  metadata.gz: 9838fa46e3d3c84c17e2994587759db404ca47e6bbb1dc666bf76cc9c79348d6fad7dc677cfd5967af376d385e4eb3532eed4f2eb7d50a078788dcc3eb87a82b
+  data.tar.gz: 8d45a6ad1b0cac2f3a3b708b070684b7ff3134b8b41a7e38fbc8b4c135f27f91ab45bb363d48dfc4cc9b5723e9b18574f794ce7c6ed546dde20279bc81f5d4a7

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 services:
   postgresql
 addons:
-  postgresql: 9.4
+  postgresql: 9.6
 before_script:
   - cp spec/dummy/config/database.yml{.sample,}
   - psql -U postgres -c 'CREATE DATABASE storey_test;'

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2018-07-04
+### Added
+- Print duplication stdout for debugging
+- Allow users to set `database_url` in the config
+- Deprecate setting of config through `Storey`; set through configuration
+
 ## [2.0.2] - 2018-06-29
 ### Fixed
 - Fix instances when the default schema is the wrong schema

data/README.md

@@ -10,17 +10,24 @@ Heavily inspired by the Apartment gem, Storey simplifies the implementation of m
 
 Typically set in an initializer: `config/initializer/storey.rb`
 
-    # Defines the tables that should stay available to all (ie in the public schema)
-    # Note that there's currently no way to exclude tables that aren't linked to models
-    # If you have any ideas on how to do this I'm open to suggestions
-    Storey.excluded_models = %w(User Company Role Permission)
+```ruby
+Storey.configure do |c|
+  # Defines the tables that should stay available to all (ie in the public schema)
+  # Note that there's currently no way to exclude tables that aren't linked to models
+  # If you have any ideas on how to do this I'm open to suggestions
+  c.excluded_models = %w(User Company Role Permission)
 
-    # If set, all schemas are created with the suffix.
-    # Used for obscuring the schema name - which is important when performing schema duplication.
-    # Storey.suffix = "_suffix"
+  # If set, all schemas are created with the suffix.
+  # Used for obscuring the schema name - which is important when performing schema duplication.
+  # c.suffix = "_suffix"
 
-    # Defines schemas that should always stay in the search path, apart from the one you switched to.
-    # Storey.persistent_schemas = %w(hstore)
+  # Defines schemas that should always stay in the search path, apart from the one you switched to.
+  # c.persistent_schemas = %w(hstore)
+
+  # If you use a connection string, set it here. When nil, it falls back to the configuration in database.yml
+  c.database_url = ENV["DATABASE_URL"]
+end
+```
 
 # Methods
 
@@ -104,7 +111,7 @@ Accepts
     origin - name of old schema to copy
     copy - name of new schema
 
-Copies a schema with all data under a new name. Best used in conjunction with `Storey.suffix` set.
+Copies a schema with all data under a new name. Best used in conjunction with `Storey.configuration.suffix` set.
 
 Usage:
 

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    storey (2.0.1)
+    storey (2.1.0)
       easy_class_to_instance_method (~> 0.0.2)
+      gem_config
       pg
       rails (>= 4.0.0)
 
@@ -59,6 +60,7 @@ GEM
     diff-lcs (1.3)
     easy_class_to_instance_method (0.0.2)
     erubis (2.7.0)
+    gem_config (0.3.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (0.9.5)

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    storey (2.0.1)
+    storey (2.1.0)
       easy_class_to_instance_method (~> 0.0.2)
+      gem_config
       pg
       rails (>= 4.0.0)
 
@@ -59,6 +60,7 @@ GEM
     diff-lcs (1.3)
     easy_class_to_instance_method (0.0.2)
     erubi (1.7.1)
+    gem_config (0.3.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (1.0.1)

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    storey (2.0.1)
+    storey (2.1.0)
       easy_class_to_instance_method (~> 0.0.2)
+      gem_config
       pg
       rails (>= 4.0.0)
 
@@ -63,6 +64,7 @@ GEM
     diff-lcs (1.3)
     easy_class_to_instance_method (0.0.2)
     erubi (1.7.1)
+    gem_config (0.3.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (1.0.1)

data/lib/storey.rb

@@ -1,3 +1,4 @@
+require "gem_config"
 require 'easy_class_to_instance_method'
 require "active_support/core_ext/module" # so we can use mattr_accessor
 require "open3"
@@ -17,8 +18,8 @@ require 'storey/suffixifier'
 require 'storey/unsuffixifier'
 require 'storey/resets_column_info'
 require 'storey/utils'
-require 'storey/builds_dump_command'
-require 'storey/builds_load_command'
+require 'storey/gen_dump_command'
+require 'storey/gen_load_command'
 require 'storey/schema_name'
 require 'storey/sets_env_password'
 require 'storey/get_migration_versions'
@@ -30,16 +31,37 @@ module Storey
   mattr_reader :excluded_models
   extend self
 
+  include GemConfig::Base
+  with_configuration do
+    has :database_url, classes: [String, NilClass]
+    has :suffix, classes: [String, NilClass]
+    has :persistent_schemas, classes: Array, default: []
+    has :excluded_models, classes: Array, default: []
+  end
+
+  def self.persistent_schemas=(schemas)
+    deprecate "setting persistent schemas directly via `Storey.persistent_schemas=` is deprecated. Please use `Storey.configure {|c| c.persistent_schemas = %w(hstore) }` instead."
+    self.configuration.persistent_schemas = schemas
+  end
+
+  def self.suffix=(s)
+    deprecate "setting suffix directly via `Storey.suffix=` is deprecated. Please use `Storey.configure {|c| c.suffix = %w(_mysfx) }` instead."
+    self.configuration.suffix = s
+  end
+
+  def self.excluded_models=(models)
+    deprecate "setting models directly via `Storey.excluded_models=` is deprecated. Please use `Storey.configure {|c| c.excluded_models = %w(User Setting) }` instead."
+    self.configuration.excluded_models = models
+  end
+
   def init
-    self.excluded_models ||= []
-    self.persistent_schemas ||= []
     process_excluded_models
   end
 
   def default_search_path
     set_default_search_path
     default_search_paths = @@default_search_path.split(',')
-    paths = default_search_paths + self.persistent_schemas
+    paths = default_search_paths + self.configuration.persistent_schemas
     paths.uniq!
     paths.compact!
     paths.join(',')
@@ -49,11 +71,6 @@ module Storey
     self.schema == self.default_search_path
   end
 
-  def excluded_models=(array)
-    @@excluded_models = array
-    process_excluded_models
-  end
-
   def schema(options={})
     options[:suffix] ||= false
 
@@ -154,7 +171,7 @@ module Storey
   def schema_exists?(name)
     schema_name = suffixify(name)
 
-    schemas_in_db = self.schemas(suffix: self.suffix.present?)
+    schemas_in_db = self.schemas(suffix: self.configuration.suffix.present?)
     schemas_in_db << %("$user")
     schema_names = schema_name.split(',').map(&:strip)
     schemas_not_in_db = schema_names - schemas_in_db
@@ -164,7 +181,7 @@ module Storey
   def schema_search_path_for(schema_name)
     schema_names = schema_name.split(',')
     path = [suffixify(schema_name)]
-    self.persistent_schemas.each do |schema|
+    self.configuration.persistent_schemas.each do |schema|
       unless schema_names.include?(schema)
         path << suffixify(schema)
       end
@@ -173,9 +190,10 @@ module Storey
   end
 
   def reload_config!
-    self.excluded_models = []
-    self.persistent_schemas = []
-    self.suffix = nil
+    self.configuration.excluded_models = []
+    self.configuration.persistent_schemas = []
+    self.configuration.suffix = nil
+    self.configuration.database_url = nil
   end
 
   def database_config
@@ -213,7 +231,7 @@ module Storey
   end
 
   def process_excluded_models
-    self.excluded_models.each do |model_name|
+    self.configuration.excluded_models.each do |model_name|
       model_name.constantize.tap do |klass|
         table_name = klass.table_name.split('.', 2).last
         klass.table_name = "public.#{table_name}"
@@ -242,7 +260,14 @@ module Storey
   end
 
   def psql_load_command(options={})
-    BuildsLoadCommand.execute(self.database_config.merge(options))
+    args = self.database_config.slice(
+      :database,
+      :username,
+      :host,
+      :port,
+      :password,
+    ).merge(options).symbolize_keys
+    GenLoadCommand.(args)
   end
 
   def set_default_search_path

data/lib/storey/duplicator.rb

@@ -39,29 +39,26 @@ module Storey
     end
 
     def dump_schema(options={})
-      SetsEnvPassword.with(Storey.database_config[:password])
       prepare_schema_dump_directories
 
-      if Storey.database_config[:host].present?
-        options[:host] ||= Storey.database_config[:host]
-      end
-
-      arg_options = options.dup
-      arg_options[:username] ||= Storey.database_config[:username]
-      arg_options[:file]     ||= @source_file
-      arg_options[:schema]   ||= @source_schema
-      arg_options['schema-only'] = nil if @structure_only
-
-      switches = Utils.command_line_switches_from(arg_options)
-      pg_dump_command = [
-        "pg_dump",
-        switches,
-        Storey.database_config[:database],
-      ].join(" ")
+      options[:host] ||= Storey.database_config[:host]
+      options[:structure_only] = true if @structure_only
+      options[:schemas] = @source_schema
+      options[:database] ||= Storey.database_config[:database]
+      options[:username] ||= Storey.database_config[:username]
+      options[:file] = @source_file
+      pg_dump_command = GenDumpCommand.(options)
 
       stdout_str, stderr_str, status = Open3.capture3(pg_dump_command)
       unless status.exitstatus.zero?
-        raise StoreyError, "There seems to have been a problem dumping `#{@source_schema}` to make a copy of it into `#{@target_schema}`"
+        msg = [
+          "Problem dumping",
+          "`#{@source_schema}`",
+          "to make a copy of it into",
+          "`#{@target_schema}`:",
+          stderr_str,
+        ].join(" ")
+        raise StoreyError, msg
       end
     end
 
@@ -73,7 +70,13 @@ module Storey
 
     def load_schema(options={})
       options[:file] ||= @target_file
-      psql_options = Storey.database_config.merge(options)
+      psql_options = Storey.database_config.slice(
+        :database,
+        :username,
+        :host,
+        :port,
+        :password,
+      ).merge(options).symbolize_keys
 
       if duplicating_from_default?
         # Since we are copying the source schema and we're after structure only,
@@ -82,7 +85,7 @@ module Storey
         ::Storey.create_plain_schema @target_schema
       end
 
-      psql_load_command = BuildsLoadCommand.execute(psql_options)
+      psql_load_command = GenLoadCommand.(psql_options)
       Open3.capture3(psql_load_command)
 
       copy_source_schema_migrations

data/lib/storey/gen_dump_command.rb

@@ -0,0 +1,52 @@
+module Storey
+  class GenDumpCommand
+
+    def self.call(
+      database_url: Storey.configuration.database_url,
+      database: nil,
+      host: nil,
+      username: nil,
+      structure_only: false,
+      file: nil,
+      schemas: nil,
+      password: nil
+    )
+      switches = {}
+
+      if database_url.nil?
+        if database.blank?
+          raise ArgumentError, 'database must be supplied'
+        end
+
+        switches['host'] = host if host.present?
+        switches['username'] = username if username.present?
+      end
+
+      switches['schema-only'] = nil if structure_only
+      switches['no-privileges'] = nil
+      switches['no-owner'] = nil
+      switches[:file] = Shellwords.escape(file)
+
+      if schemas
+        schemas = schemas.split(',')
+        schemas_switches = schemas.map do |part|
+          Utils.command_line_switches_from({schema: Shellwords.escape(part) })
+        end
+      end
+
+      command_parts = []
+      if password.present?
+        command_parts << "PGPASSWORD=#{password}"
+      end
+      command_parts << "pg_dump"
+      command_parts << database_url if database_url.present?
+      command_parts += [
+        Utils.command_line_switches_from(switches),
+        schemas_switches,
+      ]
+      command_parts << database if database_url.blank?
+      command_parts.compact.join(' ')
+    end
+
+  end
+end

data/lib/storey/gen_load_command.rb

@@ -0,0 +1,41 @@
+module Storey
+  class GenLoadCommand
+
+    def self.call(
+      file: nil,
+      command: nil,
+      database_url: Storey.configuration.database_url,
+      database: nil,
+      username: nil,
+      host: nil,
+      port: nil,
+      password: nil
+    )
+      switches = {}
+      if file.present?
+        switches[:file] = Shellwords.escape(file)
+      end
+      switches[:command] = %Q("#{command}") if command.present?
+
+      command_parts = ["psql"]
+
+      if database_url.present?
+        command_parts << database_url
+      else
+        switches[:dbname] = database
+        switches[:username] = username if username.present?
+        switches[:host] = host if host.present?
+        switches[:port] = port if port.present?
+        if password.present?
+          switches[:password] = password
+        else
+          switches['no-password'] = nil
+        end
+      end
+
+      command_parts << Utils.command_line_switches_from(switches)
+      command_parts.join(' ')
+    end
+
+  end
+end

data/lib/storey/hstore.rb

@@ -19,7 +19,7 @@ module Storey
     private
 
     def ensure_hstore_is_persistent
-      unless Storey.persistent_schemas.include?('hstore')
+      unless Storey.configuration.persistent_schemas.include?('hstore')
         fail StoreyError, 'You are attempting to install hstore data type, but the hstore schema (where the data type will be installed) is not one of the persistent schemas. Please add hstore to the list of persistent schemas.'
       end
     end

data/lib/storey/sql_dumper.rb

@@ -33,8 +33,8 @@ module Storey
         file: @file,
         schemas: search_path,
         database: database_name,
-      )
-      @command = BuildsDumpCommand.execute(args)
+      ).symbolize_keys
+      @command = GenDumpCommand.(args)
     end
 
   end

data/lib/storey/suffixifier.rb

@@ -26,7 +26,7 @@ module Storey
     end
 
     def suffix
-      Storey.suffix
+      Storey.configuration.suffix
     end
 
     def native_schema?(schema_name)

data/lib/storey/unsuffixifier.rb

@@ -22,7 +22,7 @@ module Storey
     private
 
     def suffix
-      Storey.suffix
+      Storey.configuration.suffix
     end
 
     def schema_names

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/lib/tasks/storey.rake

@@ -1,7 +1,7 @@
 namespace :storey do
 
   namespace :hstore do
-    desc "Install hstore into the hstore#{Storey.suffix} schema"
+    desc "Install hstore into the hstore#{Storey.configuration.suffix} schema"
     task :install => :environment do
       Storey::Hstore.install
     end

data/spec/lib/storey_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.describe Storey do
+
+  describe ".configure" do
+    it "customizes settings" do
+      described_class.configure do |c|
+        c.database_url = "postgres://url.com/db"
+      end
+
+      expect(described_class.configuration.database_url).
+        to eq "postgres://url.com/db"
+    end
+  end
+
+end

data/spec/storey/configuration_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Storey, "configuration" do
   it "should allow setting of suffix" do
-    Storey.suffix = "_hello"
-    Storey.suffix.should == "_hello"
+    Storey.configuration.suffix = "_hello"
+    expect(Storey.configuration.suffix).to eq "_hello"
   end
 
   it "should allow setting of excluded_models" do
-    Storey.excluded_models = %w(Company)
-    Storey.excluded_models.should == %w(Company)
+    Storey.configuration.excluded_models = %w(Company)
+    expect(Storey.configuration.excluded_models).to eq %w(Company)
   end
 end

data/spec/storey/create_plain_schema_spec.rb

@@ -4,18 +4,18 @@ describe Storey, '.create_plain_schema' do
   context 'when there is no suffix set' do
     it 'should create a schema without a suffix' do
       Storey.create_plain_schema 'dun'
-      Storey.schemas(suffix: true).should include('dun')
+      expect(Storey.schemas(suffix: true)).to include('dun')
     end
   end
 
   context 'when there is a suffix set' do
     before do
-      Storey.suffix = '_lop'
+      Storey.configuration.suffix = '_lop'
     end
 
     it 'should create a schema with the suffix' do
       Storey.create_plain_schema 'dun'
-      Storey.schemas(suffix: true).should include('dun_lop')
+      expect(Storey.schemas(suffix: true)).to include('dun_lop')
     end
   end
 end

data/spec/storey/create_spec.rb

@@ -76,7 +76,7 @@ describe Storey, "#create" do
 
   context "when suffix is set" do
     before do
-      Storey.suffix = "_rock"
+      Storey.configuration.suffix = "_rock"
     end
 
     it "should create a schema with the suffix" do

data/spec/storey/default_search_path_spec.rb

@@ -17,13 +17,13 @@ describe 'Storey', '#default_search_path' do
   end
 
   it 'includes the persistent schemas' do
-    Storey.persistent_schemas = %w(hello there)
+    Storey.configuration.persistent_schemas = %w(hello there)
     expect(Storey.default_search_path).to eq '"$user",public,hello,there'
   end
 
   context 'when the persistent schemas includes `public`' do
     it 'has one instance of public' do
-      Storey.persistent_schemas = %w(public hello)
+      Storey.configuration.persistent_schemas = %w(public hello)
       expect(Storey.default_search_path).to eq '"$user",public,hello'
     end
   end

data/spec/storey/drop_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Storey, "#drop" do
   context "when suffix is set" do
     before do
-      Storey.suffix = "bar"
+      Storey.configuration.suffix = "bar"
       Storey.create "foo"
     end
 

data/spec/storey/duplicate_spec.rb

@@ -52,17 +52,9 @@ describe Storey, "#duplicate!" do
 
   end
 
-  it "should clear the PGPASSWORD environment variable" do
-    Storey.create 'ricky'
-    expect(Storey::SetsEnvPassword).to receive(:with).
-      with(Storey.database_config[:password])
-    Storey.duplicate! 'ricky', 'bobby'
-    ENV['PGPASSWORD'].should be_blank
-  end
-
   context "when a suffix is set" do
     before do
-      Storey.suffix = "_shakenbake"
+      Storey.configuration.suffix = "_shakenbake"
       Storey.create 'ricky' do
         Post.create :name => "Hi"
       end

data/spec/storey/duplicator_spec.rb

@@ -4,18 +4,19 @@ describe Storey::Duplicator do
 
   describe '#perform!' do
     context "when the dump is a failure" do
-      it 'should raise an error' do
+      it 'raises an error' do
         duplicator = described_class.new('non-existent-will-fail-dump', 'new')
-        expect {
-          duplicator.perform!
-        }.to raise_error(
-          Storey::StoreyError,
-          "There seems to have been a problem dumping `non-existent-will-fail-dump` to make a copy of it into `new`"
-        )
+        expected_msg = [
+          "Problem dumping `non-existent-will-fail-dump` to make a copy of it",
+          "into `new`: pg_dump: no matching schemas were found",
+        ].join(" ")
+        expect { duplicator.perform! }.
+          to raise_error(Storey::StoreyError).
+          with_message(/#{expected_msg}/)
       end
     end
 
-    it 'should remove the target and source sql files after work' do
+    it 'removes the target and source sql files after work' do
       Storey.create 'boo'
       duplicator = described_class.new('boo', 'ya')
       duplicator.perform!

data/spec/storey/excluded_models_spec.rb

@@ -2,14 +2,17 @@ require 'spec_helper'
 
 describe Storey, "dealing with excluded_models" do
   before do
-    Storey.excluded_models = %w(Company)
+    Storey.configuration.excluded_models = %w(Company)
+    # In practice, `excluded_models` is not set on the fly, but since we do so
+    # in the tests, we must call `init` to set the models to the right tables:
+    Storey.init
   end
 
   it "should always reference these models in the public schema" do
     Storey.create("foo") { Company.create :name => "company_1" }
     Company.create :name => "company_2"
 
-    Company.count.should == 2
-    Storey.switch("foo") {Company.count.should == 2}
+    expect(Company.count).to eq 2
+    Storey.switch("foo") { expect(Company.count).to eq 2 }
   end
 end

data/spec/storey/{builds_dump_command_spec.rb → gen_dump_command_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Storey::BuildsDumpCommand do
+module Storey
+  describe GenDumpCommand do
 
-  describe '.execute' do
-    subject do
-      described_class.execute(options)
+    subject(:command) do
+      described_class.(options)
     end
 
     let(:options) do
@@ -16,6 +16,54 @@ describe Storey::BuildsDumpCommand do
       }
     end
 
+    context "connection string is passed in" do
+      let(:options) do
+        {
+          structure_only: true,
+          file: 'myfile.sql',
+          schemas: 'public',
+          database_url: "postgres://user:pass@ip.com:5432/db",
+        }
+      end
+
+      it "uses the connection string" do
+        expect(command).to include "pg_dump postgres://user:pass@ip.com:5432/db"
+      end
+    end
+
+    context "connection string is passed in" do
+      let(:options) do
+        {
+          structure_only: true,
+          file: 'myfile.sql',
+          database_url: "postgres://user:pass@ip.com:5432/db",
+          database: "testdb",
+        }
+      end
+
+      it "ignores the `database` value" do
+        expect(command).to_not match /testdb/
+      end
+    end
+
+    context "connection string is set in Storey" do
+      before do
+        Storey.configuration.database_url = "postgres://user:pass@ip.com:5432/db"
+      end
+
+      let(:options) do
+        {
+          structure_only: true,
+          file: 'myfile.sql',
+          schemas: 'public',
+        }
+      end
+
+      it "uses the connection string" do
+        expect(command).to include "pg_dump postgres://user:pass@ip.com:5432/db"
+      end
+    end
+
     context "when host is specified" do
       before do
         options.merge!(host: "localhost")

data/spec/storey/{builds_load_command_spec.rb → gen_load_command_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Storey::BuildsLoadCommand do
+module Storey
+  describe GenLoadCommand do
 
-  describe '.execute' do
     let(:options) do
       {
         file: '/path/file dump.sql',
@@ -10,11 +10,12 @@ describe Storey::BuildsLoadCommand do
         username: 'myuser',
         host: 'localhost',
         port: '5467',
-        password: '12345'
+        password: '12345',
+        database_url: nil,
       }
     end
 
-    subject { described_class.execute(options) }
+    subject(:command) { described_class.(options) }
 
     it { should include('--file=/path/file\ dump.sql') }
     it { should include('--dbname=mydb') }
@@ -22,6 +23,36 @@ describe Storey::BuildsLoadCommand do
     it { should include('--host=localhost') }
     it { should include('--password=12345')}
 
+    context "when database_url is passed in" do
+      subject(:command) do
+        described_class.(
+          database_url: "postgres://u:p@host:5432/db",
+          file: '/path/file dump.sql',
+          host: 'localhost',
+        )
+      end
+
+      it "prioritizes the database_url" do
+        expect(command).to include "psql postgres://u:p@host:5432/db"
+        expect(command).to_not include "localhost"
+      end
+    end
+
+    context "when database_url is set in Storey config" do
+      before do
+        Storey.configuration.database_url = "postgres://u:p@host:5432/db"
+      end
+
+      subject(:command) do
+        described_class.(file: '/path/file dump.sql', host: 'localhost')
+      end
+
+      it "prioritizes the database_url" do
+        expect(command).to include "psql postgres://u:p@host:5432/db"
+        expect(command).to_not include "localhost"
+      end
+    end
+
     context 'when host is not set' do
       before { options[:host] = nil }
       it { should_not include('--host=') }

data/spec/storey/hstore_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Storey::Hstore do
   describe '.install' do
     it 'installs the extension into the hstore schema' do
-      Storey.persistent_schemas = %w(hstore)
+      Storey.configuration.persistent_schemas = %w(hstore)
       described_class.install
       expect { ::ActiveRecord::Base.connection.execute "DROP EXTENSION hstore" }.
         to_not raise_error
@@ -11,7 +11,7 @@ describe Storey::Hstore do
 
     context 'hstore is not one of the persistent schemas' do
       it 'fails with an StoreyError' do
-        Storey.persistent_schemas = []
+        Storey.configuration.persistent_schemas = []
         message = 'You are attempting to install hstore data type, but the hstore schema (where the data type will be installed) is not one of the persistent schemas. Please add hstore to the list of persistent schemas.'
         expect { described_class.install }.
           to raise_error(Storey::StoreyError, message)

data/spec/storey/schema_exists_spec.rb

@@ -28,7 +28,7 @@ describe Storey, '#schema_exists?' do
   context 'when there is a suffix' do
     context 'when the schema exists' do
       before do
-        Storey.suffix = '_boo'
+        Storey.configuration.suffix = '_boo'
         Storey.create 'croo'
       end
 

data/spec/storey/schema_search_path_for_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Storey, '#schema_search_path_for' do
 
   context 'given a search path that is one of the persistent schemas' do
-    Storey.persistent_schemas = %w(halla)
+    Storey.configuration.persistent_schemas = %w(halla)
     Storey.schema_search_path_for('bola,halla').should == 'bola, halla'
     Storey.schema_search_path_for('halla').should == 'halla'
     Storey.schema_search_path_for('halla,bola').should == 'halla, bola'

data/spec/storey/schema_spec.rb

@@ -13,7 +13,7 @@ describe Storey, "#schema" do
 
   context "when a suffix is set" do
     before do
-      Storey.suffix = "_rock"
+      Storey.configuration.suffix = "_rock"
       Storey.create "hello"
       Storey.switch "hello"
     end

data/spec/storey/schemas_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Storey, "#schemas" do
   context "when suffix is set" do
     before do
-      Storey.suffix = "_roboto"
+      Storey.configuration.suffix = "_roboto"
     end
 
     it "should return an array of the schemas without the suffix by default" do

data/spec/storey/suffixifier_spec.rb

@@ -8,7 +8,7 @@ describe Storey::Suffixifier do
     end
 
     context 'suffixes have been turned on' do
-      before { Storey.suffix = '_suff' }
+      before { Storey.configuration.suffix = '_suff' }
 
       context 'when the schema given has not already been suffixified' do
         let(:schema_name) { 'boom' }
@@ -30,7 +30,7 @@ describe Storey::Suffixifier do
     end
 
     context 'suffixes are not on' do
-      before { Storey.suffix = nil }
+      before { Storey.configuration.suffix = nil }
       let(:schema_name) { 'boom' }
       it { should == 'boom' }
     end

data/spec/storey/switch_spec.rb

@@ -11,7 +11,7 @@ describe Storey, "#switch" do
 
   context "with a schema set" do
     before do
-      Storey.suffix = "_hello"
+      Storey.configuration.suffix = "_hello"
       Storey.create "foobar"
     end
 
@@ -56,7 +56,7 @@ describe Storey, "#switch" do
   context "when the schema passed does not exist" do
     context "when the suffix is set" do
       before do
-        Storey.suffix = "_rock"
+        Storey.configuration.suffix = "_rock"
       end
 
       it "should raise an error naming the schema with suffix" do
@@ -111,7 +111,7 @@ describe Storey, "#switch" do
         persistent_schemas.each do |schema|
           Storey.create schema
         end
-        Storey.persistent_schemas = persistent_schemas
+        Storey.configuration.persistent_schemas = persistent_schemas
       end
 
       it 'should switch to the schema with the persitent schemas still in the search path' do
@@ -125,13 +125,13 @@ describe Storey, "#switch" do
 
     context 'when suffixes are set' do
       before do
-        Storey.suffix = '_boomboom'
+        Storey.configuration.suffix = '_boomboom'
         Storey.create 'foobar'
         persistent_schemas = %w(handle bar foo)
         persistent_schemas.each do |schema|
           Storey.create schema
         end
-        Storey.persistent_schemas = persistent_schemas
+        Storey.configuration.persistent_schemas = persistent_schemas
       end
 
       it 'should switch to the schema with the persitent schemas still in the search path' do
@@ -151,7 +151,7 @@ describe Storey, "#switch" do
         persistent_schemas.each do |schema|
           Storey.create schema
         end
-        Storey.persistent_schemas = persistent_schemas
+        Storey.configuration.persistent_schemas = persistent_schemas
       end
 
       it 'should not have duplicate schemas in the search path' do

data/spec/storey/unsuffixifier_spec.rb

@@ -6,7 +6,7 @@ describe Storey::Unsuffixifier do
     subject { described_class.new(schema_name).unsuffixify }
 
     context 'when the suffix is set' do
-      before { Storey.suffix = '_buff' }
+      before { Storey.configuration.suffix = '_buff' }
 
       context 'when the schema name does not have a suffix' do
         let(:schema_name) { 'big' }

data/storey.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'easy_class_to_instance_method', '~> 0.0.2'
   s.add_runtime_dependency "rails", ">= 4.0.0"
   s.add_runtime_dependency "pg"
+  s.add_runtime_dependency "gem_config"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ramon Tayag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Storey aims to simplify the implementation of managing a multi-tenant
   application.
 email:
@@ -106,11 +120,11 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_5.2.gemfile.lock
 - lib/storey.rb
-- lib/storey/builds_dump_command.rb
-- lib/storey/builds_load_command.rb
 - lib/storey/dumper.rb
 - lib/storey/duplicator.rb
 - lib/storey/exceptions.rb
+- lib/storey/gen_dump_command.rb
+- lib/storey/gen_load_command.rb
 - lib/storey/get_migration_versions.rb
 - lib/storey/hstore.rb
 - lib/storey/migrator.rb
@@ -165,10 +179,9 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/fixtures/.gitkeep
+- spec/lib/storey_spec.rb
 - spec/migrator_spec.rb
 - spec/spec_helper.rb
-- spec/storey/builds_dump_command_spec.rb
-- spec/storey/builds_load_command_spec.rb
 - spec/storey/configuration_spec.rb
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
@@ -179,6 +192,8 @@ files:
 - spec/storey/duplicate_spec.rb
 - spec/storey/duplicator_spec.rb
 - spec/storey/excluded_models_spec.rb
+- spec/storey/gen_dump_command_spec.rb
+- spec/storey/gen_load_command_spec.rb
 - spec/storey/get_migration_versions_spec.rb
 - spec/storey/hstore_spec.rb
 - spec/storey/native_schema_matcher_spec.rb
@@ -261,10 +276,9 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/fixtures/.gitkeep
+- spec/lib/storey_spec.rb
 - spec/migrator_spec.rb
 - spec/spec_helper.rb
-- spec/storey/builds_dump_command_spec.rb
-- spec/storey/builds_load_command_spec.rb
 - spec/storey/configuration_spec.rb
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
@@ -275,6 +289,8 @@ test_files:
 - spec/storey/duplicate_spec.rb
 - spec/storey/duplicator_spec.rb
 - spec/storey/excluded_models_spec.rb
+- spec/storey/gen_dump_command_spec.rb
+- spec/storey/gen_load_command_spec.rb
 - spec/storey/get_migration_versions_spec.rb
 - spec/storey/hstore_spec.rb
 - spec/storey/native_schema_matcher_spec.rb

data/lib/storey/builds_dump_command.rb

@@ -1,42 +0,0 @@
-module Storey
-  class BuildsDumpCommand
-
-    easy_class_to_instance
-
-    def initialize(options={})
-      @options = options
-      if @options[:database].blank?
-        raise ArgumentError, 'database must be supplied'
-      end
-    end
-
-    def execute
-
-      switches = {}
-      switches['schema-only'] = nil if @options[:structure_only]
-      switches['no-privileges'] = nil
-      switches['no-owner'] = nil
-      switches['host'] = @options[:host] if @options[:host].present?
-      switches['username'] = @options[:username] if @options[:username].present?
-      switches[:file] = Shellwords.escape(@options[:file])
-
-      if @options[:schemas]
-        schemas = @options[:schemas].split(',')
-        schemas_switches = schemas.map do |part|
-          Utils.command_line_switches_from({schema: Shellwords.escape(part) })
-        end
-      end
-
-      command_parts = []
-      if @options[:password].present?
-        command_parts << "PGPASSWORD=#{@options[:password]}"
-      end
-      command_parts += ['pg_dump',
-                       Utils.command_line_switches_from(switches),
-                       schemas_switches,
-                       @options[:database]]
-      command_parts.compact.join(' ')
-    end
-
-  end
-end

data/lib/storey/builds_load_command.rb

@@ -1,31 +0,0 @@
-module Storey
-  class BuildsLoadCommand
-
-    easy_class_to_instance
-
-    def initialize(options={})
-      @options = options
-    end
-
-    def execute
-      switches = {}
-      if @options[:file].present?
-        switches[:file] = Shellwords.escape(@options[:file])
-      end
-      switches[:dbname] = @options[:database]
-      switches[:username] = @options[:username] if @options[:username].present?
-      switches[:host] = @options[:host] if @options[:host].present?
-      switches[:port] = @options[:port] if @options[:port].present?
-      if @options[:password].present?
-        switches[:password] = @options[:password]
-      else
-        switches['no-password'] = nil
-      end
-      switches[:command] = %Q("#{@options[:command]}") if @options[:command].present?
-      command_parts = ['psql',
-                       Utils.command_line_switches_from(switches)]
-      command_parts.join(' ')
-    end
-
-  end
-end