monsoon 0.3 → 0.4

data/lib/monsoon/backup.rb

@@ -58,18 +58,6 @@ module Monsoon
       config["database"]
     end
 
-    # Helper method for database backup location.
-    #
-    # Examples
-    #
-    #   Monsoon::Backup("mongodb://test.mongohq.com:10036/app_development").backup_location
-    #   # => "dump/app_development"
-    #
-    # Returns a String of the database name.
-    def backup_location
-      "dump/#{config['database']}"
-    end
-
     # Helper to form the mongodump command.
     #
     # Examples
@@ -80,7 +68,7 @@ module Monsoon
     # Returns the command as a String.
     def mongo_dump_command
       cmd = ""
-      cmd = "mongodump -h #{config['host']}:#{config['port']} -d #{config['database']} "
+      cmd = "mongodump -h #{config['host']}:#{config['port']} -d #{config['database']} -o . "
       cmd += "--username #{config['username']} --password #{config['password']}" unless config["username"].nil? and config["password"].nil?
       cmd
     end

data/lib/monsoon/compress.rb

@@ -29,7 +29,7 @@ module Monsoon
     #
     # Returns the command as a String.
     def compress_command
-      "tar -czf #{filename} #{@backup.backup_location}"
+      "tar -czf #{filename} #{@backup.database}"
     end
 
     # Helper to form the tar compress command.

data/lib/monsoon/version.rb

@@ -1,3 +1,3 @@
 module Monsoon
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/spec/monsoon/backup_spec.rb

@@ -79,46 +79,20 @@ module Monsoon
       end
     end
 
-    describe "#backup_location" do
-      subject{ Backup.new(uri).backup_location }
-
-      it "should return correct backup location for mongodump output" do
-        subject.should == "dump/app_development"
-      end
-    end
-
     describe "#mongo_dump_command" do
       subject{ Backup.new(uri).mongo_dump_command }
 
-      it "should include mongo dump command" do
-        subject.should include("mongodump")
-      end
-
-      it "should include switch for host including port" do
-        subject.should include("-h test.mongohq.com:10036")
-      end
-
-      it "should include switch for database" do
-        subject.should include("-d app_development")
-      end
-
-      it "should include switch for username" do
-        subject.should include("--username testuser")
-      end
-
-      it "should include switch for password" do
-        subject.should include("--password pass1")
+      describe "when username/password is provided" do
+        it "should return correct command" do
+          subject.should == "mongodump -h test.mongohq.com:10036 -d app_development -o . --username testuser --password pass1"
+        end
       end
 
       describe "when user and password is not included" do
         let(:backup) { Backup.new("mongodb://test.mongohq.com:10036/app_development").mongo_dump_command }
 
-        it "should not include username switch" do
-          backup.should_not include("--username")
-        end
-
-        it "should not include password switch" do
-          backup.should_not include("--password")
+        it "should return correct command" do
+          backup.should == "mongodump -h test.mongohq.com:10036 -d app_development -o . "
         end
       end
 

data/spec/monsoon/compress_spec.rb

@@ -36,11 +36,11 @@ module Monsoon
     describe "#compress_command" do
       before(:each) do
         compress.stub(:filename).and_return("app_development.1234.tar.gz")
-        backup.stub(:backup_location).and_return("dump/app_development")
+        backup.stub(:database).and_return("app_development")
       end
 
       it "should return correct tar command" do
-        compress.compress_command.should == "tar -czf app_development.1234.tar.gz dump/app_development"
+        compress.compress_command.should == "tar -czf app_development.1234.tar.gz app_development"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monsoon
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70268861224460 !ruby/object:Gem::Requirement
+  requirement: &70101338915580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70268861224460
+  version_requirements: *70101338915580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70268861224040 !ruby/object:Gem::Requirement
+  requirement: &70101338915020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268861224040
+  version_requirements: *70101338915020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70268861223580 !ruby/object:Gem::Requirement
+  requirement: &70101338914560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70268861223580
+  version_requirements: *70101338914560
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70268861223160 !ruby/object:Gem::Requirement
+  requirement: &70101338914120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70268861223160
+  version_requirements: *70101338914120
 description: Monsoon is a MongoDB backup tool that allows you to take backups and
   store them in Amazon S3.
 email: