shelly 0.0.43 → 0.0.44.pre

data/lib/shelly/cli/main.rb

@@ -9,23 +9,24 @@ module Shelly
     class Main < Command
       include Thor::Actions
 
-      register(User, "user", "user <command>", "Manages users using this cloud")
-      register(Backup, "backup", "backup <command>", "Manages database backups from this cloud")
-      register(Deploys, "deploys", "deploys <command>", "View cloud deploy logs")
-      register(Config, "config", "config <command>", "Manages cloud configuration files")
+      register(User, "user", "user <command>", "Manage collaborators")
+      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")
       check_unknown_options!
 
-      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete]
-      before_hook :inside_git_repository?, :only => [:add, :ip]
+      # FIXME: it should be possible to pass single symbol, instead of one element array
+      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete, :ip, :logout]
+      before_hook :inside_git_repository?, :only => [:add]
       before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip]
 
       map %w(-v --version) => :version
-      desc "version", "Displays shelly version"
+      desc "version", "Display shelly version"
       def version
         say "shelly version #{Shelly::VERSION}"
       end
 
-      desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
+      desc "register [EMAIL]", "Register new account"
       def register(email = nil)
         user = Shelly::User.new
         user.ssh_key_registered?
@@ -38,12 +39,10 @@ module Shelly
         end
         say "Successfully registered!"
         say "Check you mailbox for email address confirmation"
-      rescue Client::APIError => e
-        if e.validation?
-          e.each_error { |error| say_error "#{error}", :with_exit => false }
-          exit 1
-        end
-      rescue RestClient::Conflict
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error "#{error}", :with_exit => false }
+        exit 1
+      rescue Client::ConflictException
         say_error "User with your ssh key already exists.", :with_exit => false
         say_error "You can login using: shelly login [EMAIL]", :with_exit => false
         exit 1
@@ -52,7 +51,7 @@ module Shelly
         say_error "Use ssh-keygen to generate ssh key pair"
       end
 
-      desc "login [EMAIL]", "Logs user in to Shelly Cloud"
+      desc "login [EMAIL]", "Log into Shelly Cloud"
       def login(email = nil)
         user = Shelly::User.new
         raise Errno::ENOENT, user.ssh_key_path unless user.ssh_key_exists?
@@ -63,16 +62,12 @@ module Shelly
         user.upload_ssh_key
         say "Uploading your public SSH key"
         list
-      rescue Client::APIError => e
-        if e.validation?
-          e.each_error { |error| say_error "#{error}", :with_exit => false }
-        end
-        if e.unauthorized?
-          say_error "Wrong email or password", :with_exit => false
-          say_error "You can reset password by using link:", :with_exit => false
-          say_error "#{e.url}", :with_exit => false
-        end
-        exit 1
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error "#{error}", :with_exit => false }
+      rescue Client::UnauthorizedException => e
+        say_error "Wrong email or password", :with_exit => false
+        say_error "You can reset password by using link:", :with_exit => false
+        say_error "#{e[:url]}"
       rescue Errno::ENOENT => e
         say_error e, :with_exit => false
         say_error "Use ssh-keygen to generate ssh key pair"
@@ -82,11 +77,11 @@ module Shelly
         :desc => "Unique code-name of your cloud"
       method_option :databases, :type => :array, :aliases => "-d",
         :banner => Shelly::App::DATABASE_KINDS.join(', '),
-        :desc => "Array of databases of your choice"
+        :desc => "List of databases of your choice"
       method_option :domains, :type => :array,
         :banner => "CODE-NAME.shellyapp.com, YOUR-DOMAIN.com",
-        :desc => "Array of your domains"
-      desc "add", "Adds new cloud to Shelly Cloud"
+        :desc => "List of your domains"
+      desc "add", "Add a new cloud"
       def add
         check_options(options)
         @app = Shelly::App.new
@@ -107,16 +102,14 @@ module Shelly
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
 
-      rescue Client::APIError => e
-        if e.validation?
-          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} --domains=#{@app.code_name}.shellyapp.com"
-        end
+      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} --domains=#{@app.code_name}.shellyapp.com"
       end
 
-      desc "list", "Lists all your clouds"
+      desc "list", "List available clouds"
       def list
         user = Shelly::User.new
         apps = user.apps
@@ -129,16 +122,12 @@ module Shelly
         else
           say "You have no clouds yet", :green
         end
-      rescue Client::APIError => e
-        if e.unauthorized?
-          say_error "You are not logged in, use `shelly login`"
-        end
       end
+
       map "status" => :list
 
-      desc "ip", "Lists clouds IP's"
+      desc "ip", "List cloud's IP addresses"
       def ip
