data_migrator 1.8 → 2.0.0

data/lib/data_migrator.rb

@@ -23,7 +23,7 @@ module RussellEdge
         seen = Hash.new false
 
         migrations = files.map do |file|
-          version, name = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?.rb/).first
+          version, name, scope = file.scan(/([0-9]+)_([_a-z0-9]*)\.?([_a-z0-9]*)?.rb/).first
 
           raise ActiveRecord::IllegalMigrationNameError.new(file) unless version
           version = version.to_i
@@ -34,14 +34,14 @@ module RussellEdge
 
           seen[version] = seen[name] = true
 
-          {:name => File.basename(file), :filename => file, :version => version}
+          {:name => name, :filename => file, :version => version, :scope => scope}
         end
 
-        migrations.sort{|h| h[:version]}
+        migrations.sort_by{|h| h[:version]}
       end
 
-      def next_migration_number
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      def next_migration_number(number)
+        [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % number].max
       end
 
       def initialize_data_migrations_table
@@ -58,24 +58,24 @@ module RussellEdge
         destination_migrations = migrations(destination)
         last = destination_migrations.last
         sources.each do |scope, path|
-          source_migrations = migrations(path)
-
-          source_migrations.each do |migration|
-
+          migrations(path).each do |migration|
             source = File.read(migration[:filename])
             source = "# This migration comes from #{scope} (originally #{migration[:version]})\n#{source}"
-
+            
             if duplicate = destination_migrations.detect { |m| m[:name] == migration[:name] }
-              if options[:on_skip] && duplicate.scope != scope.to_s
-                options[:on_skip].call(scope, migration)
+              if options[:refresh] && duplicate[:scope] == scope.to_s
+                Dir.glob(File.join(destination,"*_#{migration[:name].underscore}.#{scope.to_s}.rb")).each { |f| puts "Removing old migration #{migration[:name]}"; File.delete(f) }
+              elsif options[:on_skip] && duplicate[:scope] != scope.to_s
+                options[:on_skip].call(scope, migration) 
               end
-              next
+              next unless options[:refresh]
             end
-
-            migration[:version] = next_migration_number().to_i
-            new_path = File.join(destination, "#{File.basename(migration[:filename], '.*')}.#{scope}.rb")
+            
+            migration[:version] = next_migration_number(last ? last[:version] + 1 : 0).to_i unless options[:preserve_timestamp]
+            new_path = File.join(destination, "#{migration[:version]}_#{migration[:name].underscore}.#{scope}.rb")
             old_path, migration[:filename] = migration[:filename], new_path
-
+            last = migration
+            
             File.open(migration[:filename], "w") { |f| f.write source }
             copied << migration
             options[:on_copy].call(scope, migration, old_path) if options[:on_copy]

data/lib/data_migrator/version.rb

@@ -0,0 +1,9 @@
+module DataMigrator
+  module VERSION #:nodoc:
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
+
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+  end
+end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -2,6 +2,6 @@ class DataMigrationGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
   
   def generate_layout  
-    template "migration_template.rb", "db/data_migrations/#{RussellEdge::DataMigrator.next_migration_number}_#{file_name}.rb" 
+    template "migration_template.rb", "db/data_migrations/#{RussellEdge::DataMigrator.next_migration_number(0)}_#{file_name}.rb" 
   end  
 end

data/lib/tasks/data_migrator.rake

@@ -40,6 +40,10 @@ namespace :railties do
     # desc "Copies missing data_migrations from Railties (e.g. plugins, engines). You can specify Railties to use with FROM=railtie1,railtie2"
     task :data_migrations => :environment do
       to_load = ENV['FROM'].blank? ? :all : ENV['FROM'].split(",").map {|n| n.strip }
+      #added to allow developer to perserve timestamps
+      preserve_timestamp = ENV['PRESERVE_TIMESTAMPS'].blank? ? false : (ENV['PRESERVE_TIMESTAMPS'].to_s.downcase == "true")
+      #refresh will replace migrations from engines
+      refresh = ENV['REFRESH'].blank? ? false : (ENV['REFRESH'].to_s.downcase == "true")
       railties = ActiveSupport::OrderedHash.new
       Rails.application.railties.all do |railtie|
         next unless to_load == :all || to_load.include?(railtie.railtie_name)
@@ -57,9 +61,14 @@ namespace :railties do
         puts "Copied data_migration #{migration[:name]} from #{name}"
       end
 
-      RussellEdge::DataMigrator.copy(RussellEdge::DataMigrator.migrations_path, railties, :on_skip => on_skip, :on_copy => on_copy)
-    end
-  end
-end
+      RussellEdge::DataMigrator.copy(RussellEdge::DataMigrator.migrations_path, railties, 
+                                     :on_skip => on_skip, 
+                                     :on_copy => on_copy, 
+                                     :preserve_timestamp => preserve_timestamp,
+                                     :refresh => refresh)
+    end #data_migrations
+    
+  end #install
+end #railties
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrator
 version: !ruby/object:Gem::Version
-  version: '1.8'
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70230211897860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70230211897860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Allows you to create data migrations that can be run up and down to insert
   data into the database.
 email: russellfholmes@gmail.com
@@ -30,6 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - db/migrate/20100819181805_create_data_migrations_table.rb
+- lib/data_migrator/version.rb
 - lib/data_migrator.rb
 - lib/extensions/railties/engine/configuration.rb
 - lib/extensions/railties/engine.rb
@@ -61,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Creates Data Migrations for data similar to schema migrations.