shelly 0.0.57 → 0.0.58

data/Guardfile

@@ -1,5 +1,6 @@
 guard 'rspec', :cli => '--color --format doc' do
   watch(%r{^spec/.+_spec\.rb$})
+  watch('lib/shelly/helpers.rb') { "spec" }
   watch(%r{^lib/shelly/(.+)\.rb$})     { |m| "spec/shelly/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/lib/shelly/cli/backup.rb

@@ -9,14 +9,13 @@ module Shelly
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :get, :create, :restore]
-      before_hook :cloudfile_present?, :only => [:list]
 
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
       desc "list", "List available database backups"
       def list
-        multiple_clouds(options[:cloud], "backup list")
-        backups = @app.database_backups
+        app = multiple_clouds(options[:cloud], "backup list")
+        backups = app.database_backups
         if backups.present?
           to_display = [["Filename", "|  Size"]]
           backups.each do |backup|
@@ -31,7 +30,7 @@ module Shelly
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "get [FILENAME]", "Download database backup"
@@ -40,9 +39,9 @@ module Shelly
         If filename is not specyfied, latest database backup will be downloaded.
       }
       def get(handler = "last")
-        multiple_clouds(options[:cloud], "backup get #{handler}")
+        app = multiple_clouds(options[:cloud], "backup get #{handler}")
 
-        backup = @app.database_backup(handler)
+        backup = app.database_backup(handler)
         bar = Shelly::DownloadProgressBar.new(backup.size)
         backup.download(bar.progress_callback)
 
@@ -51,7 +50,7 @@ module Shelly
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
-          say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+          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"
@@ -65,31 +64,31 @@ module Shelly
         If database kind is not specified, backup of all configured databases will be performed.
       }
       def create(kind = nil)
-        multiple_clouds(options[:cloud], "backup create [DB_KIND]")
-        @app.request_backup(kind)
+        app = 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::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"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       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)
+        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_new_line
         ask_to_restore_database
-        @app.restore_backup(filename)
+        app.restore_backup(filename)
         say_new_line
         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"
+          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"

data/lib/shelly/cli/config.rb

@@ -6,98 +6,87 @@ module Shelly
       include Thor::Actions
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :show, :create, :edit, :delete]
-      before_hook :cloudfile_present?, :only => [:list, :show, :create, :edit, :delete]
+      before_hook :logged_in?, :only => [:list, :show, :create, :new, :edit, :update, :delete]
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
       desc "list", "List configuration files"
       def list
-        cloudfile = Cloudfile.new
-        cloudfile.clouds.each do |cloud|
-          @app = App.new(cloud)
-          begin
-            configs = @app.configs
-            unless configs.empty?
-              say "Configuration files for #{cloud}", :green
-              user_configs = @app.user_configs
-              unless user_configs.empty?
-                say "Custom configuration files:"
-                print_configs(user_configs)
-              else
-                say "You have no custom configuration files."
-              end
-              shelly_configs = @app.shelly_generated_configs
-              unless shelly_configs.empty?
-                say "Following files are created by Shelly Cloud:"
-                print_configs(shelly_configs)
-              end
-            else
-              say "Cloud #{cloud} has no configuration files"
-            end
-          rescue Client::NotFoundException => e
-            raise unless e.resource == :cloud
-            say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        app = multiple_clouds(options[:cloud], "list")
+        configs = app.configs
+        unless configs.empty?
+          say "Configuration files for #{app}", :green
+          user_configs = app.user_configs
+          unless user_configs.empty?
+            say "Custom configuration files:"
+            print_configs(user_configs)
+          else
+            say "You have no custom configuration files."
           end
+          shelly_configs = app.shelly_generated_configs
+          unless shelly_configs.empty?
+            say "Following files are created by Shelly Cloud:"
+            print_configs(shelly_configs)
+          end
+        else
+          say "Cloud #{cloud} has no configuration files"
         end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
-      # FIXME: Check if path argument is present via Thor (mandatory arguments)
-      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}")
-        config = @app.config(path)
+      def show(path)
+        app = multiple_clouds(options[:cloud], "show #{path}")
+        config = app.config(path)
         say "Content of #{config["path"]}:", :green
         say config["content"]
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+          say_error "You have no access to '#{app}' 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}`"
+          say_error "You can list available config files with `shelly config list --cloud #{app}`"
         else raise
         end
       end
 
       map "new" => :create
-      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
+      def create(path)
         output = open_editor(path)