-        say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Cloudfile.new
         @cloudfile.clouds.each do |cloud|
           begin
@@ -146,31 +135,26 @@ module Shelly
             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::APIError => e
-            if e.not_found?
-              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
-            else
-              say_error e.message, :with_exit => false
-            end
+          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
       end
 
-      desc "start", "Starts the cloud"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to start"
+      desc "start", "Start the cloud"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def start
-        multiple_clouds(options[:cloud], "start", "Select cloud to start using:")
+        multiple_clouds(options[:cloud], "start")
         @app.start
-        say "Starting cloud #{@app.code_name}. Check status with:", :green
+        say "Starting cloud #{@app}. Check status with:", :green
         say "  shelly list"
-      rescue RestClient::Conflict => e
-        response =  JSON.parse(e.response)
-        case response['state']
+      rescue Client::ConflictException => e
+        case e[:state]
         when "running"
-          say_error "Not starting: cloud '#{@app.code_name}' is already running"
+          say_error "Not starting: cloud '#{@app}' is already running"
         when "deploying", "configuring"
-          say_error "Not starting: cloud '#{@app.code_name}' 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
@@ -178,36 +162,32 @@ module Shelly
         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 "See #{response['link']} for reasons of failure"
+          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure"
         when "no_billing"
           say_error "Please fill in billing details to start foo-production. Opening browser.", :with_exit => false
           @app.open_billing_page
         end
         exit 1
-      rescue Client::APIError => e
-        if e.not_found?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
-      desc "stop", "Stops the cloud"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to stop"
+      desc "stop", "Stop the cloud"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def stop
-        multiple_clouds(options[:cloud], "stop", "Select cloud to stop using:")
+        multiple_clouds(options[:cloud], "stop")
         @app.stop
         say "Cloud '#{@app.code_name}' stopped"
-      rescue Client::APIError => e
-        if e.not_found?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
       end
 
-      desc "delete", "Delete cloud from Shelly Cloud"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to delete"
+      desc "delete", "Delete the cloud"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def delete
-        multiple_clouds(options[:cloud], "delete", "Select cloud to delete using:")
+        multiple_clouds(options[:cloud], "delete")
         say "You are about to delete application: #{@app.code_name}."
         say "Press Control-C at any moment to cancel."
         say "Please confirm each question by typing yes and pressing Enter."
@@ -224,18 +204,16 @@ module Shelly
         else
           say "Missing git remote"
         end
-      rescue Client::APIError => e
-        if e.not_found?
-          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
-        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
       end
 
-      desc "logs", "Show latest application logs from each instance"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to show logs for"
+      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", "Select which to show logs for using:")
+        multiple_clouds(cloud, "logs")
         begin
           logs = @app.application_logs
           say "Cloud #{@app.code_name}:", :green
@@ -243,11 +221,39 @@ module Shelly
             say "Instance #{i+1}:", :green
             say log
           end
-        rescue Client::APIError => e
-          if e.not_found?
-            say_error "You have no access to cloud '#{cloud || @app.code_name}'"
-          end
+        rescue Client::NotFoundException => e
+          raise unless e.resource == :cloud
+          say_error "You have no access to '#{cloud || @app.code_name}' cloud defined in Cloudfile"
+        end
+      end
+
+      desc "logout", "Logout from Shelly Cloud"
+      def logout
+        user = Shelly::User.new
+        say "Your public SSH key has been removed from Shelly Cloud" if user.delete_ssh_key
+        say "You have been successfully logged out" if user.delete_credentials
+      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
+      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}`"
+          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
 
       # FIXME: move to helpers
@@ -257,6 +263,7 @@ module Shelly
             unless ["code-name", "databases", "domains"].all? do |option|
               options.include?(option.to_s) && options[option.to_s] != option.to_s
             end && valid_databases?(options["databases"])
+            # FIXME: ' to `
               say_error "Try 'shelly help add' for more information"
             end
           end
@@ -302,7 +309,7 @@ module Shelly
             databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
           end while not valid
 
-          databases.empty? ? ["postgresql"] : databases
+          databases.empty? ? ["postgresql"] : databases - ["none"]
         end
 
         def info_adding_cloudfile_to_repository

data/lib/shelly/cli/runner.rb

@@ -17,8 +17,12 @@ module Shelly
 
       def start
         Shelly::CLI::Main.start(args)
-      rescue => e
-        raise e if debug?
+      rescue SystemExit; raise
+      rescue Interrupt
+        say_new_line
+        say_error "[canceled]"
+      rescue Exception
+        raise if debug?
         say_error "Unknown error, to see debug information run command with --debug"
       end
     end

data/lib/shelly/cli/user.rb

