shelly 0.2.25 → 0.2.26

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.26 / 2013-06-10
+* [bug] `shelly backup import` now actually compresses the file (bzip2 is used)
+* [improvement] `shelly backup import` also accepts path to dump file
+
 ## 0.2.25 / 2013-06-06
 
 * [feature] It's possible to import PostgreSQL and MongoDB database from a dump file with `shelly backup import KIND FILENAME`. See our documentation for more info https://shellycloud.com/documentation/database_backups#import_database

data/lib/shelly/app.rb

@@ -120,8 +120,9 @@ module Shelly
       shelly.restore_backup(code_name, filename)
     end
 
-    def import_database(kind, filename)
-      ssh(:command => "import_database #{kind} #{filename}")
+    def import_database(kind, filename, server)
+      ssh(:command => "import_database #{kind} #{filename}",
+        :server => server)
     end
 
     def request_backup(kinds)
@@ -248,8 +249,9 @@ module Shelly
     end
 
     def upload(source)
-      conn = console_connection
-      rsync(source, "#{conn['host']}:/srv/glusterfs/disk")
+      console_connection.tap do |conn|
+        rsync(source, "#{conn['host']}:/srv/glusterfs/disk")
+      end
     end
 
     def download(relative_source, destination)

data/lib/shelly/cli/backup.rb

@@ -103,7 +103,7 @@ module Shelly
       long_desc %{
         Import database from local dump file to your cloud
         KIND - Database kind. Possible values are: postgresql or mongodb
-        FILENAME - Database dump file or directory (mongodb), it has to be in current working directory.
+        FILENAME - Database dump file or directory (mongodb)
       }
       def import(kind, filename)
         app = multiple_clouds(options[:cloud], "backup import KIND FILENAME")
@@ -114,18 +114,18 @@ module Shelly
         ask_to_import_database
         archive = compress(filename)
         say "Uploading #{archive}", :green
-        app.upload(archive)
+        connection = app.upload(archive)
         say "Uploading done", :green
         say "Importing database", :green
-        app.import_database(kind, archive)
+        app.import_database(kind, archive, connection["server"])
         say "Database imported successfully", :green
       end
 
       no_tasks do
         def compress(filename)
-          archive_name = "#{::File.basename(filename)}.tar"
+          archive_name = "#{::File.basename(filename)}-#{Time.now.to_i}.tar.bz2"
           say "Compressing #{filename} into #{archive_name}", :green
-          system("tar -cf #{archive_name} #{filename}")
+          system("tar -cjf #{archive_name} #{filename}")
           archive_name
         end
       end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -255,10 +255,11 @@ describe Shelly::CLI::Backup do
   describe "#import" do
     before do
       FileUtils.touch("dump.sql")
-      @app.stub(:upload => nil, :ssh => nil)
+      @app.stub(:upload => {"server" => "app1"}, :ssh => nil)
       @backup.stub(:system)
       $stdout.stub(:puts)
       $stdout.stub(:print)
+      Time.stub_chain(:now, :to_i => 1370879705)
     end
 
     it "should ensure user has logged in" do
@@ -266,23 +267,24 @@ describe Shelly::CLI::Backup do
     end
 
     it "should compress file" do
-      @backup.should_receive(:system).with("tar -cf dump.sql.tar dump.sql")
-      $stdout.should_receive(:puts).with(green "Compressing dump.sql into dump.sql.tar")
+      @backup.should_receive(:system).with("tar -cjf dump.sql-1370879705.tar.bz2 dump.sql")
+      $stdout.should_receive(:puts).with(green "Compressing dump.sql into dump.sql-1370879705.tar.bz2")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "postgresql", "dump.sql")
       end
     end
 
     it "should upload compressed file" do
-      @app.should_receive(:upload).with("dump.sql.tar")
-      $stdout.should_receive(:puts).with(green "Uploading dump.sql.tar")
+      @app.should_receive(:upload).with("dump.sql-1370879705.tar.bz2")
+      $stdout.should_receive(:puts).with(green "Uploading dump.sql-1370879705.tar.bz2")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "postgresql", "dump.sql")
       end
     end
 
     it "should import given database from uploaded file" do
-      @app.should_receive(:ssh).with(:command => "import_database postgresql dump.sql.tar")
+      @app.should_receive(:ssh).with(:command => "import_database postgresql dump.sql-1370879705.tar.bz2",
+        :server => "app1")
       $stdout.should_receive(:puts).with(green "Importing database")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "postgresql", "dump.sql")

metadata

@@ -2,14 +2,14 @@
 name: shelly
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec