db_nazi 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,10 +1,39 @@
 language: ruby
 bundler_args: --without dev
 script: bundle exec rake ci
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
-  - ruby-head
-  - jruby-head
+rvm: []  # only run the builds in the matrix below
+matrix:
+  include:
+    - rvm: 1.9.2
+      env: DB_NAZI_ADAPTER=sqlite3
+    - rvm: 1.9.2
+      env: DB_NAZI_ADAPTER=mysql
+    - rvm: 1.9.2
+      env: DB_NAZI_ADAPTER=mysql2
+    - rvm: 1.9.2
+      before_script: psql -c 'create database myapp_test;' -U postgres
+      env: DB_NAZI_ADAPTER=postgresql
+
+    - rvm: 1.9.3
+      env: DB_NAZI_ADAPTER=sqlite3
+    - rvm: 1.9.3
+      env: DB_NAZI_ADAPTER=mysql
+    - rvm: 1.9.3
+      env: DB_NAZI_ADAPTER=mysql2
+    - rvm: 1.9.3
+      before_script: psql -c 'create database myapp_test;' -U postgres
+      env: DB_NAZI_ADAPTER=postgresql
+
+    - rvm: rbx-19mode
+      env: DB_NAZI_ADAPTER=sqlite3
+    - rvm: rbx-19mode
+      env: DB_NAZI_ADAPTER=mysql
+    - rvm: rbx-19mode
+      env: DB_NAZI_ADAPTER=mysql2
+    - rvm: rbx-19mode
+      before_script: psql -c 'create database myapp_test;' -U postgres
+      env: DB_NAZI_ADAPTER=postgresql
+
+    # jruby-1.6.7 has a broken testrb - use head for now
+    - rvm: jruby-head
+      env: DB_NAZI_ADAPTER=jdbcmysql

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.0.3 2012-06-27
+
+ * Disable DB Nazi when loading schema.
+
 == 0.0.2 2012-06-25
 
  * Support bulk alters.

data/Gemfile

@@ -1,7 +1,17 @@
 source :rubygems
 gemspec
 
-group :dev do
-  gem 'looksee'
-  gem 'debugger'
+case ENV['DB_NAZI_ADAPTER']
+when 'mysql'
+  gem 'mysql'
+when 'mysql'
+  gem 'mysql'
+when 'mysql2'
+  gem 'mysql2'
+when 'postgresql'
+  gem 'pg'
+when 'jdbcmysql'
+  gem 'activerecord-jdbcmysql-adapter'
+else
+  gem 'sqlite3'
 end

data/Rakefile

@@ -1,6 +1,6 @@
 require 'ritual'
 
 task :ci do
-  sh 'bundle exec testrb test/unit'
-  sh 'bundle exec testrb test/integration'
+  sh 'testrb test/unit'
+  sh 'testrb test/integration'
 end

data/db_nazi.gemspec

@@ -19,7 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'activerecord', '~> 3.2.6'
   gem.add_development_dependency 'ritual', '~> 0.4.1'
   gem.add_development_dependency 'minitest', '~> 3.1.0'
-  gem.add_development_dependency 'temporaries', '~> 0.2.0'
-  gem.add_development_dependency 'sqlite3', '~> 1.3.6'
-  gem.add_development_dependency 'mysql2', '~> 0.3.11'
+  gem.add_development_dependency 'temporaries', '~> 0.3.0'
 end

data/lib/db_nazi.rb

@@ -2,6 +2,7 @@ module DBNazi
   autoload :AbstractAdapter, 'db_nazi/abstract_adapter'
   autoload :Migration, 'db_nazi/migration'
   autoload :MigrationProxy, 'db_nazi/migration_proxy'
+  autoload :Schema, 'db_nazi/schema'
   autoload :Table, 'db_nazi/table'
   autoload :TableDefinition, 'db_nazi/table_definition'
   autoload :VERSION, 'db_nazi/version'
@@ -85,3 +86,4 @@ ActiveRecord::ConnectionAdapters::TableDefinition.__send__ :include, DBNazi::Tab
 ActiveRecord::ConnectionAdapters::Table.__send__ :include, DBNazi::Table
 ActiveRecord::Migration.__send__ :include, DBNazi::Migration
 ActiveRecord::MigrationProxy.__send__ :include, DBNazi::MigrationProxy
+ActiveRecord::Schema.__send__ :include, DBNazi::Schema

data/lib/db_nazi/schema.rb

