exodus 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.2
+
+* Exodus now supports custom namespacing to not conflict with AR db:migrate
+
 ## v1.1.1
 
 * Extracted methods from the rake file itself into a module

data/lib/exodus/config/migration_info.rb

@@ -1,7 +1,7 @@
 module Exodus
 	class MigrationInfo
 		attr_accessor :info, :migrations_directory
-		attr_reader :config_file, :db, :connection
+		attr_reader :config_file, :db, :connection, :rake_namespace
 
 		def initialize(file = nil)
 			config_file = file if file 
@@ -18,12 +18,17 @@ module Exodus
 		def config_file=(file)
 			if File.exists?(file)
 				@config_file = file
-				@info = YAML.load_file(file)
+				self.info = YAML.load_file(file)
+				self.rake_namespace = (info['migration'] && info['migration']['rake_namespace']).to_s
 			else
 				raise ArgumentError, "#{file} not found"
 			end
 		end
 
+		def rake_namespace=(namespace)
+			@rake_namespace = namespace.to_s.empty? || namespace[-1] == ':' ? namespace.to_s : namespace + ':'
+		end
+
 		def migrate
 			verify_yml_syntax { @info['migration']['migrate'] }
 		end
@@ -52,7 +57,7 @@ module Exodus
 			begin
 				yield if block_given?
 			rescue
-				Raise StandardError, "Syntax error detected in config file #{self.config_file}. To find the good syntax take a look at the documentation."
+				Raise StandardError, "Syntax error detected in config file #{self.config_file}. To find the correct syntax take a look at the documentation."
 			end
 		end
 	end

data/lib/exodus/version.rb

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

data/spec/exodus/exodus_spec.rb

@@ -1,6 +1,30 @@
 require "spec_helper"
 
 describe Exodus do 
+  describe Exodus::MigrationInfo do 
+    describe "#rake_namespace" do 
+      it "should use the namespace provided in the yml file" do 
+        Exodus.configuration.rake_namespace.should == 'test:'
+      end
+
+      it "should be blank when no namespace is given" do 
+        Exodus.configuration.rake_namespace = nil
+        Exodus.configuration.rake_namespace.should == ''
+
+        Exodus.configuration.rake_namespace = ''
+        Exodus.configuration.rake_namespace.should == ''
+      end
+
+      it "should end with ':' when a namespace is given" do 
+        Exodus.configuration.rake_namespace = 'test1'
+        Exodus.configuration.rake_namespace.should == 'test1:'
+
+        Exodus.configuration.rake_namespace = 'test2:'
+        Exodus.configuration.rake_namespace.should == 'test2:'
+      end
+    end
+  end
+
   before do
     Exodus::Migration.collection.drop
   end

data/spec/spec_helper.rb

@@ -1,10 +1,17 @@
 require File.dirname(__FILE__) + '/../lib/exodus'
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
 mongo_uri = 'mongodb://exodus:exodus@dharma.mongohq.com:10048/Exodus-test'
+local_uri = 'mongodb://localhost:27017/Exodus-test'
 
 Exodus.configure do |config| 
 	config.db = 'Exodus-test'
-	config.connection = Mongo::MongoClient.from_uri(mongo_uri)
 	config.config_file = File.dirname(__FILE__) + '/support/config.yml'
+
+	begin 
+		config.connection = Mongo::MongoClient.from_uri(mongo_uri)
+	rescue Mongo::ConnectionFailure => e
+		puts e.message, 'Connecting to local db...'
+		config.connection = Mongo::MongoClient.from_uri(local_uri)
+	end
 end
 

data/spec/support/config.yml

@@ -1,4 +1,5 @@
 migration:
+  rake_namespace: 'test'
   migrate:
   rollback:
   custom:

data/tasks/exodus.rake

@@ -1,14 +1,13 @@
 require 'rake'
+require File.dirname(__FILE__) + '/../lib/exodus'
+require File.dirname(__FILE__) + '/../lib/exodus/helpers/rake_helper'
 
 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
 
-namespace :db do
+namespace Exodus.configuration.rake_namespace + 'db' do
   desc "Migrate the database"
   task :migrate => :require_env do 
     time_it "db:migrate#{" step #{step}" if step}" do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exodus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper