dumper 1.1.3 → 1.2.0

data/dumper.gemspec

@@ -18,6 +18,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'multi_json', '~> 1.0'
   gem.add_runtime_dependency 'multipart-post', '~> 1.1.5'
   gem.add_runtime_dependency 'posix-spawn', '~> 0.3.6'
+
+  gem.add_development_dependency 'bson_ext'
+  gem.add_development_dependency 'mongo_mapper'
+  gem.add_development_dependency 'mongoid', '~> 3.0'
+  gem.add_development_dependency 'rails', '~> 3.2.6'
+  gem.add_development_dependency 'redis'
   gem.add_development_dependency 'rspec'
 
   # For Travis

data/lib/dumper/database/mongodb.rb

@@ -21,15 +21,17 @@ module Dumper
 
       def set_config_for(rails_env=nil)
         return unless defined?(Mongo::DB) &&
-          (mongo = find_instance_in_object_space(Mongo::DB))
+          (mongo = find_instance_in_object_space(Mongo::DB)) ||
+          defined?(Mongoid) && Mongoid::Config.respond_to?(:sessions) &&
+          (mongoid = Mongoid::Config.sessions[:default])
 
         @config = {
-          :host => mongo.connection.host,
-          :port => mongo.connection.port,
-          :database => mongo.name,
+          :host => mongo ? mongo.connection.host : mongoid[:hosts].first.split(/:/).first,
+          :port => mongo ? mongo.connection.port : mongoid[:hosts].first.split(/:/).last,
+          :database => mongo ? mongo.name : mongoid[:database],
           :dump_tool => dump_tool_path
         }.tap do |h|
-          if auth = mongo.connection.auths.first
+          if auth = mongo ? mongo.connection.auths.first : mongoid
             h.update(:username => auth['username'], :password => auth['password'])
           end
         end

data/lib/dumper/stack.rb

@@ -15,7 +15,7 @@ module Dumper
       @databases = {}
 
       # Rackup?
-      @rackup = find_instance_in_object_space(Rack::Server)
+      @rackup = defined?(Rack::Server) && find_instance_in_object_space(Rack::Server)
 
       # Rails?
       if defined?(::Rails)
@@ -23,21 +23,20 @@ module Dumper
         @rails_env = Rails.env.to_s
         @rails_version = Rails::VERSION::STRING
         @is_supported_rails_version = (::Rails::VERSION::MAJOR >= 3)
-
-        if defined?(MongoMapper)
-          MongoMapper.database # Creates the Mongo::DB instance
-        end
-
-        DATABASES.each do |key, klass|
-          database = klass.new
-          next unless database.set_config_for(@rails_env) || database.set_config_for(options[:additional_env])
-          @databases[key] = database
-        end
-
       else
         @framework = :ruby
       end
 
+      if defined?(MongoMapper)
+        MongoMapper.database # Trigger to create a Mongo::DB instance
+      end
+
+      DATABASES.each do |key, klass|
+        database = klass.new
+        next unless database.set_config_for(@rails_env) || database.set_config_for(options[:additional_env])
+        @databases[key] = database
+      end
+
       # Which dispatcher?
       [ :unicorn, :passenger, :thin, :mongrel, :webrick, :resque ].find do |name|
         @dispatcher = send("#{name}?") ? name : nil

data/lib/dumper/version.rb

@@ -1,3 +1,3 @@
 module Dumper
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/spec/dumper_spec.rb

@@ -1,7 +1,58 @@
 require 'spec_helper'
 
+require 'rails'
+
 describe Dumper do
-  it 'initializes' do
+  it 'conforms to public API' do
     Dumper::Agent.respond_to?(:start).should be_true
   end
+
+  describe :Stack do
+    it 'initializes stack' do
+      stack = Dumper::Stack.new
+      stack.framework.should == :rails
+      stack.rails_env.should == 'development'
+    end
+
+    it 'detects mongoid 3' do
+      require 'mongoid'
+      Mongoid::Config.send :load_configuration, { sessions: { default: { hosts: ['localhost:27017'], database: 'test' } } }
+
+      stack = Dumper::Stack.new
+      stack.databases[:mongodb].should_not == nil
+    end
+
+    it 'detects mongo_mapper' do
+      require 'mongo_mapper'
+      MongoMapper.setup({ development: { database: 'test' } }, :development)
+      MongoMapper.database
+
+      stack = Dumper::Stack.new
+      stack.databases[:mongodb].should_not == nil
+    end
+
+    it 'detects mysql' do
+      require 'active_record'
+      ActiveRecord::Base.configurations['development'] = { 'adapter' => 'mysql2' }
+
+      stack = Dumper::Stack.new
+      stack.databases[:mysql].should_not == nil
+    end
+
+    it 'detects postgresql' do
+      require 'active_record'
+      ActiveRecord::Base.configurations['development'] = { 'adapter' => 'postgresql' }
+
+      stack = Dumper::Stack.new
+      stack.databases[:postgresql].should_not == nil
+    end
+
+    it 'detects redis' do
+      require 'redis'
+      redis = Redis.new
+
+      stack = Dumper::Stack.new
+      stack.databases[:redis].should_not == nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumper
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -59,6 +59,86 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  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