migrant 1.5.0 → 2.0.0.pre

data/lib/generators/templates/create_migration.erb

@@ -1,4 +1,4 @@
-class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration
+class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration<%= @class_suffix %>
   def self.up
     create_table :<%= @table_name %> do |t|
       <% @columns.each do |field, options| %>

data/lib/generators/templates/create_migration.rb

@@ -1,4 +1,4 @@
-class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration
+class <%= @activity.camelize.gsub(/\s/, '') %> < ActiveRecord::Migration<%= @class_suffix %>
   def self.up
     create_table :<%= @table_name %> do |t|
       <% @columns.each do |field, options| %>

data/lib/migrant/migration_generator.rb

@@ -1,4 +1,4 @@
-require 'erubis'
+require 'erubi'
 require 'term/ansicolor'
 
 module Migrant
@@ -11,9 +11,11 @@ module Migrant
       migrator = (ActiveRecord::Migrator.public_methods.include?(:open))? 
                   ActiveRecord::Migrator.open(migrations_path) : 
                   ActiveRecord::Migrator.new(:up, migrations_path)
+                  
+      @class_suffix = defined?(ActiveRecord::Migration::Compatibility)? "[#{Rails.version[/^\d+\.\d+/]}]" : ''
 
       unless migrator.pending_migrations.blank?
-        log "You have some pending database migrations. You can either:\n1. Run them with rake db:migrate\n2. Delete them, in which case this task will probably recreate their actions (DON'T do this if they've been in SCM).", :error
+        log "Aborting as this database has not yet run all the existing migrations.\n\nMost likely you just need to run rake db:migrate instead of rake db:upgrade in this environment.", :error
         return false
       end
 
@@ -24,7 +26,7 @@ module Migrant
 
       Dir["#{model_root}**/*.rb"].each do |file|
         if (model_name = file.sub(model_root, '').match(/(.*)?\.rb$/))
-          model_name[1].camelize.constantize
+          model_name[1].camelize.safe_constantize
         end
       end
 
@@ -128,7 +130,7 @@ module Migrant
 
     def change_column(name, new_schema, old_schema)
       if new_schema[:default] && new_schema[:default].respond_to?(:to_s) && new_schema[:default].to_s.length < 31
-        change_description = "#{name}_defaulted_to_#{new_schema[:default].to_s.underscore}"
+        change_description = "#{name}_defaulted_to_#{new_schema[:default].to_s.underscore.gsub(/\./, '')}"
       else
         change_description = name
       end
@@ -152,7 +154,7 @@ module Migrant
     end
 
     def migrations_path
-      Rails.root.join(ActiveRecord::Migrator.migrations_path)
+      Rails.root.join(ActiveRecord::Migrator.migrations_paths.first)
     end
 
     include Term::ANSIColor
@@ -209,7 +211,9 @@ module Migrant
     end
 
     def render(template_name)
-      @output = Erubis::Eruby.new(File.read(File.join(File.dirname(__FILE__), "../generators/templates/#{template_name}.erb"))).result(binding)
+      template = File.read(File.join(File.dirname(__FILE__), "../generators/templates/#{template_name}.erb"))
+      erubi = Erubi::Engine.new(template, :trim => true)
+      @output = eval(erubi.src, binding)
     end
   end
 end

data/lib/migrant/model_extensions.rb

@@ -34,7 +34,7 @@ module Migrant
         end
         # Set up serialized columns as required
         @schema.columns.select do |name, column|
-          if column.serialized? && !serialized_attributes.keys.include?(name.to_s)
+          if column.serialized?
             serialize(name, column.serialized_class_name)
           end
         end

data/lib/migrant/schema.rb

@@ -1,5 +1,3 @@
-require 'simple_object'
-
 module Migrant
   # Converts the following DSL:
   #

data/lib/railtie.rb

@@ -1,6 +1,6 @@
 # lib/my_gem/railtie.rb
-require 'migrant'
-require 'rails'
+#require 'migrant'
+#require 'rails'
 
 module Migrant
   class Railtie < Rails::Railtie

data/lib/tasks/db.rake

@@ -4,12 +4,6 @@ namespace :db do
     if Migrant::MigrationGenerator.new.run
       puts "\nInvoking db:migrate for #{Rails.env} environment."
       Rake::Task['db:migrate'].invoke
-
-      # If RAILS_ENV is explicitly specified, don't clone out to test
-      unless ENV['RAILS_ENV']
-        puts "Migrated. Now, cloning out to the test database."
-        Rake::Task['db:test:clone'].invoke
-      end
     end
   end
   

data/migrant.gemspec