@@ -7,7 +7,6 @@ module Shelly
       include Helpers
 
       before_hook :logged_in?, :only => [:list, :add]
-      before_hook :inside_git_repository?, :only => [:list, :add]
       before_hook :cloudfile_present?, :only => [:list, :add]
 
       desc "list", "List users with access to clouds defined in Cloudfile"
@@ -18,12 +17,9 @@ module Shelly
             @app = App.new(cloud)
             say "Cloud #{cloud}:"
             @app.users.each { |user| say "  #{user["email"]}" }
-          rescue Client::APIError => e
-            if e.not_found?
-              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
-            else
-              say_error e.message, :with_exit => false
-            end
+          rescue Client::NotFoundException => e
+            raise unless e.resource == :cloud
+            say_error "You have no access to '#{cloud}' cloud defined in Cloudfile"
           end
         end
       end
@@ -36,19 +32,17 @@ module Shelly
         @cloudfile.clouds.each do |cloud|
           begin
             @user.send_invitation(cloud, user_email)
-          rescue Client::APIError => e
-            if e.validation? && e.errors.include?(["email", "#{email} has already been taken"])
+            say "Sending invitation to #{user_email} to work on #{cloud}", :green
+          rescue Client::ValidationException => e
+            if e.errors.include?(["email", "#{email} has already been taken"])
               say_error "User #{email} is already in the cloud #{cloud}", :with_exit => false
-            elsif e.not_found?
-              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
-            elsif e.validation?
+            else
               e.each_error { |error| say_error error, :with_exit => false }
               exit 1
-            else
-              say_error e.message, :with_exit => false
             end
-          else
-            say "Sending invitation to #{user_email} to work on #{cloud}", :green
+          rescue Client::NotFoundException => e
+            raise unless e.resource == :cloud
+            say_error "You have no access to '#{cloud}' cloud defined in Cloudfile"
           end
         end
       end

data/lib/shelly/client.rb

@@ -4,41 +4,24 @@ require "cgi"
 
 module Shelly
   class Client
-    class APIError < Exception
+    class APIException < Exception
       attr_reader :status_code, :body
 
-      def initialize(status_code, body = {})
+      def initialize(body = {}, status_code = nil)
         @status_code = status_code
         @body = body
       end
 
-      def message
-        body["message"]
+      def [](key)
+        body[key.to_s]
       end
+    end
 
+    class UnauthorizedException < APIException; end
+    class ConflictException < APIException; end
+    class ValidationException < APIException
       def errors
-        body["errors"]
-      end
-
-      def url
-        body["url"]
-      end
-
-      def validation?
-        message == "Validation Failed"
-      end
-
-      def not_found?
-        status_code == 404
-      end
-
-      def resource_not_found
-        return unless not_found?
-        message =~ /Couldn't find (.*) with/ && $1.downcase.to_sym
-      end
-
-      def unauthorized?
-        status_code == 401
+        self[:errors]
       end
 
       def each_error
@@ -47,6 +30,11 @@ module Shelly
         end
       end
     end
+    class NotFoundException < APIException
+      def resource
+        self[:resource].to_sym
+      end
+    end
 
     attr_reader :email, :password
 
@@ -104,7 +92,11 @@ module Shelly
     end
 
     def add_ssh_key(ssh_key)
-      post("/ssh_key", :ssh_key => ssh_key)
+      post("/ssh_keys", :ssh_key => ssh_key)
+    end
+
+    def logout(ssh_key)
+      delete("/ssh_keys", :ssh_key => ssh_key)
     end
 
     def start_cloud(cloud)
@@ -124,15 +116,15 @@ module Shelly
     end
 
     def deploy_logs(cloud)
-      get("/apps/#{cloud}/deploys")
+      get("/apps/#{cloud}/deployment_logs")
     end
 
     def deploy_log(cloud, log)
-      get("/apps/#{cloud}/deploys/#{log}")
+      get("/apps/#{cloud}/deployment_logs/#{log}")
     end
 
     def application_logs(cloud)
-      get("/apps/#{cloud}/logs")
+      get("/apps/#{cloud}/application_logs")
     end
 
     def database_backups(code_name)
@@ -159,6 +151,10 @@ module Shelly
       get("/apps/#{cloud}/users")
     end
 
+    def redeploy(cloud)
+      post("/apps/#{cloud}/deploys")
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end
@@ -220,10 +216,18 @@ module Shelly
     def process_response(response)
       body = JSON.parse(response.body) rescue JSON::ParserError && {}
       code = response.code
