shelly 0.1.9 → 0.1.10

data/lib/shelly/app.rb

@@ -170,7 +170,7 @@ module Shelly
     end
 
     def rake(task)
-      ssh("rake_runner \"#{task}\"")
+      ssh_command("rake_runner \"#{task}\"")
     end
 
     def attributes
@@ -213,22 +213,35 @@ module Shelly
       Launchy.open("http://#{attributes["domain"]}")
     end
 
-    def node_and_port
-      shelly.node_and_port(code_name)
+    def console
+      ssh_command
     end
 
-    def console
-      ssh
+    def upload(source)
+      rsync(source, "#{ssh['node_ip']}:/srv/glusterfs/disk")
+    end
+
+    def download(relative_source, destination)
+      source = File.join("#{ssh['node_ip']}:/srv/glusterfs/disk", relative_source)
+      rsync(source, destination)
+    end
+
+    private
+
+    def ssh
+      @ssh ||= shelly.node_and_port(code_name)
+    end
+
+    def ssh_command(command = "")
+      exec "ssh #{ssh_options} #{ssh['node_ip']} #{command}"
     end
 
-    def ssh(command = "")
-      params = node_and_port
-      exec "ssh -o StrictHostKeyChecking=no -p #{params['port']} -l #{params['user']} #{params['node_ip']} #{command}"
+    def ssh_options
+      "-o StrictHostKeyChecking=no -p #{ssh['port']} -l #{ssh['user']}"
     end
 
-    def upload(path)
-      params = node_and_port
-      exec "rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p #{params['port']}' --progress #{path} #{params['user']}@#{params['node_ip']}:/srv/glusterfs/disk"
+    def rsync(source, destination)
+      exec "rsync -avz -e 'ssh #{ssh_options}' --progress #{source} #{destination}"
     end
   end
 end

data/lib/shelly/cli/backup.rb

@@ -28,9 +28,6 @@ module Shelly
         else
           say "No database backups available"
         end
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "get [FILENAME]", "Download database backup"
@@ -48,14 +45,9 @@ module Shelly
         say_new_line
         say "Backup file saved to #{backup.filename}", :green
       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
-        end
+        raise unless e.resource == :database_backup
+        say_error "Backup not found", :with_exit => false
+        say "You can list available backups with `shelly backup list` command"
       end
 
       desc "create [DB_KIND]", "Create backup of given database"
@@ -70,9 +62,6 @@ module Shelly
           "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"
       end
 
       desc "restore FILENAME", "Restore database to state from given backup"
@@ -86,14 +75,9 @@ module Shelly
         say_new_line
         say "Restore has been scheduled. Wait a few minutes till database is restored.", :green
       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
-        end
+        raise unless e.resource == :database_backup
+        say_error "Backup not found", :with_exit => false
+        say "You can list available backups with `shelly backup list` command"
       end
     end
   end

data/lib/shelly/cli/config.rb

@@ -30,9 +30,6 @@ module Shelly
         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
 
       desc "show PATH", "View configuration file"
@@ -42,14 +39,9 @@ module Shelly
         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}' 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
-        end
+        raise unless e.resource == :config
+        say_error "Config '#{path}' not found", :with_exit => false
+        say_error "You can list available config files with `shelly config list --cloud #{app}`"
       end
 
       map "new" => :create
@@ -61,9 +53,6 @@ module Shelly
         say "File '#{path}' created.", :green
         say "To make changes to running application redeploy it using:"
         say "`shelly redeploy --cloud #{app}`"
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        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
@@ -81,14 +70,9 @@ module Shelly
         say "To make changes to running application redeploy it using:"
         say "`shelly redeploy --cloud #{app}`"
       rescue Client::NotFoundException => e
-        case e.resource
-        when :cloud
-          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}`"
-        else raise
-        end
+        raise unless e.resource == :config
+        say_error "Config '#{path}' not found", :with_exit => false
+        say_error "You can list available config files with `shelly config list --cloud #{app}`"
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         exit 1
@@ -108,14 +92,9 @@ module Shelly
           say "File not deleted"
         end
       rescue Client::NotFoundException => e
