data_migrator 1.6 → 1.7

data/lib/data_migrator.rb

@@ -10,11 +10,55 @@ module RussellEdge
   class DataMigrator
     REMOVE_FILES_REGEX = /^\./
     
-    #class methods
-    def self.next_migration_number
-  	  Time.now.utc.strftime("%Y%m%d%H%M%S")
+    class << self
+      def next_migration_number
+    	  Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+    
+      def initialize_data_migrations_table
+        puts "** data_migrations table missing creating now...."
+        puts ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__),'../db/migrate/'), 20100819181805)
+        puts "** done"
+      end
+      
+      def prepare_migrations
+        target = "#{Rails.root}/db/data_migrations/"
+
+        # first copy all app data_migrations away
+        files = Dir["#{target}*.rb"]
+
+        unless files.empty?
+          FileUtils.mkdir_p "#{target}/ignore/app/"
+          FileUtils.cp files, "#{target}/ignore/app/"
+          puts "copied #{files.size} data_migrations to db/data_migrations/ignore/app"
+        end
+
+        dirs = Rails::Application::Railties.engines.map{|p| p.config.root.to_s}
+        files = Dir["{#{dirs.join(',')}}/db/data_migrations/*.rb"]
+
+        unless files.empty?
+          FileUtils.mkdir_p target
+          FileUtils.cp files, target
+          puts "copied #{files.size} migrations to db/data_migrations"
+        end
+      end
+
+      def cleanup_migrations
+        target = "#{Rails.root}/db/data_migrations/"
+
+    	  files = Dir["#{target}*.rb"]
+        unless files.empty?
+          FileUtils.rm files
+          puts "removed #{files.size} data_migrations from db/data_migrations"
+        end
+        files = Dir["#{target}/ignore/app/*.rb"]
+        unless files.empty?
+          FileUtils.cp files, target
+          puts "copied #{files.size} data_migrations back to db/data_migrations"
+        end
+        FileUtils.rm_rf "#{target}/ignore/app"
+      end
     end
-    #end
     
     def initialize(migrations_path=nil)
       @default_migrations_path = migrations_path || "#{Rails.root}/db/data_migrations"
@@ -95,49 +139,11 @@ module RussellEdge
       puts "** Version #{passed_version} not found" unless found
     
     end
-  
-    def prepare_migrations
-      target = "#{Rails.root}/db/data_migrations/"
-
-      # first copy all app data_migrations away
-      files = Dir["#{target}*.rb"]
-
-      unless files.empty?
-        FileUtils.mkdir_p "#{target}/ignore/app/"
-        FileUtils.cp files, "#{target}/ignore/app/"
-        puts "copied #{files.size} data_migrations to db/data_migrations/ignore/app"
-      end
-
-      dirs = Rails::Application::Railties.engines.map{|p| p.config.root.to_s}
-      files = Dir["{#{dirs.join(',')}}/db/data_migrations/*.rb"]
-
-      unless files.empty?
-        FileUtils.mkdir_p target
-        FileUtils.cp files, target
-        puts "copied #{files.size} migrations to db/data_migrations"
-      end
-    end
-  
-    def cleanup_migrations
-      target = "#{Rails.root}/db/data_migrations/"
-      
-  	  files = Dir["#{target}*.rb"]
-      unless files.empty?
-        FileUtils.rm files
-        puts "removed #{files.size} data_migrations from db/data_migrations"
-      end
-      files = Dir["#{target}/ignore/app/*.rb"]
-      unless files.empty?
-        FileUtils.cp files, target
-        puts "copied #{files.size} data_migrations back to db/data_migrations"
-      end
-      FileUtils.rm_rf "#{target}/ignore/app"
-    end
 	
     private
   
     def setup
-      create_data_migrations_table unless data_migrations_table_exists?
+      RussellEdge::DataMigrator.initialize_data_migrations_table unless data_migrations_table_exists?
       
       unless File.directory?  @default_migrations_path
         FileUtils.mkdir_p( @default_migrations_path)
@@ -196,7 +202,7 @@ module RussellEdge
           end
         end
       rescue Exception=>ex
-        cleanup_migrations
+        RussellEdge::DataMigrator.cleanup_migrations
         raise ex
       end
       time_str = "(%.4fs)" % time.real
@@ -229,12 +235,6 @@ module RussellEdge
       table_names.include?('data_migrations')
     end
 
-    def create_data_migrations_table
-      puts "** data_migrations table missing creating now...."
-      puts ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__),'../db/migrate/'), 20100819181805)
-      puts "** done"
-    end
-
     def seperate_file_parts(file)
       paths = file.split('/')
       filename = paths[paths.length - 1]

data/lib/tasks/data_migrator.rake

@@ -2,39 +2,34 @@ namespace :db do
   desc 'migrates data into database'
   task :migrate_data => :environment do
     passed_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-    data_migrator = RussellEdge::DataMigrator.new
-    data_migrator.prepare_migrations
-    data_migrator.migrate(nil, passed_version)
-	  data_migrator.cleanup_migrations
+    RussellEdge::DataMigrator.prepare_migrations
+    RussellEdge::DataMigrator.new.migrate(nil, passed_version)
+	  RussellEdge::DataMigrator.cleanup_migrations
       
   end#end migrate_data task
     
   namespace :migrate_data do
 	task :list_pending => :environment do
-      data_migrator = RussellEdge::DataMigrator.new
-      data_migrator.prepare_migrations
-      pending_migrations = data_migrator.pending_migrations
+      RussellEdge::DataMigrator.prepare_migrations
+      pending_migrations = RussellEdge::DataMigrator.new.pending_migrations
       puts "================Pending Data Migrations=========="
       puts pending_migrations
       puts "================================================="
-      data_migrator.cleanup_migrations
+      RussellEdge::DataMigrator.cleanup_migrations
     end#end list_pending task
 
     task :version => :environment do
-      data_migrator = RussellEdge::DataMigrator.new
-      version = data_migrator.get_current_version
-
+      version = RussellEdge::DataMigrator.new.get_current_version
       puts (version.nil?) ? "** No migrations ran" : "** Current version #{version}"
     end#end version task
       
     task :up => :environment do
       passed_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless passed_version
-      
-      data_migrator = RussellEdge::DataMigrator.new  
-      data_migrator.prepare_migrations
-      data_migrator.run_up(passed_version)
-      data_migrator.cleanup_migrations
+       
+      RussellEdge::DataMigrator.prepare_migrations
+      RussellEdge::DataMigrator.new.run_up(passed_version)
+      RussellEdge::DataMigrator.cleanup_migrations
         
     end#end up task
       
@@ -42,10 +37,9 @@ namespace :db do
       passed_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless passed_version
 		  
-		  data_migrator = RussellEdge::DataMigrator.new 
-      data_migrator.prepare_migrations
-      data_migrator.run_down(passed_version)
-      data_migrator.cleanup_migrations
+      RussellEdge::DataMigrator.prepare_migrations
+      RussellEdge::DataMigrator.new.run_down(passed_version)
+      RussellEdge::DataMigrator.cleanup_migrations
         
     end#end down task
   end#end namespace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrator
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161558960 !ruby/object:Gem::Requirement
+  requirement: &2157691620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2161558960
+  version_requirements: *2157691620
 description: Allows you to create data migrations that can be run up and down to insert
   data into the database.
 email: russellfholmes@gmail.com