mongo-db-utils 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebca148c29c6c312df7459863527b52e53c2347
-  data.tar.gz: f61231bfa2e9d579aec99f55d3ff0c42158f804f
+  metadata.gz: 415c2d49fcbcad5aa3e835eb0b5fe88c880e8cfe
+  data.tar.gz: 93218696727910919cd569d0658fa1f2fe8f6a65
 SHA512:
-  metadata.gz: dc1e86cc61d9ee1a748c508f8875fab63774e7583a1683fdbc78c1c66c5aed0670625da5e867f5198ad507fa807272244f4961c575b0ac5d2f38d552efb82041
-  data.tar.gz: 9467a8f2f6c08b93324842b881fd7a8418246b66c889cfca24e5db1bb72482cfd913ce9303323cf8933200b75e8c483badb6d2b6fb53ee9514e93636ccf0fd19
+  metadata.gz: d6b92ba1baa0e548c2f845370e2a909602897ff216e6bb6366803c7535f286a22783be2cc9557a6816751bc9e74da2ebc137f3320214a4538bc5d9c91100ea49
+  data.tar.gz: a56d22c2bc234e4e9c9c2cadab2a27b019228a4ac577b620a1462e2cfd584ac6f3848f59ab4e8cd1447c8446102edc75cd923923a22e561ac1446faebbb326ba

data/.gitignore

@@ -1,7 +1,10 @@
 *.gem
+*.iml
 *.rbc
 .bundle
 .config
+.idea
+.tmp_path
 .yardoc
 Gemfile.lock
 InstalledFiles
@@ -14,5 +17,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
-.tmp_path
+tmp

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

@@ -15,21 +15,31 @@ module MongoDbUtils
     class BaseCmd
 
       def initialize(cmd_name, host_and_port, db, username = "", password = "")
-        @options = build_base_options(host_and_port, db, username, password)
+        @unsafeOptions = build_base_options(host_and_port, db, username, password)
+        @optionsWithoutCredentials = build_base_options(host_and_port, db, username.empty? ? '':'****', password.empty? ? '':'****')
         @cmd_name = cmd_name
       end
 
       def run
         puts "[#{self.class}] run: #{cmd}"
-        output = `#{cmd}`
+        output = `#{executableCmd}`
         raise ToolsException.new("#{cmd}", output) unless $?.to_i == 0
       end
 
       def cmd
-        "#{@cmd_name} #{options_string(@options)}"
+        "#{@cmd_name} #{options_string(@optionsWithoutCredentials)}"
+      end
+
+      def executableCmd
+        "#{@cmd_name} #{options_string(@unsafeOptions)}"
       end
 
       private
+      
+      def addOption(option)
+        @unsafeOptions << option
+        @optionsWithoutCredentials << option
+      end
 
       def o(key,value)
         Option.new(key,value)
@@ -55,29 +65,33 @@ module MongoDbUtils
     class Dump < BaseCmd
       def initialize(host_and_port,db,output,username = "", password = "")
         super("mongodump", host_and_port, db, username, password)
-        @options << o("-o", output)
+        addOption(o("-o", output))
       end
     end
 
     class Restore < BaseCmd
       def initialize(host_and_port,db,source_folder,username = "", password = "")
         super("mongorestore", host_and_port, db, username, password)
-        @options << "--drop"
+        addOption("--drop")
         @source_folder = source_folder
       end
 
       def cmd
         "#{super} #{@source_folder}"
       end
+
+      def executableCmd
+        "#{super} #{@source_folder}"
+      end
     end
 
     class Import < BaseCmd
       def initialize(host_and_port, db, collection, file, username = "", password = "", opts = {})
         super("mongoimport", host_and_port, db, username, password)
-        @options << o("-c", collection)
-        @options << o("--file", file)
-        @options << "--jsonArray" if opts[:json_array]
-        @options << "--drop" if opts[:drop]
+        addOption(o("-c", collection))
+        addOption(o("--file", file))
+        addOption("--jsonArray") if opts[:json_array]
+        addOption("--drop") if opts[:drop]
       end
     end
 
@@ -85,10 +99,10 @@ module MongoDbUtils
 
       def initialize(host_and_port, db, collection, query, output, username = "", password = "", opts = {})
         super("mongoexport", host_and_port, db, username, password)
-        @options << o("-c", collection)
-        @options << o("-o", output)
-        @options << o("--query", "'#{query}'")
-        @options << "--jsonArray" if opts[:json_array]
+        addOption(o("-c", collection))
+        addOption(o("-o", output))
+        addOption(o("--query", "'#{query}'"))
+        addOption("--jsonArray") if opts[:json_array]
       end
     end
 

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

@@ -1,4 +1,4 @@
 module MongoDbUtils
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
   READY_FOR_USE = "(prod version)"
 end

data/spec/mongo_tools_cmd_spec.rb

@@ -4,64 +4,98 @@ include MongoDbUtils::Tools
 
 describe Dump do
 
+  it "should safely work with single uris" do
+    Dump.new("host:port", "db", "out", "user", "pass").cmd.should eql "mongodump -h host:port -db db -u **** -p **** -o out"
+  end
+
   it "should work with single uris" do
-    Dump.new("host:port", "db", "out", "user", "pass").cmd.should eql "mongodump -h host:port -db db -u user -p pass -o out"
+    Dump.new("host:port", "db", "out", "user", "pass").executableCmd.should eql "mongodump -h host:port -db db -u user -p pass -o out"
   end
+
   it "should work with single uris - no user/pass" do
-    Dump.new("host:port", "db", "out").cmd.should eql "mongodump -h host:port -db db -o out"
+    Dump.new("host:port", "db", "out").executableCmd.should eql "mongodump -h host:port -db db -o out"
+  end
+
+  it "should safely work with replica set uris" do
+    expected = "mongodump -h setname/host1:port1,host2:port2 -db db -u **** -p **** -o out"
+    Dump.new("setname/host1:port1,host2:port2","db", "out", "user", "pass").cmd.should eql expected
   end
 
   it "should work with replica set uris" do
     expected = "mongodump -h setname/host1:port1,host2:port2 -db db -u user -p pass -o out"
-    Dump.new("setname/host1:port1,host2:port2","db", "out", "user", "pass").cmd.should eql expected
+    Dump.new("setname/host1:port1,host2:port2","db", "out", "user", "pass").executableCmd.should eql expected
   end
+
 end
 
 describe Restore do
 
-  it "should work with single uris" do
-    Restore.new("host:port", "db", "source", "user", "pass").cmd.should eql "mongorestore -h host:port -db db -u user -p pass --drop source"
+  it "should safely work with single uris" do
+    Restore.new("host:port", "db", "source", "user", "pass").cmd.should eql "mongorestore -h host:port -db db -u **** -p **** --drop source"
   end
 
   it "should work with single uris" do
-    Restore.new("host:port", "db", "source").cmd.should eql "mongorestore -h host:port -db db --drop source"
+    Restore.new("host:port", "db", "source", "user", "pass").executableCmd.should eql "mongorestore -h host:port -db db -u user -p pass --drop source"
+  end
+
+  it "should safely work with replica set uris" do
+    expected = "mongorestore -h setname/host1:port1,host2:port2 -db db -u **** -p **** --drop source"
+    Restore.new("setname/host1:port1,host2:port2","db", "source", "user", "pass").cmd.should eql expected
   end
 
   it "should work with replica set uris" do
     expected = "mongorestore -h setname/host1:port1,host2:port2 -db db -u user -p pass --drop source"
-    Restore.new("setname/host1:port1,host2:port2","db", "source", "user", "pass").cmd.should eql expected
+    Restore.new("setname/host1:port1,host2:port2","db", "source", "user", "pass").executableCmd.should eql expected
   end
 end
 
 describe Import do
 