-      raise APIError.new(code, body) if (400..599).include?(code)
+      if (400..599).include?(code)
+        exception_class = case response.code
+        when 401; UnauthorizedException
+        when 404; NotFoundException
+        when 409; ConflictException
+        when 422; ValidationException
+        else; APIException
+        end
+        raise exception_class.new(body, code)
+      end
       response.return!
       body
     end
   end
 end
-

data/lib/shelly/download_progress_bar.rb

@@ -6,7 +6,7 @@ module Shelly
       super("Progress", total)
       self.format_arguments = [:title, :percentage, :bar, :stat_for_file_transfer]
     end
-  
+
     def progress_callback
       lambda { |size| inc(size) }
     end

data/lib/shelly/helpers.rb

@@ -63,19 +63,15 @@ module Shelly
       user = Shelly::User.new
       user.token
       user
-    rescue Client::APIError => e
-      if e.unauthorized?
-        say_error "You are not logged in. To log in use:", :with_exit => false
-        say "  shelly login"
-        exit 1
-      end
+    rescue Client::UnauthorizedException
+      say_error "You are not logged in. To log in use: `shelly login`"
     end
 
-    def multiple_clouds(cloud, action, message)
+    def multiple_clouds(cloud, action)
       clouds = Cloudfile.new.clouds
       if clouds.count > 1 && cloud.nil?
-        say "You have multiple clouds in Cloudfile. #{message}"
-        say "  shelly #{action} --cloud #{clouds.first}"
+        say_error "You have multiple clouds in Cloudfile.", :with_exit => false
+        say "Select cloud using `shelly #{action} --cloud #{clouds.first}`"
         say "Available clouds:"
         clouds.each do |cloud|
           say " * #{cloud}"
@@ -85,6 +81,5 @@ module Shelly
       @app = Shelly::App.new
       @app.code_name = cloud || clouds.first
     end
-
   end
 end

data/lib/shelly/user.rb

@@ -44,6 +44,14 @@ module Shelly
       set_credentials_permissions
     end
 
+    def delete_credentials
+      File.delete(credentials_path) if credentials_exists?
+    end
+
+    def delete_ssh_key
+      shelly.logout(File.read(ssh_key_path)) if ssh_key_exists?
+    end
+
     def ssh_key_exists?
       File.exists?(ssh_key_path)
     end
@@ -53,8 +61,8 @@ module Shelly
     end
 
     def ssh_key_registered?
-    	ssh_key = File.read(ssh_key_path).strip
-    	shelly.ssh_key_available?(ssh_key)
+      ssh_key = File.read(ssh_key_path).strip
+      shelly.ssh_key_available?(ssh_key)
     end
 
     def self.guess_email

data/lib/shelly/version.rb

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

data/lib/thor/thor.rb

@@ -5,6 +5,10 @@ class Thor
       @hook[method] = options
     end
 
+    def hooks
+      @hook
+    end
+
     def send(*args)
       if args.first == :dispatch && !args[2].empty?
         running_task = args[2].first

data/shelly.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "simplecov"
   if RUBY_PLATFORM =~ /darwin/
-    s.add_development_dependency "growl_notify"
+    s.add_development_dependency "ruby_gntp"
     s.add_development_dependency "rb-fsevent"
   end
   s.add_development_dependency "fakefs"

data/spec/helpers.rb

@@ -15,5 +15,12 @@ module RSpec
     def red(string)
       "\e[31m#{string}\e[0m"
     end
+
+    def hooks(model, method)
+      model.class.hooks.inject([]) do |result, v|
+        result << v[0] if v[1][:only].include?(method)
+        result
+      end
+    end
   end
 end

data/spec/shelly/app_spec.rb

@@ -82,24 +82,24 @@ describe Shelly::App do
       @app.delete_config("path")
     end
   end
-  
+
   describe "#attributes" do
     before do
       @response = {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
       @client.stub(:app).and_return(@response)
     end
-    
+
     it "should fetch app attributes from API and cache them" do
       @client.should_receive(:app).with("foo-staging").exactly(:once).and_return(@response)
       2.times { @app.attributes }
     end
-    
+
     describe "#web_server_ip" do
       it "should return web server ip address" do
         @app.web_server_ip.should == "192.0.2.1"
       end
     end
-    
+
     describe "#mail_server_ip" do
       it "should return mail server ip address" do
         @app.mail_server_ip.should == "192.0.2.3"
@@ -280,6 +280,13 @@ config
       end
     end
   end
+  
+  describe "#redeploy" do
+    it "should redeploy app via API" do
+      @client.should_receive(:redeploy).with("foo-staging")
+      @app.redeploy
+    end
+  end
 
   describe "#to_s" do
     it "should return code_name" do
@@ -287,4 +294,3 @@ config
     end
   end
 end
-