storey 0.3.0 → 0.3.1

data/lib/storey/dumper.rb

@@ -0,0 +1,39 @@
+class Storey::Dumper
+  def self.dump(options={})
+    case Rails.configuration.active_record.schema_format
+    when :sql  ; self.dump_structure_sql(options)
+    when :ruby ; self.dump_schema_rb(options)
+    end
+  end
+
+  def self.dump_schema_rb(options={})
+    require 'active_record/schema_dumper'
+    filename = options[:file] || "#{Rails.root}/db/schema.rb"
+    File.open(filename, "w:utf-8") do |file|
+      ActiveRecord::Base.establish_connection(Rails.env)
+      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+    end
+  end
+
+  def self.dump_structure_sql(options={})
+    abcs = ActiveRecord::Base.configurations
+    filename = options[:file] || File.join(Rails.root, "db", "structure.sql")
+    set_psql_env(abcs[Rails.env])
+    search_path = abcs[Rails.env]['schema_search_path']
+    unless search_path.blank?
+      search_path = search_path.split(",").map{|search_path_part| "--schema=#{Shellwords.escape(search_path_part.strip)}" }.join(" ")
+    end
+    `pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(abcs[Rails.env]['database'])}`
+    raise 'Error dumping database' if $?.exitstatus == 1
+    File.open(filename, "a") { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
+  end
+
+  private
+
+  def self.set_psql_env(config)
+    ENV['PGHOST']     = config['host']          if config['host']
+    ENV['PGPORT']     = config['port'].to_s     if config['port']
+    ENV['PGPASSWORD'] = config['password'].to_s if config['password']
+    ENV['PGUSER']     = config['username'].to_s if config['username']
+  end
+end

data/lib/storey/migrator.rb

@@ -1,6 +1,14 @@
 module Storey::Migrator
   extend self
 
+  def migrate_all
+    self.migrate 'public'
+    Storey::Dumper.dump
+    Storey.schemas(public: false).each do |schema|
+      self.migrate schema
+    end
+  end
+
   def migrate(schema)
     Storey.switch schema do
       ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path

data/lib/storey/version.rb

@@ -1,3 +1,3 @@
 module Storey
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/storey.rb

@@ -6,6 +6,7 @@ require 'storey/exceptions'
 require 'storey/migrator'
 require 'storey/duplicator'
 require 'storey/hstore'
+require 'storey/dumper'
 
 module Storey
   extend self

data/lib/tasks/storey.rake

@@ -8,10 +8,8 @@ namespace :storey do
   end
 
   desc "Migrate all schemas including public"
-  task :migrate => "db:migrate" do
-    Storey.schemas.each do |schema|
-      Storey::Migrator.migrate schema
-    end
+  task migrate: :environment do
+    Storey::Migrator.migrate_all
   end
 
   desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all schemas."

data/spec/migrator_spec.rb

@@ -7,16 +7,31 @@ describe Storey::Migrator do
     Storey.create @schema_1
   end
 
-  describe "#migrate" do
-    it "should connect to new db, then reset when done" do
-      ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@schema_1).once
-      ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
-      Storey::Migrator.migrate(@schema_1)
+  describe '.migrate_all' do
+    it 'should migrate the default search path first, then all available schemas' do
+      described_class.should_receive(:migrate).with('public').ordered
+      described_class.should_receive(:migrate).with(@schema_1).ordered
+      described_class.migrate_all
     end
 
-    it "should migrate db" do
-      ActiveRecord::Migrator.should_receive(:migrate)
-      Storey::Migrator.migrate(@schema_1)
+    it 'should dump the database' do
+      Storey::Dumper.should_receive(:dump)
+      described_class.migrate_all
+    end
+  end
+
+  describe '.migrate' do
+    context 'given a schema' do
+      it 'should connect to new db, then reset when done' do
+        ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@schema_1).once
+        ActiveRecord::Base.connection.should_receive(:schema_search_path=).with(@original_schema).once
+        Storey::Migrator.migrate(@schema_1)
+      end
+
+      it "should migrate db" do
+        ActiveRecord::Migrator.should_receive(:migrate)
+        Storey::Migrator.migrate(@schema_1)
+      end
     end
   end
 

data/spec/storey/dumper_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Storey::Dumper do
+  describe '.dump' do
+    context 'when the schema_format is :ruby' do
+      before do
+        Rails.configuration.active_record.schema_format = :ruby
+      end
+
+      it 'should create a db/schema.rb file' do
+        schema_rb_path = File.join Rails.root, 'db', 'schema.rb'
+        FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+        described_class.dump
+        File.should exist(schema_rb_path)
+        FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+      end
+
+      context 'given a file is specified' do
+        it 'should create the schema dump file in the specified location' do
+          schema_rb_path = File.join Rails.root, 'db', 'schema2.rb'
+          FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+          described_class.dump file: schema_rb_path
+          File.should exist(schema_rb_path)
+          FileUtils.rm schema_rb_path if File.exists?(schema_rb_path)
+        end
+      end
+    end
+
+    context 'when the schema_format is :sql' do
+      before do
+        Rails.configuration.active_record.schema_format = :sql
+      end
+
+      it 'should create a db/structure.sql file' do
+        structure_path = File.join Rails.root, 'db', 'structure.sql'
+        FileUtils.rm structure_path if File.exists?(structure_path)
+        described_class.dump
+        File.should exist(structure_path)
+        FileUtils.rm structure_path
+      end
+
+      context 'when the file is specified' do
+        it 'should create dump into the given file' do
+          structure_path = File.join Rails.root, 'db', 'structure2.sql'
+          FileUtils.rm structure_path if File.exists?(structure_path)
+          described_class.dump file: structure_path
+          File.should exist(structure_path)
+          FileUtils.rm structure_path
+        end
+      end
+    end
+  end
+end

data/spec/storey/schema_search_path_for_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Storey, '.schema_search_path_for' do
+  context 'given a blank argument' do
+    it 'should return the default path' do
+      Storey.switch
+      Storey.schema.should == Storey.default_search_path
+    end
+  end
+end

data/spec/storey/schemas_spec.rb

@@ -47,5 +47,6 @@ describe Storey, "#schemas" do
         Storey.schemas(:public => false).should_not include("public")
       end
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storey
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76025600 !ruby/object:Gem::Requirement
+  requirement: &82507520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76025600
+  version_requirements: *82507520
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &76025050 !ruby/object:Gem::Requirement
+  requirement: &82506870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.2
   type: :development
   prerelease: false
-  version_requirements: *76025050
+  version_requirements: *82506870
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &76024290 !ruby/object:Gem::Requirement
+  requirement: &82506250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76024290
+  version_requirements: *82506250
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &76023620 !ruby/object:Gem::Requirement
+  requirement: &82505580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76023620
+  version_requirements: *82505580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76023040 !ruby/object:Gem::Requirement
+  requirement: &82504910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76023040
+  version_requirements: *82504910
 description: Storey aims to simplify the implementation of managing a multi-tenant
   application.
 email:
@@ -81,6 +81,7 @@ files:
 - README.md
 - Rakefile
 - lib/storey.rb
+- lib/storey/dumper.rb
 - lib/storey/duplicator.rb
 - lib/storey/exceptions.rb
 - lib/storey/hstore.rb
@@ -134,10 +135,12 @@ files:
 - spec/storey/create_plain_schema_spec.rb
 - spec/storey/create_spec.rb
 - spec/storey/drop_spec.rb
+- spec/storey/dumper_spec.rb
 - spec/storey/duplicate_spec.rb
 - spec/storey/excluded_models_spec.rb
 - spec/storey/hstore_spec.rb
 - spec/storey/persistent_schemas_spec.rb
+- spec/storey/schema_search_path_for_spec.rb
 - spec/storey/schema_spec.rb
 - spec/storey/schemas_spec.rb
 - spec/storey/suffixify_spec.rb