exodus 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.1
+
+* Extracted methods from the rake file itself into a module
+* Fixed running custom migrations
+
 ## v1.1.0
 
 * Changed the way migration are executed 

data/lib/exodus.rb

@@ -49,7 +49,7 @@ module Exodus
 	  	runnable_migrations = migrations_info.map do |migration_class, args| 
 	  		migration = instanciate_migration(migration_class, args)
 	  		migration if migration.is_runnable?(direction)
-	  	end.compact
+	  	end.compact.uniq
 
 	  	step ? runnable_migrations.shift(step.to_i) : runnable_migrations
 	  end

data/lib/exodus/helpers/rake_helper.rb

@@ -0,0 +1,14 @@
+module Exodus
+  module RakeHelper
+  	def time_it(task, &block)
+		  puts "#{task} starting..."
+		  start = Time.now
+		  yield
+		  puts "#{task} Done in (#{Time.now-start}s)!!"
+		end
+
+		def step
+		  ENV['STEP']
+		end
+  end
+end

data/lib/exodus/migrations/migration.rb

@@ -128,6 +128,14 @@ module Exodus
       "#{self.class}: #{self.status.arguments}"
     end
 
+    def eql?(other_migration)
+      self.class == other_migration.class && self.status.arguments == other_migration.status.arguments
+    end
+
+    def hash
+      self.class.hash ^ self.status.arguments.hash
+    end
+
     protected
 
     # Executes a given block if the status has not being processed

data/lib/exodus/version.rb

@@ -1,3 +1,3 @@
 module Exodus
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/exodus/exodus_spec.rb

@@ -1,6 +1,10 @@
 require "spec_helper"
 
 describe Exodus do 
+  before do
+    Exodus::Migration.collection.drop
+  end
+
   describe "sort_migrations" do 
   	before do
       class Migration_test4 < Exodus::Migration; end
@@ -89,8 +93,7 @@ describe Exodus do
       describe "with a valid migration" do 
         it "should successfully create the migration" do 
           migration = Exodus.instanciate_migration(Migration_test6, {})
-          lambda{ Exodus.run_one_migration(migration, 'up')}.should 
-          change {Exodus::Migration}.by(1)
+          lambda{ Exodus.run_one_migration(migration, 'up')}.should change(Exodus::Migration, :count).by(1)
         end
       end
 
@@ -98,13 +101,11 @@ describe Exodus do
         let(:migration) {Exodus.instanciate_migration(Migration_test7, {})}
 
         it "should raise an error" do 
-          lambda {Exodus.run_one_migration(migration, 'up')}.should 
-          raise_error(StandardError) 
+          lambda {Exodus.run_one_migration(migration, 'up')}.should raise_error(StandardError) 
         end
 
-        it "should create the migration" do 
-          lambda {Exodus.run_one_migration(migration, 'up')}.should 
-          change {Exodus::Migration}.by(1)
+        it "should still create the migration" do 
+          lambda {Exodus.run_one_migration(migration, 'up') rescue nil}.should change(Exodus::Migration, :count).by(1)
         end
       end
     end
@@ -115,8 +116,7 @@ describe Exodus do
           migration = Exodus.instanciate_migration(Migration_test6, {})
           Exodus.run_one_migration(migration, 'up')
 
-          lambda {Exodus.run_one_migration(migration, 'up')}.should 
-          change {Exodus::Migration}.by(0)
+          lambda {Exodus.run_one_migration(migration, 'up')}.should change(Exodus::Migration, :count).by(0)
         end
       end
 
@@ -125,8 +125,7 @@ describe Exodus do
           migration = Exodus.instanciate_migration(Migration_test7, {})
           Exodus.run_one_migration(migration, 'up') rescue nil
 
-          lambda {Exodus.run_one_migration(migration, 'up')}.should 
-          change {Exodus::Migration}.by(0)
+          lambda {Exodus.run_one_migration(migration, 'up') rescue nil}.should change(Exodus::Migration, :count).by(0)
         end
       end
     end
@@ -194,6 +193,7 @@ describe Exodus do
           UserSupport.create!({:name => "Thomas"})
         end
       end
+
       class Migration_test10 < Exodus::Migration
         @migration_number = 10
         def up 
@@ -247,6 +247,16 @@ describe Exodus do
       end
     end
 
+    it "should run only one time the same migration" do
+      migrations = [[Migration_test9, {}], [Migration_test9, {}]] 
+      lambda {Exodus.sort_and_run_migrations('up', migrations)}.should change(Exodus::Migration, :count).by(1)
+    end
+
+    it "should run successfully only one time when specifying the step option" do
+      migrations = [[Migration_test9, {}], [Migration_test10, {}]] 
+      lambda {Exodus.sort_and_run_migrations('up', migrations, 1)}.should change(Exodus::Migration, :count).by(1)
+    end
+
     describe "Getting migration information" do 
       it "should successfully print the migrations information" do
         migrations = [[Migration_test9, {}], [Migration_test10, {}]] 

