standalone_migrations 2.1.4 → 2.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU2ZDcxNmU0ZTY2MTdmOWRlNWQ4YzQ3YWU3N2I5Y2ZmN2QzMGQyOQ==
+    YWM3OTBhMzM0MDNhYmM1M2ZkZDIzNzQ1YjdjNGU2ZjgzNjQ1Y2M1Zg==
   data.tar.gz: !binary |-
-    M2EyNmZlMzk4YTA0Mzc2ZDMzY2VlZGZiNjZiM2I0YWE2ZTRiNDFiOQ==
+    ZDQwZTMwZjA0NGE3ODg2NWExN2MxZjYyZWZhODY1YTk0NzM3YzcwZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM0MzhkOTllMmVhNDJjOWI4ODQ5ZjEwYmIzMjViOWZhM2MzMzJiY2U4MTY1
-    M2M4N2ZhMzdlOTBkZDMxZDk1YWFkYmRkMjc5ODUzOWU5OTFhZWZkOTBkZmRl
-    ODRmNDk2MzBiMjViMzFkNjBkOTQxN2EyZTQzNzhjNWI3NWNkOTA=
+    NDY0YTU2MmI4MDcwMzNkMGUwYTg3YTQwNWUzZGFiZGM4Y2Y5ZDY0NDhmNjM5
+    MjQ1N2M2MWY4NGU4MWZlMzY0NDNlNmNmOGY5ZjQxMWQ1MzY1NTllZWI3MDMz
+    MDE2Y2NiNjg0ZDFkOGM2NTIwYjNiNzk3MGVlNmViMGUyODEzNDM=
   data.tar.gz: !binary |-
-    OGQyOTI4M2IxMWE2NWYwNzhjYWUzNjFmYjVkNjg5ZGQ2NzFlMDA5NTZmOTZj
-    NDE1YzY0NmNkNGYzNzgyYWZlMjE2NWE4ODE5YWRhZTAxMDNiNGE0NjEzMjEw
-    N2E5N2QyYzY2ZGMzYzc3OThkNTVjNTM4YWMyZWQ4OWIzMWFhZWY=
+    MDgzOTMzODhlY2NiMDlkZWE4YzU5YTY4Y2Y3NzU1NDM4ZjE3ZDljM2FmYzJj
+    NjhlODFjNzY4NjQ0NjhiYmE0M2UxNGFlMmUxYmY5Y2FiYWYxZDJmZmE2Nzcy
+    YmY1YWEwNTdhNDdjNmM1OWE3OWFhNjcxMWMzZWRjM2Y4ZTYxMDk=

data/.travis.yml

@@ -2,5 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
-  - 1.8.7
-script: bundle exec rake specs:all
+script: bundle exec rake specs:travis

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake', '~> 10.0'
 gem 'activerecord', ENV['AR'] || '~> 3.2'

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionpack (3.2.13)
       activemodel (= 3.2.13)

data/README.markdown

@@ -107,6 +107,18 @@ config:
 These are the configurable options available. You can omit any of
 the keys and Standalone Migrations will assume the default values. 
 