+  it "should safely work with single uris - with user/pass" do
+    Import.new("host:port", "db", "coll", "myfile.json", "user", "pass").cmd.should eql "mongoimport -h host:port -db db -u **** -p **** -c coll --file myfile.json"
+  end
+
   it "should work with single uris - with user/pass" do
-    Import.new("host:port", "db", "coll", "myfile.json", "user", "pass").cmd.should eql "mongoimport -h host:port -db db -u user -p pass -c coll --file myfile.json"
+    Import.new("host:port", "db", "coll", "myfile.json", "user", "pass").executableCmd.should eql "mongoimport -h host:port -db db -u user -p pass -c coll --file myfile.json"
   end
 
   it "should work with single uris - no user/pass" do
-    Import.new("host:port", "db", "coll", "myfile.json").cmd.should eql "mongoimport -h host:port -db db -c coll --file myfile.json"
+    Import.new("host:port", "db", "coll", "myfile.json").executableCmd.should eql "mongoimport -h host:port -db db -c coll --file myfile.json"
+  end
+
+  it "should safely work with replica set uris" do
+    expected = "mongoimport -h setname/host1:port1,host2:port2 -db db -u **** -p **** -c coll --file myfile.json --jsonArray"
+    Import.new("setname/host1:port1,host2:port2","db", "coll", "myfile.json", "user", "pass", { :json_array => true} ).cmd.should eql expected
   end
 
   it "should work with replica set uris" do
     expected = "mongoimport -h setname/host1:port1,host2:port2 -db db -u user -p pass -c coll --file myfile.json --jsonArray"
-    Import.new("setname/host1:port1,host2:port2","db", "coll", "myfile.json", "user", "pass", { :json_array => true} ).cmd.should eql expected
+    Import.new("setname/host1:port1,host2:port2","db", "coll", "myfile.json", "user", "pass", { :json_array => true} ).executableCmd.should eql expected
   end
 end
 
 describe Export do
 
+  it "should safely work with single uris - with user/pass" do
+    Export.new("host:port", "db", "coll", "{query}", "myfile.json", "user", "pass").cmd.should eql "mongoexport -h host:port -db db -u **** -p **** -c coll -o myfile.json --query '{query}'"
+  end
+
   it "should work with single uris - with user/pass" do
-    Export.new("host:port", "db", "coll", "{query}", "myfile.json", "user", "pass").cmd.should eql "mongoexport -h host:port -db db -u user -p pass -c coll -o myfile.json --query '{query}'"
+    Export.new("host:port", "db", "coll", "{query}", "myfile.json", "user", "pass").executableCmd.should eql "mongoexport -h host:port -db db -u user -p pass -c coll -o myfile.json --query '{query}'"
   end
 
   it "should work with single uris - no user/pass" do
-    Export.new("host:port", "db", "coll", "{query}", "myfile.json").cmd.should eql "mongoexport -h host:port -db db -c coll -o myfile.json --query '{query}'"
+    Export.new("host:port", "db", "coll", "{query}", "myfile.json").executableCmd.should eql "mongoexport -h host:port -db db -c coll -o myfile.json --query '{query}'"
+  end
+
+  it "should safely work with replica set uris" do
+    expected = "mongoexport -h setname/host1:port1,host2:port2 -db db -u **** -p **** -c coll -o myfile.json --query '{query}' --jsonArray"
+    Export.new("setname/host1:port1,host2:port2","db", "coll", "{query}", "myfile.json", "user", "pass", { :json_array => true} ).cmd.should eql expected
   end
 
   it "should work with replica set uris" do
     expected = "mongoexport -h setname/host1:port1,host2:port2 -db db -u user -p pass -c coll -o myfile.json --query '{query}' --jsonArray"
-    Export.new("setname/host1:port1,host2:port2","db", "coll", "{query}", "myfile.json", "user", "pass", { :json_array => true} ).cmd.should eql expected
+    Export.new("setname/host1:port1,host2:port2","db", "coll", "{query}", "myfile.json", "user", "pass", { :json_array => true} ).executableCmd.should eql expected
   end
 end
 

metadata

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