dawn-cli 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5648f22bab9ddaf3fc4b15aa7d442e8cd14dde2d
-  data.tar.gz: 755487a68afc3f624344ad1fcb171147cbe9b3eb
+  metadata.gz: fb88fe1d21465c414f7484e29a1ea5c0b5707fce
+  data.tar.gz: ab4c46253f6b16ee661d6e80502ffc075087fea3
 SHA512:
-  metadata.gz: 32142f2d3d226bf03a43fc4b6fe6c3f73173d5a56a8a4c4df47eb20225c9d16ffd81e0d5d9909bb55a359e6313464c3a44cc22d7ac9e0047ea103e1571f0554f
-  data.tar.gz: ee71bb731ff703315c787c644680359c53a6958aed662a3325990947346daf39746902c5100cced416d8ad332bb3508efca9c5ec79aa5c39de9a54e7d5218eed
+  metadata.gz: 3a0a7ddb400aa20f6e1159f6ddce03f2a337a7a435fa344b1b0a6f3d829a166047293d62d828cdb11dedbf5b71dd4a7a59323c6ac558082e9feb538016775552
+  data.tar.gz: 9bed41ab03f8752d942d738c8b52eda1e6fd8a5b2e6bfd0e8865f30223baef4a48c8dccf46f2c3e1c5e197fe067c80d4af1ebfd2fd79c36998f3feb5c61b345e

data/README.md

@@ -1,12 +1,10 @@
 Dawn-CLI
 ========
