mongoid-shell 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64cf2c359ad1afd04b88ccf54613cccc593ea3cc
+  data.tar.gz: bd9aaf637391a1ee1eb1775514ac09b7b567f88d
+SHA512:
+  metadata.gz: 48dbac68ced2c383aefa39817eac22165073ce1177e4c4ff5dbee81cc867994c005e7559079987a438cb0076077a935e35e8c54be26117e1e3a86f32bd4a6f2f
+  data.tar.gz: de542005f6aa6b91ed3630031b46a62d32cd84de2bc3f5c606a56b13bef0e0430fde73742ad3dce1da33e5c9eeb0bbbea2bfac68d1162a5eab2bf4930c2d32a7

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-Next Release
-============
+0.3.0 (7/1/2014)
+================
 
-* Your contribution here.
+* [#3](https://github.com/dblock/mongoid-shell/pull/3): Added Mongoid 4.x support - [@pawelniewie](https://github.com/pawelniewie), [@dblock](https://github.com/dblock).
+* [#2](https://github.com/dblock/mongoid-shell/pull/2): Added support for `--noIndexRestore` to `Mongoid::Shell::Commands::Mongorestore` - [@macreery](https://github.com/macreery).
+* [#1](https://github.com/dblock/mongoid-shell/pull/1): Enforced compatibility with Mongoid 3.x only - [@macreery](https://github.com/macreery).
+* Fix: the `mongorestore` command requires a primary node in a replica set - [@dblock](https://github.com/dblock).
+* Added Rubocop, Ruby style linter - [@dblock](https://github.com/dblock).
+* Upgraded to RSpec 3.x expectation syntax - [@dblock](https://github.com/dblock).
 
 0.2.0 (1/29/2013)
 =================

data/README.md

@@ -32,9 +32,9 @@ system mongodump.to_s # mongodump --db another_database --out /tmp/db_backup
 ```
 
 Supported Commands
-==================
+------------------
 
-## Mongo
+### Mongo
 
 The mongo shell is an interactive JavaScript shell for MongoDB. The `Mongoid::Shell::Commands::Mongo` class generates a command line to connect to MongoDB. A particularly useful feature is that it will always yield the address of the master node of a MongoDB replica set.
 
@@ -44,7 +44,7 @@ Mongoid::Shell::Commands::Mongo.new.to_s
 
 Supports `--username`, `--password`, `--eval`, `--nodb`, `--norc`, `--quiet` and `--ipv6`.
 
-## Mongodump
+### Mongodump
 
 Mongodump is a utility for creating a binary export of the contents of a database.
 
@@ -55,7 +55,7 @@ mongodump.to_s # mongodump --db test --collection test
 
 The `Mongoid::Shell::Commands::Mongodump` class supports `--db`, `--host`, `--username`, `--password`, `--query`, `--out`, `--collection`, `--directoryperdb`, `--journal`, `--oplog`, `--repair`, `--forceTableScan`, `--dbpath` and `--ipv6`.
 
-## Mongorestore
+### Mongorestore
 
 The mongorestore tool imports content from binary database dump, created by mongodump into a specific database.
 
@@ -64,9 +64,9 @@ mongorestore = Mongoid::Shell::Commands::Mongorestore.new({ collection: 'test',
 mongorestore.to_s # mongorestore --db test --collection test /tmp/db_backup
 ```
 
-The `Mongoid::Shell::Commands::Mongorestore` class supports `--db`, `--host`, `--username`, `--password`, `--collection`, `--ipv6, `--dbpath`, `--directoryperdb`, `--journal`, `--objcheck`, `--filter`, `--drop`, `--oplogReplay` and `--keepIndexVersion`.
+The `Mongoid::Shell::Commands::Mongorestore` class supports `--db`, `--host`, `--username`, `--password`, `--collection`, `--ipv6`, `--dbpath`, `--directoryperdb`, `--journal`, `--objcheck`, `--filter`, `--drop`, `--oplogReplay`, `--keepIndexVersion` and `--noIndexRestore`.
 
-## Mongostat
+### Mongostat
 
 The mongostat utility provides a quick overview of the status of a currently running mongod or mongos instance.
 

data/lib/mongoid/shell/commands/base.rb

@@ -2,22 +2,19 @@ module Mongoid
   module Shell
     module Commands
       class Base
-
         attr_accessor :session
 
         class << self
-
           def command_for(session)
-            self.new({ session: session })
+            new(session: session)
           end
-
         end
 
         def initialize(options = nil)
           options ||= {}
           options[:session] ||= Mongoid.default_session
           options.each do |sym, val|
-            self.send "#{sym}=", val
+            send "#{sym}=", val
           end
           raise Mongoid::Shell::Errors::MissingSessionError unless @session
         end
@@ -28,9 +25,9 @@ module Mongoid
 
         def vargs(args = {})
           args.map do |key, property|
-            value = self.send(property)
+            value = send(property)
             next unless value
-            if value.is_a? Boolean
+            if value.is_a?(Boolean) || value.is_a?(TrueClass)
               key
             else
               value = value.to_s
@@ -42,9 +39,8 @@ module Mongoid
         end
 
         def to_s
-          [ self.cmd, vargs ].flatten.compact.join(" ")
+          [cmd, vargs].flatten.compact.join(" ")
         end
-
       end
     end
   end

data/lib/mongoid/shell/commands/mongo.rb

@@ -14,7 +14,7 @@ module Mongoid
         end
 
         def host_port_and_db
-          [ primary, db ].compact.join("/")
+          [primary, db].compact.join("/")
         end
 
         def vargs
@@ -26,10 +26,9 @@ module Mongoid
             '--nodb' => :nodb,
             '--norc' => :norc,
             '--quiet' => :quiet,
-            '--ipv6' => :ipv6,
+            '--ipv6' => :ipv6
           })
         end
-
       end
     end
   end

data/lib/mongoid/shell/commands/mongodump.rb

@@ -31,7 +31,6 @@ module Mongoid
             '--ipv6' => :ipv6
           })
         end
-
       end
     end
   end

data/lib/mongoid/shell/commands/mongorestore.rb

@@ -2,17 +2,21 @@ module Mongoid
   module Shell
     module Commands
       class Mongorestore < Mongoid::Shell::Commands::Base
-        include Mongoid::Shell::Properties::Host
+        include Mongoid::Shell::Properties::Primary
         include Mongoid::Shell::Properties::Database
         include Mongoid::Shell::Properties::Username
         include Mongoid::Shell::Properties::Password
 
-        attr_accessor :collection, :ipv6, :dbpath, :directoryperdb, :journal, :objcheck, :filter, :drop, :oplogReplay, :keepIndexVersion, :restore
+        attr_accessor :host, :collection, :ipv6, :dbpath, :directoryperdb, :journal, :objcheck, :filter, :drop, :oplogReplay, :keepIndexVersion, :noIndexRestore, :restore
 
         def initialize(attrs = {})
           super
         end
 
+        def host
+          @host || primary
+        end
+
         def vargs
           super({
             '--host' => :host,
@@ -29,10 +33,10 @@ module Mongoid
             '--drop' => :drop,
             '--oplogReplay' => :oplogReplay,
             '--keepIndexVersion' => :keepIndexVersion,
+            '--noIndexRestore' => :noIndexRestore,
             'directory or filename to restore from' => :restore
           })
         end
-
       end
     end
   end

data/lib/mongoid/shell/commands/mongostat.rb

@@ -3,6 +3,7 @@ module Mongoid
     module Commands
       class Mongostat < Mongoid::Shell::Commands::Base
         include Mongoid::Shell::Properties::Host
+        include Mongoid::Shell::Properties::Database
         include Mongoid::Shell::Properties::Username
         include Mongoid::Shell::Properties::Password
 
@@ -24,7 +25,6 @@ module Mongoid
             '--all' => :all
           })
         end
-
       end
     end
   end

data/lib/mongoid/shell/errors/base.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Shell
     module Errors
       class Base < StandardError
-
         # Problem occurred.
         attr_reader :problem
 
@@ -21,60 +20,59 @@ module Mongoid
           @summary = create_summary(key, attributes)
           @resolution = create_resolution(key, attributes)
 
-          "\nProblem:\n  #{@problem}"+
-          "\nSummary:\n  #{@summary}"+
+          "\nProblem:\n  #{@problem}" \
+          "\nSummary:\n  #{@summary}" \
           "\nResolution:\n  #{@resolution}"
         end
 
         private
 
-          BASE_KEY = "mongoid.shell.errors.messages" #:nodoc:
-
-          # Given the key of the specific error and the options hash, translate the
-          # message.
-          #
-          # === Parameters
-          # [key] The key of the error in the locales.
-          # [options] The objects to pass to create the message.
-          #
-          # Returns a localized error message string.
-          def translate(key, options)
-            ::I18n.translate("#{BASE_KEY}.#{key}", { :locale => :en }.merge(options)).strip
-          end
+        BASE_KEY = "mongoid.shell.errors.messages" #:nodoc:
 
-          # Create the problem.
-          #
-          # === Parameters
-          # [key] The error key.
-          # [attributes] The attributes to interpolate.
-          #
-          # Returns the problem.
-          def create_problem(key, attributes)
-            translate("#{key}.message", attributes)
-          end
+        # Given the key of the specific error and the options hash, translate the
+        # message.
+        #
+        # === Parameters
+        # [key] The key of the error in the locales.
+        # [options] The objects to pass to create the message.
+        #
+        # Returns a localized error message string.
+        def translate(key, options)
+          ::I18n.translate("#{BASE_KEY}.#{key}", { locale: :en }.merge(options)).strip
+        end
 
-          # Create the summary.
-          #
-          # === Parameters
-          # [key] The error key.
-          # [attributes] The attributes to interpolate.
-          #
-          # Returns the summary.
-          def create_summary(key, attributes)
-            translate("#{key}.summary", attributes)
-          end
+        # Create the problem.
+        #
+        # === Parameters
+        # [key] The error key.
+        # [attributes] The attributes to interpolate.
+        #
+        # Returns the problem.
+        def create_problem(key, attributes)
+          translate("#{key}.message", attributes)
+        end
 
-          # Create the resolution.
-          #
-          # === Parameters
-          # [key] The error key.
-          # [attributes] The attributes to interpolate.
-          #
-          # Returns the resolution.
-          def create_resolution(key, attributes)
-            translate("#{key}.resolution", attributes)
-          end
+        # Create the summary.
+        #
+        # === Parameters
+        # [key] The error key.
+        # [attributes] The attributes to interpolate.
+        #
+        # Returns the summary.
+        def create_summary(key, attributes)
+          translate("#{key}.summary", attributes)
+        end
 
+        # Create the resolution.
+        #
+        # === Parameters
+        # [key] The error key.
+        # [attributes] The attributes to interpolate.
+        #
+        # Returns the resolution.
+        def create_resolution(key, attributes)
+          translate("#{key}.resolution", attributes)
+        end
       end
     end
   end

data/lib/mongoid/shell/mongoid.rb

@@ -0,0 +1,7 @@
+module Mongoid
+  module Shell
+    def self.mongoid3?
+      ::Mongoid.const_defined? :Observer # deprecated in Mongoid 4.x
+    end
+  end
+end

data/lib/mongoid/shell/properties/database.rb

@@ -2,14 +2,12 @@ module Mongoid
   module Shell
     module Properties
       module Database
-
         attr_accessor :db
 
         # current database name
         def db
           @db || session.send(:current_database).name
         end
-
       end
     end
   end

data/lib/mongoid/shell/properties/host.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Shell
     module Properties
       module Host
-
         attr_accessor :host
 
         # database host
@@ -10,10 +9,13 @@ module Mongoid
           @host || begin
             node = session.cluster.nodes.first
             raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
-            node.address == "localhost:27017" ? nil : node.address
+            if Mongoid::Shell.mongoid3?
+              node.address == "localhost:27017" ? nil : node.address
+            else
+              node.address.original == "localhost:27017" ? nil : node.address.original
+            end
           end
         end
-
       end
     end
   end

data/lib/mongoid/shell/properties/password.rb

@@ -2,17 +2,22 @@ module Mongoid
   module Shell
     module Properties
       module Password
-
         attr_accessor :password
 
         # current password
         def password
           @password || begin
-            return nil unless session.context.cluster.auth && session.context.cluster.auth.first
-            session.context.cluster.auth.first[1][1]
+            if Mongoid::Shell.mongoid3?
+              return nil unless session.context.cluster.auth && session.context.cluster.auth.first
+              session.context.cluster.auth.first[1][1]
+            else
+              node = session.cluster.nodes.first
+              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              return nil if !node.credentials.key?(db) || node.credentials[db].empty?
+              node.credentials[db][1]
+            end
           end
         end
-
       end
     end
   end

data/lib/mongoid/shell/properties/primary.rb

@@ -2,7 +2,6 @@ module Mongoid
   module Shell
     module Properties
       module Primary
-
         attr_accessor :primary
 
         # primary database host
@@ -11,10 +10,13 @@ module Mongoid
             raise Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.nodes.any?
             node = session.cluster.nodes.find(&:primary?)
             raise Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
-            node.address == "localhost:27017" ? nil : node.address
+            if Mongoid::Shell.mongoid3?
+              node.address == "localhost:27017" ? nil : node.address
+            else
+              node.address.original == "localhost:27017" ? nil : node.address.original
+            end
           end
         end
-
       end
     end
   end

data/lib/mongoid/shell/properties/username.rb

@@ -2,17 +2,22 @@ module Mongoid
   module Shell
     module Properties
       module Username
-
         attr_accessor :username
 
         # current username
         def username
           @username || begin
-            return nil unless session.context.cluster.auth && session.context.cluster.auth.first
-            session.context.cluster.auth.first[1][0]
+            if Mongoid::Shell.mongoid3?
+              return nil unless session.context.cluster.auth && session.context.cluster.auth.first
+              session.context.cluster.auth.first[1][0]
+            else
+              node = session.cluster.nodes.first
+              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              return nil if !node.credentials.key?(db) || node.credentials[db].empty?
+              node.credentials[db][0]
+            end
           end
         end
-
       end
     end
   end

data/lib/mongoid/shell/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Shell
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/mongoid-shell.rb

@@ -3,6 +3,7 @@ require 'i18n'
 I18n.load_path << File.join(File.dirname(__FILE__), "config", "locales", "en.yml")
 
 require 'mongoid/shell/version'
+require 'mongoid/shell/mongoid'
 require 'mongoid/shell/errors'
 require 'mongoid/shell/properties'
 require 'mongoid/shell/commands'

data/lib/mongoid_shell.rb

@@ -1,2 +1 @@
 require 'mongoid-shell'
-

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -49,73 +44,53 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- CHANGELOG.md
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
+- CHANGELOG.md
 - lib/config/locales/en.yml
-- lib/mongoid-shell.rb
-- lib/mongoid/shell/commands.rb
 - lib/mongoid/shell/commands/base.rb
 - lib/mongoid/shell/commands/mongo.rb
 - lib/mongoid/shell/commands/mongodump.rb
 - lib/mongoid/shell/commands/mongorestore.rb
 - lib/mongoid/shell/commands/mongostat.rb
-- lib/mongoid/shell/errors.rb
+- lib/mongoid/shell/commands.rb
 - lib/mongoid/shell/errors/base.rb
 - lib/mongoid/shell/errors/missing_primary_node_error.rb
 - lib/mongoid/shell/errors/missing_session_error.rb
 - lib/mongoid/shell/errors/session_not_connected_error.rb
-- lib/mongoid/shell/properties.rb
+- lib/mongoid/shell/errors.rb
+- lib/mongoid/shell/mongoid.rb
 - lib/mongoid/shell/properties/database.rb
 - lib/mongoid/shell/properties/host.rb
 - lib/mongoid/shell/properties/password.rb
 - lib/mongoid/shell/properties/primary.rb
 - lib/mongoid/shell/properties/username.rb
+- lib/mongoid/shell/properties.rb
 - lib/mongoid/shell/version.rb
+- lib/mongoid-shell.rb
 - lib/mongoid_shell.rb
-- mongoid-shell.gemspec
-- spec/mongoid/commands/base_spec.rb
-- spec/mongoid/commands/mongo_spec.rb
-- spec/mongoid/commands/mongodump_spec.rb
-- spec/mongoid/commands/mongorestore_spec.rb
-- spec/mongoid/commands/mongostat_spec.rb
-- spec/mongoid/mongoid_shell_spec.rb
-- spec/mongoid/properties/host_spec.rb
-- spec/mongoid/properties/primary_spec.rb
-- spec/spec_helper.rb
-- spec/support/config/mongoid.yml
-- spec/support/helpers/moped_session_helper.rb
 homepage: http://github.com/dblock/mongoid-shell
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4237627171487641625
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Derive shell commands from Mongoid configuration options.
 test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/.rspec

@@ -1,3 +0,0 @@
---color
---format=documentation
-

data/.travis.yml

@@ -1,9 +0,0 @@
-services:
-  - mongodb
-
-rvm:
-  - 1.9.3
-
-notifications:
-  email:
-    - dblock@dblock.org

data/Gemfile

@@ -1,9 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-group :development, :test do
-  gem "rake"
-  gem "bundler"
-  gem "rspec"
-end

data/Rakefile

@@ -1,24 +0,0 @@
-require 'rubygems'
-require 'bundler/gem_tasks'
-
-require File.expand_path('../lib/mongoid/shell/version', __FILE__)
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-require 'rake'
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :default => :spec
-

data/mongoid-shell.gemspec

@@ -1,20 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "mongoid/shell/version"
-
-Gem::Specification.new do |s|
-  s.name = "mongoid-shell"
-  s.version = Mongoid::Shell::VERSION
-  s.authors = [ "Daniel Doubrovkine" ]
-  s.email = "dblock@dblock.org"
-  s.platform = Gem::Platform::RUBY
-  s.required_rubygems_version = '>= 1.3.6'
-  s.files = `git ls-files`.split("\n")
-  s.require_paths = [ "lib" ]
-  s.homepage = "http://github.com/dblock/mongoid-shell"
-  s.licenses = [ "MIT" ]
-  s.summary = "Derive shell commands from Mongoid configuration options."
-  s.add_dependency "mongoid"
-  s.add_dependency "i18n"
-end
-
-

data/spec/mongoid/commands/base_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Commands::Base do
-  context "without a default session" do
-    before :each do
-      Mongoid.stub(:default_session).and_return(nil)
-    end
-    it "raises an exception when a session is missing" do
-      expect {
-        Mongoid::Shell::Commands::Base.new({})
-      }.to raise_error Mongoid::Shell::Errors::MissingSessionError, /Missing session./
-    end
-    it "raises an exception when options are missing" do
-      expect {
-        Mongoid::Shell::Commands::Base.new(nil)
-      }.to raise_error Mongoid::Shell::Errors::MissingSessionError, /Missing session./
-    end
-  end
-  it "creates a command using the default session" do
-    command = Mongoid::Shell::Commands::Base.new
-    command.session.should eq Mongoid.default_session
-  end
-  it "creates a command using the session provided" do
-    session = Moped::Session.new([ "127.0.0.1:27017" ])
-    command = Mongoid::Shell::Commands::Base.new(session: session)
-    command.session.should eq session
-  end
-  it "command_for" do
-    command = Mongoid::Shell::Commands::Base.command_for(Mongoid.default_session)
-    command.session.should eq Mongoid.default_session
-  end
-end

data/spec/mongoid/commands/mongo_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Commands::Mongo do
-  include MopedSessionHelper
-  context "local" do
-    it "defaults to local" do
-      Mongoid::Shell::Commands::Mongo.new.to_s.should == "mongo mongoid_shell_tests"
-    end
-    it "includes eval" do
-      Mongoid::Shell::Commands::Mongo.new({
-        eval: 'find x'
-      }).to_s.should == 'mongo mongoid_shell_tests --eval "find x"'
-    end
-    it "overrides primary" do
-      Mongoid::Shell::Commands::Mongo.new({
-        eval: 'find x',
-        primary: 'my_primary'
-      }).to_s.should == 'mongo my_primary/mongoid_shell_tests --eval "find x"'
-    end
-    [ :nodb, :norc, :quiet, :ipv6 ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongo.new({
-          option => true
-        }).to_s.should == "mongo mongoid_shell_tests --#{option}"
-      end
-    end
-
-  end
-  context "sessions" do
-    context "default" do
-      before :each do
-        @session = Mongoid::Sessions.with_name(:default)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongo.new({
-          session: @session
-        }).to_s.should == "mongo mongoid_shell_tests"
-      end
-    end
-    context "a replica set" do
-      before :each do
-        @session = moped_session(:replica_set)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongo.new({
-          session: @session
-        }).to_s.should == "mongo dedicated1.myapp.com:27017/mongoid --username user --password password"
-      end
-    end
-    context "url" do
-      before :each do
-        @session = moped_session(:url)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongo.new({
-          session: @session
-        }).to_s.should == "mongo 59.1.22.1:27017/mongoid --username user --password password"
-      end
-    end
-  end
-end

data/spec/mongoid/commands/mongodump_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Commands::Mongodump do
-  include MopedSessionHelper
-  context "local" do
-    it "defaults to local" do
-      Mongoid::Shell::Commands::Mongodump.new.to_s.should == "mongodump --db mongoid_shell_tests"
-    end
-    it "includes collection" do
-      Mongoid::Shell::Commands::Mongodump.new({
-        collection: 'test'
-      }).to_s.should == "mongodump --db mongoid_shell_tests --collection test"
-    end
-    it "includes query" do
-      Mongoid::Shell::Commands::Mongodump.new({
-        query: 'find x'
-      }).to_s.should == 'mongodump --db mongoid_shell_tests --query "find x"'
-    end
-    [ :out, :dbpath ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongodump.new({
-          option => '/this is a folder'
-        }).to_s.should == "mongodump --db mongoid_shell_tests --#{option} \"/this is a folder\""
-      end
-    end
-    [ :directoryperdb, :journal, :oplog, :repair, :forceTableScan, :dbpath, :ipv6 ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongodump.new({
-          option => true
-        }).to_s.should == "mongodump --db mongoid_shell_tests --#{option}"
-      end
-    end
-  end
-  context "sessions" do
-    context "default" do
-      before :each do
-        @session = moped_session(:default)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongodump.new({
-          session: @session
-        }).to_s.should == "mongodump --db mongoid_shell_tests"
-      end
-    end
-    context "a replica set" do
-      before :each do
-        @session = moped_session(:replica_set)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongodump.new({
-          session: @session
-        }).to_s.should == "mongodump --host dedicated1.myapp.com:27017 --db mongoid --username user --password password"
-      end
-    end
-    context "url" do
-      before :each do
-        @session = moped_session(:url)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongodump.new({
-          session: @session
-        }).to_s.should == "mongodump --host 59.1.22.1:27017 --db mongoid --username user --password password"
-      end
-    end
-  end
-end

data/spec/mongoid/commands/mongorestore_spec.rb

@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Commands::Mongorestore do
-  include MopedSessionHelper
-  context "local" do
-    it "defaults to local" do
-      Mongoid::Shell::Commands::Mongorestore.new.to_s.should == "mongorestore --db mongoid_shell_tests"
-    end
-    it "includes collection" do
-      Mongoid::Shell::Commands::Mongorestore.new({
-        collection: 'test',
-        restore: 'folder'
-      }).to_s.should == "mongorestore --db mongoid_shell_tests --collection test folder"
-    end
-    it "can override the database, username, password and host" do
-      Mongoid::Shell::Commands::Mongorestore.new({
-        host: 'my_host',
-        username: 'my_username',
-        password: 'my_password',
-        collection: 'test',
-        db: 'my_db',
-        restore: 'folder'
-      }).to_s.should == "mongorestore --host my_host --db my_db --username my_username --password my_password --collection test folder"
-    end
-    [ :collection, :dbpath, :filter ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongorestore.new({
-          option => 'var arg',
-          restore: 'a folder'
-        }).to_s.should == "mongorestore --db mongoid_shell_tests --#{option} \"var arg\" \"a folder\""
-      end
-    end
-    [ :ipv6, :directoryperdb, :journal, :objcheck, :drop, :oplogReplay, :keepIndexVersion ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongorestore.new({
-          option => true
-        }).to_s.should == "mongorestore --db mongoid_shell_tests --#{option}"
-      end
-    end
-  end
-  context "sessions" do
-    context "default" do
-      before :each do
-        @session = moped_session(:default)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongorestore.new({
-          session: @session,
-          restore: "a folder"
-        }).to_s.should == "mongorestore --db mongoid_shell_tests \"a folder\""
-      end
-    end
-    context "a replica set" do
-      before :each do
-        @session = moped_session(:replica_set)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongorestore.new({
-          session: @session,
-          restore: "a folder"
-        }).to_s.should == "mongorestore --host dedicated1.myapp.com:27017 --db mongoid --username user --password password \"a folder\""
-      end
-    end
-    context "url" do
-      before :each do
-        @session = moped_session(:url)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongorestore.new({
-          session: @session,
-          restore: "a folder"
-        }).to_s.should == "mongorestore --host 59.1.22.1:27017 --db mongoid --username user --password password \"a folder\""
-      end
-    end
-  end
-end

data/spec/mongoid/commands/mongostat_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Commands::Mongostat do
-  include MopedSessionHelper
-  context "local" do
-    it "defaults to local" do
-      Mongoid::Shell::Commands::Mongostat.new.to_s.should == "mongostat"
-    end
-    it "rowcount" do
-      Mongoid::Shell::Commands::Mongostat.new({
-        :rowcount => 10
-      }).to_s.should == "mongostat --rowcount 10"
-    end
-    [ :http, :discover, :all, :noheaders ].each do |option|
-      it "includes #{option}" do
-        Mongoid::Shell::Commands::Mongostat.new({
-          option => true
-        }).to_s.should == "mongostat --#{option}"
-      end
-    end
-  end
-  context "sessions" do
-    context "default" do
-      before :each do
-        @session = Mongoid::Sessions.with_name(:default)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongostat.new({
-          session: @session
-        }).to_s.should == "mongostat"
-      end
-    end
-    context "a replica set" do
-      before :each do
-        @session = moped_session(:replica_set)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongostat.new({
-          session: @session
-        }).to_s.should == "mongostat --host dedicated1.myapp.com:27017 --username user --password password"
-      end
-    end
-    context "url" do
-      before :each do
-        @session = moped_session(:url)
-      end
-      it "includes username and password" do
-        Mongoid::Shell::Commands::Mongostat.new({
-          session: @session
-        }).to_s.should == "mongostat --host 59.1.22.1:27017 --username user --password password"
-      end
-    end
-  end
-end

data/spec/mongoid/mongoid_shell_spec.rb

@@ -1,8 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell do
-  it "has a version" do
-    Mongoid::Shell::VERSION.should_not be_nil
-  end
-end
-

data/spec/mongoid/properties/host_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Properties::Host do
-  subject do
-    klass = Class.new do
-      include Mongoid::Shell::Properties::Host
-
-      def session
-        Mongoid.default_session
-      end
-    end
-    klass.new
-  end
-  it "raises an exception when the session is not connected" do
-    Mongoid.default_session.cluster.stub(:nodes).and_return([])
-    expect {
-      subject.host
-    }.to raise_error Mongoid::Shell::Errors::SessionNotConnectedError, /Session is not connected./
-  end
-end

data/spec/mongoid/properties/primary_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::Shell::Properties::Primary do
-  subject do
-    klass = Class.new do
-      include Mongoid::Shell::Properties::Primary
-
-      def session
-        Mongoid.default_session
-      end
-    end
-    klass.new
-  end
-  it "raises an exception when the session is not connected" do
-    Mongoid.default_session.cluster.nodes.first.stub(:primary?).and_return(false)
-    expect {
-      subject.primary
-    }.to raise_error Mongoid::Shell::Errors::MissingPrimaryNodeError, /Session does not have a primary node./
-  end
-end

data/spec/spec_helper.rb

@@ -1,17 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'rspec'
-require 'mongoid'
-require 'mongoid-shell'
-
-[ "support/helpers/*.rb" ].each do |path|
-  Dir["#{File.dirname(__FILE__)}/#{path}"].each do |file|
-    require file
-  end
-end
-
-Mongoid.configure do |config|
-  config.connect_to('mongoid_shell_tests')
-end

data/spec/support/config/mongoid.yml

@@ -1,37 +0,0 @@
-# Tell Mongoid which environment this configuration is for.
-production:
-  # This starts the session configuration settings. You may have as
-  # many sessions as you like, but you must have at least 1 named
-  # 'default'.
-  sessions:
-    # Define the default session.
-    default:
-      # A session can have any number of hosts. Usually 1 for a single
-      # server setup, and at least 3 for a replica set. Hosts must be
-      # an array of host:port pairs. This session is single server.
-      hosts:
-        - flame.mongohq.com:27017
-      # Define the default database name.
-      database: mongoid
-      # Since this database points at a session connected to MongoHQ, we must
-      # provide the authentication details.
-      username: user
-      password: password
-    # This defines a secondary session at a replica set.
-    replica_set:
-      # This configuration is a 3 node replica set.
-      hosts:
-        - dedicated1.myapp.com:27017
-        - dedicated2.myapp.com:27017
-        - dedicated3.myapp.com:27017
-      database: mongoid
-      # We can set session specific options, like reads executing
-      # on secondary nodes, and defaulting the session to safe mode.
-      options:
-        consistency: :eventual
-        safe: true
-      username: user
-      password: password
-    # This configuration shows an authenticated replica set via a uri.
-    url:
-      uri: mongodb://user:password@59.1.22.1:27017,59.1.22.2:27017/mongoid

data/spec/support/helpers/moped_session_helper.rb

@@ -1,11 +0,0 @@
-module MopedSessionHelper
-  # returns a Moped session with stubbed address resolution
-  def moped_session(name)
-    config = File.join(File.dirname(__FILE__), "../../support/config/mongoid.yml")
-    Mongoid.load! config, :production
-    Moped::Node.any_instance.stub(:resolve_address)
-    session = Mongoid::Sessions.with_name(name)
-    session.cluster.nodes.last.stub(:primary?).and_return(true)
-    session
-  end
-end