gotime-cassandra_object 0.8.3 → 0.8.4

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '0.8.3'
+  s.version = '0.8.4'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.required_rubygems_version = '>= 1.3.5'

data/lib/cassandra_object.rb

@@ -26,8 +26,7 @@ module CassandraObject
   autoload :FindWithIds
   autoload :Timestamps
 
-  autoload :Migrator
-  autoload :Migration  
+  autoload :Schema
 
   module Tasks
     extend ActiveSupport::Autoload

data/lib/cassandra_object/generators/templates/migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= name %> < CassandraObject::Migration
+class <%= name %> < CassandraObject::Schema::Migration
 
   def self.up
 

data/lib/cassandra_object/migrations.rb

@@ -1,23 +1,15 @@
 module CassandraObject
   module Migrations
     extend ActiveSupport::Concern
+    extend ActiveSupport::Autoload
+
     included do
       class_inheritable_array :migrations
       class_inheritable_accessor :current_schema_version
       self.current_schema_version = 0
     end
-    
-    class Migration
-      attr_reader :version
-      def initialize(version, block)
-        @version = version
-        @block = block
-      end
-      
-      def run(attrs)
-        @block.call(attrs)
-      end
-    end
+
+    autoload :Migration
     
     class MigrationNotFoundError < StandardError
       def initialize(record_version, migrations)

data/lib/cassandra_object/migrations/migration.rb

@@ -0,0 +1,15 @@
+module CassandraObject
+  module Migrations
+    class Migration
+      attr_reader :version
+      def initialize(version, block)
+        @version = version
+        @block = block
+      end
+
+      def run(attrs)
+        @block.call(attrs)
+      end
+    end
+  end
+end

data/lib/cassandra_object/schema.rb

@@ -0,0 +1,37 @@
+module CassandraObject
+  module Schema
+    extend ActiveSupport::Autoload
+
+    class IrreversibleMigration < StandardError
+    end
+
+    class DuplicateMigrationVersionError < StandardError#:nodoc:
+      def initialize(version)
+        super("Multiple migrations have the version number #{version}")
+      end
+    end
+
+    class DuplicateMigrationNameError < StandardError#:nodoc:
+      def initialize(name)
+        super("Multiple migrations have the name #{name}")
+      end
+    end
+
+    class UnknownMigrationVersionError < StandardError #:nodoc:
+      def initialize(version)
+        super("No migration with version number #{version}")
+      end
+    end
+
+    class IllegalMigrationNameError < StandardError#:nodoc:
+      def initialize(name)
+        super("Illegal name for migration file: #{name}\n\t(only lower case letters, numbers, and '_' allowed)")
+      end
+    end
+
+    autoload :Migrator
+    autoload :Migration
+    autoload :MigrationProxy
+
+  end
+end

data/lib/cassandra_object/schema/migration.rb

@@ -0,0 +1,106 @@
+module CassandraObject
+  module Schema
+
+    class Migration
+
+      @@verbose = true
+      cattr_accessor :verbose
+
+      # Returns the raw connection to Cassandra
+      def self.connection
+        CassandraObject::Base.connection
+      end
+
+      def self.migrate(direction)
+        return unless respond_to?(direction)
+
+        case direction
+        when :up   then announce "migrating"
+        when :down then announce "reverting"
+        end
+
+        result = nil
+        time = Benchmark.measure { result = send("#{direction}") }
+
+        case direction
+        when :up   then announce "migrated (%.4fs)" % time.real; write
+        when :down then announce "reverted (%.4fs)" % time.real; write
+        end
+
+        result
+      end
+
+      # Creates a new column family with the given name.  Column family configurations can be set within
+      # a block like this:
+      #
+      #  create_column_family(:users) do |cf|
+      #    cf.comment = 'Users column family'
+      #    cf.comparator_type = 'TimeUUIDType'
+      #  end
+      #
+      # A complete list of available configuration settings is here:
+      #
+      # http://github.com/fauna/cassandra/blob/master/vendor/0.7/gen-rb/cassandra_types.rb
+      #
+      # Scroll down to the CfDef definition.
+      def self.create_column_family(name, &block)
+        say_with_time("create_column_family #{name}") do
+          column_family_tasks.create(name, &block)
+        end
+      end
+
+      # Drops the given column family
+      def self.drop_column_family(name)
+        say_with_time("drop_column_family #{name}") do
+          column_family_tasks.drop(name)
+        end
+      end
+
+      # Renames the column family from the old name to the new name
+      def self.rename_column_family(old_name, new_name)
+        say_with_time("rename_column_family #{name}") do
+          column_family_tasks.rename(old_name, new_name)
+        end
+      end
+
+      def self.write(text="")
+        puts(text) if verbose
+      end
+
+      def self.announce(message)
+        version = defined?(@version) ? @version : nil
+
+        text = "#{version} #{name}: #{message}"
+        length = [0, 75 - text.length].max
+        write "== %s %s" % [text, "=" * length]
+      end
+
+      def self.say(message, subitem=false)
+        write "#{subitem ? "   ->" : "--"} #{message}"
+      end
+
+      def self.say_with_time(message)
+        say(message)
+        result = nil
+        time = Benchmark.measure { result = yield }
+        say "%.4fs" % time.real, :subitem
+        say("#{result} rows", :subitem) if result.is_a?(Integer)
+        result
+      end
+
+      def self.suppress_messages
+        save, self.verbose = verbose, false
+        yield
+      ensure
+        self.verbose = save
+      end
+
+      private
+
+      def self.column_family_tasks
+        Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
+      end
+
+    end
+  end
+end

