shelly 0.0.41.pre → 0.0.41

data/lib/shelly/app.rb

@@ -74,6 +74,10 @@ module Shelly
       Shelly::Backup.new(attributes.merge("code_name" => code_name))
     end
 
+    def restore_backup(filename)
+      shelly.restore_backup(code_name, filename)
+    end
+
     def request_backup(kind)
       shelly.request_backup(code_name, kind)
     end

data/lib/shelly/backup.rb

@@ -1,12 +1,13 @@
 module Shelly
   class Backup < Model
-    attr_reader :filename, :size, :human_size, :code_name
+    attr_reader :filename, :size, :human_size, :code_name, :kind
 
     def initialize(attributes = {})
       @filename   = attributes["filename"]
       @size       = attributes["size"]
       @human_size = attributes["human_size"]
       @code_name  = attributes["code_name"]
+      @kind       = attributes["kind"]
     end
 
     def download(callback)

data/lib/shelly/cli/backup.rb

@@ -65,7 +65,7 @@ module Shelly
       def create(kind = nil)
         multiple_clouds(options[:cloud], "backup create", "Select cloud to create snapshot of database")
         @app.request_backup(kind)
-        say "Backup requested. It can take up to several minutes for" +
+        say "Backup requested. It can take up to several minutes for " +
           "the backup process to finish and the backup to show up in backups list.", :green
       rescue Client::APIError => e
         if e.not_found?
@@ -74,6 +74,29 @@ module Shelly
           say_error e.message
         end
       end
+
+      desc "restore <filename>", "Restore database to state from filename"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to restore database snapshot for"
+      def restore(filename = nil)
+        logged_in?
+        multiple_clouds(options[:cloud], "backup restore <filename>", "Select cloud for which you want restore backup")
+        say_error "Filename is required" unless 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_new_line
+        ask_to_restore_database
+        @app.restore_backup(filename)
+        say_new_line
+        say "Restore has been scheduled. Wait few minutes till database is restored."
+      rescue Client::APIError => e
+        if e.not_found?
+          say_error "Backup not found", :with_exit => false
+          say "You can list available backups with 'shelly backup list' command"
+        else
+          raise e
+        end
+      end
     end
   end
 end

data/lib/shelly/cli/main.rb

@@ -60,13 +60,8 @@ module Shelly
         user.password = ask_for_password(:with_confirmation => false)
         user.login
         say "Login successful"
-        # FIXME: remove conflict boolean, move it to rescue block
-        begin user.upload_ssh_key
-          conflict = false
-        rescue RestClient::Conflict
-          conflict = true
-        end
-        say "Uploading your public SSH key" if conflict == false
+        user.upload_ssh_key
+        say "Uploading your public SSH key"
         list
       rescue Client::APIError => e
         if e.validation?

data/lib/shelly/client.rb

@@ -6,7 +6,7 @@ module Shelly
   class Client
     class APIError < Exception
       attr_reader :status_code, :body
-      
+
       def initialize(status_code, body = {})
         @status_code = status_code
         @body = body
@@ -118,7 +118,7 @@ module Shelly
     def apps
       get("/apps")
     end
-    
+
     def app(code_name)
       get("/apps/#{code_name}")
     end
@@ -138,11 +138,15 @@ module Shelly
     def database_backups(code_name)
       get("/apps/#{code_name}/database_backups")
     end
-    
+
     def database_backup(code_name, handler)
       get("/apps/#{code_name}/database_backups/#{handler}")
     end
 
+    def restore_backup(code_name, filename)
+      put("/apps/#{code_name}/database_backups/#{filename}/restore")
+    end
+
     def request_backup(code_name, kind = nil)
       post("/apps/#{code_name}/database_backups", :kind => kind)
     end
@@ -170,7 +174,7 @@ module Shelly
     def delete(path, params = {})
       request(path, :delete, params)
     end
-    
+
     def download_backup(cloud, filename, progress_callback = nil)
       File.open(filename, "w") do |out|
         process_response = lambda do |response|
@@ -181,9 +185,9 @@ module Shelly
         end
 
         options = request_parameters("/apps/#{cloud}/database_backups/#{filename}", :get)
-        options = options.merge(:block_response => process_response, 
+        options = options.merge(:block_response => process_response,
           :headers => {:accept => "application/x-gzip"})
-      
+
         RestClient::Request.execute(options)
       end
     end

data/lib/shelly/helpers.rb

@@ -53,6 +53,12 @@ module Shelly
       say_error "No Cloudfile found" unless Cloudfile.present?
     end
 
+    def ask_to_restore_database
+      delete_application_question = "I want to restore the database (yes/no):"
+      delete_application = ask(delete_application_question)
+      say_new_line say_error "Canceled" unless delete_application == "yes"
+    end
+
     def logged_in?
       user = Shelly::User.new
       user.token

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.41.pre"
+  VERSION = "0.0.41"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -149,9 +149,63 @@ describe Shelly::CLI::Backup do
 
     it "should display information about request backup" do
       @client.stub(:request_backup)
-      $stdout.should_receive(:puts).with(green "Backup requested. It can take up to several minutes for" +
+      $stdout.should_receive(:puts).with(green "Backup requested. It can take up to several minutes for " +
           "the backup process to finish and the backup to show up in backups list.")
       invoke(@backup, :create)
     end
   end
+
+  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"})
+      $stdout.stub(:puts)
+    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(: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")
+      $stdout.should_receive(:puts).with("\n")
+      $stdout.should_receive(:puts).with("Restore has been scheduled. Wait few minutes till database is restored.")
+
+      fake_stdin(["yes"]) do
+        @backup.restore("better.tar.gz")
+      end
+    end
+
+    context "on type 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(:print).with("I want to restore the database (yes/no): ")
+        $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:puts).with(red "Canceled")
+
+        lambda {
+          fake_stdin(["no"]) do
+            @backup.restore("better.tar.gz")
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    it "should exit with 1 when filename is not specified" do
+      $stdout.should_receive(:puts).with(red "Filename is required")
+      lambda {
+        @backup.restore
+      }.should raise_error(SystemExit)
+    end
+
+    context "on backup not found" do
+      it "should display error message" do
+        response = {"message" => "Backup restore not found"}
+        exception = Shelly::Client::APIError.new(404, response)
+        @client.stub(:database_backup).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Backup not found")
+        $stdout.should_receive(:puts).with("You can list available backups with 'shelly backup list' command")
+        @backup.restore("better.tar.gz")
+      end
+    end
+  end
 end

data/spec/shelly/cli/main_spec.rb

@@ -227,14 +227,6 @@ OUT
         end
       end
 
-      it "should upload user's public SSH key and raise HTTP status 409 Conflict when SSH key exists in database" do
-        @user.should_receive(:upload_ssh_key).and_raise(RestClient::Conflict)
-        $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
-        fake_stdin(["megan@example.com", "secret"]) do
-          invoke(@main, :login)
-        end
-      end
-
       it "should display list of applications to which user has access" do
         $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
         $stdout.should_receive(:puts).with(/  abc\s+\|  running/)

metadata

@@ -1,167 +1,188 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.41.pre
-  prerelease: 7
+version: !ruby/object:Gem::Version 
+  hash: 77
+  prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 41
+  version: 0.0.41
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70129852876100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70129852876100
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70129852875680 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70129852875680
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &70129852875260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70129852875260
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70129852874840 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *70129852874840
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &70129852890740 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *70129852890740
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70129852890320 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70129852890320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &70129852889900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70129852889900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &70129852889480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70129852889480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: wijet-thor
-  requirement: &70129852888980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 14
+        - 7
         version: 0.14.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70129852888980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &70129852888560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70129852888560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70129852888100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70129852888100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: wijet-launchy
-  requirement: &70129852887680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70129852887680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: progressbar
-  requirement: &70129852887260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70129852887260
+  version_requirements: *id011
 description: Tool for managing applications and clouds at shellycloud.com
-email:
+email: 
 - support@shellycloud.com
-executables:
+executables: 
 - shelly
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -213,43 +234,36 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files:
-- spec/helpers.rb
-- spec/input_faker.rb
-- spec/shelly/app_spec.rb
-- spec/shelly/backup_spec.rb
-- spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploys_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/runner_spec.rb
-- spec/shelly/cli/user_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/download_progress_bar_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []
+