data/tasks/exodus.rake

@@ -1,19 +1,10 @@
 require 'rake'
 
-def time_it(task, &block)
-  puts "#{task} starting..."
-  start = Time.now
-  yield
-  puts "#{task} Done in (#{Time.now-start}s)!!"
-end
-
-def step
-  ENV['STEP']
-end
-
 task :require_env do
   require 'csv'
   require File.dirname(__FILE__) + '/../lib/exodus'
+  require File.dirname(__FILE__) + '/../lib/exodus/helpers/rake_helper'
+  include Exodus::RakeHelper
   Exodus.load_migrations
 end
 
@@ -44,7 +35,9 @@ namespace :db do
     task :show => :require_env do 
       migrations = Exodus::Migration.load_all(Exodus.migrations_info.migrate)
       puts "List of all the migrations that will be executed by running 'rake db:rollback#{" STEP=#{step}" if step}': \n\n"
-      puts Exodus::sort_and_run_migrations('up', migrations, step, true)
+      
+      migrations_info = Exodus::sort_and_run_migrations('up', migrations, step, true)
+      puts migrations_info.empty? ? "There is no new migrations to migrate." : migrations_info
     end
 
     desc "Manually migrates specified migrations (specify migrations or use config/migration.yml)"
@@ -56,8 +49,7 @@ namespace :db do
           Exodus::Migration.load_custom(Exodus.migrations_info.migrate_custom)
         end
 
-        migrations = migrations.shift(step.to_i) if step
-        Exodus::run_migrations('up', migrations)
+        Exodus::sort_and_run_migrations('up', migrations, step)
       end
     end
 
@@ -82,7 +74,9 @@ namespace :db do
     task :show => :require_env do 
       migrations = Exodus::Migration.load_all(Exodus.migrations_info.migrate)
       puts "List of all the migrations that will be executed by running 'rake db:rollback#{" STEP=#{step}" if step}': \n\n"
-      puts Exodus::sort_and_run_migrations('down', migrations, step, true)
+
+      migrations_info = Exodus::sort_and_run_migrations('down', migrations, step, true)
+      puts migrations_info.empty? ? "There is no new migrations to rollback." : migrations_info
     end
 
     desc "Manually rolls the database back using specified migrations (specify migrations or use config/migration.yml)"
@@ -94,8 +88,7 @@ namespace :db do
           Exodus::Migration.load_custom(Exodus.migrations_info.rollback_custom)
         end
 
-        migrations = migrations.shift(step.to_i) if step
-        Exodus::run_migrations('down', migrations)
+        Exodus::sort_and_run_migrations('down', migrations, step)
       end
     end
   end

metadata

@@ -1,62 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: exodus
-version: !ruby/object:Gem::Version 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Dmytryk
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-11-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo_mapper
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Exodus is a migration framework for MongoDb
-email: 
+email:
 - thomas@fanhattan.com
 - thomas.dmytryk@supinfo.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -69,6 +95,7 @@ files:
 - exodus.gemspec
 - lib/exodus.rb
 - lib/exodus/config/migration_info.rb
+- lib/exodus/helpers/rake_helper.rb
 - lib/exodus/helpers/text_formatter.rb
 - lib/exodus/migrations/migration.rb
 - lib/exodus/migrations/migration_error.rb
@@ -81,29 +108,31 @@ files:
 - spec/support/user_support.rb
 - tasks/exodus.rake
 homepage: https://github.com/ThomasAlxDmy/Exodus
-licenses: 
+licenses:
 - MIT
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.13
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Exodus uses mongomapper to provide a complete migration framework
-test_files: 
+test_files:
 - spec/exodus/exodus_spec.rb
 - spec/exodus/migration_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: 200e6321b65c9da53640570039104a3431d9b01c
-  data.tar.gz: 3bfc62dbf17cb4e149fb0e05099f6cf90cbd7f40
-SHA512: 
-  metadata.gz: 93a228768b22948e1aa9d0901aafe751d855f807af5c136fc5e198277412e6b7172acd48a009fd066317e4f3a209e08330d26195dd9d19a1b6fbcf56d34dbff2
-  data.tar.gz: 7312deffd0e3ab6347ea390ab0d8374f3be0365eda5043450ea152be159b5d9c9818b01161f43c18857f851d6114a1855a0159d15ef83d5b4a4e60203304b513