-[link](https://github.com/dawn/dawn-cli)
-
 [![Dependency Status](https://gemnasium.com/dawn/dawn-cli.svg)](https://gemnasium.com/dawn/dawn-cli)
 [![Gem Version](https://badge.fury.io/rb/dawn-cli.svg)](http://badge.fury.io/rb/dawn-cli)
 [![Code Climate](https://codeclimate.com/github/dawn/dawn-cli.png)](https://codeclimate.com/github/dawn/dawn-cli)
 
-CLI for [Dawn](https://github.com/dawn/dawn)
+[CLI](https://github.com/dawn/dawn-cli) for [Dawn](https://github.com/dawn/dawn)
 
 If you are looking for the ruby API
 [Dawn-API](https://github.com/dawn/dawn-api)

data/bin/dawni

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'dawn/cli'
+
+line_number = 1
+loop do
+  print("~dawn %03d> " % line_number)
+  line = gets.chomp
+  argv = line.split(" ")
+  break if %w[quit exit].include?(argv.first)
+  begin
+    Dawn::CLI.run argv
+  rescue SystemExit # any form of abort
+  end
+  line_number += 1
+end

data/lib/dawn/cli/commands.rb

@@ -1,8 +1,9 @@
-require 'dawn/cli/commands/auth'    # Netrc setup and login command
-require 'dawn/cli/commands/app'     # App management
-require 'dawn/cli/commands/drain'   # App Drains management
-require 'dawn/cli/commands/env'     # App ENV management
-require 'dawn/cli/commands/domain'  # App Domains management
-require 'dawn/cli/commands/key'     # Key management
-require 'dawn/cli/commands/local'   # Various functions
-require 'dawn/cli/commands/release' # App Releases functions
+require 'dawn/cli/commands/base_commands' #
+require 'dawn/cli/commands/auth'          # Netrc setup and login command
+require 'dawn/cli/commands/app'           # App management
+require 'dawn/cli/commands/drain'         # App Drains management
+require 'dawn/cli/commands/env'           # App ENV management
+require 'dawn/cli/commands/domain'        # App Domains management
+require 'dawn/cli/commands/key'           # Key management
+require 'dawn/cli/commands/local'         # Various functions
+require 'dawn/cli/commands/release'       # App Releases functions

data/lib/dawn/cli/commands/app.rb

@@ -1,12 +1,15 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
+require "json"
 
 module Dawn
   module CLI
     module App
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
       # "Create a new dawn App (with git; setup)"
+      # @param [String] appname
+      ###
       def self.create(appname=nil)
         app = try_create_app appname
         # since its possible for dawn to create a new app, with a random name
@@ -16,12 +19,18 @@ module Dawn
         say "\tAPP\t#{app.name}"
       end
 
+      ###
       # "Displays a list of all the apps you have deployed to dawn"
+      ###
       def self.list
         say format_apps(Dawn::App.all)
       end
 
+      ###
       # "Modify the gears of the current app"
+      # @param [Hash<String, Array[String, Integer]>] modifiers
+      #   EG. { "web" => ["+", 1] }
+      ###
       def self.scale(modifiers)
         app = current_app
 
@@ -43,7 +52,9 @@ module Dawn
         app.scale(app: { formation: formation })
       end
 
+      ###
       # "Deletes the app on dawn"
+      ###
       def self.delete
         app = current_app
 
@@ -51,19 +62,23 @@ module Dawn
         git_remove_dawn_remote app
       end
 
+      ###
       # "Prints the App's log to STDOUT"
-      def self.logs(follow=false)
+      # @param [Array<String>] filters
+      # @param [Boolean] follow
+      ###
+      def self.logs(filters, follow=false)
         # this is the only method which requires the uri & net/http
         require 'uri'
         require 'net/http'
 
+        app = current_app
+
         filter_regex = %r{\A(?<timestamp>\S+)\s(?<token>\S+)\[(?<proc_id>\S+)\]\:(?<message>.*)}
         timestamp_regex = %r{(?<year>\d+)-(?<month>\d+)-(?<day>\d+)T(?<hour>\d+)\:(?<minute>\d+)\:(?<second>\d+)\.(?<other>.*)}
 
         opts = {}
         opts[:tail] = follow
-        filters = args
-        app = current_app
         url = app.logs(opts)
         uri  = URI.parse(url)
 
@@ -97,7 +112,9 @@ module Dawn
         end
       end
 
+      ###
       # "Lists all currently running Gears"
+      ###
       def self.list_gears
         app = current_app
         gears = app.gears.all.sort_by(&:number)
@@ -113,10 +130,22 @@ module Dawn
         end
       end
 
+      ###
+      # "Restart the current app"
+      ###
       def self.restart
         current_app.restart
       end
 
+      ###
+      # "run a command in the current_app"
+      # @param [Array<String>] argv
+      ###
+      def self.run(argv)
+        current_app.run(command: argv.join(" "))
+      rescue Excon::Errors::BadRequest => ex
+        handle_abort_exception("dawn run", ex)
+      end
     end
   end
 end

data/lib/dawn/cli/commands/auth.rb

@@ -1,19 +1,21 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Auth
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
       # "save login details to .netrc"
-      # usn = ask "Username: "
-      # psw = password "Password: "
+      # @param [String] username
+      # @param [String] password
+      ###
       def self.login(username, password)
         Dawn.authenticate(username: username, password: password)
-        say " ! login details have been saved to your .netrc"
+        say "\tLOGIN details have been saved to your ~/.netrc"
+      rescue Excon::Errors::BadRequest
+        abort "dawn login: Login has failed, check your username and password"
       end
-
     end
   end
 end

data/lib/dawn/cli/commands/base_commands.rb

@@ -0,0 +1,31 @@
+require "dawn/cli/helpers"
+
+module Dawn
+  module CLI
+    module BaseCommands
+      include Dawn::CLI::Helpers
+
+      ###
+      # @param [Symbol] sym
+      # @param [Array<Objects>] *args
+      ###
+      def command(sym, *args, &block)
+        if Dawn::CLI.no_operation
+          say "#{self}.#{sym}(#{args.map(&:inspect).join(", ")})"
+        else
+          send(sym, *args, &block)
+        end
+        sym
+      end
+
+      def handle_abort_exception(basename, ex)
+        error_obj = JSON.load(ex.response.body) rescue nil
+        if error_obj
+          abort "#{basename}: (#{error_obj["id"]}) #{error_obj["message"]} #{error_obj["error"]}"
+        else
+          abort "#{basename}: has failed for some unknown reason"
+        end
+      end
+    end
+  end
+end

data/lib/dawn/cli/commands/domain.rb

@@ -1,26 +1,36 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Domain
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
       # "List all domains for the current app"
+      ###
       def self.list
         say format_domains(current_app.domains.all)
       end
 
+      ###
       # "Add a new domain to the current app"
+      # @param [String] url
+      ###
       def self.add(url)
         current_app.domains.create(domain: { url: url })
+      rescue Excon::Errors::Conflict => ex
+        handle_abort_exception("dawn domain add", ex)
       end
 
+      ###
       # "Remove an existing domain from the current app"
+      # @param [String] url
+      ###
       def self.delete(url)
-        current_app.domains.delete(url: url)
+        current_app.domains.destroy(url: url)
+      rescue Excon::Errors::NotFound => ex
+        handle_abort_exception("dawn domain delete", ex)
       end
-
     end
   end
 end

data/lib/dawn/cli/commands/drain.rb

@@ -1,26 +1,36 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Drain
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
       # "List all drains for the current app"
+      ###
       def self.list
         say format_drains(current_app.drains.all)
       end
 
+      ###
       # "Add a new drain to the current app"
+      # @param [String] url
+      ###
       def self.add(url)
         current_app.drains.create(drain: { url: url })
+      rescue Excon::Errors::Conflict => ex
+        handle_abort_exception("dawn drain add", ex)
       end
 
+      ###
       # "Remove an existing drain from the current app"
+      # @param [String] url
+      ###
       def self.delete(url)
-        current_app.drains.delete(url: url)
+        current_app.drains.destroy(url: url)
+      rescue Excon::Errors::NotFound => ex
+        handle_abort_exception("dawn drain delete", ex)
       end
-
     end
   end
 end

data/lib/dawn/cli/commands/env.rb

@@ -1,43 +1,54 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Env
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
-      # displays all the current app's ENV variables
+      ###
+      # "Displays all the current app's ENV variables"
+      ###
       def self.list
         current_app.env.each do |k, v|
           say "#{k}=#{v}"
         end
       end
 
+      ###
       # "Get an ENV var"
+      ###
       def self.get(*keys)
-        app = current_app
-        env = app.env
+        env = current_app.env
         keys.each do |k|
           say "#{k}=#{env[k]}"
         end
       end
 
+      ###
       # "Set multiple ENV variables"
-      def self.set(hash)
-        app = current_app
-        app.env.update(app.env.merge(hash)) # this is a Hash method
-        app.env.save                        # this is a API method
+      # @param [Hash<String, String>] env
+      ###
+      def self.set(env)
+        appenv = current_app.env
+        appenv.update(appenv.merge(env)) # this is a Hash method
+        appenv.save                       # this is an API method
+      rescue Excon::Errors::BadRequest => ex
+        handle_abort_exception("dawn env set", ex)
       end
 
+      ###
       # "Deletes an ENV var"
+      # @param [Array<String>] *keys
+      ###
       def self.unset(*keys)
-        app = current_app
+        env = current_app.env
         keys.each do |k|
-          app.env.delete(k)
+          env.delete(k)
         end
-        app.env.save
+        env.save
+      rescue Excon::Errors::BadRequest => ex
+        handle_abort_exception("dawn env unset", ex)
       end
-
     end
   end
 end

data/lib/dawn/cli/commands/key.rb

@@ -1,34 +1,47 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Key
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
       # "Lists all your Keys currently on dawn"
+      ###
       def self.list
         say format_keys(Dawn::Key.all)
       end
 
+      ###
       # "Adds this machine's sshkey to Dawn"
+      ###
       def self.add
         filename = File.join(Dir.home, ".ssh/id_rsa.pub")
         pubkey = File.read filename
         key    = Dawn::Key.create(key: pubkey)
+      rescue Excon::Errors::UnprocessableEntity => ex
+        handle_abort_exception("dawn key add", ex)
       end
 
+      ###
       # "Retrieve a Key by ID"
+      # @param [String] id
+      ###
       def self.get(id)
-        key = Dawn::Key.find(id: id)
-        say format_keys([key])
+        say Dawn::Key.find(id: id).key
+      rescue Excon::Errors::NotFound => ex
+        handle_abort_exception("dawn key get", ex)
       end
 
+      ###
       # "Delete a Key by ID"
-      def self.delete
+      # @param [String] id
+      ###
+      def self.delete(id)
         Dawn::Key.destroy(id: id)
+      rescue Excon::Errors::NotFound => ex
+        handle_abort_exception("dawn key delete", ex)
       end
-
     end
   end
 end

data/lib/dawn/cli/commands/local.rb

@@ -1,15 +1,25 @@
-require "dawn/cli/helpers"
+require "dawn/cli/commands/base_commands"
 
 module Dawn
   module CLI
     module Local
+      extend Dawn::CLI::BaseCommands
 
-      extend Dawn::CLI::Helpers
-
+      ###
+      # "verify if server is running"
+      ###
       def self.health_check
         Dawn::API.health_check
+        say "All is well"
       end
 
+      ###
+      # "print current username to console"
+      ###
+      def self.whoami
+        account = Dawn::Account.current
+        say account.username
+      end
     end
   end
 end