shelly 0.0.28 → 0.0.29

data/lib/shelly/app.rb

@@ -8,11 +8,19 @@ module Shelly
     attr_accessor :code_name, :databases, :ruby_version, :environment,
       :git_url, :domains
 
+    def initialize(code_name = nil)
+      self.code_name = code_name
+    end
+
     def add_git_remote
       system("git remote rm production > /dev/null 2>&1")
       system("git remote add production #{git_url}")
     end
 
+    def remove_git_remote
+      system("git remote rm production > /dev/null 2>&1")
+    end
+
     def generate_cloudfile
       @email = current_user.email
       template = File.read(cloudfile_template_path)
@@ -33,11 +41,28 @@ module Shelly
       self.environment = response["environment"]
     end
 
+    def delete(code_name)
+      shelly.delete_app(code_name)
+      #response = shelly.delete_app(code_name)
+    end
+
     def create_cloudfile
       content = generate_cloudfile
       File.open(cloudfile_path, "a+") { |f| f << content }
     end
 
+    def logs
+      shelly.cloud_logs(self.code_name)
+    end
+
+    def start
+      shelly.start_cloud(self.code_name)
+    end
+
+    def stop
+      shelly.stop_cloud(self.code_name)
+    end
+
     def cloudfile_path
       File.join(Dir.pwd, "Cloudfile")
     end
@@ -46,8 +71,12 @@ module Shelly
       File.basename(Dir.pwd)
     end
 
-    def users(apps)
-      shelly.app_users(apps)
+    def ips
+      shelly.app_ips(self.code_name)
+    end
+
+    def users
+      shelly.app_users(self.code_name)
     end
 
     def open_billing_page

data/lib/shelly/cli/command.rb

@@ -3,6 +3,7 @@ require "thor"
 require "thor/group"
 require "thor/options"
 require "thor/arguments"
+require "thor/basic"
 
 module Shelly
   module CLI

data/lib/shelly/cli/deploys.rb

@@ -0,0 +1,34 @@
+require "shelly/cli/command"
+require "time"
+
+module Shelly
+  module CLI
+    class Deploys < Command
+      namespace :deploys
+      include Helpers
+
+      desc "list", "Lists deploy logs"
+      def list(cloud = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        multiple_clouds(cloud, "deploy list", "Select cloud to view deploy logs using:")
+        logs = @app.logs
+        unless logs.empty?
+          say "Available deploy logs", :green
+          logs.each do |log|
+            log["failed"] ? say(" * #{log["created_at"]} (failed)") : say(" * #{log["created_at"]}")
+          end
+        else
+          say "No deploy logs available"
+        end
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        else
+          say_error e.message
+        end
+      end
+
+    end
+  end
+end

data/lib/shelly/cli/main.rb

@@ -1,5 +1,6 @@
 require "shelly/cli/command"
 require "shelly/cli/user"
+require "shelly/cli/deploys"
 
 module Shelly
   module CLI
@@ -7,6 +8,7 @@ module Shelly
       include Thor::Actions
       include Helpers
       register(User, "user", "user <command>", "Manages users using this cloud")
+      register(Deploys, "deploys", "deploys <command>", "View cloud deploy logs")
       check_unknown_options!
 
       map %w(-v --version) => :version
@@ -17,11 +19,11 @@ module Shelly
 
       desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
       def register(email = nil)
-      	user = Shelly::User.new
-      	user.ssh_key_registered?
+        user = Shelly::User.new
+        user.ssh_key_registered?
         say "Registering with email: #{email}" if email
-				user.email = (email || ask_for_email)
-				user.password = ask_for_password
+        user.email = (email || ask_for_email)
+        user.password = ask_for_password
         user.register
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
@@ -44,16 +46,19 @@ module Shelly
 
       desc "login [EMAIL]", "Logs user in to Shelly Cloud"
       def login(email = nil)
-        user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
+        user = Shelly::User.new
+        raise Errno::ENOENT, user.ssh_key_path unless user.ssh_key_exists?
+        user.email = email || ask_for_email
+        user.password = ask_for_password(:with_confirmation => false)
         user.login
         say "Login successful"
+        # FIXME: remove conflict boolean, move it to rescue block
         begin user.upload_ssh_key
-        conflict = false
+          conflict = false
         rescue RestClient::Conflict
           conflict = true
         end
         say "Uploading your public SSH key" if conflict == false
-        email = nil
         list
       rescue Client::APIError => e
         if e.validation?
@@ -65,6 +70,9 @@ module Shelly
           say_error "#{e.url}", :with_exit => false
         end
         exit 1
+      rescue Errno::ENOENT => e
+        say_error e, :with_exit => false
+        say_error "Use ssh-keygen to generate ssh key pair"
       end
 
       method_option "code-name", :type => :string, :aliases => "-c",
@@ -131,21 +139,100 @@ module Shelly
       def ip
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        @cloudfile = check_clouds.first
-        @cloudfile.fetch_ips.each do |server|
-          say "Cloud #{server['code_name']}:"
-          say "Web server IP : #{server['web_server_ip']}"
-          say "Mail server IP: #{server['mail_server_ip']}"
+        @cloudfile = Cloudfile.new
+        @cloudfile.clouds.each do |cloud|
+          begin
+            @app = App.new(cloud)
+            say "Cloud #{cloud}:", :green
+            ips = @app.ips
+            print_wrapped "Web server IP: #{ips['web_server_ip']}", :ident => 2
+            print_wrapped "Mail server IP: #{ips['mail_server_ip']}", :ident => 2
+          rescue Client::APIError => e
+            if e.unauthorized?
+              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
+            else
+              say_error e.message, :with_exit => false
+            end
+          end
+        end
+      end
+
+      desc "start [CODE-NAME]", "Starts specific cloud"
+      def start(cloud = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        multiple_clouds(cloud, "start", "Select which to start using:")
+        @app.start
+        say "Starting cloud #{@app.code_name}. Check status with:", :green
+        say "  shelly list"
+      rescue RestClient::Conflict => e
+        response =  JSON.parse(e.response)
+        case response['state']
+        when "running"
+          say_error "Not starting: cloud '#{@app.code_name}' is already running"
+        when "deploying", "configuring"
+          say_error "Not starting: cloud '#{@app.code_name}' 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 production 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 "See #{response['link']} 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.unauthorized?
-          e.errors.each { |error| say_error error, :with_exit => false}
-          exit 1
-        else
-          say_error e.message
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
         end
       end
 
+      desc "stop [CODE-NAME]", "Stops specific cloud"
+      def stop(cloud = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        multiple_clouds(cloud, "stop", "Select which to stop using:")
+        @app.stop
+        say "Cloud '#{@app.code_name}' stopped"
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        end
+      end
+
+      desc "delete CODE-NAME", "Delete cloud from Shelly Cloud"
+      def delete(code_name = nil)
+        user = Shelly::User.new
+        user.token
+        if code_name.present?
+          app = Shelly::App.new
+          say "You are about to delete application: #{code_name}."
+          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(code_name)
+          say_new_line
+          say "Scheduling application delete - done"
+          if App.inside_git_repository?
+            app.remove_git_remote
+            say "Removing git remote - done"
+          else
+            say "Missing git remote"
+          end
+        else
+          say_error "Missing CODE-NAME", :with_exit => false
+          say_error "Use: shelly delete CODE-NAME"
+        end
+      rescue Client::APIError => e
+        say_error e.message
+      end
 
       # FIXME: move to helpers
       no_tasks do
@@ -224,4 +311,3 @@ module Shelly
     end
   end
 end
-

data/lib/shelly/cli/user.rb

@@ -10,17 +10,19 @@ module Shelly
       def list
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        @cloudfile = check_clouds.first
-        @cloudfile.fetch_users.each do |cloud, users|
-          say "Cloud #{cloud}:"
-          users.each { |user| say "  #{user}" }
-        end
-      rescue Client::APIError => e
-        if e.unauthorized?
-          e.errors.each { |error| say_error error, :with_exit => false}
-          exit 1
-        else
-          say_error e.message
+        @cloudfile = Cloudfile.new
+        @cloudfile.clouds.each do |cloud|
+          begin
+            @app = App.new(cloud)
+            say "Cloud #{cloud}:"
+            @app.users.each { |user| say "  #{user["email"]}" }
+          rescue Client::APIError => e
+            if e.unauthorized?
+              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
+            else
+              say_error e.message, :with_exit => false
+            end
+          end
         end
       end
 
@@ -28,7 +30,8 @@ module Shelly
       def add(email = nil)
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        @cloudfile, @user = check_clouds
+        @cloudfile = Cloudfile.new
+        @user = Shelly::User.new
         user_email = email || ask_for_email({:guess_email => false})
         @cloudfile.clouds.each do |cloud|
           begin
@@ -36,9 +39,13 @@ module Shelly
           rescue Client::APIError => e
             if e.validation? && e.errors.include?(["email", "#{email} has already been taken"])
               say_error "User #{email} is already in the cloud #{cloud}", :with_exit => false
+            elsif e.unauthorized?
+              say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
             elsif e.validation?
               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

data/lib/shelly/client.rb

@@ -25,7 +25,7 @@ module Shelly
       end
 
       def unauthorized?
-        message == "Unauthorized"
+        message == "Unauthorized" || message =~ /Cloud .+ not found/
       end
 
       def each_error
@@ -64,28 +64,40 @@ module Shelly
       post("/apps", :app => attributes)
     end
 
+    def delete_app(code_name)
+      delete("/apps/#{code_name}")
+    end
+
     def add_ssh_key(ssh_key)
       post("/ssh_key", :ssh_key => ssh_key)
     end
 
+    def start_cloud(cloud)
+      put("/apps/#{cloud}/start")
+    end
+
+    def stop_cloud(cloud)
+      put("/apps/#{cloud}/stop")
+    end
+
     def apps
       get("/apps")
     end
 
+    def cloud_logs(cloud)
+      get("/apps/#{cloud}/deploys")
+    end
+
     def ssh_key_available?(ssh_key)
     	get("/users/new", :ssh_key => ssh_key)
     end
 
-    def apps_users(apps)
-      apps.map do |app|
-        get("/apps/#{app}/users")
-      end
+    def app_users(cloud)
+      get("/apps/#{cloud}/users")
     end
 
-    def apps_ips(apps)
-      apps.map do |app|
-        get("/apps/#{app}/ips")
-      end
+    def app_ips(cloud)
+      get("/apps/#{cloud}/ips")
     end
 
     def post(path, params = {})
@@ -100,6 +112,10 @@ module Shelly
       request(path, :get, params)
     end
 
+    def delete(path, params = {})
+      request(path, :delete, params)
+    end
+
     def request(path, method, params = {})
       options = request_parameters(path, method, params)
       RestClient::Request.execute(options) do |response, request|

data/lib/shelly/cloudfile.rb

@@ -36,23 +36,5 @@ module Shelly
       # FIXME: check if it possible to remove sub("---", "") by passing options to_yaml
       string.sub("---","").split("\n").map(&:rstrip).join("\n").strip
     end
-
-    def fetch_users
-      response = shelly.apps_users(clouds)
-      response.inject({}) do |result, app|
-        result[app['code_name']] = app['users'].map do |user|
-          user['email']
-        end
-        result
-      end
-    end
-
-    def fetch_ips
-      response = shelly.apps_ips(clouds)
-      response.each do |result|
-        result
-      end
-    end
   end
 end
-

data/lib/shelly/helpers.rb

@@ -27,19 +27,51 @@ module Shelly
       say_error "Email can't be blank, please try again"
     end
 
-    def check_clouds
-        @cloudfile = Shelly::Cloudfile.new
-        @user = Shelly::User.new
-        user_apps = @user.apps.map { |cloud| cloud['code_name'] }
-        unless @cloudfile.clouds.all? { |cloud| user_apps.include?(cloud) }
-          errors = (@cloudfile.clouds - user_apps).map do |cloud|
-            "You have no access to '#{cloud}' cloud defined in Cloudfile"
-          end
-          raise Shelly::Client::APIError.new({:message => "Unauthorized",
-            :errors => errors}.to_json)
+    def ask_to_delete_files
+      delete_files_question = "I want to delete all files stored on Shelly Cloud (yes/no):"
+      delete_files = ask(delete_files_question)
+      exit 1 unless delete_files == "yes"
+    end
+
+    def ask_to_delete_database
+      delete_database_question = "I want to delete all database data stored on Shelly Cloud (yes/no):"
+      delete_database = ask(delete_database_question)
+      exit 1 unless delete_database == "yes"
+    end
+
+    def ask_to_delete_application
+      delete_application_question = "I want to delete the application (yes/no):"
+      delete_application = ask(delete_application_question)
+      exit 1 unless delete_application == "yes"
+    end
+
+    def logged_in?
+      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
+    end
+
+    def multiple_clouds(cloud, action, message)
+      clouds = Cloudfile.new.clouds
+      if clouds.count > 1 && cloud.nil?
+        say "You have multiple clouds in Cloudfile. #{message}"
+        say "  shelly #{action} #{clouds.first}"
+        say "Available clouds:"
+        clouds.each do |cloud|
+          say " * #{cloud}"
         end
-        [@cloudfile, @user]
+        exit 1
       end
+      @app = Shelly::App.new
+      @app.code_name = cloud.nil? ? clouds.first : cloud
+    end
+
   end
 end