exodus 1.1.2 → 1.1.3

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@exodus
+rvm use ruby-1.9.3-p194@exodus --create

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-19mode
+  - rbx
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.3
+
+* Small changes around rerunnable migrations
+
 ## v1.1.2
 
 * Exodus now supports custom namespacing to not conflict with AR db:migrate
@@ -24,7 +28,7 @@
 
 ## v1.0.4
 
-* Custom migrations now runs in the given order
+* Custom migrations now run in the given order
 
 ## v1.0.3
 

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in exodus.gemspec
 gemspec
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end

data/README.md

@@ -171,4 +171,15 @@ Exodus - A migration framework for MongoDb
 
     rake db:mongo_info
 
+## Namespacing
 
+  You might be using other gems in your project that uses `rake db:migrate` or `rake db:rollback`. In order to avoid conflicts you can define rake_namespace, in the Ruby code: 
+
+    Exodus.configure do |config| 
+      config.rake_namespace = 'mongo'
+    end
+
+  Or in your Yaml file:
+
+    migration:
+      rake_namespace: 'mongo'

data/lib/exodus/config/migration_info.rb

@@ -26,7 +26,7 @@ module Exodus
 		end
 
 		def rake_namespace=(namespace)
-			@rake_namespace = namespace.to_s.empty? || namespace[-1] == ':' ? namespace.to_s : namespace + ':'
+			@rake_namespace = namespace.to_s.empty? || namespace.end_with?(':') ? namespace.to_s : namespace + ':'
 		end
 
 		def migrate

data/lib/exodus/migrations/migration.rb

@@ -103,7 +103,7 @@ module Exodus
       self.status.direction = direction
 
       # reset the status if the job is rerunnable and has already be completed
-      self.status = self.status.reset if self.rerunnable_safe && completed?(direction) 
+      self.status.reset! if self.rerunnable_safe && completed?(direction) 
       self.status.execution_time = time_it { self.send(direction) }
       self.status.last_succesful_completion = Time.now
     end

data/lib/exodus/migrations/migration_status.rb

@@ -37,7 +37,7 @@ module Exodus
     end
 
     # Resets a status
-    def reset
+    def reset!
       self.message = nil
       self.current_status = 0
       self.execution_time = 0

data/lib/exodus/version.rb

@@ -1,3 +1,3 @@
 module Exodus
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/exodus/migration_spec.rb

@@ -57,6 +57,24 @@ describe Exodus::Migration do
           end
         end
       end
+
+      class RerunnableMigrationTest < Exodus::Migration
+        def initialize(args = {})
+          super(args)
+          self.rerunnable_safe = true
+        end
+
+        def up 
+          step("Creating new APIUser entity", 1) {UserSupport.first_or_create(:name =>'testor')}
+        end
+
+        def down 
+          step("Droping APIUser entity", 0) do 
+            user = UserSupport.first
+            user.destroy if user
+          end
+        end
+      end
     end
 
     subject { Migration_test1.first_or_create({}) }
@@ -87,6 +105,25 @@ describe Exodus::Migration do
         subject.status.execution_time.should > 0
         subject.status.message.should == 'Droping APIUser entity'
       end
+
+      it "should run and rerun when the migration is rerunnable safe" do
+        RerunnableMigrationTest.collection.drop
+        UserSupport.collection.drop
+
+        migration = RerunnableMigrationTest.first_or_create({})
+
+        lambda{ migration.run('up')}.should change { UserSupport.count }.by(1)
+        migration.status.arguments.should be_empty
+        migration.status.current_status.should == 1
+        migration.status.direction.should == 'up'
+        migration.status.execution_time.should > 0
+        migration.status.last_succesful_completion.should
+        migration.status.message.should == 'Creating new APIUser entity'
+
+        UserSupport.first.destroy
+        UserSupport.count.should == 0
+        lambda{ migration.run('up')}.should change { UserSupport.count }.by(1)
+      end
     end
 
     describe "#failure=" do

data/spec/exodus/migration_status_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe Exodus::MigrationStatus do
+
+  let(:migration) { Exodus::Migration.new }
+  subject {migration.status }
+
+  describe "New Oject" do
+    it "should have a status" do
+      subject.should_not be_nil
+    end
+  end
+
+  describe "#reset!" do
+    it "should reset the current status" do
+      time = Time.now
+
+      subject.message = "test"
+      subject.current_status = 1
+      subject.execution_time = 2
+      subject.last_succesful_completion = time
+
+      subject.message.should == "test"
+      subject.current_status.should ==  1
+      subject.execution_time.should == 2
+      subject.last_succesful_completion.to_i.should == time.to_i
+
+      subject.reset!
+
+      subject.message.should == nil
+      subject.current_status.should == 0
+      subject.execution_time.should == 0
+      subject.last_succesful_completion.should == nil
+    end
+  end
+end

data/tasks/exodus.rake

@@ -33,7 +33,7 @@ namespace Exodus.configuration.rake_namespace + 'db' do
     desc "Show which migrations will be run when calling 'rake db:migrate'"
     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 "List of all the migrations that will be executed by running 'rake db:migrate#{" STEP=#{step}" if step}': \n\n"
       
       migrations_info = Exodus::sort_and_run_migrations('up', migrations, step, true)
       puts migrations_info.empty? ? "There is no new migrations to migrate." : migrations_info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exodus
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
@@ -103,6 +103,7 @@ files:
 - lib/exodus/version.rb
 - spec/exodus/exodus_spec.rb
 - spec/exodus/migration_spec.rb
+- spec/exodus/migration_status_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml
 - spec/support/user_support.rb
@@ -135,6 +136,7 @@ summary: Exodus uses mongomapper to provide a complete migration framework
 test_files:
 - spec/exodus/exodus_spec.rb
 - spec/exodus/migration_spec.rb
+- spec/exodus/migration_status_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.yml
 - spec/support/user_support.rb