@@ -0,0 +1,16 @@
+module DBNazi
+  module Schema
+    def self.included(base)
+      base.extend ClassMethods
+      base.singleton_class.alias_method_chain :define, :db_nazi
+    end
+
+    module ClassMethods
+      def define_with_db_nazi(*args, &block)
+        DBNazi.disable do
+          define_without_db_nazi(*args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/db_nazi/version.rb

@@ -1,5 +1,5 @@
 module DBNazi
-  VERSION = [0, 0, 2]
+  VERSION = [0, 0, 3]
 
   class << VERSION
     include Comparable

data/test/database.yml

@@ -1,11 +1,19 @@
 sqlite3:
   database: ':memory:'
+mysql:
+  username: root
+  password:
+  database: db_nazi_test
 mysql2:
   username: root
   password:
   database: db_nazi_test
 postgresql:
+  username: postgres
+  password:
+  database: db_nazi_test
+  min_messages: warning
+jdbcmysql:
   username: root
   password:
   database: db_nazi_test
-  min_messages: warning

data/test/integration/test_integration.rb

@@ -3,10 +3,7 @@ require_relative '../test_helper'
 describe DBNazi do
   use_database
   use_temporary_directory "#{ROOT}/test/tmp"
-
-  # Migrations use Kernel.puts. Lame.
-  out = Class.new { def write(*) end; def flush(*) end }.new
-  use_global_value :stdout, out
+  silence_stdout
 
   before do
     DBNazi.reset

data/test/test_helper.rb

@@ -5,7 +5,6 @@ require 'minitest/spec'
 require 'yaml'
 require 'active_record'
 require 'temporaries'
-require 'debugger'
 require 'db_nazi'
 
 ADAPTER = ENV['DB_NAZI_ADAPTER'] || 'sqlite3'
@@ -53,4 +52,10 @@ MiniTest::Spec.class_eval do
     before { recreate_database }
     after { drop_database }
   end
+
+  # Migrations use Kernel.puts. Lame. This shuts them up.
+  def self.silence_stdout
+    out = Class.new { def puts(*); end; def write(*) end; def flush(*) end }.new
+    use_global_value :stdout, out
+  end
 end

data/test/unit/db_nazi/test_migration_proxy.rb

@@ -3,10 +3,7 @@ require_relative '../../test_helper'
 describe DBNazi::MigrationProxy do
   use_database
   use_temporary_directory "#{ROOT}/test/tmp"
-
-  # Migrations use Kernel.puts. Lame.
-  out = Class.new { def write(*) end; def flush(*) end }.new
-  use_global_value :stdout, out
+  silence_stdout
 
   before do
     @original_pwd = Dir.pwd

data/test/unit/db_nazi/test_schema.rb

@@ -0,0 +1,16 @@
+require_relative '../../test_helper'
+
+describe DBNazi::Schema do
+  use_database
+  silence_stdout
+
+  describe ".define" do
+    it "should not be policed" do
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table 'test_table' do |t|
+          t.boolean :test_column
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_nazi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,39 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 0.3.0
 description: ''
 email:
 - george.ogata@gmail.com
@@ -126,6 +94,7 @@ files:
 - lib/db_nazi/abstract_adapter.rb
 - lib/db_nazi/migration.rb
 - lib/db_nazi/migration_proxy.rb
+- lib/db_nazi/schema.rb
 - lib/db_nazi/table.rb
 - lib/db_nazi/table_definition.rb
 - lib/db_nazi/version.rb
@@ -135,6 +104,7 @@ files:
 - test/unit/db_nazi/test_abstract_adapter.rb
 - test/unit/db_nazi/test_migration.rb
 - test/unit/db_nazi/test_migration_proxy.rb
+- test/unit/db_nazi/test_schema.rb
 - test/unit/db_nazi/test_table.rb
 - test/unit/db_nazi/test_table_definition.rb
 - test/unit/test_db_nazi.rb
@@ -153,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1208224069343605588
+      hash: -2333184105652215530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1208224069343605588
+      hash: -2333184105652215530
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -176,6 +146,7 @@ test_files:
 - test/unit/db_nazi/test_abstract_adapter.rb
 - test/unit/db_nazi/test_migration.rb
 - test/unit/db_nazi/test_migration_proxy.rb
+- test/unit/db_nazi/test_schema.rb
 - test/unit/db_nazi/test_table.rb
 - test/unit/db_nazi/test_table_definition.rb
 - test/unit/test_db_nazi.rb