@@ -1,36 +1,35 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{migrant}
-  s.version = File.read('VERSION')
+Gem::Specification.new do |spec|
+  spec.name          = "migrant"
+  spec.version       = File.read('VERSION')
+  spec.authors       = ["Pascal Houliston"]
+  spec.email         = ["101pascal@gmail.com"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pascal Houliston"]
-  s.description = %q{Easier schema management for Rails that complements your domain model.}
-  s.email = %q{101pascal@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  spec.summary       = %q{All the fun of ActiveRecord without writing your migrations, and with a dash of mocking.}
+  spec.description   = %q{Easier schema management for Rails that complements your domain model.}
+  spec.homepage      = %q{http://github.com/pascalh1011/migrant}
+  spec.license       = "MIT"
 
-  s.homepage = %q{http://github.com/pascalh1011/migrant}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{All the fun of ActiveRecord without writing your migrations, and with a dash of mocking.}
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  s.add_development_dependency(%q<minitest>, ["~> 4.0"])
-  s.add_development_dependency(%q<ansi>, [">= 0"])
-  s.add_development_dependency(%q<turn>, [">= 0"])
-  s.add_development_dependency(%q<sqlite3>, [">= 0"])
-  s.add_development_dependency(%q<simplecov>, [">= 0"])
-  s.add_development_dependency(%q<terminal-table>, [">= 0"])
-  s.add_development_dependency(%q<rake>, [">= 0.8.7"])
-  s.add_development_dependency(%q<simplecov>, [">= 0"])
-  s.add_dependency(%q<rails>, [">= 3.0.0"])
-  s.add_dependency(%q<faker>, [">= 0"])
-  s.add_dependency(%q<term-ansicolor>, [">= 0"])
+  rails_version = ENV['RAILS_VERSION'] || '5.1'
+ 
+  spec.add_development_dependency "rails", "~> #{rails_version}"
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "sqlite3", ">= 1.3.13"
+  spec.add_development_dependency "coveralls", ">= 0.7.1"
+  
+  spec.add_runtime_dependency "erubi", ">= 1.7.0"
+  spec.add_runtime_dependency "term-ansicolor", ">= 1.6.0"
+  spec.add_runtime_dependency "faker", ">= 1.8.4"
 end
-

metadata

@@ -1,222 +1,154 @@
 --- !ruby/object:Gem::Specification
 name: migrant
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 2.0.0.pre
 platform: ruby
 authors:
 - Pascal Houliston
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thoughtbot-shoulda
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.4
 description: Easier schema management for Rails that complements your domain model.
-email: 101pascal@gmail.com
+email:
+- 101pascal@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
-- LICENSE
-- README.rdoc
+- LICENSE.txt
+- README.md
 - Rakefile
 - VERSION
 - changelog.md
@@ -235,93 +167,31 @@ files:
 - lib/migrant/schema.rb
 - lib/pickle/migrant.rb
 - lib/railtie.rb
-- lib/simple_object.rb
 - lib/tasks/db.rake
 - migrant.gemspec
-- test/additional_models/review.rb
-- test/helper.rb
-- test/rails_app/.gitignore
-- test/rails_app/README
-- test/rails_app/Rakefile
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/models/business.rb
-- test/rails_app/app/models/business_category.rb
-- test/rails_app/app/models/category.rb
-- test/rails_app/app/models/chameleon.rb
-- test/rails_app/app/models/customer.rb
-- test/rails_app/app/models/non_migrant_model.rb
-- test/rails_app/app/models/user.rb
-- test/rails_app/app/views/layouts/application.html.erb
-- test/rails_app/config.ru
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/database.yml
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/backtrace_silencers.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/mime_types.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/locales/en.yml
-- test/rails_app/config/routes.rb
-- test/rails_app/db/seeds.rb
-- test/rails_app/lib/tasks/.gitkeep
-- test/rails_app/public/404.html
-- test/rails_app/public/422.html
-- test/rails_app/public/500.html
-- test/rails_app/script/rails
-- test/rails_app/test/performance/browsing_test.rb
-- test/rails_app/test/test_helper.rb
-- test/rails_app/vendor/plugins/.gitkeep
-- test/test_data_schema.rb
-- test/test_migration_generator.rb
-- test/test_validations.rb
-- test/test_zzz_performance.rb
-- test/verified_output/migrations/added_incompatible_spot_and_deleted_spots.rb
-- test/verified_output/migrations/business_id.rb
-- test/verified_output/migrations/businesses_indexed_name.rb
-- test/verified_output/migrations/chameleons_added_new_longer_spots_and_moved_new_spots.rb
-- test/verified_output/migrations/create_business_categories.rb
-- test/verified_output/migrations/create_businesses.rb
-- test/verified_output/migrations/create_categories.rb
-- test/verified_output/migrations/create_chameleons.rb
-- test/verified_output/migrations/create_reviews.rb
-- test/verified_output/migrations/create_users.rb
-- test/verified_output/migrations/created_at.rb
-- test/verified_output/migrations/deleted_incompatible_spot.rb
-- test/verified_output/migrations/deleted_spots.rb
-- test/verified_output/migrations/estimated_value_notes.rb
-- test/verified_output/migrations/landline.rb
-- test/verified_output/migrations/modified_verified.rb
-- test/verified_output/migrations/renamed_old_spots.rb
 homepage: http://github.com/pascalh1011/migrant
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: All the fun of ActiveRecord without writing your migrations, and with a dash
   of mocking.
 test_files: []
-has_rdoc: