data_migrator 1.3 → 1.4

data/lib/data_migrator.rb

@@ -6,304 +6,282 @@ class DataMigrationTask < Rails::Railtie
   end
 end
 
-class DataMigrator
-  DEFAULT_MIGRATIONS_PATH = "#{Rails.root}/db/data_migrations"
-  REMOVE_FILES_REGEX = /^\./
-  
-  def self.migrate(passed_location=nil, passed_version=nil)
-    self.setup
+module RussellEdge
+  class DataMigrator
+    REMOVE_FILES_REGEX = /^\./
+    
+    def initialize(migrations_path=nil)
+      @default_migrations_path = migrations_path || "#{Rails.root}/db/data_migrations"
+    end
+      
+    def migrate(passed_location=nil, passed_version=nil)
+      setup
    
-    location = passed_location.nil? ? DEFAULT_MIGRATIONS_PATH  : passed_location
-    @@current_version = get_current_version
-
-    if passed_version.nil? || @@current_version.nil?
-      self.run_all_non_migrated(passed_version)
-    elsif passed_version < @@current_version
-      self.handle_lower_passed_version(passed_version)
-    elsif passed_version > @@current_version
-      self.handle_higher_passed_version(passed_version)
+      location = passed_location.nil? ? @default_migrations_path  : passed_location
+      @@current_version = get_current_version
+
+      if passed_version.nil? || @@current_version.nil?
+        run_all_non_migrated(passed_version)
+      elsif passed_version < @@current_version
+        handle_lower_passed_version(passed_version)
+      elsif passed_version > @@current_version
+        handle_higher_passed_version(passed_version)
+      end
     end
-  end
   
-  def self.pending_migrations
-    versions = []
-    files = self.get_all_files
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      unless version_has_been_migrated?(version)
-        versions << filename
+    def pending_migrations
+      versions = []
+      files = get_all_files
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        versions << filename unless version_has_been_migrated?(version)
       end
-    end
 
-    versions
-  end
+      versions
+    end
 
-  def self.get_current_version
-    result = ActiveRecord::Base.connection.select_all("select max(version) as current_version from data_migrations")
+    def get_current_version
+      result = ActiveRecord::Base.connection.select_all("select max(version) as current_version from data_migrations")
 
-    current_version = result[0]['current_version'] unless result == -1
+      current_version = result[0]['current_version'] unless result == -1
 
-    current_version = current_version.to_i unless current_version.nil?
+      current_version = current_version.to_i unless current_version.nil?
 
-    current_version
-  end
+      current_version
+    end
   
-  def self.next_migration_number
-	Time.now.utc.strftime("%Y%m%d%H%M%S")
-  end
+    def next_migration_number
+  	Time.now.utc.strftime("%Y%m%d%H%M%S")
+    end
   
-  def self.run_up(passed_version)
-    self.setup
+    def run_up(passed_version)
+      setup
     
-    raise "VERSION is required" unless passed_version
+      raise "VERSION is required" unless passed_version
     
-    files = self.get_all_files
-    found = false
+      files = get_all_files
+      found = false
     
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      if passed_version == version
-        found = true
-        unless self.version_has_been_migrated?(version)
-          self.handle_action(file, klass_name, version, :up)
-        else
-          puts "** Version #{passed_version} has already been migrated"
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        if passed_version == version
+          found = true
+          (version_has_been_migrated?(version)) ? (puts "** Version #{passed_version} has already been migrated") : handle_action(file, klass_name, version, :up)
         end
       end
-    end
     
-    unless found
-      puts "** Version #{passed_version} not found"
-    end
+      puts "** Version #{passed_version} not found" unless found
     
-  end
+    end
   
-  def self.run_down(passed_version)
-    self.setup
+    def run_down(passed_version)
+      setup
     
-    raise "VERSION is required" unless passed_version
+      raise "VERSION is required" unless passed_version
     
-    files = self.get_all_files
-    found = false 
-
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      if passed_version == version
-        found = true
-        if self.version_has_been_migrated?(version)
-          self.handle_action(file, klass_name, version, :down)
-        else
-          puts "** Version #{passed_version} has not been migrated"
+      files = get_all_files
+      found = false 
+
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        if passed_version == version
+          found = true
+          (version_has_been_migrated?(version)) ? (puts "** Version #{passed_version} has not been migrated") : handle_action(file, klass_name, version, :down)
         end
       end