data/lib/cassandra_object/schema/migration_proxy.rb

@@ -0,0 +1,25 @@
+module CassandraObject
+  module Schema
+
+    # MigrationProxy is used to defer loading of the actual migration classes
+    # until they are needed
+    class MigrationProxy
+
+      attr_accessor :name, :version, :filename
+
+      delegate :migrate, :announce, :write, :to=>:migration
+
+      private
+
+      def migration
+        @migration ||= load_migration
+      end
+
+      def load_migration
+        require(File.expand_path(filename))
+        name.constantize
+      end
+
+    end
+  end
+end

data/lib/cassandra_object/schema/migrator.rb

@@ -0,0 +1,213 @@
+module CassandraObject
+  module Schema
+
+    class Migrator
+
+      def self.migrate(migrations_path, target_version = nil)
+        case
+        when target_version.nil?
+          up(migrations_path, target_version)
+        when current_version == 0 && target_version == 0
+        when current_version > target_version
+          down(migrations_path, target_version)
+        else
+          up(migrations_path, target_version)
+        end
+      end
+
+      def self.rollback(migrations_path, steps = 1)
+        move(:down, migrations_path, steps)
+      end
+
+      def self.forward(migrations_path, steps = 1)
+        move(:up, migrations_path, steps)
+      end
+
+      def self.up(migrations_path, target_version = nil)
+        new(:up, migrations_path, target_version).migrate
+      end
+
+      def self.down(migrations_path, target_version = nil)
+        new(:down, migrations_path, target_version).migrate
+      end
+
+      def self.run(direction, migrations_path, target_version)
+        new(direction, migrations_path, target_version).run
+      end
+
+      def self.migrations_path
+        'ks/migrate'
+      end
+
+      def self.schema_migrations_column_family
+        :schema_migrations
+      end
+
+      def self.column_family_tasks
+        cas = CassandraObject::Base.connection
+        Tasks::ColumnFamily.new(cas.keyspace)
+      end
+
+      def self.get_all_versions
+        cas = CassandraObject::Base.connection
+        cas.get(schema_migrations_column_family, 'all').map {|(name, _value)| name.to_i}.sort
+      end
+
+      def self.current_version
+        sm_cf = schema_migrations_column_family
+        if column_family_tasks.exists?(sm_cf)
+          get_all_versions.max || 0
+        else
+          0
+        end
+      end
+
+      private
+
+      def self.move(direction, migrations_path, steps)
+        migrator = self.new(direction, migrations_path)
+        start_index = migrator.migrations.index(migrator.current_migration)
+
+        if start_index
+          finish = migrator.migrations[start_index + steps]
+          version = finish ? finish.version : 0
+          send(direction, migrations_path, version)
+        end
+      end
+
+      public
+
+      def initialize(direction, migrations_path, target_version = nil)
+        sm_cf = self.class.schema_migrations_column_family
+
+        unless column_family_tasks.exists?(sm_cf)
+          column_family_tasks.create(sm_cf) do |cf|
+            cf.comparator_type = 'LongType'
+          end
+        end
+
+        @direction, @migrations_path, @target_version = direction, migrations_path, target_version
+      end
+
+      def current_version
+        migrated.last || 0
+      end
+
+      def current_migration
+        migrations.detect { |m| m.version == current_version }
+      end
+
+      def run
+        target = migrations.detect { |m| m.version == @target_version }
+        raise UnknownMigrationVersionError.new(@target_version) if target.nil?
+        unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
+          target.migrate(@direction)
+          record_version_state_after_migrating(target)
+        end
+      end
+
+      def migrate
+        current = migrations.detect { |m| m.version == current_version }
+        target = migrations.detect { |m| m.version == @target_version }
+
+        if target.nil? && !@target_version.nil? && @target_version > 0
+          raise UnknownMigrationVersionError.new(@target_version)
+        end
+
+        start = up? ? 0 : (migrations.index(current) || 0)
+        finish = migrations.index(target) || migrations.size - 1
+        runnable = migrations[start..finish]
+
+        # skip the last migration if we're headed down, but not ALL the way down
+        runnable.pop if down? && !target.nil?
+
+        runnable.each do |migration|
+          #puts "Migrating to #{migration.name} (#{migration.version})"
+
+          # On our way up, we skip migrating the ones we've already migrated
+          next if up? && migrated.include?(migration.version.to_i)
+
+          # On our way down, we skip reverting the ones we've never migrated
+          if down? && !migrated.include?(migration.version.to_i)
+            migration.announce 'never migrated, skipping'; migration.write
+            next
+          end
+
+          migration.migrate(@direction)
+          record_version_state_after_migrating(migration)
+        end
+      end
+
+      def migrations
+        @migrations ||= begin
+                          files = Dir["#{@migrations_path}/[0-9]*_*.rb"]
+
+                          migrations = files.inject([]) do |klasses, file|
+                            version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
+
+                            raise IllegalMigrationNameError.new(file) unless version
+                            version = version.to_i
+
+                            if klasses.detect { |m| m.version == version }
+                              raise DuplicateMigrationVersionError.new(version)
+                            end
+
+                            if klasses.detect { |m| m.name == name.camelize }
+                              raise DuplicateMigrationNameError.new(name.camelize)
+                            end
+
+                            migration = MigrationProxy.new
+                            migration.name     = name.camelize
+                            migration.version  = version
+                            migration.filename = file
+                            klasses << migration
+                          end
+
+                          migrations = migrations.sort_by { |m| m.version }
+                          down? ? migrations.reverse : migrations
+                        end
+      end
+
+      def pending_migrations
+        already_migrated = migrated
+        migrations.reject { |m| already_migrated.include?(m.version.to_i) }
+      end
+
+      def migrated
+        @migrated_versions ||= self.class.get_all_versions
+      end
+
+      private
+
+      def column_family_tasks
+        Tasks::ColumnFamily.new(connection.keyspace)
+      end
+
+      def connection
+        CassandraObject::Base.connection
+      end
+
+      def record_version_state_after_migrating(migration)
+        sm_cf = self.class.schema_migrations_column_family
+
+        @migrated_versions ||= []
+        if down?
+          @migrated_versions.delete(migration.version)
+          connection.remove sm_cf, 'all', migration.version
+        else
+          @migrated_versions.push(migration.version).sort!
+          connection.insert sm_cf, 'all', { migration.version => migration.name }
+        end
+      end
+
+      def up?
+        @direction == :up
+      end
+
+      def down?
+        @direction == :down
+      end
+
+    end
+  end
+end