-        multiple_clouds(options[:cloud], "create #{path}")
-        @app.create_config(path, output)
+        app = multiple_clouds(options[:cloud], "create #{path}")
+        app.create_config(path, output)
         say "File '#{path}' created.", :green
         say "To make changes to running application redeploy it using:"
-        say "`shelly redeploy --cloud #{@app}`"
+        say "`shelly redeploy --cloud #{app}`"
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' 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 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}")
-        config = @app.config(path)
+        app = multiple_clouds(options[:cloud], "edit #{path}")
+        config = app.config(path)
         content = open_editor(config["path"], config["content"])
-        @app.update_config(path, content)
+        app.update_config(path, content)
         say "File '#{config["path"]}' updated.", :green
         say "To make changes to running application redeploy it using:"
-        say "`shelly redeploy --cloud #{@app}`"
+        say "`shelly redeploy --cloud #{app}`"
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+          say_error "You have no access to '#{app}' 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}`"
+          say_error "You can list available config files with `shelly config list --cloud #{app}`"
         else raise
         end
       rescue Client::ValidationException => e
@@ -105,27 +94,26 @@ module Shelly
         exit 1
       end
 
-      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}")
+        app = multiple_clouds(options[:cloud], "delete #{path}")
         answer = yes?("Are you sure you want to delete 'path' (yes/no): ")
         if answer
-          @app.delete_config(path)
+          app.delete_config(path)
           say "File '#{path}' deleted.", :green
           say "To make changes to running application redeploy it using:"
-          say "`shelly redeploy --cloud #{@app}`"
+          say "`shelly redeploy --cloud #{app}`"
         else
           say "File not deleted"
         end
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+          say_error "You have no access to '#{app}' 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}`"
+          say_error "You can list available config files with `shelly config list --cloud #{app}`"
         else raise
         end
       end

data/lib/shelly/cli/deploys.rb

@@ -8,13 +8,12 @@ module Shelly
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :show]
-      before_hook :cloudfile_present?, :only => [:list, :show]
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
       desc "list", "Lists deploy logs"
-      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def list
-        multiple_clouds(options[:cloud], "deploys list")
-        logs = @app.deploy_logs
+        app = multiple_clouds(options[:cloud], "deploys list")
+        logs = app.deploy_logs
         unless logs.empty?
           say "Available deploy logs", :green
           logs.each do |log|
@@ -25,15 +24,14 @@ module Shelly
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        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 cloud"
       def show(log = nil)
         specify_log(log)
-        multiple_clouds(options[:cloud], "deploys show #{log}")
-        content = @app.deploy_log(log)
+        app = 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"]
           say("Starting bundle install", :green); say(content["bundle_install"])
@@ -53,9 +51,9 @@ module Shelly
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+          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}`"
+          say_error "Log not found, list all deploy logs using  `shelly deploys list --cloud=#{app.code_name}`"
         else raise
         end
       end

data/lib/shelly/cli/main.rb

@@ -18,7 +18,6 @@ module Shelly
       # FIXME: it should be possible to pass single symbol, instead of one element array
       before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute, :rake, :setup]
       before_hook :inside_git_repository?, :only => [:add, :setup]
-      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip, :execute, :rake, :setup]
 
       map %w(-v --version) => :version
       desc "version", "Display shelly version"
@@ -79,39 +78,38 @@ module Shelly
       desc "add", "Add a new cloud"
       def add
         check_options(options)
-        @app = Shelly::App.new
-        @app.code_name = options["code-name"] || ask_for_code_name
-        @app.databases = options["databases"] || ask_for_databases
-        @app.size = options["size"] || "large"
-        @app.create
-
-        if overwrite_remote?(@app)
-          say "Adding remote #{@app} #{@app.git_url}", :green
-          @app.add_git_remote
+        app = Shelly::App.new
+        app.code_name = options["code-name"] || ask_for_code_name
+        app.databases = options["databases"] || ask_for_databases
+        app.size = options["size"] || "large"
+        app.create
+
+        if overwrite_remote?(app)
+          say "Adding remote #{app} #{app.git_url}", :green
+          app.add_git_remote
         else
           say "You have to manually add git remote:"
-          say "`git remote add NAME #{@app.git_url}`"
+          say "`git remote add NAME #{app.git_url}`"
         end
 
         say "Creating Cloudfile", :green
-        @app.create_cloudfile
-        if @app.attributes["trial"]
+        app.create_cloudfile
+        if app.attributes["trial"]
           say_new_line
           say "Billing information", :green
           say "Cloud created with 20 Euro credit."
           say "Remember to provide billing details before trial ends."
