shelly 0.0.43 → 0.0.44.pre

data/.gitignore

@@ -4,3 +4,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+coverage

data/lib/shelly/app.rb

@@ -94,6 +94,10 @@ module Shelly
       shelly.stop_cloud(code_name)
     end
 
+    def redeploy
+      shelly.redeploy(code_name)
+    end
+
     def cloudfile_path
       File.join(Dir.pwd, "Cloudfile")
     end

data/lib/shelly/cli/backup.rb

@@ -8,14 +8,14 @@ module Shelly
       namespace :backup
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :get, :create]
+      before_hook :logged_in?, :only => [:list, :get, :create, :restore]
       before_hook :cloudfile_present?, :only => [:list]
 
-      desc "list", "List database backups"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to list backups for"
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+
+      desc "list", "List available database backups"
       def list
-        multiple_clouds(options[:cloud], "backup list", "Select cloud to view database backups for using:")
+        multiple_clouds(options[:cloud], "backup list")
         backups = @app.database_backups
         if backups.present?
           to_display = [["Filename", "|  Size"]]
@@ -29,18 +29,18 @@ module Shelly
         else
           say "No database backups available"
         end
-      rescue Client::APIError => e
-        if e.not_found?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        else
-          raise e
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
-      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify which cloud list backups for"
-      desc "get [FILENAME]", "Downloads specified or last backup to current directory"
+      desc "get [FILENAME]", "Download database backup"
+      long_desc %{
+        Download given database backup to current directory.
+        If filename is not specyfied, latest database backup will be downloaded.
+      }
       def get(handler = "last")
-        multiple_clouds(options[:cloud], "backup get [FILENAME]", "Select cloud for which you want download backup")
+        multiple_clouds(options[:cloud], "backup get #{handler}")
 
         backup = @app.database_backup(handler)
         bar = Shelly::DownloadProgressBar.new(backup.size)
@@ -48,53 +48,52 @@ module Shelly
 
         say_new_line
         say "Backup file saved to #{backup.filename}", :green
-      rescue Client::APIError => e
-        case e.resource_not_found
+      rescue Client::NotFoundException => e
+        case e.resource
         when :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        when :backup
+          say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        when :database_backup
           say_error "Backup not found", :with_exit => false
-          say "You can list available backups with 'shelly backup list' command"
-        else; raise e
+          say "You can list available backups with `shelly backup list` command"
+        else; raise
         end
       end
 
-      desc "create [KIND]", "Creates current snapshot of given database. Default: all databases."
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to create database snapshot for"
+      desc "create [DB_KIND]", "Create backup of given database"
+      long_desc %{
+        Create backup of given database.
+        If database kind is not specified, backup of all configured databases will be performed.
+      }
       def create(kind = nil)
-        multiple_clouds(options[:cloud], "backup create", "Select cloud to create snapshot of database")
+        multiple_clouds(options[:cloud], "backup create [DB_KIND]")
         @app.request_backup(kind)
         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?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        else
-          say_error e.message
-        end
+      rescue Client::ValidationException => e
+        say_error e[:message]
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       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
+      desc "restore FILENAME", "Restore database to state from given backup"
+      def restore(filename)
+        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_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 "Restore has been scheduled. Wait a few minutes till database is restored."
+      rescue Client::NotFoundException => e
+        case e.resource
+        when :cloud
+          say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        when :database_backup
           say_error "Backup not found", :with_exit => false
-          say "You can list available backups with 'shelly backup list' command"
-        else
-          raise e
+          say "You can list available backups with `shelly backup list` command"
+        else; raise
         end
       end
     end

data/lib/shelly/cli/config.rb

@@ -33,88 +33,78 @@ module Shelly
             else
               say "Cloud #{cloud} has no configuration files"
             end
-          rescue Client::APIError => e
-            if e.resource_not_found == :cloud
-              say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
-            else
-              raise e
-            end
+          rescue Client::NotFoundException => e
+            raise unless e.resource == :cloud
+            say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
           end
         end
       end
 
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to show configuration file for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "show PATH", "View configuration file"
       def show(path = nil)
         say_error "No configuration file specified" unless path
-        multiple_clouds(options[:cloud], "show #{path}", "Specify cloud using:")
+        multiple_clouds(options[:cloud], "show #{path}")
         config = @app.config(path)
         say "Content of #{config["path"]}:", :green
         say config["content"]
-      rescue Client::APIError => e
-        case e.resource_not_found
+      rescue Client::NotFoundException => e
+        case e.resource
         when :cloud
           say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
         when :config
           say_error "Config '#{path}' not found", :with_exit => false
           say_error "You can list available config files with `shelly config list --cloud #{@app}`"
-        else; raise e
+        else raise
         end
       end
 
       map "new" => :create
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to create configuration file for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "create PATH", "Create configuration file"
       def create(path = nil)
         say_error "No path specified" unless path
         output = open_editor(path)
-        multiple_clouds(options[:cloud], "create #{path}", "Specify cloud using:")
+        multiple_clouds(options[:cloud], "create #{path}")
         @app.create_config(path, output)
         say "File '#{path}' created, it will be used after next code deploy", :green
-      rescue Client::APIError => e
-        if e.resource_not_found == :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        elsif e.validation?
-          e.each_error { |error| say_error error, :with_exit => false }
-          exit 1
-        else
-          say_error e.message
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        exit 1
       end
 
       map "update" => :edit
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to edit configuration file for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "edit PATH", "Edit configuration file"
       def edit(path = nil)
         say_error "No configuration file specified" unless path
-        multiple_clouds(options[:cloud], "edit #{path}", "Specify cloud using:")
+        multiple_clouds(options[:cloud], "edit #{path}")
         config = @app.config(path)
         content = open_editor(config["path"], config["content"])
         @app.update_config(path, content)
         say "File '#{config["path"]}' updated, it will be used after next code deploy", :green
-      rescue Client::APIError => e
-        if e.resource_not_found == :cloud
+      rescue Client::NotFoundException => e
+        case e.resource
+        when :cloud
           say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        elsif e.resource_not_found == :config
+        when :config
           say_error "Config '#{path}' not found", :with_exit => false
           say_error "You can list available config files with `shelly config list --cloud #{@app}`"
-        elsif e.validation?
-          e.each_error { |error| say_error error, :with_exit => false }
-          exit 1
-        else
-          say_error e.message
+        else raise
         end
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        exit 1
       end
 
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify for which cloud to delete configuration file for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "delete PATH", "Delete configuration file"
       def delete(path = nil)
         say_error "No configuration file specified" unless path
-        multiple_clouds(options[:cloud], "delete #{path}", "Specify cloud using:")
+        multiple_clouds(options[:cloud], "delete #{path}")
         answer = yes?("Are you sure you want to delete 'path' (yes/no): ")
         if answer
           @app.delete_config(path)
@@ -122,17 +112,14 @@ module Shelly
         else
           say "File not deleted"
         end
-      rescue Client::APIError => e
-        if e.resource_not_found == :cloud
+      rescue Client::NotFoundException => e
+        case e.resource
+        when :cloud
           say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        elsif e.resource_not_found == :config
+        when :config
           say_error "Config '#{path}' not found", :with_exit => false
           say_error "You can list available config files with `shelly config list --cloud #{@app}`"
-        elsif e.validation?
-          e.each_error { |error| say_error error, :with_exit => false }
-          exit 1
-        else
-          say_error e.message
+        else raise
         end
       end
 
@@ -166,4 +153,4 @@ module Shelly
 
     end
   end
-end
+end

data/lib/shelly/cli/deploys.rb

@@ -11,10 +11,9 @@ module Shelly
       before_hook :cloudfile_present?, :only => [:list, :show]
 
       desc "list", "Lists deploy logs"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to show deploy logs for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def list
-        multiple_clouds(options[:cloud], "deploys list", "Select cloud to view deploy logs using:")
+        multiple_clouds(options[:cloud], "deploys list")
         logs = @app.deploy_logs
         unless logs.empty?
           say "Available deploy logs", :green
@@ -24,20 +23,16 @@ module Shelly
         else
           say "No deploy logs available"
         end
-      rescue Client::APIError => e
-        if e.not_found?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        else
-          raise e
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
       desc "show LOG", "Show specific deploy log"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to show deploy logs for"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def show(log = nil)
         specify_log(log)
-        multiple_clouds(options[:cloud], "deploys show #{log}", "Select log and cloud to view deploy logs using:")
+        multiple_clouds(options[:cloud], "deploys show #{log}")
         content = @app.deploy_log(log)
         say "Log for deploy done on #{content["created_at"]}", :green
         if content["bundle_install"]
@@ -55,16 +50,13 @@ module Shelly
         if content["thin_restart"]
           say("Starting thin", :green); say(content["thin_restart"])
         end
-      rescue Client::APIError => e
-        if e.not_found?
-          case e.resource_not_found
-          when :cloud
-            say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-          when :log
-            say_error "Log not found, list all deploy logs using  `shelly deploys list --cloud=#{@app.code_name}`"
-          end
-        else
-          raise e
+      rescue Client::NotFoundException => e
+        case e.resource
+        when :cloud
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        when :log
+          say_error "Log not found, list all deploy logs using  `shelly deploys list --cloud=#{@app.code_name}`"
+        else raise
         end
       end