-        case e.resource
-        when :cloud
-          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}`"
-        else raise
-        end
+        raise unless e.resource == :config
+        say_error "Config '#{path}' not found", :with_exit => false
+        say_error "You can list available config files with `shelly config list --cloud #{app}`"
       end
 
       no_tasks do
@@ -145,7 +124,6 @@ module Shelly
           say_error "Please set EDITOR environment variable"
         end
       end
-
     end
   end
 end

data/lib/shelly/cli/deploys.rb

@@ -22,9 +22,6 @@ module Shelly
         else
           say "No deploy logs available"
         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"
@@ -49,13 +46,8 @@ module Shelly
           say("Starting thin", :green); say(content["thin_restart"])
         end
       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
+        raise unless e.resource == :log
+        say_error "Log not found, list all deploy logs using `shelly deploys list --cloud=#{app.code_name}`"
       end
 
       no_tasks do

data/lib/shelly/cli/files.rb

@@ -0,0 +1,43 @@
+require "shelly/cli/command"
+
+module Shelly
+  module CLI
+    class Files < Command
+      namespace :files
+      include Helpers
+
+      before_hook :logged_in?, :only => [:upload, :download]
+      before_hook :require_rsync, :only => [:upload, :download]
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+
+      desc "upload PATH", "Upload files to persistent data storage"
+      def upload(path)
+        app = multiple_clouds(options[:cloud], "upload #{path}")
+        app.upload(path)
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot upload files."
+      end
+
+      desc "download [SOURCE_PATH] [DEST_PATH]", "Download files from persistent data storage"
+      long_desc %{
+        Download files from persistent data storage.\n
+        SOURCE_PATH - optional source directory or file.\n
+        DEST_PATH - optional destination where files should be saved. By default is current working directory.
+      }
+      def download(relative_source = ".", destination = ".")
+        app = multiple_clouds(options[:cloud], "download #{relative_source} #{destination}")
+        app.download(relative_source, destination)
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot download files."
+      end
+
+      no_tasks do
+        def require_rsync
+          unless command_exists?("rsync")
+            say_error "You need to install rsync in order to upload and download files"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shelly/cli/main.rb

@@ -3,6 +3,7 @@ require "shelly/cli/user"
 require "shelly/cli/backup"
 require "shelly/cli/deploys"
 require "shelly/cli/config"
+require "shelly/cli/files"
 
 module Shelly
   module CLI
@@ -13,10 +14,12 @@ module Shelly
       register(Backup, "backup", "backup <command>", "Manage database backups")
       register(Deploys, "deploys", "deploys <command>", "View deploy logs")
       register(Config, "config", "config <command>", "Manage application configuration files")
+      register(Files, "files", "files <command>", "Upload and download files to and from persistent storage")
+
       check_unknown_options!(:except => :rake)
 
       # 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, :info, :ip, :logout, :execute, :rake, :setup, :console, :upload]
+      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
@@ -159,9 +162,6 @@ module Shelly
             print_wrapped "CPU: #{stat['cpu']['wait']}%, MEM: #{stat['memory']['percent']}%, SWAP: #{stat['swap']['percent']}%", :ident => 6
           end
         end
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       rescue Client::GatewayTimeoutException
         say_error "Server statistics temporarily unavailable"
       end
@@ -198,9 +198,6 @@ We have been notified about it. We will be adding new resources shortly}
           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"
       end
 
       desc "setup", "Set up clouds"
@@ -225,9 +222,6 @@ We have been notified about it. We will be adding new resources shortly}
 
         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"
@@ -263,9 +257,6 @@ We have been notified about it. We will be adding new resources shortly}
         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"
       end
 
       desc "logs", "Show latest application logs"
@@ -276,28 +267,23 @@ We have been notified about it. We will be adding new resources shortly}
       def logs
         cloud = options[:cloud]
         app = multiple_clouds(cloud, "logs")
-        begin
-          limit = options[:limit].to_i <= 0 ? 100 : options[:limit]
-          query = {:limit => limit}
-          query.merge!(:from => options[:from]) if options[:from]
-
-          logs = app.application_logs(query)
-          print_logs(logs)
-
-          if options[:tail]
-            loop do
-              logs = app.application_logs(:from => logs['range']['last'])
-              print_logs(logs)
-              sleep 1
-            end
+        limit = options[:limit].to_i <= 0 ? 100 : options[:limit]
+        query = {:limit => limit}
+        query.merge!(:from => options[:from]) if options[:from]
+
+        logs = app.application_logs(query)
+        print_logs(logs)
+
+        if options[:tail]
+          loop do
+            logs = app.application_logs(:from => logs['range']['last'])
+            print_logs(logs)
+            sleep 1
           end
-        rescue Client::NotFoundException => e
-          raise unless e.resource == :cloud
-          say_error "You have no access to '#{cloud || app}' cloud defined in Cloudfile"
-        rescue Client::APIException => e
-          raise e unless e.status_code == 416
-          say_error "You have requested too many log messages. Try a lower number."
         end
+      rescue Client::APIException => e
+        raise e unless e.status_code == 416
+        say_error "You have requested too many log messages. Try a lower number."
       end
 
       desc "logout", "Logout from Shelly Cloud"
@@ -313,9 +299,6 @@ We have been notified about it. We will be adding new resources shortly}
         task = rake_args.join(" ")
         app = multiple_clouds(options[:cloud], "rake #{task}")
         app.rake(task)
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run rake task."
       end
@@ -337,9 +320,6 @@ We have been notified about it. We will be adding new resources shortly}
           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"
       end
 
       desc "open", "Open application page in browser"
@@ -360,29 +340,10 @@ We have been notified about it. We will be adding new resources shortly}
       def console
         app = multiple_clouds(options[:cloud], "console")
         app.console
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run console."
       end
 
-      desc "upload PATH", "Upload files to persisted data storage"
-      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
-      def upload(path)
-        unless command_exists?("rsync")
-          say_error "You need to install rsync in order to use `shelly upload`"
-        end
-        app = multiple_clouds(options[:cloud], "upload #{path}")
-        app.upload(path)
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
-      rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot upload files."
-      end
-
-      require 'bundler'
       desc "check", "List all requirements and check which are fulfilled"
       def check
         s = Shelly::StructureValidator.new

data/lib/shelly/cli/runner.rb

@@ -21,6 +21,10 @@ module Shelly
       rescue Client::UnauthorizedException
         raise if debug?
         say_error "You are not logged in. To log in use: `shelly login`"
+        desc "download [SOURCE_PATH] [DEST_PATH]", "Download files from persitent data storage"
+      rescue Client::NotFoundException => e
+        raise if debug? or e.resource != :cloud
+        say_error "You have no access to '#{e.id}' cloud defined in Cloudfile"
       rescue Client::GemVersionException => e
         raise if debug?
         say "Required shelly gem version: #{e.body["required_version"]}"

data/lib/shelly/cli/user.rb

@@ -16,9 +16,6 @@ module Shelly
         app.active_collaborations.each { |c| say "  #{c["email"]}" }
         app.inactive_collaborations.each { |c|
           say "  #{c["email"]} (invited)" }
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "add [EMAIL]", "Add new developer to clouds defined in Cloudfile"
@@ -35,9 +32,6 @@ module Shelly
           e.each_error { |error| say_error error, :with_exit => false }
           exit 1
         end
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :cloud
-        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
       end
 
       desc "delete [EMAIL]", "Remove developer from clouds defined in Cloudfile"
@@ -50,16 +44,10 @@ module Shelly
       rescue Client::ConflictException => e
         say_error e[:message]
       rescue Client::NotFoundException => e
-        case e.resource
-        when :cloud
-          say_error "You have no access to '#{app}' cloud defined in Cloudfile"
-        when :user
-          say_error "User '#{user_email}' not found", :with_exit => false
-          say_error "You can list users with `shelly user list`"
-        else raise
-        end
+        raise unless e.resource == :user
+        say_error "User '#{user_email}' not found", :with_exit => false
+        say_error "You can list users with `shelly user list`"
       end
-
     end
   end
 end

data/lib/shelly/client.rb

@@ -37,6 +37,10 @@ module Shelly
       def resource
         self[:resource].to_sym
       end
+
+      def id
+        self[:id]
+      end
     end
 
     attr_reader :email, :password

data/lib/shelly/structure_validator.rb

@@ -1,4 +1,5 @@
 require 'grit'
+require 'bundler'
 
 module Shelly
   class StructureValidator

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/spec/shelly/app_spec.rb