-    end
     
-    unless found
-      puts "** Version #{passed_version} not found"
-    end
+      puts "** Version #{passed_version} not found" unless found
     
-  end
+    end
   
-  def self.prepare_migrations
-    target = "#{Rails.root}/db/data_migrations/"
+    def prepare_migrations
+      target = "#{Rails.root}/db/data_migrations/"
 
-    # first copy all app data_migrations away
-    files = Dir["#{target}*.rb"]
+      # 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
+      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"]
+      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"
+      unless files.empty?
+        FileUtils.mkdir_p target
+        FileUtils.cp files, target
+        puts "copied #{files.size} migrations to db/data_migrations"
+      end
     end
-  end
   
-  def self.cleanup_migrations
-    target = "#{Rails.root}/db/data_migrations/"
+    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"
+  	  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
-    FileUtils.rm_rf "#{target}/ignore/app"
-  end
 	
-  private
+    private
   
-  def self.setup
-    unless self.data_migrations_table_exists?
-      self.create_data_migrations_table
-    end
-    
-    unless File.directory? DEFAULT_MIGRATIONS_PATH
-      FileUtils.mkdir_p(DEFAULT_MIGRATIONS_PATH)
-      #create ignore folder
-      FileUtils.mkdir_p(DEFAULT_MIGRATIONS_PATH + '/ignore/')
+    def setup
+      create_data_migrations_table unless data_migrations_table_exists?
+      
+      unless File.directory?  @default_migrations_path
+        FileUtils.mkdir_p( @default_migrations_path)
+        #create ignore folder
+        FileUtils.mkdir_p(File.join(@default_migrations_path,'ignore/'))
+      end
     end
-  end
   
-  def self.handle_higher_passed_version(passed_version)
-    files = self.get_all_files
-
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      if version <= passed_version
-        unless self.version_has_been_migrated?(version)
-          self.handle_action(file, klass_name, version, :up)
+    def handle_higher_passed_version(passed_version)
+      files = get_all_files
+
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        if version <= passed_version
+          unless version_has_been_migrated?(version)
+            handle_action(file, klass_name, version, :up)
+          end
         end
       end
-    end
 
-  end
+    end
 
-  def self.run_all_non_migrated(passed_version)
-    files = self.get_all_files
+    def run_all_non_migrated(passed_version)
+      files = get_all_files
 
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      if passed_version.nil? or version <= passed_version
-        if !self.version_has_been_migrated?(version) 
-          self.handle_action(file, klass_name, version, :up)
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        if passed_version.nil? or version <= passed_version
+          if !version_has_been_migrated?(version) 
+            handle_action(file, klass_name, version, :up)
+          end
         end
       end
     end
-  end
 
-  def self.handle_lower_passed_version(passed_version)
-    files = self.get_all_files
+    def handle_lower_passed_version(passed_version)
+      files = get_all_files
 
-    files.each do |file|
-      filename, version, klass_name = self.seperate_file_parts(file)
-      if version > passed_version
-        if self.version_has_been_migrated?(version)
-          self.handle_action(file, klass_name, version, :down)
+      files.each do |file|
+        filename, version, klass_name = seperate_file_parts(file)
+        if version > passed_version
+          handle_action(file, klass_name, version, :down) if version_has_been_migrated?(version)
         end
       end
-    end
 
-  end
+    end
 
-  def self.handle_action(file, klass_name, version, action)
-    require file
-    klass = klass_name.camelize.constantize
-    puts "=================Migrating #{klass.to_s} #{action.to_s.upcase}============"
-    begin
-      time = Benchmark.measure do
-        ActiveRecord::Base.transaction do
-          klass.send(action.to_s)
+    def handle_action(file, klass_name, version, action)
+      require file
+      klass = klass_name.camelize.constantize
+      puts "=================Migrating #{klass.to_s} #{action.to_s.upcase}============"
+      begin
+        time = Benchmark.measure do
+          ActiveRecord::Base.transaction do
+            klass.send(action.to_s)
+          end
         end
+      rescue Exception=>ex
+        cleanup_migrations
+        raise ex
       end
-    rescue Exception=>ex
-      self.cleanup_migrations
-      raise ex
+      time_str = "(%.4fs)" % time.real
+      puts "================Finished #{klass.to_s} in #{time_str}=="
+      insert_migration_version(version)
     end
-    time_str = "(%.4fs)" % time.real
-    puts "================Finished #{klass.to_s} in #{time_str}=="
-    self.insert_migration_version(version)
-  end
   
-  def self.insert_migration_version(version)
-    ActiveRecord::Base.connection.execute("insert into data_migrations (version) values ('#{version}')")
-  end
+    def insert_migration_version(version)
+      ActiveRecord::Base.connection.execute("insert into data_migrations (version) values ('#{version}')")
+    end
 
-  def self.remove_migration_version(version)
-    ActiveRecord::Base.connection.execute("delete from data_migrations where version = '#{version}'")
-  end
+    def remove_migration_version(version)
+      ActiveRecord::Base.connection.execute("delete from data_migrations where version = '#{version}'")
+    end
 
-  def self.version_has_been_migrated?(version)
-    result = true
+    def version_has_been_migrated?(version)
+      result = true
 
-    db_result = ActiveRecord::Base.connection.select_all("select count(*) as num_rows from data_migrations where version = '#{version}'")
+      db_result = ActiveRecord::Base.connection.select_all("select count(*) as num_rows from data_migrations where version = '#{version}'")
 
-    num_rows = db_result[0]['num_rows'] unless db_result == -1
+      num_rows = db_result[0]['num_rows'] unless db_result == -1
 
-    if num_rows.nil? || num_rows.to_i == 0
-      result = false
-    end
+      if num_rows.nil? || num_rows.to_i == 0
+        result = false
+      end
 
-    result
-  end
+      result
+    end
 
-  def self.data_migrations_table_exists?
-    table_names =  ActiveRecord::Base.connection.tables
-    table_names.include?('data_migrations')
-  end
+    def data_migrations_table_exists?
+      table_names =  ActiveRecord::Base.connection.tables
+      table_names.include?('data_migrations')
+    end
 
-  def self.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 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 self.seperate_file_parts(file)
-    paths = file.split('/')
-    filename = paths[paths.length - 1]
-    version = filename.split('_')[0]
-    klass_name = filename.gsub(/#{version}/, "").gsub(/.rb/, "")[1..filename.length]
+    def seperate_file_parts(file)
+      paths = file.split('/')
+      filename = paths[paths.length - 1]
+      version = filename.split('_')[0]
+      klass_name = filename.gsub(/#{version}/, "").gsub(/.rb/, "")[1..filename.length]
 
-    return filename, version.to_i, klass_name
-  end
+      return filename, version.to_i, klass_name
+    end
 
-  def self.get_all_files
-    files = []
+    def get_all_files
+      files = []
     
-    if File.directory? DEFAULT_MIGRATIONS_PATH
+      if File.directory? @default_migrations_path
     
-      files_or_directories = Dir.entries(DEFAULT_MIGRATIONS_PATH).map{|directory| directory}
+        files_or_directories = Dir.entries(@default_migrations_path).map{|directory| directory}
 
-      files_or_directories.delete_if{|name| name =~ REMOVE_FILES_REGEX} #remove any file leading with . or ..
-      files_or_directories.delete_if{|name| name == 'ignore'} #ignore the ignore folder
+        files_or_directories.delete_if{|name| name =~ REMOVE_FILES_REGEX} #remove any file leading with . or ..
+        files_or_directories.delete_if{|name| name == 'ignore'} #ignore the ignore folder
 
       
-      files_or_directories.each do |file_or_directory|
-        file_or_directory = DEFAULT_MIGRATIONS_PATH + "/" + file_or_directory
-        files = self.get_files_in_directory(file_or_directory, files)
+        files_or_directories.each do |file_or_directory|
+          file_or_directory = @default_migrations_path + "/" + file_or_directory
+          files = get_files_in_directory(file_or_directory, files)
+        end
+
+        files.sort! {|x,y| File.basename(x) <=> File.basename(y)}
       end
 
-      files.sort! {|x,y| self.get_file_name(x) <=> self.get_file_name(y)}
+      files
     end
 
-    files
-  end
-
-  def self.get_files_in_directory(file_or_directory, files)
-    unless file_or_directory =~ /\w\.rb/
-      files_or_directories = Dir.entries(file_or_directory).map{|directory| directory}
+    def get_files_in_directory(file_or_directory, files)
+      unless file_or_directory =~ /\w\.rb/
+        files_or_directories = Dir.entries(file_or_directory).map{|directory| directory}
 
-      files_or_directories.delete_if{|name| name =~ REMOVE_FILES_REGEX} #remove any file leading with . or ..
-      files_or_directories.delete_if{|name| name == 'ignore'} #ignore the ignore folder
+        files_or_directories.delete_if{|name| name =~ REMOVE_FILES_REGEX} #remove any file leading with . or ..
+        files_or_directories.delete_if{|name| name == 'ignore'} #ignore the ignore folder
 
-      files_or_directories.each do |_file_or_directory|
-        _file_or_directory = file_or_directory + "/" + _file_or_directory
-        files = self.get_files_in_directory(_file_or_directory, files)
+        files_or_directories.each do |_file_or_directory|
+          _file_or_directory = file_or_directory + "/" + _file_or_directory
+          files = get_files_in_directory(_file_or_directory, files)
+        end
+      else
+        files << file_or_directory
       end
-    else
-      files << file_or_directory
-    end
-
-    files
-  end
-
-  def self.get_file_name(dir)
-    file_name = dir
 
-    paths = dir.split('/')
-    file_name = paths[paths.length - 1]
-
-    file_name
+      files
+    end
   end
 end

data/lib/tasks/data_migrator.rake

@@ -1,53 +1,53 @@
 namespace :db do
   desc 'migrates data into database'
   task :migrate_data => :environment do
-      
     passed_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-    DataMigrator.prepare_migrations
-    DataMigrator.migrate(nil, passed_version)
-	  DataMigrator.cleanup_migrations
+    data_migrator = RussellEdge::DataMigrator.new
+    data_migrator.prepare_migrations
+    data_migrator.migrate(nil, passed_version)
+	  data_migrator.cleanup_migrations
       
-  end#end task
+  end#end migrate_data task
     
   namespace :migrate_data do
 	task :list_pending => :environment do
-      DataMigrator.prepare_migrations
-      pending_migrations = DataMigrator.pending_migrations
+      data_migrator = RussellEdge::DataMigrator.new
+      data_migrator.prepare_migrations
+      pending_migrations = data_migrator.pending_migrations
       puts "================Pending Data Migrations=========="
       puts pending_migrations
       puts "================================================="
-      DataMigrator.cleanup_migrations
-    end
+      data_migrator.cleanup_migrations
+    end#end list_pending task
 
     task :version => :environment do
-      version = DataMigrator.get_current_version
+      data_migrator = RussellEdge::DataMigrator.new
+      version = data_migrator.get_current_version
 
-      unless version.nil?
-        puts "** Current version #{version}"
-      else
-        puts "** No migrations ran"
-      end
-    end
+      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
         
-      DataMigrator.prepare_migrations
-      DataMigrator.run_up(passed_version)
-      DataMigrator.cleanup_migrations
-        
-    end#end task
+    end#end up task
       
     task :down => :environment do
       passed_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless passed_version
-		
-      DataMigrator.prepare_migrations
-      DataMigrator.run_down(passed_version)
-      DataMigrator.cleanup_migrations
+		  
+		  data_migrator = RussellEdge::DataMigrator.new 
+      data_migrator.prepare_migrations
+      data_migrator.run_down(passed_version)
+      data_migrator.cleanup_migrations
         
-    end#end task
+    end#end down task
   end#end namespace
 end
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: data_migrator
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Russell Holmes, Adam Hull
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 -04:00
+date: 2011-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,6 @@ files:
 - lib/generators/data_migration/templates/migration_template.rb
 - lib/generators/data_migration/USAGE
 - lib/tasks/data_migrator.rake
-- lib/version.rb
 - MIT-LICENSE
 - README.rdoc
 - test/data_migrator_test.rb

data/lib/version.rb

@@ -1,3 +0,0 @@
-module DataMigrator
-  VERSION = '1.3' unless defined?(::DataMigrator::VERSION)
-end