mongoid-shell 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64cf2c359ad1afd04b88ccf54613cccc593ea3cc
-  data.tar.gz: bd9aaf637391a1ee1eb1775514ac09b7b567f88d
+  metadata.gz: b8e2171bae62ea69cca115b3e565481d8eec2264
+  data.tar.gz: 2a23dce764d1c449c36710985a57c4f0b21665da
 SHA512:
-  metadata.gz: 48dbac68ced2c383aefa39817eac22165073ce1177e4c4ff5dbee81cc867994c005e7559079987a438cb0076077a935e35e8c54be26117e1e3a86f32bd4a6f2f
-  data.tar.gz: de542005f6aa6b91ed3630031b46a62d32cd84de2bc3f5c606a56b13bef0e0430fde73742ad3dce1da33e5c9eeb0bbbea2bfac68d1162a5eab2bf4930c2d32a7
+  metadata.gz: 5a6595709848647bca1f6f917b4203db842ec600e8241896f042fd5edfbc32ac1bfce69cf98505feac096e9da8ed85c35ff4a310b2d347a09ee443d9ed610aee
+  data.tar.gz: 9bd96b1f707fc37caca976d2c0c17a633231c4f9251cf1f1b04d12312aa9b4e828f922ce387cf7b1f8e8e83b1205b3202da1d8ac5f5d138a23b4c4a06c8c0124

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.4.0 (10/20/2015)
+==================
+
+* [#6](https://github.com/dblock/mongoid-shell/pull/6) - Compatibility with Mongoid 5.x - [@dblock](https://github.com/dblock).
+
 0.3.0 (7/1/2014)
 ================
 

data/README.md

@@ -1,6 +1,11 @@
-Mongoid::Shell [![Build Status](https://travis-ci.org/dblock/mongoid-shell.png?branch=master)](https://travis-ci.org/dblock/mongoid-shell)
+Mongoid::Shell
 ==============
 
+[![Gem Version](http://img.shields.io/gem/v/mongoid-shell.svg)](http://badge.fury.io/rb/mongoid-shell)
+[![Build Status](http://img.shields.io/travis/dblock/mongoid-shell.svg)](https://travis-ci.org/dblock/mongoid-shell)
+[![Dependency Status](https://gemnasium.com/dblock/mongoid-shell.svg)](https://gemnasium.com/dblock/mongoid-shell)
+[![Code Climate](https://codeclimate.com/github/dblock/mongoid-shell.svg)](https://codeclimate.com/github/dblock/mongoid-shell)
+
 Create mongo command-lines from Mongoid configuration.
 
 For example, connect to your production database without having to remember the entire command line using a `db:production:shell` Rake task.
@@ -31,6 +36,11 @@ mongodump = Mongoid::Shell::Commands::Mongodump.new(db: 'another_database', out:
 system mongodump.to_s # mongodump --db another_database --out /tmp/db_backup
 ```
 
+Compatibility
+-------------
+
+This gem supports Mongoid 3, 4 and 5.
+
 Supported Commands
 ------------------
 

data/lib/mongoid-shell.rb

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

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

@@ -12,11 +12,11 @@ module Mongoid
 
         def initialize(options = nil)
           options ||= {}
-          options[:session] ||= Mongoid.default_session
+          options[:session] ||= default_client_or_session
           options.each do |sym, val|
             send "#{sym}=", val
           end
-          raise Mongoid::Shell::Errors::MissingSessionError unless @session
+          fail Mongoid::Shell::Errors::MissingSessionError unless @session
         end
 
         def cmd
@@ -39,7 +39,19 @@ module Mongoid
         end
 
         def to_s
-          [cmd, vargs].flatten.compact.join(" ")
+          [cmd, vargs].flatten.compact.join(' ')
+        end
+
+        private
+
+        if ::Mongoid::Compatibility::Version.mongoid3? || ::Mongoid::Compatibility::Version.mongoid4?
+          def default_client_or_session
+            Mongoid.default_session
+          end
+        else
+          def default_client_or_session
+            Mongoid.default_client
+          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

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

@@ -27,7 +27,7 @@ module Mongoid
 
         private
 
-        BASE_KEY = "mongoid.shell.errors.messages" #:nodoc:
+        BASE_KEY = 'mongoid.shell.errors.messages' #:nodoc:
 
         # Given the key of the specific error and the options hash, translate the
         # message.

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

@@ -3,7 +3,7 @@ module Mongoid
     module Errors
       class MissingPrimaryNodeError < Mongoid::Shell::Errors::Base
         def initialize
-          super(compose_message("missing_primary_node"))
+          super(compose_message('missing_primary_node'))
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Mongoid
     module Errors
       class MissingSessionError < Mongoid::Shell::Errors::Base
         def initialize
-          super(compose_message("missing_session"))
+          super(compose_message('missing_session'))
         end
       end
     end

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

@@ -3,7 +3,7 @@ module Mongoid
     module Errors
       class SessionNotConnectedError < Mongoid::Shell::Errors::Base
         def initialize
-          super(compose_message("session_not_connected"))
+          super(compose_message('session_not_connected'))
         end
       end
     end

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

@@ -5,8 +5,14 @@ module Mongoid
         attr_accessor :db
 
         # current database name
-        def db
-          @db || session.send(:current_database).name
+        if ::Mongoid::Compatibility::Version.mongoid3? || ::Mongoid::Compatibility::Version.mongoid4?
+          def db
+            @db || session.send(:current_database).name
+          end
+        else
+          def db
+            @db || session.database.name
+          end
         end
       end
     end

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

@@ -5,14 +5,28 @@ module Mongoid
         attr_accessor :host
 
         # database host
-        def host
-          @host || begin
-            node = session.cluster.nodes.first
-            raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
-            if Mongoid::Shell.mongoid3?
-              node.address == "localhost:27017" ? nil : node.address
-            else
-              node.address.original == "localhost:27017" ? nil : node.address.original
+        if ::Mongoid::Compatibility::Version.mongoid3?
+          def host
+            @host || begin
+              node = session.cluster.nodes.first
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              node.address == 'localhost:27017' ? nil : node.address
+            end
+          end
+        elsif ::Mongoid::Compatibility::Version.mongoid4?
+          def host
+            @host || begin
+              node = session.cluster.nodes.first
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              node.address.original == 'localhost:27017' ? nil : node.address.original
+            end
+          end
+        else
+          def host
+            @host || begin
+              node = session.cluster.servers.first
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              node.address.to_s == 'localhost:27017' ? nil : node.address.to_s
             end
           end
         end

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

@@ -5,18 +5,32 @@ module Mongoid
         attr_accessor :password
 
         # current password
-        def password
-          @password || begin
-            if Mongoid::Shell.mongoid3?
+        if ::Mongoid::Compatibility::Version.mongoid3?
+          def password
+            @password || begin
               return nil unless session.context.cluster.auth && session.context.cluster.auth.first
               session.context.cluster.auth.first[1][1]
-            else
+            end
+          end
+        elsif ::Mongoid::Compatibility::Version.mongoid4?
+          def password
+            @password || begin
               node = session.cluster.nodes.first
-              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless node
               return nil if !node.credentials.key?(db) || node.credentials[db].empty?
               node.credentials[db][1]
             end
           end
+        else
+          def password
+            @password || begin
+              server = session.cluster.servers.first
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless server
+              server.context.with_connection do |connection|
+                connection.options[:password]
+              end
+            end
+          end
         end
       end
     end

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

@@ -5,15 +5,31 @@ module Mongoid
         attr_accessor :primary
 
         # primary database host
-        def primary
-          @primary || begin
-            raise Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.nodes.any?
-            node = session.cluster.nodes.find(&:primary?)
-            raise Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
-            if Mongoid::Shell.mongoid3?
-              node.address == "localhost:27017" ? nil : node.address
-            else
-              node.address.original == "localhost:27017" ? nil : node.address.original
+        if ::Mongoid::Compatibility::Version.mongoid3?
+          def primary
+            @primary || begin
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.nodes.any?
+              node = session.cluster.nodes.find(&:primary?)
+              fail Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
+              node.address == 'localhost:27017' ? nil : node.address
+            end
+          end
+        elsif ::Mongoid::Compatibility::Version.mongoid4?
+          def primary
+            @primary || begin
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.nodes.any?
+              node = session.cluster.nodes.find(&:primary?)
+              fail Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
+              node.address.original == 'localhost:27017' ? nil : node.address.original
+            end
+          end
+        else
+          def primary
+            @primary || begin
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless session.cluster.servers.any?
+              node = session.cluster.servers.find { |server| server.primary? || server.standalone? }
+              fail Mongoid::Shell::Errors::MissingPrimaryNodeError unless node
+              node.address.to_s == 'localhost:27017' ? nil : node.address.to_s
             end
           end
         end

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

@@ -5,18 +5,32 @@ module Mongoid
         attr_accessor :username
 
         # current username
-        def username
-          @username || begin
-            if Mongoid::Shell.mongoid3?
+        if ::Mongoid::Compatibility::Version.mongoid3?
+          def username
+            @username || begin
               return nil unless session.context.cluster.auth && session.context.cluster.auth.first
               session.context.cluster.auth.first[1][0]
-            else
+            end
+          end
+        elsif ::Mongoid::Compatibility::Version.mongoid4?
+          def username
+            @username || begin
               node = session.cluster.nodes.first
-              raise Mongoid::Shell::Errors::SessionNotConnectedError unless node
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless node
               return nil if !node.credentials.key?(db) || node.credentials[db].empty?
               node.credentials[db][0]
             end
           end
+        else
+          def username
+            @username || begin
+              server = session.cluster.servers.first
+              fail Mongoid::Shell::Errors::SessionNotConnectedError unless server
+              server.context.with_connection do |connection|
+                connection.options[:user]
+              end
+            end
+          end
         end
       end
     end

data/lib/mongoid/shell/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-shell
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -38,36 +38,49 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid-compatibility
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: dblock@dblock.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE.md
 - README.md
-- 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/commands.rb
+- lib/mongoid/shell/errors.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/errors.rb
-- lib/mongoid/shell/mongoid.rb
+- lib/mongoid/shell/properties.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
 homepage: http://github.com/dblock/mongoid-shell
 licenses:
@@ -89,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Derive shell commands from Mongoid configuration options.

data/lib/mongoid/shell/mongoid.rb

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