data/lib/cassandra_object/tasks/ks.rb

@@ -50,21 +50,21 @@ namespace :ks do
   desc 'Migrate the keyspace (options: VERSION=x)'
   task :migrate => :configure do
     version = ( ENV['VERSION'] ? ENV['VERSION'].to_i : nil )
-    CassandraObject::Migrator.migrate CassandraObject::Migrator.migrations_path, version
+    CassandraObject::Schema::Migrator.migrate CassandraObject::Schema::Migrator.migrations_path, version
     schema_dump
   end
 
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n)'
   task :rollback => :set_keyspace do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    CassandraObject::Migrator.rollback CassandraObject::Migrator.migrations_path, step
+    CassandraObject::Schema::Migrator.rollback CassandraObject::Schema::Migrator.migrations_path, step
     schema_dump
   end
 
   desc 'Pushes the schema to the next version (specify steps w/ STEP=n)'
   task :forward => :set_keyspace do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    CassandraObject::Migrator.forward CassandraObject::Migrator.migrations_path, step
+    CassandraObject::Schema::Migrator.forward CassandraObject::Schema::Migrator.migrations_path, step
     schema_dump
   end
 
@@ -90,7 +90,7 @@ namespace :ks do
 
   desc 'Retrieves the current schema version number'
   task :version => :set_keyspace do
-    version = CassandraObject::Migrator.current_version
+    version = CassandraObject::Schema::Migrator.current_version
     puts "Current version: #{version}"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-09 00:00:00.000000000 -08:00
+date: 2011-03-10 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &11677480 !ruby/object:Gem::Requirement
+  requirement: &10878420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *11677480
+  version_requirements: *10878420
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &11676780 !ruby/object:Gem::Requirement
+  requirement: &10877740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *11676780
+  version_requirements: *10877740
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &11676220 !ruby/object:Gem::Requirement
+  requirement: &10877160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11676220
+  version_requirements: *10877160
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11675520 !ruby/object:Gem::Requirement
+  requirement: &10876480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11675520
+  version_requirements: *10876480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11674780 !ruby/object:Gem::Requirement
+  requirement: &10875720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11674780
+  version_requirements: *10875720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11674020 !ruby/object:Gem::Requirement
+  requirement: &10874980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *11674020
+  version_requirements: *10874980
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &11673460 !ruby/object:Gem::Requirement
+  requirement: &10874400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11673460
+  version_requirements: *10874400
 description: Cassandra ActiveModel
 email: grantr@gmail.com
 executables: []
@@ -130,11 +130,14 @@ files:
 - lib/cassandra_object/identity/uuid_key_factory.rb
 - lib/cassandra_object/indexes.rb
 - lib/cassandra_object/log_subscriber.rb
-- lib/cassandra_object/migration.rb
 - lib/cassandra_object/migrations.rb
-- lib/cassandra_object/migrator.rb
+- lib/cassandra_object/migrations/migration.rb
 - lib/cassandra_object/mocking.rb
 - lib/cassandra_object/persistence.rb
+- lib/cassandra_object/schema.rb
+- lib/cassandra_object/schema/migration.rb
+- lib/cassandra_object/schema/migration_proxy.rb
+- lib/cassandra_object/schema/migrator.rb
 - lib/cassandra_object/serialization.rb
 - lib/cassandra_object/tasks/column_family.rb
 - lib/cassandra_object/tasks/keyspace.rb

data/lib/cassandra_object/migration.rb