@@ -312,13 +312,6 @@ describe Shelly::App do
     end
   end
 
-  describe "#node_and_console" do
-    it "should fetch instance data from Api" do
-      @client.should_receive(:node_and_port).with("foo-staging")
-      @app.node_and_port
-    end
-  end
-
   describe "#console" do
     it "should run ssh with all parameters" do
       @client.stub(:node_and_port).and_return(
@@ -329,14 +322,23 @@ describe Shelly::App do
   end
 
   describe "#upload" do
-    it "should run rsync with all parameters" do
+    it "should run rsync with proper parameters" do
       @client.stub(:node_and_port).and_return(
         {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010' --progress /path foo@10.0.0.1:/srv/glusterfs/disk")
+      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path 10.0.0.1:/srv/glusterfs/disk")
       @app.upload("/path")
     end
   end
 
+  describe "#download" do
+    it "should run rsync with proper parameters" do
+      @client.stub(:node_and_port).and_return(
+        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress 10.0.0.1:/srv/glusterfs/disk/. /tmp")
+      @app.download(".", "/tmp")
+    end
+  end
+
   describe "#create_cloudfile" do
     it "should create cloudfile with app attributes" do
       @app.ruby_version = "1.9.3"

data/spec/shelly/cli/backup_spec.rb

@@ -36,13 +36,6 @@ describe Shelly::CLI::Backup do
       invoke(@backup, :list)
     end
 
-    it "should exit if user doesn't have access to cloud in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:database_backups).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-      lambda { invoke(@backup, :list) }.should raise_error(SystemExit)
-    end
-
     it "should take cloud from command line for which to show backups" do
       @client.should_receive(:database_backups).with("foo-staging").and_return([{"filename" => "backup.postgre.tar.gz", "human_size" => "10kb", "size" => 12345},{"filename" => "backup.mongo.tar.gz", "human_size" => "22kb", "size" => 333}])
       $stdout.should_receive(:puts).with(green "Available backups:")
@@ -136,13 +129,6 @@ describe Shelly::CLI::Backup do
       invoke(@backup, :create)
     end
 
-    it "should exit if user doesn't have access to cloud in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new({"resource" => "cloud"})
-      @client.stub(:request_backup).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-      lambda { invoke(@backup, :create) }.should raise_error(SystemExit)
-    end
-
     it "should display errors and exit 1 when kind is not valid" do
       response = {"message" => "Wrong KIND argument. User one of following: postgresql, mongodb, redis"}
       exception = Shelly::Client::ValidationException.new(response)

data/spec/shelly/cli/config_spec.rb

@@ -33,13 +33,6 @@ describe Shelly::CLI::Config do
       invoke(@config, :list)
     end
 
-    it "should exit if user doesn't have access to cloud in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:app_configs).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@config, :list) }.should raise_error(SystemExit)
-    end
-
     it "should list available configuration files for clouds" do
       @client.should_receive(:app_configs).with("foo-production").and_return([{"created_by_user" => false, "path" => "config/app.yml"}])
       $stdout.should_receive(:puts).with(green "Configuration files for foo-production")
@@ -82,17 +75,6 @@ describe Shelly::CLI::Config do
           }.should raise_error(SystemExit)
         end
       end
-
-      context "when user doesn't have access to cloud" do
-        it "should display error message and exit with 1" do
-          exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-          @client.should_receive(:app_config).and_raise(exception)
-          $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-          lambda {
-            invoke(@config, :show, "config/app.yml")
-          }.should raise_error(SystemExit)
-        end
-      end
     end
   end
 
@@ -192,17 +174,6 @@ describe Shelly::CLI::Config do
         end
       end
 
-      context "when user doesn't have access to cloud" do
-        it "should display error message and exit with 1" do
-          exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-          @client.should_receive(:app_config).and_raise(exception)
-          $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-          lambda {
-            invoke(@config, :edit, "config/app.yml")
-          }.should raise_error(SystemExit)
-        end
-      end
-
       context "on validation errors" do
         it "should display validation errors" do
           exception = Shelly::Client::ValidationException.new({"errors" => [["path", "is already taken"]]})
@@ -262,19 +233,6 @@ describe Shelly::CLI::Config do
           end
         end
       end
-
-      context "when user doesn't have access to cloud" do
-        it "should display error message and exit with 1" do
-          exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-          @client.should_receive(:app_delete_config).and_raise(exception)
-          $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-          fake_stdin(["y"]) do
-            lambda {
-              invoke(@config, :delete, "config/app.yml")
-            }.should raise_error(SystemExit)
-          end
-        end
-      end
     end
   end
 end

data/spec/shelly/cli/deploys_spec.rb

@@ -33,12 +33,6 @@ describe Shelly::CLI::Deploys do
       invoke(@deploys, :list)
     end
 
-    it "should exit if user doesn't have access to cloud in Cloudfile" do
-      @client.stub(:deploy_logs).and_raise(Shelly::Client::NotFoundException.new("resource" => "cloud"))
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-      lambda { invoke(@deploys, :list) }.should raise_error(SystemExit)
-    end
-
     it "should display available logs" do
       @client.should_receive(:deploy_logs).with("foo-staging").and_return([
         {"failed" => false, "created_at" => "2011-12-12-14-14-59"},
@@ -69,15 +63,6 @@ describe Shelly::CLI::Deploys do
       invoke(@deploys, :show, "last")
     end
 
-    context "user doesn't have access to cloud" do
-      it "should exit 1 with message" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:deploy_log).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        lambda { @deploys.show("last") }.should raise_error(SystemExit)
-      end
-    end
-
     context "log not found" do
       it "should exit 1 with message" do
         exception = Shelly::Client::NotFoundException.new("resource" => "log")

data/spec/shelly/cli/files_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+require "shelly/cli/files"
+
+describe Shelly::CLI::Files do
+  before do
+    FileUtils.stub(:chmod)
+    @cli_files = Shelly::CLI::Files.new
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    @client.stub(:token).and_return("abc")
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    @app = Shelly::App.new("foo-staging")
+    Shelly::App.stub(:new).and_return(@app)
+    File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
+  end
+
+  describe "#upload" do
+    it "should ensure user has logged in" do
+      hooks(@cli_files, :upload).should include(:logged_in?)
+    end
+
+    it "should upload files" do
+      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
+      @client.stub(:node_and_port).and_return(expected)
+      @app.should_receive(:upload).with("some/path")
+      invoke(@cli_files, :upload, "some/path")
+    end
+
+    it "should exit if rsync isn't installed" do
+      FakeFS::File.stub(:executable?).and_return(false)
+
+      $stdout.should_receive(:puts).with(red "You need to install rsync in order to upload and download files")
+      lambda { invoke(@cli_files, :upload, "some/path") }.should raise_error(SystemExit)
+    end
+
+    context "cloud is not running" do
+      it "should display error" do
+        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
+        lambda {
+          invoke(@cli_files, :upload, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe "#download" do
+    it "should ensure user has logged in" do
+      hooks(@cli_files, :download).should include(:logged_in?)
+    end
+
+    it "should exit if rsync isn't installed" do
+      FakeFS::File.stub(:executable?).and_return(false)
+      $stdout.should_receive(:puts).with(red "You need to install rsync in order to upload and download files")
+      lambda { invoke(@cli_files, :download, "some/path") }.should raise_error(SystemExit)
+    end
+
+    it "should download files" do
+      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
+      @client.stub(:node_and_port).and_return(expected)
+      @app.should_receive(:download).with("some/path", "/destination")
+      invoke(@cli_files, :download, "some/path", "/destination")
+    end
+  end
+end

data/spec/shelly/cli/main_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 require "shelly/cli/main"
+require "grit"
 
 describe Shelly::CLI::Main do
   before do
@@ -32,6 +33,7 @@ Tasks:
   shelly delete             # Delete the cloud
   shelly deploys <command>  # View deploy logs
   shelly execute CODE       # Run code on one of application servers
+  shelly files <command>    # Upload and download files to and from persistent storage
   shelly help [TASK]        # Describe available tasks or one specific task
   shelly info               # Show basic information about cloud
   shelly list               # List available clouds
@@ -45,7 +47,6 @@ Tasks:
   shelly setup              # Set up clouds
   shelly start              # Start the cloud
   shelly stop               # Shutdown the cloud
-  shelly upload PATH        # Upload files to persisted data storage
   shelly user <command>     # Manage collaborators
   shelly version            # Display shelly version
 
@@ -558,13 +559,6 @@ OUT
       hooks(@main, :start).should include(:logged_in?)
     end
 
-    it "should exit if user doesn't have access to clouds in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:start_cloud).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@main, :start) }.should raise_error(SystemExit)
-    end
-
     context "single cloud in Cloudfile" do
       it "should start the cloud" do
         @client.stub(:start_cloud)
@@ -832,15 +826,6 @@ We have been notified about it. We will be adding new resources shortly")
       end
     end
 
-    context "on failure" do
-      it "should raise an error if user does not have access to cloud" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:app).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-        lambda { invoke(@main, :ip) }.should raise_error(SystemExit)
-      end
-    end
-
     def response(options = {})
       { "code_name" => "foo-production",
         "state" => "running",
@@ -1010,25 +995,6 @@ We have been notified about it. We will be adding new resources shortly")
       end
     end
 
-    context "when cloud given in option doesn't exist" do
-      before do
-        File.open("Cloudfile", 'w') {|f|
-          f.write("foo-staging:\n") }
-      end
-
-      it "should raise Client::NotFoundException" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @app.stub(:delete).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-bar' cloud defined in Cloudfile")
-        lambda{
-          fake_stdin(["yes", "yes", "yes"]) do
-            @main.options = {:cloud => "foo-bar"}
-            invoke(@main, :delete)
-          end
-        }.should raise_error(SystemExit)
-      end
-    end
-
     context "when no cloud option is given" do
       before do
         File.open("Cloudfile", 'w') {|f|
@@ -1112,14 +1078,6 @@ We have been notified about it. We will be adding new resources shortly")
       invoke(@main, :logs)
     end
 
-    it "should exit if user doesn't have access to clouds in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:application_logs).and_raise(exception)
-      $stdout.should_receive(:puts).
-        with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@main, :logs) }.should raise_error(SystemExit)
-    end
-
     it "should exit if user requested too many log lines" do
       exception = Shelly::Client::APIException.new({}, 416)
       @client.stub(:application_logs).and_raise(exception)
@@ -1185,16 +1143,6 @@ We have been notified about it. We will be adding new resources shortly")
         @main.rake_args.should == @main.rake_args(ARGV)
       end
     end
-
-    context "cloud is not in running state" do
-      it "should print error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
-        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
-        lambda {
-          invoke(@main, :upload, "some/path")
-        }.should raise_error(SystemExit)
-      end
-    end
   end
 
   describe "#redeploy" do
@@ -1305,13 +1253,6 @@ We have been notified about it. We will be adding new resources shortly")
       invoke(@main, :console)
     end
 
-    it "should exit if user doesn't have access to clouds in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:node_and_port).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@main, :console) }.should raise_error(SystemExit)
-    end
-
     context "Instances are not running" do
       it "should display error" do
         @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
@@ -1323,51 +1264,6 @@ We have been notified about it. We will be adding new resources shortly")
     end
   end
 
-  describe "#upload" do
-    before do
-      @client.stub(:token).and_return("abc")
-      @app = Shelly::App.new("foo-production")
-      Shelly::App.stub(:new).and_return(@app)
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
-    end
-
-    it "should ensure user has logged in" do
-      hooks(@main, :upload).should include(:logged_in?)
-    end
-
-    it "should upload files" do
-      expected = {"port" => "40010", "node_ip" => "10.0.0.10", "user"=>"foo-production"}
-      @client.stub(:node_and_port).and_return(expected)
-      @app.should_receive(:upload).with("some/path")
-      invoke(@main, :upload, "some/path")
-    end
-
-    it "should exit if user doesn't have access to clouds in Cloudfile" do
-      exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-      @client.stub(:node_and_port).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@main, :upload, "some/path") }.should raise_error(SystemExit)
-    end
-
-    it "should exit if rsync isn't installed" do
-      FakeFS::File.stub(:executable?).and_return(false)
-      $stdout.should_receive(:puts).with(red "You need to install rsync in order to use `shelly upload`")
-      lambda { invoke(@main, :upload, "some/path") }.should raise_error(SystemExit)
-    end
-
-    context "Instances are not running" do
-      it "should display error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
-        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
-        lambda {
-          invoke(@main, :upload, "some/path")
-        }.should raise_error(SystemExit)
-      end
-    end
-  end
-
   describe "#check" do
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)

data/spec/shelly/cli/runner_spec.rb

@@ -65,16 +65,38 @@ describe Shelly::CLI::Runner do
       }.should raise_error(SystemExit)
     end
 
-    it "should rescue unauthorized exception and display message" do
-      @client = mock
-      runner = Shelly::CLI::Runner.new(%w(status))
-      Shelly::Client.stub(:new).and_return(@client)
-      @client.stub(:token).and_return("abc")
-      @client.stub(:apps).and_raise(Shelly::Client::UnauthorizedException.new)
-      $stdout.should_receive(:puts).with("You are not logged in. To log in use: `shelly login`")
-      lambda {
-        runner.start
-      }.should raise_error(SystemExit)
+    describe "API exception handling" do
+      before do
+        @client = mock
+        Shelly::Client.stub(:new).and_return(@client)
+        @client.stub(:token).and_return("abc")
+        @runner = Shelly::CLI::Runner.new(%w(status))
+      end
+
+      it "should rescue unauthorized exception and display message" do
+        @client.stub(:apps).and_raise(Shelly::Client::UnauthorizedException.new)
+        $stdout.should_receive(:puts).with("You are not logged in. To log in use: `shelly login`")
+        lambda {
+          @runner.start
+        }.should raise_error(SystemExit)
+      end
+
+      it "should rescue not found exception for cloud" do
+        exception = Shelly::Client::NotFoundException.new({"resource" => "cloud", "id" => "foooo"}, 404)
+        @client.stub(:apps).and_raise(exception)
+        $stdout.should_receive(:puts).with("You have no access to 'foooo' cloud defined in Cloudfile")
+        lambda {
+          @runner.start
+        }.should raise_error(SystemExit)
+      end
+
+      it "should re-raise not found exception for non cloud" do
+        exception = Shelly::Client::NotFoundException.new({"resource" => "config"}, 404)
+        @client.stub(:apps).and_raise(exception)
+        lambda {
+          @runner.start
+        }.should raise_error(Shelly::Client::NotFoundException)
+      end
     end
 
     context "with --debug option (debug mode)" do

data/spec/shelly/cli/user_spec.rb

@@ -53,15 +53,6 @@ describe Shelly::CLI::User do
         invoke(@cli_user, :list)
       end
     end
-
-    context "on failure" do
-      it "should exit with 1 if user does not have access to cloud" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:collaborations).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        lambda { invoke(@cli_user, :list) }.should raise_error(SystemExit)
-      end
-    end
   end
 
   describe "#add" do