-          url = "#{@app.shelly.shellyapp_url}/apps/#{@app}/billing/edit"
-          say url
+          say app.edit_billing_url
         end
 
         info_adding_cloudfile_to_repository
-        info_deploying_to_shellycloud(@app)
+        info_deploying_to_shellycloud(app)
 
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         say_new_line
         say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
-        say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join(',')} --size=#{@app.size}"
+        say_error "shelly add --code-name=#{app.code_name} --databases=#{app.databases.join(',')} --size=#{app.size}"
       end
 
       desc "list", "List available clouds"
@@ -134,146 +132,136 @@ module Shelly
       end
 
       map "status" => :list
-
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "ip", "List cloud's IP addresses"
       def ip
-        @cloudfile = Cloudfile.new
-        @cloudfile.clouds.each do |cloud|
-          begin
-            @app = App.new(cloud)
-            say "Cloud #{cloud}:", :green
-            print_wrapped "Web server IP: #{@app.web_server_ip}", :ident => 2
-            print_wrapped "Mail server IP: #{@app.mail_server_ip}", :ident => 2
-          rescue Client::NotFoundException => e
-            raise unless e.resource == :cloud
-            say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
-          end
-        end
+        app = multiple_clouds(options[:cloud], "ip")
+        web_server_ip = app.web_server_ip
+        say "Cloud #{app}:", :green
+        print_wrapped "Web server IP: #{web_server_ip}", :ident => 2
+        print_wrapped "Mail server IP: #{app.mail_server_ip}", :ident => 2
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "start", "Start the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def start
-        multiple_clouds(options[:cloud], "start")
-        @app.start
-        say "Starting cloud #{@app}.", :green
+        app = multiple_clouds(options[:cloud], "start")
+        app.start
+        say "Starting cloud #{app}.", :green
         say "This can take up to 10 minutes."
         say "Check status with: `shelly list`"
       rescue Client::ConflictException => e
         case e[:state]
         when "running"
-          say_error "Not starting: cloud '#{@app}' is already running"
+          say_error "Not starting: cloud '#{app}' is already running"
         when "deploying", "configuring"
-          say_error "Not starting: cloud '#{@app}' is currently deploying"
+          say_error "Not starting: cloud '#{app}' is currently deploying"
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
           say_error "Push source code using:", :with_exit => false
-          say       "  git push #{@app} master"
+          say       "  git push #{app} master"
         when "deploy_failed", "configuration_failed"
           say_error "Not starting: deployment failed", :with_exit => false
           say_error "Support has been notified", :with_exit => false
-          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure"
+          say_error "Check `shelly deploys show last --cloud #{app}` for reasons of failure"
         when "not_enough_resources"
           say_error %{Sorry, There are no resources for your servers.
 We have been notified about it. We will be adding new resources shortly}
         when "no_billing"
-          say_error "Please fill in billing details to start #{@app}.", :with_exit => false
-          say_error "Visit: #{@app.edit_billing_url}", :with_exit => false
+          say_error "Please fill in billing details to start #{app}.", :with_exit => false
+          say_error "Visit: #{app.edit_billing_url}", :with_exit => false
         when "payment_declined"
-          say_error "Not starting. Invoice for cloud '#{@app}' was declined."
+          say_error "Not starting. Invoice for cloud '#{app}' was declined."
         end
         exit 1
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "setup", "Set up clouds"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def setup
-        say "Investigating Cloudfile"
-        cloudfile = Cloudfile.new
-        cloudfile.clouds.each do |cloud|
-          begin
-            app = App.new(cloud)
-            say "Adding #{app} cloud", :green
-            app.git_url = app.attributes["git_info"]["repository_url"]
-            if overwrite_remote?(app)
-              say "git remote add #{app} #{app.git_url}"
-              app.add_git_remote
-              say "git fetch production"
-              app.git_fetch_remote
-              say "git checkout -b #{app} --track #{app}/master"
-              app.git_add_tracking_branch
-            else
-              say "You have to manually add remote:"
-              say "`git remote add #{app} #{app.git_url}`"
-              say "`git fetch production`"
-              say "`git checkout -b #{app} --track #{app}/master`"
-            end
-
-            say_new_line
-          rescue Client::NotFoundException => e
-            raise unless e.resource == :cloud
-            say_error "You have no access to '#{app}' cloud defined in Cloudfile"
-          end
+        app = multiple_clouds(options[:cloud], "setup")
+        say "Setting up #{app} cloud", :green
+        app.git_url = app.attributes["git_info"]["repository_url"]
+        if overwrite_remote?(app)
+          say "git remote add #{app} #{app.git_url}"
+          app.add_git_remote
+          say "git fetch production"
+          app.git_fetch_remote
+          say "git checkout -b #{app} --track #{app}/master"
+          app.git_add_tracking_branch
+        else
+          say "You have to manually add remote:"
+          say "`git remote add #{app} #{app.git_url}`"
+          say "`git fetch production`"
+          say "`git checkout -b #{app} --track #{app}/master`"
         end
 
