shelly 0.2.24 → 0.2.25

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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
+
 ## 0.2.24 / 2013-06-04
 
 * [bug] exit gracefully when downloaded or restored database backup doesn't exist

data/lib/shelly/app.rb

@@ -120,6 +120,10 @@ module Shelly
       shelly.restore_backup(code_name, filename)
     end
 
+    def import_database(kind, filename)
+      ssh(:command => "import_database #{kind} #{filename}")
+    end
+
     def request_backup(kinds)
       Array(kinds).each do |kind|
         shelly.request_backup(code_name, kind)
@@ -342,7 +346,7 @@ module Shelly
 
     def ssh(options = {})
       conn = console_connection(options[:server])
-      exec "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
+      system "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 
     def ssh_options(conn = console_connection)
@@ -350,7 +354,7 @@ module Shelly
     end
 
     def rsync(source, destination)
-      exec "rsync -avz -e 'ssh #{ssh_options}' --progress #{source} #{destination}"
+      system "rsync -avz -e 'ssh #{ssh_options}' --progress #{source} #{destination}"
     end
   end
 end

data/lib/shelly/cli/backup.rb

@@ -9,7 +9,7 @@ module Shelly
       namespace :backup
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :get, :create, :restore]
+      before_hook :logged_in?, :only => [:list, :get, :create, :restore, :import]
 
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
@@ -85,7 +85,7 @@ module Shelly
       def restore(filename)
         app = multiple_clouds(options[:cloud], "backup restore FILENAME")
         backup = app.database_backup(filename)
-        say "You are about restore database #{backup.kind} for cloud #{backup.code_name} to state from #{backup.filename}"
+        say "You are about restore #{backup.kind} database for cloud #{backup.code_name} to state from #{backup.filename}"
         say_new_line
         ask_to_restore_database
         app.restore_backup(filename)
@@ -98,6 +98,37 @@ module Shelly
       rescue Client::ConflictException => e
         say_error e[:message]
       end
+
+      desc "import KIND FILENAME", "Import database from dump file"
+      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.
+      }
+      def import(kind, filename)
+        app = multiple_clouds(options[:cloud], "backup import KIND FILENAME")
+        unless ::File.exist?(filename)
+          say_error "File #{filename} doesn't exist"
+        end
+        say "You are about import #{kind} database for cloud #{app} to state from file #{filename}"
+        ask_to_import_database
+        archive = compress(filename)
+        say "Uploading #{archive}", :green
+        app.upload(archive)
+        say "Uploading done", :green
+        say "Importing database", :green
+        app.import_database(kind, archive)
+        say "Database imported successfully", :green
+      end
+
+      no_tasks do
+        def compress(filename)
+          archive_name = "#{::File.basename(filename)}.tar"
+          say "Compressing #{filename} into #{archive_name}", :green
+          system("tar -cf #{archive_name} #{filename}")
+          archive_name
+        end
+      end
     end
   end
 end

data/lib/shelly/helpers.rb

@@ -72,6 +72,11 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
       say_new_line say_error "Canceled" unless delete_application == "yes"
     end
 
+    def ask_to_import_database
+      import_database = ask("I want to import the database (yes/no):")
+      say_new_line say_error "Canceled" unless import_database == "yes"
+    end
+
     def logged_in?
       user = Shelly::User.new
       user.token

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -293,7 +293,7 @@ describe Shelly::App do
     it "should return result of rake task" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com rake_runner \"test\"")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com rake_runner \"test\"")
       @app.rake("test")
     end
   end
@@ -302,7 +302,7 @@ describe Shelly::App do
     it "should return result of dbconsole" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com dbconsole")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com dbconsole")
       @app.dbconsole
     end
   end
@@ -333,14 +333,14 @@ describe Shelly::App do
     it "should run ssh with all parameters" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com ")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com ")
       @app.console
     end
 
     context "when server passed" do
       it "should request console on given server" do
         @client.should_receive(:console).with("foo-staging", "app1").and_return({})
-        @app.stub(:exec)
+        @app.stub(:system)
         @app.console("app1")
       end
     end
@@ -357,7 +357,7 @@ describe Shelly::App do
     it "should run rsync with proper parameters" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/srv/glusterfs/disk")
+      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/srv/glusterfs/disk")
       @app.upload("/path")
     end
   end
@@ -366,7 +366,7 @@ describe Shelly::App do
     it "should run rsync with proper parameters" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/srv/glusterfs/disk/. /tmp")
+      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/srv/glusterfs/disk/. /tmp")
       @app.download(".", "/tmp")
     end
   end

data/spec/shelly/cli/backup_spec.rb

@@ -193,8 +193,8 @@ describe Shelly::CLI::Backup do
 
   describe "restore" do
     before do
-      @client.stub(:database_backup).and_return({"filename" => "better.tar.gz", "size" => 12345, "kind" => "postgre"})
-      @client.stub(:restore_backup).and_return({"filename" => "better.tar.gz", "size" => 12345, "kind" => "postgre"})
+      @client.stub(:database_backup).and_return({"filename" => "better.tar.gz", "size" => 12345, "kind" => "postgresql"})
+      @client.stub(:restore_backup).and_return({"filename" => "better.tar.gz", "size" => 12345, "kind" => "postgresql"})
       $stdout.stub(:puts)
       $stdout.stub(:print)
     end
@@ -213,7 +213,7 @@ describe Shelly::CLI::Backup do
     end
 
     it "should restore database" do
-      $stdout.should_receive(:puts).with("You are about restore database postgre for cloud foo-staging to state from better.tar.gz")
+      $stdout.should_receive(:puts).with("You are about restore postgresql database for cloud foo-staging to state from better.tar.gz")
       $stdout.should_receive(:print).with("I want to restore the database (yes/no): ")
       $stdout.should_receive(:puts).with("\n")
       @client.stub(:restore_backup).with("todo-list-test","better.tar.gz")
@@ -227,7 +227,7 @@ describe Shelly::CLI::Backup do
 
     context "when answering no" do
       it "should cancel restore database" do
-        $stdout.should_receive(:puts).with("You are about restore database postgre for cloud foo-staging to state from better.tar.gz")
+        $stdout.should_receive(:puts).with("You are about restore postgresql database for cloud foo-staging to state from better.tar.gz")
         $stdout.should_receive(:print).with("I want to restore the database (yes/no): ")
         $stdout.should_receive(:puts).with("\n")
         $stdout.should_receive(:puts).with(red "Canceled")
@@ -251,4 +251,67 @@ describe Shelly::CLI::Backup do
       end
     end
   end
+
+  describe "#import" do
+    before do
+      FileUtils.touch("dump.sql")
+      @app.stub(:upload => nil, :ssh => nil)
+      @backup.stub(:system)
+      $stdout.stub(:puts)
+      $stdout.stub(:print)
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@backup, :import).should include(:logged_in?)
+    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")
+      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")
+      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")
+      $stdout.should_receive(:puts).with(green "Importing database")
+      fake_stdin(["yes"]) do
+        invoke(@backup, :import, "postgresql", "dump.sql")
+      end
+    end
+
+    context "on answering no" do
+      it "should cancel database import" do
+        $stdout.should_receive(:puts).with("You are about import postgresql database for cloud foo-staging to state from file dump.sql")
+        $stdout.should_receive(:print).with("I want to import the database (yes/no): ")
+        $stdout.should_receive(:puts).with(red "Canceled")
+        lambda {
+          fake_stdin(["no"]) do
+            invoke(@backup, :import, "postgresql", "dump.sql")
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "file doesn't exist" do
+      it "should exit with error" do
+        FileUtils.rm("dump.sql")
+        $stdout.should_receive(:puts).with(red "File dump.sql doesn't exist")
+        lambda {
+          fake_stdin(["yes"]) do
+            invoke(@backup, :import, "postgresql", "dump.sql")
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
 end

metadata

@@ -1,207 +1,236 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  prerelease: 
+  version: 0.2.25
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
 - !ruby/object:Gem::Dependency
   name: rest-client
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -276,26 +305,27 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Shelly Cloud command line tool
 test_files:
 - spec/helpers.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWM5MmE2NjRhNGJmMjM1YzBjYzEzNWQwMzMxODlmZjlkZWZmZDU1YQ==
-  data.tar.gz: !binary |-
-    MTQwNDM4OTY5NGU4NDI2MWY1MmUyN2JmZTNmOGZkZTFkZDc4OTljMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NTJhMTU1ZWQ5ZjgyNGEzNWRkYjBhZjAyYzUwN2VmMThiN2NlNDVmYmI3YTdk
-    MjQ1ZjI0OTA3Zjk3MjE5NjJiNmZkMmUyODdmOTU5ODBiNWJhMTQ3MTgxZTVm
-    ZDMzMWI0Zjk2NjQzNjY1YjQxZmU0YWZhMzcyNTdlMmQ3ZWFlYjg=
-  data.tar.gz: !binary |-
-    NzNhZTEzMjljOWYyNmEyOTQ2MDE0ZDYyZjkxZGIyMzkyYjJhMDE2ZGZkNGZk
-    NmUwZjE3Y2VlNTI2MWU2MGY4NTlkYzgzOTU3ODA1ZmFhMDIyZDA4OTdhYzFh
-    NjMyNzhlOTBmMjYzN2ZmNjRkZGU4OTcyNmM4Y2U4NTFjMzQzN2Y=