migration_assist 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/migration_assist/class_methods.rb

@@ -3,11 +3,17 @@
 # which provides the #next_migration_number class method that lets #migration_template work as expected
 # 
 module Rails::Migration::Assist    
+  class << self   
+    attr_accessor :rails_root_dir
+    attr_accessor :orm
+  end
+
   def self.included(base) #:nodoc: 
-    base.extend ClassMethods      
+    base.extend ClassMethods  
   end
 
   module ClassMethods    
+
     def migration_lookup_at(dirname) #:nodoc:
       Dir.glob("#{dirname}/[0-9]*_*.rb")
     end
@@ -28,7 +34,7 @@ module Rails::Migration::Assist
     end
 
     def next_migration_number(dirname) #:nodoc:
-      orm = Rails.configuration.generators.options[:rails][:orm]
+      orm = Rails::Migration::Assist.orm || Rails.configuration.generators.options[:rails][:orm]
       require "rails/generators/#{orm}"
       "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname)
     rescue

data/lib/migration_assist/helper/file_name.rb

@@ -1,8 +1,4 @@
-module Rails::Migration::Assist 
-  class << self
-    attr_accessor :rails_root_dir
-  end  
-  
+module Rails::Migration::Assist   
   module FileNameHelper         
     def artifact_path name, type, dir=nil
       dir ||= send :"#{type}_dir"
@@ -40,7 +36,7 @@ module Rails::Migration::Assist
     end
 
     def root_dir                                                                                    
-      dir = Migration::Assist.rails_root_dir
+      dir = Rails::Migration::Assist.rails_root_dir || Rails.root
       raise "You must set the Rails app root dir: Rails::Migration::Assist.rails_root_dir = '/my/root/dir'" if !dir
       dir
     end    

data/lib/migration_assist/namespaces.rb

@@ -0,0 +1,6 @@
+module Rails
+  module Migration
+    module Assist
+    end
+  end
+end

data/lib/migration_assist.rb

@@ -1,10 +1,3 @@
 require 'require_all'
-
-module Rails
-  module Migration
-    module Assist
-    end
-  end
-end
-
+require 'migration_assist/namespaces'
 require_all File.dirname(__FILE__) + '/migration_assist'

data/migration_assist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{migration_assist}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2010-09-11}
   s.description = %q{Assists in handling migrations, including generating migration files from a Thor Generator}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/migration_assist/class_methods.rb",
      "lib/migration_assist/helper/file_name.rb",
      "lib/migration_assist/implementation.rb",
+     "lib/migration_assist/namespaces.rb",
      "migration_assist.gemspec",
      "spec/generators/migration_generator_spec.rb",
      "spec/load_spec.rb",

data/spec/migration_assist/class_methods_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
-require 'rails'
 
 class TestGenerator
   include Rails::Migration::Assist
 end
 
+Rails::Migration::Assist.orm = :active_record
+
 describe 'Migration Assist' do
   let(:dir) { fixtures_dir }  
   let(:generator) { TestGenerator.new }  
@@ -54,7 +55,8 @@ describe 'Migration Assist' do
   end
 
   describe '#next_migration_number' do    
-    it "should find next migration number 5" do               
+    it "should find next migration number > 4" do               
+      generator.class.next_migration_number(dir).to_i.should be > 4      
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - lib/migration_assist/class_methods.rb
 - lib/migration_assist/helper/file_name.rb
 - lib/migration_assist/implementation.rb
+- lib/migration_assist/namespaces.rb
 - migration_assist.gemspec
 - spec/generators/migration_generator_spec.rb
 - spec/load_spec.rb