+### on_loaded callbacks
+
+If you would like to use an external library such as [foreigner](https://github.com/matthuhiggins/foreigner) with standalone migrations, you can add the following to your `Rakefile`:
+
+```ruby
+require 'foreigner'
+
+StandaloneMigrations.on_load do
+  Foreigner.load
+end
+```
+
 ###Multiple database support
 
 ####Structure
@@ -248,5 +260,6 @@ Contributors
  - [Koen Punt](http://www.koen.pt/)
  - [Parker Moore](http://www.parkermoore.de/)
  - [Marcell Jusztin](http://www.morcmarc.com)
+ - [Eric Hayes](http://ejhay.es)
 
 This work is originally based on [Lincoln Stoll's blog post](http://lstoll.net/2008/04/stand-alone-activerecord-migrations/) and [David Welton's post](http://journal.dedasys.com/2007/01/28/using-migrations-outside-of-rails).

data/Rakefile

@@ -19,6 +19,12 @@ namespace :specs do
     t.pattern = "spec/standalone_migrations/**/*_spec.rb"
   end
 
+  desc "run all specs for travis"
+  RSpec::Core::RakeTask.new "travis" do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.rspec_opts = "--tag ~@travis_error"
+  end
+
   desc "run all specs including those which uses database"
   task :all => [:default, :nodb]
 end

data/VERSION

@@ -1 +1 @@
-2.1.4
+2.1.5

data/lib/standalone_migrations.rb

@@ -7,6 +7,7 @@ require "active_record"
 
 require "standalone_migrations/configurator"
 require "standalone_migrations/generator"
+require "standalone_migrations/callbacks"
 
 railtie_app_path = "#{lib_path}/standalone_migrations/minimal_railtie_config"
 APP_PATH = File.expand_path(railtie_app_path,  __FILE__)

data/lib/standalone_migrations/callbacks.rb

@@ -0,0 +1,13 @@
+module StandaloneMigrations
+  @@callbacks ||= []
+
+  def self.on_loaded(&block)
+    @@callbacks << block
+  end
+
+  def self.run_on_load_callbacks
+    @@callbacks.each do |callback|
+      callback.call
+    end
+  end
+end

data/lib/standalone_migrations/configurator.rb

@@ -78,9 +78,9 @@ module StandaloneMigrations
       config = YAML.load( ERB.new(IO.read(configuration_file)).result )
       {
         :config       => config["config"] ? config["config"]["database"] : defaults[:config],
-        :migrate_dir  => config["db"] ? config["db"]["migrate"] : defaults[:migrate_dir],
-        :seeds        => config["db"] ? config["db"]["seeds"] : defaults[:seeds],
-        :schema       => config["db"] ? config["db"]["schema"] : defaults[:schema]
+        :migrate_dir  => (config["db"] || {})["migrate"] || defaults[:migrate_dir],
+        :seeds        => (config["db"] || {})["seeds"] || defaults[:seeds],
+        :schema       => (config["db"] || {})["schema"] || defaults[:schema]
       }
     end
 

data/lib/standalone_migrations/tasks/connection.rake

@@ -3,5 +3,6 @@ namespace :standalone do
   task :connection do
     configurator = StandaloneMigrations::Configurator.new
     ActiveRecord::Base.establish_connection configurator.config_for(Rails.env)
+    StandaloneMigrations.run_on_load_callbacks
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 $: << File.join(File.expand_path('../', __FILE__), 'lib')
 
-require 'standalone_migrations/configurator'
+require 'rake'
+require 'standalone_migrations'

data/spec/standalone_migrations/callbacks_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module StandaloneMigrations
+
+  describe "Callbacks" do
+
+    describe ".on_loaded" do
+
+      it "responds to on_loaded" do
+        StandaloneMigrations.should respond_to :on_loaded
+      end
+
+      it "responds to run_on_load_callbacks" do
+        StandaloneMigrations.should respond_to :run_on_load_callbacks
+      end
+
+      it "can pass a block do on_loaded" do
+        callback_was_called = false
+
+        StandaloneMigrations.on_loaded do
+          callback_was_called = true
+        end
+
+        # invoke the callbacks
+        StandaloneMigrations.run_on_load_callbacks
+
+        callback_was_called.should be_true
+      end
+
+      it "can pass multiple blocks to on_loaded" do
+        callback_count = 0
+
+        for i in 1..4
+          StandaloneMigrations.on_loaded do
+            callback_count += 1
+          end
+        end
+
+        StandaloneMigrations.run_on_load_callbacks
+
+        callback_count.should == 4
+      end
+
+    end
+
+  end
+
+end

data/spec/standalone_migrations/configurator_spec.rb

@@ -216,6 +216,9 @@ module StandaloneMigrations
           {
             "config" => {
               "database" => "file/config/database.yml"
+            },
+            "db" => {
+              "seeds" => "file/db/seeds.rb"
             }
           }
         end
@@ -228,6 +231,10 @@ module StandaloneMigrations
           configurator.config.should == yaml_hash["config"]["database"]
         end
 
+        it "use custom config value from partial configuration" do
+          configurator.seeds.should == yaml_hash["db"]["seeds"]
+        end
+
       end
 
       it "use custom config from file" do

data/spec/standalone_migrations_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe 'Standalone migrations' do
 
   def write(file, content)
@@ -81,7 +83,7 @@ end
     write_rakefile
     write 'db/config.yml', <<-TXT
 development:
-  adapter: <%= "sqlite3" %>
+  adapter: sqlite3
   database: db/development.sql
 test:
   adapter: sqlite3
@@ -107,6 +109,25 @@ test:
     end
   end
 
+  describe 'callbacks' do
+    it 'runs the callbacks' do
+      StandaloneMigrations::Tasks.should_receive(:configure)
+
+      connection_established = false
+      ActiveRecord::Base.should_receive(:establish_connection) do
+        connection_established = true
+      end
+      StandaloneMigrations.should_receive(:run_on_load_callbacks) do
+        connection_established.should be_true
+      end
+
+      Dir.chdir(File.join(File.dirname(__FILE__), "tmp")) do 
+        load "Rakefile"
+        Rake::Task['standalone:connection'].invoke
+      end
+    end
+  end
+
   describe 'db:new_migration' do
     it "fails if i do not add a name" do
       lambda{ run("rake db:new_migration") }.should raise_error(/name=/)
@@ -296,15 +317,15 @@ test:
   end
 
   describe 'db:migrate when environment is specified' do
-    it "runs when using the DB environment variable" do
+    it "runs when using the DB environment variable", :travis_error => true do
       make_migration('yyy')
-      run('rake db:migrate DB=test')
-      run('rake db:version DB=test').should_not =~ /version: 0/
+      run('rake db:migrate RAILS_ENV=test')
+      run('rake db:version RAILS_ENV=test').should_not =~ /version: 0/
       run('rake db:version').should =~ /version: 0/
     end
 
-    it "should error on an invalid database" do
-      lambda{ run("rake db:create DB=nonexistent")}.should raise_error(/rake aborted/)
+    it "should error on an invalid database", :travis_error => true do
+      lambda{ run("rake db:create RAILS_ENV=nonexistent")}.should raise_error(/rake aborted/)
     end
   end
 end

data/standalone_migrations.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: standalone_migrations 2.1.4 ruby lib
+# stub: standalone_migrations 2.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "standalone_migrations"
-  s.version = "2.1.4"
+  s.version = "2.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Todd Huss", "Michael Grosser"]
-  s.date = "2014-04-12"
+  s.date = "2014-08-26"
   s.email = "thuss@gabrito.com"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "example/db/config.yml",
     "example/db/migrate/20120930053225_create_table_awesome_migration.rb",
     "lib/standalone_migrations.rb",
+    "lib/standalone_migrations/callbacks.rb",
     "lib/standalone_migrations/configurator.rb",
     "lib/standalone_migrations/generator.rb",
     "lib/standalone_migrations/minimal_railtie_config.rb",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
     "lib/standalone_migrations/tasks/environment.rake",
     "lib/tasks/standalone_migrations.rb",
     "spec/spec_helper.rb",
+    "spec/standalone_migrations/callbacks_spec.rb",
     "spec/standalone_migrations/configurator_spec.rb",
     "spec/standalone_migrations_spec.rb",
     "standalone_migrations.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standalone_migrations
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Todd Huss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,7 @@ files:
 - example/db/config.yml
 - example/db/migrate/20120930053225_create_table_awesome_migration.rb
 - lib/standalone_migrations.rb
+- lib/standalone_migrations/callbacks.rb
 - lib/standalone_migrations/configurator.rb
 - lib/standalone_migrations/generator.rb
 - lib/standalone_migrations/minimal_railtie_config.rb
@@ -82,6 +83,7 @@ files:
 - lib/standalone_migrations/tasks/environment.rake
 - lib/tasks/standalone_migrations.rb
 - spec/spec_helper.rb
+- spec/standalone_migrations/callbacks_spec.rb
 - spec/standalone_migrations/configurator_spec.rb
 - spec/standalone_migrations_spec.rb
 - standalone_migrations.gemspec