@@ -1,126 +0,0 @@
-module CassandraObject
-
-  class Migration
-
-    @@verbose = true
-    cattr_accessor :verbose
-
-    # Returns the raw connection to Cassandra
-    def self.connection
-      CassandraObject::Base.connection
-    end
-
-    def self.migrate(direction)
-      return unless respond_to?(direction)
-
-      case direction
-        when :up   then announce "migrating"
-        when :down then announce "reverting"
-      end
-
-      result = nil
-      time = Benchmark.measure { result = send("#{direction}") }
-
-      case direction
-        when :up   then announce "migrated (%.4fs)" % time.real; write
-        when :down then announce "reverted (%.4fs)" % time.real; write
-      end
-
-      result
-    end
-
-    # Creates a new column family with the given name.  Column family configurations can be set within
-    # a block like this:
-    #
-    #  create_column_family(:users) do |cf|
-    #    cf.comment = 'Users column family'
-    #    cf.comparator_type = 'TimeUUIDType'
-    #  end
-    #
-    # A complete list of available configuration settings is here:
-    #
-    # http://github.com/fauna/cassandra/blob/master/vendor/0.7/gen-rb/cassandra_types.rb
-    #
-    # Scroll down to the CfDef definition.
-    def self.create_column_family(name, &block)
-      say_with_time("create_column_family #{name}") do
-        column_family_tasks.create(name, &block)
-      end
-    end
-
-    # Drops the given column family
-    def self.drop_column_family(name)
-      say_with_time("drop_column_family #{name}") do
-        column_family_tasks.drop(name)
-      end
-    end
-
-    # Renames the column family from the old name to the new name
-    def self.rename_column_family(old_name, new_name)
-      say_with_time("rename_column_family #{name}") do
-        column_family_tasks.rename(old_name, new_name)
-      end
-    end
-
-    def self.write(text="")
-      puts(text) if verbose
-    end
-
-    def self.announce(message)
-      version = defined?(@version) ? @version : nil
-
-      text = "#{version} #{name}: #{message}"
-      length = [0, 75 - text.length].max
-      write "== %s %s" % [text, "=" * length]
-    end
-
-    def self.say(message, subitem=false)
-      write "#{subitem ? "   ->" : "--"} #{message}"
-    end
-
-    def self.say_with_time(message)
-      say(message)
-      result = nil
-      time = Benchmark.measure { result = yield }
-      say "%.4fs" % time.real, :subitem
-      say("#{result} rows", :subitem) if result.is_a?(Integer)
-      result
-    end
-
-    def self.suppress_messages
-      save, self.verbose = verbose, false
-      yield
-    ensure
-      self.verbose = save
-    end
-
-    private
-
-    def self.column_family_tasks
-      Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
-    end
-
-  end
-
-  # MigrationProxy is used to defer loading of the actual migration classes
-  # until they are needed
-  class MigrationProxy
-
-    attr_accessor :name, :version, :filename
-
-    delegate :migrate, :announce, :write, :to=>:migration
-
-    private
-
-    def migration
-      @migration ||= load_migration
-    end
-
-    def load_migration
-      require(File.expand_path(filename))
-      name.constantize
-    end
-
-  end
-
-end

data/lib/cassandra_object/migrator.rb

