schema_plus 0.1.1 → 0.1.2

data/.gitignore

@@ -23,3 +23,4 @@ pkg
 *.log
 *.sqlite3
 Gemfile.lock
+gemfiles/*.lock

data/.travis.yml

@@ -0,0 +1,18 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+gemfile:
+  - gemfiles/Gemfile.rails-2.3
+  - gemfiles/Gemfile.rails-3.0
+  - gemfiles/Gemfile.rails-3.1
+before_script:
+  - "mysql -e 'create database schema_plus_unittest;' > /dev/null"
+  - "psql -c 'create database schema_plus_unittest;' -U postgres > /dev/null"
+after_script:
+  - "mysql -e 'drop database schema_plus_unittest;' > /dev/null"
+  - "psql -c 'drop database schema_plus_unittest;' -U postgres > /dev/null"
+env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+notifications:
+  recipients:
+    - michal.lomnicki@gmail.com
+    - ronen@barzel.org

data/Gemfile

@@ -1,3 +1,7 @@
 source "http://rubygems.org"
 
 gemspec
+
+platforms :ruby_19 do
+  gem "ruby-debug19"
+end

data/README.rdoc

@@ -64,7 +64,7 @@ You can also create multi-column indexes, for example:
 
     t.string :country_code
     t.string :area_code
-    t.string :local_number      :index => { :width => [:country_code, :area_code], :unique => true }
+    t.string :local_number      :index => { :with => [:country_code, :area_code], :unique => true }
 
 If you're using Postgresql, SchemaPlus provides support for conditions, expressions, index methods, and case-insensitive indexes; see doc at SchemaPlus::ActiveRecord::ConnectionAdapters::PostgresqlAdapter and SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition
 
@@ -146,7 +146,7 @@ running.  Create database user "schema_plus" with permissions for database
   $ ./runspecs --install  # do this once to install gem dependencies for all versions (slow)
   $ ./runspecs # as many times as you like
 
-You can also pick a specific version of rails and ruby to use, such as:
+See <tt>./runspecs --help</tt> for more options.  You can also manually pick a specific version of rails and ruby to use, such as:
   $ rvm use 1.9.2
   $ export SCHEMA_ASSOCIATIONS_RAILS_VERSION=3.1
   $ bundle update --local rails mysql2  # different versions of rails require different mysql2's

data/gemfiles/Gemfile.rails-2.3

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+puts __FILE__
+gemspec :path => File.expand_path('../..', __FILE__)
+gem "rails", "~> 2.3"
+gem "mysql2", "~> 0.2.7"

data/gemfiles/Gemfile.rails-3.0

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => File.expand_path('../..', __FILE__)
+gem "rails", "~> 3.0.0"
+gem "mysql2", "~> 0.2.7"

data/gemfiles/Gemfile.rails-3.1

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => File.expand_path('../..', __FILE__)
+gem "rails", "~> 3.1.0.rc5"
+gem "mysql2"

data/lib/schema_plus.rb

@@ -11,7 +11,7 @@ require 'schema_plus/active_record/connection_adapters/abstract_adapter'
 require 'schema_plus/active_record/connection_adapters/column'
 require 'schema_plus/active_record/connection_adapters/foreign_key_definition'
 require 'schema_plus/active_record/connection_adapters/index_definition'
-require 'schema_plus/railtie' if defined?(Rails)
+require 'schema_plus/railtie' if defined?(Rails::Railtie)
 
 module SchemaPlus
   module ActiveRecord

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/runspecs

@@ -1,36 +1,61 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'ostruct'
+
+PROJECT = File.basename(File.expand_path('..', __FILE__))
 
 RUBY_VERSIONS = %W[1.8.7 1.9.2]
 RAILS_VERSIONS = %W[2.3 3.0 3.1]
 
-options = {}
+o = OpenStruct.new
+o.ruby_versions = RUBY_VERSIONS
+o.rails_versions = RAILS_VERSIONS
+o.run_cmd = "rake spec"
+
 OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
 
     opts.on("--install", "Install gem dependencies") do |v|
-        options[:install] = v
+        o.install = v
+    end
+
+    opts.on("--db adapter", String, "Choose which db adapter to run: postgresql, mysql, mysql2, or sqlite3.  Default is all of them" ) do |adapter|
+        p adapter
+        o.run_cmd = "rake #{adapter}:spec"
+    end
+
+    opts.on("--ruby version", String, "Choose which version(s) of ruby to run.  Default is: #{o.ruby_versions.join(' ')}") do |ruby|
+        o.ruby_versions = ruby.split(' ')
     end
+
+    opts.on("--rails version", String, "Choose which version(s) of rails to run.  Default is: #{o.rails_versions.join(' ')}") do |rails|
+        o.rails_versions = rails.split(' ')
+    end
+
+    opts.on("--quick", "quick run on Postgres, ruby #{RUBY_VERSIONS.last} and rails #{RAILS_VERSIONS.last}") do
+      o.ruby_versions  = [RUBY_VERSIONS.last]
+      o.rails_versions = [RAILS_VERSIONS.last]
+      o.run_cmd = "rake postgresql:spec"
+    end
+
 end.parse!
 
-cmds = if options [:install]
-           ['bundle update']
+cmds = if o.install
+           "bundle install"
        else
-           ['bundle update --local rails mysql2 | egrep "rails|mysql2"', 'rake spec']
+           "bundle exec #{o.run_cmd}"
        end
 
 n = 1
-total = RUBY_VERSIONS.size * RAILS_VERSIONS.size
-RUBY_VERSIONS.each do |ruby|
-    RAILS_VERSIONS.each do |rails|
+GEMFILES_DIR = File.expand_path('../gemfiles', __FILE__)
+total = o.ruby_versions.size * o.rails_versions.size
+o.ruby_versions.each do |ruby|
+    o.rails_versions.each do |rails|
         puts "\n\n*** ruby version #{ruby} - rails version #{rails}  [#{n} of #{total}]\n\n"
+        gemfile = File.join(GEMFILES_DIR, "Gemfile.rails-#{rails}")
         n += 1
-        allcmds = []
-        allcmds << "rvm use #{ruby}"
-        allcmds << "export SCHEMA_PLUS_RAILS_VERSION=#{rails}"
-        allcmds += cmds
-        allcmds << 'exit'
-        system %Q{echo '#{allcmds.join(' \n ')}' | bash -i} or abort "aborting #{$0}"
+        command = %Q{BUNDLE_GEMFILE="#{gemfile}" rvm #{ruby} exec #{cmds}}
+        system(command)
     end
 end

data/schema_plus.gemspec

@@ -22,20 +22,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("rails")
   s.add_dependency("valuable")
-      
-  case ENV['SCHEMA_PLUS_RAILS_VERSION']
-  when '2.3'
-      s.add_development_dependency("rails", "~> 2.3")
-      s.add_development_dependency("mysql2", "~> 0.2.6")
-  when '3.0'
-      s.add_development_dependency("rails", "~> 3.0")
-      s.add_development_dependency("mysql2", "~> 0.2.6")
-  when '3.1'
-      s.add_development_dependency("rails", ">= 3.1.0.rc1")
-      s.add_development_dependency("mysql2")
-  else
-      s.add_development_dependency("mysql2")
-  end
 
   s.add_development_dependency("rake", "~> 0.8.7")
   s.add_development_dependency("rspec")
@@ -44,6 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("sqlite3")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("simplecov-gem-adapter")
-  s.add_development_dependency("ruby-debug19") if RUBY_VERSION >= "1.9.2"
 end
 

data/spec/connections/mysql/connection.rb

@@ -7,9 +7,8 @@ ActiveRecord::Base.configurations = {
   'schema_plus' => {
     :adapter => 'mysql',
     :database => 'schema_plus_unittest',
-    :username => 'schema_plus',
+    :username => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
     :encoding => 'utf8',
-    :socket => '/tmp/mysql.sock',
     :min_messages => 'warning'
   }
 

data/spec/connections/mysql2/connection.rb

@@ -7,9 +7,8 @@ ActiveRecord::Base.configurations = {
   'schema_plus' => {
     :adapter => 'mysql2',
     :database => 'schema_plus_unittest',
-    :username => 'schema_plus',
+    :username => ENV.fetch('MYSQL_DB_USER', 'schema_plus'),
     :encoding => 'utf8',
-    :socket => '/tmp/mysql.sock',
     :min_messages => 'warning'
   }
 

data/spec/connections/postgresql/connection.rb

@@ -6,6 +6,7 @@ ActiveRecord::Base.logger = Logger.new(File.open("postgresql.log", "w"))
 ActiveRecord::Base.configurations = {
   'schema_plus' => {
     :adapter => 'postgresql',
+    :username => ENV['POSTGRES_DB_USER'],
     :database => 'schema_plus_unittest',
     :min_messages => 'warning'
   }

data/spec/connections/sqlite3/connection.rb

@@ -12,3 +12,4 @@ ActiveRecord::Base.configurations = {
 }
 
 ActiveRecord::Base.establish_connection 'schema_plus'
+ActiveRecord::Base.connection.execute "PRAGMA synchronous = OFF"

metadata

@@ -2,7 +2,7 @@
 name: schema_plus
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ronen Barzel
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,40 +37,40 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.3"
+        version: 0.8.7
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mysql2
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.6
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: pg
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mysql
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -81,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: pg
+  name: sqlite3
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -92,7 +92,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: simplecov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -103,7 +103,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: simplecov-gem-adapter
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -113,39 +113,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: simplecov-gem-adapter
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id012
 description: "SchemaPlus is an ActiveRecord extension that provides enhanced capabilities for schema definition and querying, including: enhanced and more DRY index capabilities, support and automation for foreign key constraints, and support for views."
 email: 
 - ronen@barzel.org
@@ -158,10 +125,14 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- gemfiles/Gemfile.rails-2.3
+- gemfiles/Gemfile.rails-3.0
+- gemfiles/Gemfile.rails-3.1
 - init.rb
 - lib/schema_plus.rb
 - lib/schema_plus/active_record/base.rb