mongo_test_server 0.0.2 → 0.0.3

data/lib/mongo_test_server/version.rb

@@ -1,3 +1,3 @@
 module MongoTestServer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mongo_test_server.rb

@@ -1,5 +1,9 @@
 # coding: UTF-8
-require 'mongo'
+#begin
+#  require 'mongo'
+#rescue LoadError => e
+#  require 'moped'
+#end
 require 'fileutils'
 require 'erb'
 require 'yaml'
@@ -7,9 +11,9 @@ require 'tempfile'
 require "mongo_test_server/version"
 
 module MongoTestServer
-  
+
   class Mongod
-  
+
     class << self
 
       def configure(options={}, &block)
@@ -22,7 +26,7 @@ module MongoTestServer
       def server
         @mongo_test_server ||= new
       end
-  
+
       def start_server
         unless @mongo_test_server.nil?
           @mongo_test_server.start
@@ -30,20 +34,20 @@ module MongoTestServer
           puts "MongoTestServer not configured properly!"
         end
       end
-  
+
       def stop_server
         unless @mongo_test_server.nil?
           @mongo_test_server.stop
         end
       end
-  
+
     end
 
     attr_writer :port
     attr_writer :path
     attr_writer :name
     attr_reader :mongo_instance_id
-  
+
     def initialize(port=nil, name=nil, path=nil)
       self.port = port
       self.path = path
@@ -78,7 +82,7 @@ module MongoTestServer
     def mongo_cmd_line
       "#{self.path} --port #{self.port} --dbpath #{self.mongo_dir} --noprealloc --nojournal --noauth --nohttpinterface --nssize 1 --oplogSize #{@oplog_size} --smallfiles --logpath #{self.mongo_log}"
     end
-  
+
     def prepare
       FileUtils.rm_rf self.mongo_dir
       FileUtils.mkdir_p self.mongo_dir
@@ -88,7 +92,7 @@ module MongoTestServer
       pids = `ps ax | grep mongod | grep #{self.port} | grep #{self.mongo_dir} | grep -v grep | awk '{print \$1}'`.chomp
       !pids.empty?
     end
-  
+
     def started?
       File.directory?(self.mongo_dir) && File.exists?("#{self.mongo_dir}/started")
     end
@@ -112,11 +116,11 @@ module MongoTestServer
     def error?
       File.exists?("#{self.mongo_dir}/error")
     end
-  
+
     def configured?
       @configured
     end
-  
+
     def start
       unless started?
         prepare
@@ -140,8 +144,8 @@ module MongoTestServer
       unless killed? || $?.success?
         error_message = <<-ERROR
           <#{self.class.name}> Error executing command: #{command}
-          <#{self.class.name}> Result is: #{IO.binread(self.mongo_log)}
-          <#{self.class.name}> Error is: #{File.read(error_filepath)}
+          <#{self.class.name}> Result is: #{IO.binread(self.mongo_log) rescue "No mongo log on disk"}
+          <#{self.class.name}> Error is: #{File.read(error_filepath) rescue "No error file on disk"}
         ERROR
         File.open("#{self.mongo_dir}/error", 'w') do |f|
           f << error_message
@@ -150,13 +154,24 @@ module MongoTestServer
       end
       result
     end
-  
+
+    def test_connection!
+      if defined?(Mongo)
+        c = Mongo::Connection.new("localhost", self.port)
+        c.close
+      elsif defined?(Moped)
+        session = Moped::Session.new(["localhost:#{self.port}"])
+        session.disconnect
+      else
+        raise Exeption.new "No mongo driver loaded! Only the official mongo driver and the moped driver are supported"
+      end
+    end
+
     def wait_until_ready
       retries = 10
       begin
         self.started = true
-        c = Mongo::Connection.new("localhost", self.port)
-        c.close
+        test_connection!
       rescue Exception => e
         if retries>0 && !killed? && !error?
           retries -= 1
@@ -167,20 +182,24 @@ module MongoTestServer
           error_lines = []
           error_lines << "<#{self.class.name}> cmd was: #{mongo_cmd_line}"
           error_lines << "<#{self.class.name}> ERROR: Failed to connect to mongo database: #{e.message}"
-          IO.binread(self.mongo_log).split("\n").each do |line|
-            error_lines << "<#{self.class.name}> #{line}"
+          begin
+            IO.binread(self.mongo_log).split("\n").each do |line|
+              error_lines << "<#{self.class.name}> #{line}"
+            end
+          rescue Exception => e
+            error_lines << "No mongo log on disk at #{self.mongo_log}"
           end
           stop
           raise Exception.new error_lines.join("\n")
         end
       end
     end
-  
+
     def pids
       pids = `ps ax | grep mongod | grep #{self.port} | grep #{self.mongo_dir} | grep -v grep | awk '{print \$1}'`.chomp
       pids.split("\n").map {|p| (p.nil? || p=='') ? nil : p.to_i }
     end
-  
+
     def stop
       mongo_pids = pids
       self.killed = true
@@ -193,7 +212,11 @@ module MongoTestServer
     def mongoid_options(options={})
       options = {host: "localhost", port: self.port, database: "#{self.name}_test_db", use_utc: false, use_activesupport_time_zone: true}.merge(options)
     end
-  
+
+    def mongoid3_options(options={})
+      options = {hosts: ["localhost:#{self.port}"], database: "#{self.name}_test_db", use_utc: false, use_activesupport_time_zone: true}.merge(options)
+    end
+
     def mongoid_yml(options={})
       options = mongoid_options(options)
       mongo_conf_yaml = <<EOY
@@ -204,6 +227,19 @@ use_utc: #{options[:use_utc]}
 use_activesupport_time_zone: #{options[:use_activesupport_time_zone]}
 EOY
     end
-  
+
+    def mongoid3_yml(options={})
+      options = mongoid3_options(options)
+      mongo_conf_yaml = <<EOY
+sessions:
+  default:
+    hosts:
+      - #{options[:hosts].first}
+    database : #{options[:database]}
+    use_utc: #{options[:use_utc]}
+    use_activesupport_time_zone: #{options[:use_activesupport_time_zone]}
+EOY
+    end
+
   end
 end

data/mongo_test_server.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MongoTestServer::VERSION
 
-  gem.add_dependency('mongo', '>=1.6.0')
+  gem.add_development_dependency('mongo', '>=1.6.0')
+  gem.add_development_dependency('moped', '>=1.3.0')
   unless RUBY_PLATFORM == 'java'
     gem.add_development_dependency('bson_ext', '>=1.3.0')
   end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-  
+
   ## perhaps this should be removed as well
   ## and done in Rakefile?
   config.color_enabled = true

metadata

@@ -1,39 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: mongo_test_server
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.2
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - John Axel Eriksson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: *2056
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: moped
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &2074 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
-    none: false
-  requirement: *2074
-  prerelease: false
   type: :development
-description: Standalone mongo test server for use with rspec or other unit testing framework
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+description: Standalone mongo test server for use with rspec or other unit testing
+  framework
 email:
 - john@insane.se
 executables: []
@@ -53,29 +96,28 @@ files:
 - test.rb
 homepage: ''
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.17
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: Standalone mongo test server for use with rspec or other unit testing framework
 test_files:
 - spec/mongo_test_server/mongo_test_server_spec.rb
 - spec/spec_helper.rb
-...