@@ -1,238 +0,0 @@
-module CassandraObject
-  class IrreversibleMigration < StandardError
-  end
-
-  class DuplicateMigrationVersionError < StandardError#:nodoc:
-    def initialize(version)
-      super("Multiple migrations have the version number #{version}")
-    end
-  end
-
-  class DuplicateMigrationNameError < StandardError#:nodoc:
-    def initialize(name)
-      super("Multiple migrations have the name #{name}")
-    end
-  end
-
-  class UnknownMigrationVersionError < StandardError #:nodoc:
-    def initialize(version)
-      super("No migration with version number #{version}")
-    end
-  end
-
-  class IllegalMigrationNameError < StandardError#:nodoc:
-    def initialize(name)
-      super("Illegal name for migration file: #{name}\n\t(only lower case letters, numbers, and '_' allowed)")
-    end
-  end
-
-  class Migrator
-
-    def self.migrate(migrations_path, target_version = nil)
-      case
-        when target_version.nil?
-          up(migrations_path, target_version)
-        when current_version == 0 && target_version == 0
-        when current_version > target_version
-          down(migrations_path, target_version)
-        else
-          up(migrations_path, target_version)
-      end
-    end
-
-    def self.rollback(migrations_path, steps = 1)
-      move(:down, migrations_path, steps)
-    end
-
-    def self.forward(migrations_path, steps = 1)
-      move(:up, migrations_path, steps)
-    end
-
-    def self.up(migrations_path, target_version = nil)
-      new(:up, migrations_path, target_version).migrate
-    end
-
-    def self.down(migrations_path, target_version = nil)
-      new(:down, migrations_path, target_version).migrate
-    end
-
-    def self.run(direction, migrations_path, target_version)
-      new(direction, migrations_path, target_version).run
-    end
-
-    def self.migrations_path
-      'ks/migrate'
-    end
-
-    def self.schema_migrations_column_family
-      :schema_migrations
-    end
-
-    def self.column_family_tasks
-      cas = CassandraObject::Base.connection
-      Tasks::ColumnFamily.new(cas.keyspace)
-    end
-
-    def self.get_all_versions
-      cas = CassandraObject::Base.connection
-      cas.get(schema_migrations_column_family, 'all').map {|(name, _value)| name.to_i}.sort
-    end
-
-    def self.current_version
-      sm_cf = schema_migrations_column_family
-      if column_family_tasks.exists?(sm_cf)
-        get_all_versions.max || 0
-      else
-        0
-      end
-    end
-
-    private
-
-    def self.move(direction, migrations_path, steps)
-      migrator = self.new(direction, migrations_path)
-      start_index = migrator.migrations.index(migrator.current_migration)
-
-      if start_index
-        finish = migrator.migrations[start_index + steps]
-        version = finish ? finish.version : 0
-        send(direction, migrations_path, version)
-      end
-    end
-
-    public
-
-    def initialize(direction, migrations_path, target_version = nil)
-      sm_cf = self.class.schema_migrations_column_family
-
-      unless column_family_tasks.exists?(sm_cf)
-        column_family_tasks.create(sm_cf) do |cf|
-          cf.comparator_type = 'LongType'
-        end
-      end
-
-      @direction, @migrations_path, @target_version = direction, migrations_path, target_version
-    end
-
-    def current_version
-      migrated.last || 0
-    end
-
-    def current_migration
-      migrations.detect { |m| m.version == current_version }
-    end
-
-    def run
-      target = migrations.detect { |m| m.version == @target_version }
-      raise UnknownMigrationVersionError.new(@target_version) if target.nil?
-      unless (up? && migrated.include?(target.version.to_i)) || (down? && !migrated.include?(target.version.to_i))
-        target.migrate(@direction)
-        record_version_state_after_migrating(target)
-      end
-    end
-
-    def migrate
-      current = migrations.detect { |m| m.version == current_version }
-      target = migrations.detect { |m| m.version == @target_version }
-
-      if target.nil? && !@target_version.nil? && @target_version > 0
-        raise UnknownMigrationVersionError.new(@target_version)
-      end
-
-      start = up? ? 0 : (migrations.index(current) || 0)
-      finish = migrations.index(target) || migrations.size - 1
-      runnable = migrations[start..finish]
-
-      # skip the last migration if we're headed down, but not ALL the way down
-      runnable.pop if down? && !target.nil?
-
-      runnable.each do |migration|
-        #puts "Migrating to #{migration.name} (#{migration.version})"
-
-        # On our way up, we skip migrating the ones we've already migrated
-        next if up? && migrated.include?(migration.version.to_i)
-
-        # On our way down, we skip reverting the ones we've never migrated
-        if down? && !migrated.include?(migration.version.to_i)
-          migration.announce 'never migrated, skipping'; migration.write
-          next
-        end
-
-        migration.migrate(@direction)
-        record_version_state_after_migrating(migration)
-      end
-    end
-
-    def migrations
-      @migrations ||= begin
-        files = Dir["#{@migrations_path}/[0-9]*_*.rb"]
-
-        migrations = files.inject([]) do |klasses, file|
-          version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
-
-          raise IllegalMigrationNameError.new(file) unless version
-          version = version.to_i
-
-          if klasses.detect { |m| m.version == version }
-            raise DuplicateMigrationVersionError.new(version)
-          end
-
-          if klasses.detect { |m| m.name == name.camelize }
-            raise DuplicateMigrationNameError.new(name.camelize)
-          end
-
-          migration = MigrationProxy.new
-          migration.name     = name.camelize
-          migration.version  = version
-          migration.filename = file
-          klasses << migration
-        end
-
-        migrations = migrations.sort_by { |m| m.version }
-        down? ? migrations.reverse : migrations
-      end
-    end
-
-    def pending_migrations
-      already_migrated = migrated
-      migrations.reject { |m| already_migrated.include?(m.version.to_i) }
-    end
-
-    def migrated
-      @migrated_versions ||= self.class.get_all_versions
-    end
-
-    private
-
-    def column_family_tasks
-      Tasks::ColumnFamily.new(connection.keyspace)
-    end
-
-    def connection
-      CassandraObject::Base.connection
-    end
-
-    def record_version_state_after_migrating(migration)
-      sm_cf = self.class.schema_migrations_column_family
-
-      @migrated_versions ||= []
-      if down?
-        @migrated_versions.delete(migration.version)
-        connection.remove sm_cf, 'all', migration.version
-      else
-        @migrated_versions.push(migration.version).sort!
-        connection.insert sm_cf, 'all', { migration.version => migration.name }
-      end
-    end
-
-    def up?
-      @direction == :up
-    end
-
-    def down?
-      @direction == :down
-    end
-
-  end
-  
-end