+        say_new_line
         say "Your application is set up.", :green
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "stop", "Shutdown the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def stop
-        multiple_clouds(options[:cloud], "stop")
+        app = multiple_clouds(options[:cloud], "stop")
         ask_to_stop_application
-        @app.stop
+        app.stop
         say_new_line
-        say "Cloud '#{@app}' stopped"
+        say "Cloud '#{app}' stopped"
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "delete", "Delete the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def delete
-        multiple_clouds(options[:cloud], "delete")
-        say "You are about to delete application: #{@app}."
+        app = multiple_clouds(options[:cloud], "delete")
+        say "You are about to delete application: #{app}."
         say "Press Control-C at any moment to cancel."
         say "Please confirm each question by typing yes and pressing Enter."
         say_new_line
         ask_to_delete_files
         ask_to_delete_database
         ask_to_delete_application
-        @app.delete
+        app.delete
         say_new_line
         say "Scheduling application delete - done"
         if App.inside_git_repository?
-          @app.remove_git_remote
+          app.remove_git_remote
           say "Removing git remote - done"
         else
           say "Missing git remote"
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "logs", "Show latest application logs"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def logs
         cloud = options[:cloud]
-        multiple_clouds(cloud, "logs")
+        app = multiple_clouds(cloud, "logs")
         begin
-          logs = @app.application_logs
-          say "Cloud #{@app}:", :green
+          logs = app.application_logs
+          say "Cloud #{app}:", :green
           logs.each_with_index do |log, i|
             say "Instance #{i+1}:", :green
             say log
           end
         rescue Client::NotFoundException => e
           raise unless e.resource == :cloud
-          say_error "You have no access to '#{cloud || @app}' cloud defined in Cloudfile"
+          say_error "You have no access to '#{cloud || app}' cloud defined in Cloudfile"
         end
       end
 
@@ -291,15 +279,14 @@ We have been notified about it. We will be adding new resources shortly}
         If a file name is given, run contents of that file."
       }
       def execute(file_name_or_code)
-        cloud = options[:cloud]
-        multiple_clouds(cloud, "execute")
+        app = multiple_clouds(options[:cloud], "execute #{file_name_or_code}")
 
-        result = @app.run(file_name_or_code)
+        result = app.run(file_name_or_code)
         say result
 
       rescue Client::APIException => e
         if e[:message] == "App not running"
-          say_error "Cloud #{@app} is not running. Cannot run code."
+          say_error "Cloud #{app} is not running. Cannot run code."
         else
           raise
         end
@@ -309,34 +296,34 @@ We have been notified about it. We will be adding new resources shortly}
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def rake(task = nil)
         task = rake_args.join(" ")
-        multiple_clouds(options[:cloud], "rake #{task}")
-        result = @app.rake(task)
+        app = multiple_clouds(options[:cloud], "rake #{task}")
+        result = app.rake(task)
         say result
       rescue Client::APIException => e
         raise unless e[:message] == "App not running"
-        say_error "Cloud #{@app} is not running. Cannot run rake task."
+        say_error "Cloud #{app} is not running. Cannot run rake task."
       end
 
       desc "redeploy", "Redeploy application"
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to redeploy application for"
       def redeploy
-        multiple_clouds(options[:cloud], "redeploy")
-        @app.redeploy
-        say "Redeploying your application for cloud '#{@app}'", :green
+        app = multiple_clouds(options[:cloud], "redeploy")
+        app.redeploy
+        say "Redeploying your application for cloud '#{app}'", :green
       rescue Client::ConflictException => e
         case e[:state]
         when "deploying", "configuring"
           say_error "Your application is being redeployed at the moment"
         when "no_code", "no_billing", "turned_off"
-          say_error "Cloud #{@app} is not running", :with_exit => false
-          say "Start your cloud with `shelly start --cloud #{@app}`"
+          say_error "Cloud #{app} is not running", :with_exit => false
+          say "Start your cloud with `shelly start --cloud #{app}`"
           exit 1
         else raise
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       # FIXME: move to helpers