@@ -102,17 +93,6 @@ describe Shelly::CLI::User do
         invoke(@cli_user, :add, "megan@example.com")
       end
     end
-
-    context "on failure" do
-      it "should raise error if user doesnt have access to cloud" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:send_invitation).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        lambda {
-          invoke(@cli_user, :add, "megan@example.com")
-        }.should raise_error(SystemExit)
-      end
-    end
   end
 
   describe "#delete" do
@@ -164,15 +144,6 @@ describe Shelly::CLI::User do
         }.should raise_error(SystemExit)
       end
 
-      it "should raise error if user doesnt have access to cloud" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:delete_collaboration).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        lambda {
-          invoke(@cli_user, :delete, "megan@example.com")
-        }.should raise_error(SystemExit)
-      end
-
       it "should show that user can't delete own collaboration" do
         exception = Shelly::Client::ConflictException.new("message" =>
           "Can't remove own collaboration")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -291,6 +291,7 @@ files:
 - lib/shelly/cli/command.rb
 - lib/shelly/cli/config.rb
 - lib/shelly/cli/deploys.rb
+- lib/shelly/cli/files.rb
 - lib/shelly/cli/main.rb
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
@@ -316,6 +317,7 @@ files:
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
 - spec/shelly/cli/deploys_spec.rb
+- spec/shelly/cli/files_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
@@ -359,6 +361,7 @@ test_files:
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
 - spec/shelly/cli/deploys_spec.rb
+- spec/shelly/cli/files_spec.rb
 - spec/shelly/cli/main_spec.rb
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb