mongo-db-utils 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebe472c1c71790c06618838dac17a6da13db206
-  data.tar.gz: e8a5fa1960f3a5c988818fdab24657f167adeaf6
+  metadata.gz: 157bf194faddd30339fdc925d52cc276b2768b53
+  data.tar.gz: 6c204abfa4cdc814c16522589168cde49fdcee3f
 SHA512:
-  metadata.gz: 825c9dd5b70b4729afaea862888d5cd308c36ed9edf004dd60aa5e66e4b8f31d17fc3b1cffcfe2dc4761151dd60aa770208c104c0cd53996fea9c25d24338dd5
-  data.tar.gz: ac3a00ea228736521b54495d38ad0bae15b1bda24993cf93bc94c08d8fc44e8ae0c7d9d65030e77d44de3f08095a88598df0d9766deabceb2851e9cc1e016878
+  metadata.gz: e686c970b7322483d8c531ed1c72adf0dd756cfbb2bf6a5dac191465a3ff7c3a7c42217e6079f16526842ecbe84a1a6664988e97c8b8baafb6641cf9d5cc29c3
+  data.tar.gz: 8b2962a8d9bb220375da19da1592f08e69a6b9b3945b8662f4a4a6cb996c6a18ec5fb8971f378a5220cb25c47a33b5341c11715c3f2392a4fde30477bfa3d7f2

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/edeustace/mongo-db-utils.png)](https://travis-ci.org/edeustace/mongo-db-utils)
 
 
-### !Current version 0.1.1 is in Beta - for a safer version use 0.0.9
+### !Current version 0.1.2 is in Beta - for a safer version use 0.0.9
 
 A little gem that simplifies backing up and copying your mongo dbs.
 
@@ -55,6 +55,12 @@ When it does backups it stores them in ````~/.mongo-db-utils/backups/````. The n
 
 
 ## Release Notes
+* 0.1.4 - Upcoming
+  - Changed db model so that it only persists the uri (smaller yml files)
+
+* 0.1.3 - BETA
+  - Added :drop flag for Import tool
+
 * 0.1.2 - BETA
   - Added 'host' and 'port' getters to Db AND 'hosts' getter to ReplicaSetDb
 

data/lib/mongo-db-utils/models/db.rb

@@ -24,26 +24,12 @@ module MongoDbUtils
       URI_NO_USER = /mongodb:\/\/(.*)\/(.*$)/
       URI_USER = /mongodb:\/\/(.*):(.*)@(.*)\/(.*$)/
 
-      attr_accessor :username, :password, :name, :uri
+      attr_reader :username, :password, :name, :uri
 
       def initialize(uri)
-        user,pwd,host_port,db = nil
-
-        if( uri.match(URI_USER))
-          match, user, pwd, host_port, name = *uri.match(URI_USER)
-        elsif(uri.match(URI_NO_USER))
-          match, host_port, name = *uri.match(URI_NO_USER)
-          user = ""
-          pwd = ""
-        end
-
-        raise "can't parse uri" if( host_port.nil? || name.nil? )
-
-        @host_port = host_port
-        @name = name
-        @username = user
-        @password = pwd
         @uri = uri
+
+        host_port
       end
 
       def authentication_required?
@@ -58,14 +44,16 @@ module MongoDbUtils
         host_and_port[:port]
       end
 
+
+
       # Return the host string in a format that is compatable with mongo binary tools
       # See: http://docs.mongodb.org/manual/reference/program/mongodump/#cmdoption-mongodump--host
       def to_host_s
-        "#{@host_port}"
+        "#{host_port}"
       end
 
       def to_s_simple
-        "#{@name} on #{@host_port} - (#{@username}:#{@password})"
+        "#{name} on #{host_port} - (#{username}:#{password})"
       end
 
       def to_s
@@ -76,14 +64,44 @@ module MongoDbUtils
         self.to_s <=> other.to_s
       end
 
+      def host_port; bits[:host_port]; end
+      def name; bits[:name]; end
+      def username; bits[:username]; end
+      def password; bits[:password]; end
+
       private
+
+      # extract the bits out of the uri
+      # @return a hash of the bits
+      def bits
+        user,pwd,host_port,db = nil
+
+        if( uri.match(URI_USER))
+          match, user, pwd, host_port, name = *uri.match(URI_USER)
+        elsif(uri.match(URI_NO_USER))
+          match, host_port, name = *uri.match(URI_NO_USER)
+          user = ""
+          pwd = ""
+        end
+
+        raise "can't parse uri" if( host_port.nil? || name.nil? )
+
+        {
+          :host_port => host_port,
+          :name => name,
+          :username => user,
+          :password => pwd
+        }
+
+      end
+
       def has?(s)
         !s.nil? && !s.empty?
       end
 
 
       def host_and_port
-        match, host,port = *@host_port.match(/(.*):(.*)/)
+        match, host,port = *host_port.match(/(.*):(.*)/)
         { :host => host, :port => port }
       end
     end
@@ -100,7 +118,7 @@ module MongoDbUtils
 
       # Return an array of host:port strings
       def hosts
-        @host_port.split(",")
+        host_port.split(",")
       end
 
       # Block usage of this method from the super
@@ -115,11 +133,11 @@ module MongoDbUtils
 
       # Note: we override this to provide a replica set format
       def to_host_s
-        "#{@set_name}/#{@host_port}"
+        "#{@set_name}/#{host_port}"
       end
 
       def to_s
-        "[ReplicaSetDb-(#{to_host_s}/#{@name})]"
+        "[ReplicaSetDb-(#{to_host_s}/#{name})]"
       end
     end
 

data/lib/mongo-db-utils/tools/commands.rb

@@ -77,6 +77,7 @@ module MongoDbUtils
         @options << o("-c", collection)
         @options << o("--file", file)
         @options << "--jsonArray" if opts[:json_array]
+        @options << "--drop" if opts[:drop]
       end
     end
 

data/lib/mongo-db-utils/version.rb

@@ -1,4 +1,4 @@
 module MongoDbUtils
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   READY_FOR_USE = "(Beta version)"
 end

data/spec/models/db_spec.rb

@@ -16,7 +16,6 @@ describe MongoDbUtils::Model::Db do
     db.host.should == "localhost"
     db.port.should == "27017"
   end
-
   it "should construct - no user/pass" do
     db = Db.new("mongodb://localhost:27017/db")
     db.to_host_s.should == "localhost:27017"
@@ -58,5 +57,4 @@ describe MongoDbUtils::Model::Db do
     db.password.should == "pass"
     db.to_host_s.should == "rs-ds063347/ds063347-a0.mongolab.com:63347,ds063347-a1.mongolab.com:63347"
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo-db-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - edeustace
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec