dawn-cli 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d84982fb0b5183bfa3934340f5bab8083a68cb0
-  data.tar.gz: 3047933667d1f0fb125c23d4ed2f81df17983c44
+  metadata.gz: 8c69df2b06d2b520437bb91ae452de45c88693ce
+  data.tar.gz: cbc1a3bd916fc0aab3651867f8b2ddf797142c11
 SHA512:
-  metadata.gz: 80bb11d6044735d1499cdf033b4f3d0cd4ded45b103b5bf6dd7488f1554cb25452685fd430c6a6c17cc66af1b0e24cfbf1ae57e094ab875fa075248930867c7e
-  data.tar.gz: ac198cc5ce1c5211e46b318c4fdbe188ad11834fc3bbbcaf78b85272486d575d4e641e8f5194d6c57a816aeddbe053adffcaa032474bbcf64ab0ab573f736e6f
+  metadata.gz: 11d3f2f1ddd10804df98ab8f571a3f36de4369bc101bccc3c8619b6931eb65f21abe7e5563c79d5c48f8af195f2b0ebd0ea984c6388729ff46578c34d3b058f8
+  data.tar.gz: b1c12805372cca918d79124a7de6f66f44dc1a66c516143ce8d5a12fa125105e6cc4e61d9b0bd182879292854c48e2c345da8bbe23474e7f08bf71e06f3ec79c

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+Overview
+========

data/README.md

@@ -0,0 +1,31 @@
+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)
+
+If you are looking for the ruby API
+[Dawn-API](https://github.com/dawn/dawn-api)
+
+## Installation
+```shell
+gem install dawn-cli
+```
+
+## Building
+```shell
+gem pack dawn-cli.gem
+```
+
+## Usage
+```shell
+dawn
+```
+Help is printed if no commands are given.
+
+## ENV Variables
+[ENV(s)](https://github.com/dawn/dawn-api#influential-env-variable)

data/bin/dawn

@@ -1,8 +1,3 @@
 #!/usr/bin/env ruby
-require 'commander'
-require 'commander/import'
-require 'dawn/cli/version'
-
 require 'dawn/cli'
-
-Dawn::CLI::Application.new.run
+Dawn::CLI.run ARGV.dup

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

@@ -1,174 +1,112 @@
-module Dawn
-module CLI
-class Application
-def app_commands
-
-command "app:ls" do |c|
-  c.syntax = "dawn app:ls"
-  c.description = "Displays a list of all the apps you have deployed to dawn"
-
-  c.action do |args, options|
-    apps = Dawn::App.all
-    say format_apps(apps)
-  end
-end
-alias_command "ls", "app:ls"
+require "dawn/cli/helpers"
 
-command "app:scale" do |c|
-  c.syntax = "dawn app:scale <gear_modifier>"
-  c.description = "Modify the gears of the current app"
+module Dawn
+  module CLI
+    module App
 
-  c.action do |args, options|
-    app = current_app
-    formation = {}
+      extend Dawn::CLI::Helpers
 
-    args.each do |s|
-      mtch_data = s.match(/(?<type>\S+)(?<op>[+-=])(?<value>\d+)/)
-      next unless mtch_data
+      # "Displays a list of all the apps you have deployed to dawn"
+      def self.list
+        say format_apps(Dawn::App.all)
+      end
 
-      type = mtch_data[:type]
-      value = mtch_data[:value].to_i
-      old_formation = (app.formation[type] || 0).to_i
+      # "Modify the gears of the current app"
+      def self.scale(modifiers)
+        app = current_app
 
-      formation[type] = case mtch_data[:op]
-                        when "+" then old_formation + value
-                        when "-" then old_formation - value
-                        when "=" then value
-                        end
-    end
-    app.scale formation: formation
-  end
-end
+        #formation = app.formation.dup
+        formation = {}
 
-command "app:delete" do |c|
-  c.syntax = "dawn app:delete [<app_id>]"
-  c.description = "Delete App app_id, if no app_id is provided, the current app is deleted instead"
+        modifiers.each do |type, a|
+          operator, value = *a
 
-  c.option "--name APPNAME", String, "specify an app by name to remove"
+          old_formation = (app.formation[type] || 0).to_i
 
-  c.action do |args, options|
-    if app_id = args.first
-      app = Dawn::App.find(id: app_id)
-    elsif app_name = options.name
-      app = Dawn::App.find(name: app_name)
-    else
-      app = current_app
-    end
+          formation[type] = case operator
+                            when "+" then old_formation + value.to_i
+                            when "-" then old_formation - value.to_i
+                            when "=" then value.to_i
+                            end
+        end
 
-    app_name = app.name
-    app.destroy
+        app.scale(app: { formation: formation })
+      end
 
-    git_remove_dawn_remote app
-  end
-end
+      # "Deletes the app on dawn"
+      def self.delete
+        app = current_app
 
-command "app:rename" do |c|
-  c.syntax = "dawn rename <new_name>"
-  c.description = "Rename the current App to <new_name>"
+        app.destroy
+        git_remove_dawn_remote app
+      end
 
-  c.action do |args, options|
-    app_name = args.first
-    app = current_app
-    app.update name: app_name
-  end
-end
-alias_command "rename", "app:rename"
-
-command "app:logs" do |c|
-  c.syntax = "dawn logs [-f]"
-  c.description = "Prints the App's log to STDOUT"
-
-  c.option "-f", "should the logs be followed?"
-
-  c.action do |args, options|
-    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] = options.f
-    filters = args
-    app = current_app
-    url = app.logs(opts)
-    uri  = URI.parse(url)
-
-    begin
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 60 * 60 * 24
-      begin
-        http.start do
-          link_url = uri.path + ("?srv=1")
-          #say uri.host + ":" + uri.port.to_s + link_url
-          http.request_get(link_url) do |request|
-            request.read_body do |chunk|
-              if filters.size > 0
-                chunk.each_line do |line|
-                  if mtch_data = line.chomp.match(filter_regex)
-                    say mtch_data[0] if filters.include?(mtch_data[:proc_id])
+      # "Prints the App's log to STDOUT"
+      def self.logs(follow=false)
+        # this is the only method which requires the uri & net/http
+        require 'uri'
+        require 'net/http'
+
+        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)
+
+        begin
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.read_timeout = 60 * 60 * 24
+          begin
+            http.start do
+              link_url = uri.path + ("?srv=1")
+              #say uri.host + ":" + uri.port.to_s + link_url
+              http.request_get(link_url) do |request|
+                request.read_body do |chunk|
+                  if filters.size > 0
+                    chunk.each_line do |line|
+                      if mtch_data = line.chomp.match(filter_regex)
+                        say mtch_data[0] if filters.include?(mtch_data[:proc_id])
+                      end
+                    end
+                  else
+                    say chunk.to_s
                   end
                 end
-              else
-                say chunk.to_s
               end
             end
+          rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
+            raise "Could not connect to logging service"
+          rescue Timeout::Error, EOFError
+            raise "\nRequest timed out"
           end
+        rescue Interrupt
         end
-      rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT, SocketError
-        raise "Could not connect to logging service"
-      rescue Timeout::Error, EOFError
-        raise "\nRequest timed out"
       end
-    rescue Interrupt
-    end
-  end
-end
-alias_command "logs", "app:logs"
 
-command "app:gears" do |c|
-  c.syntax = "dawn ps [<gear_name>]"
-  c.description = "Lists all currently running Gears"
+      # "Lists all currently running Gears"
+      def self.list_gears
+        app = current_app
+        gears = app.gears.all.sort_by(&:number)
 
-  c.action do |args, options|
-    app = current_app
-    gears = app.gears.all.sort_by(&:number)
-
-    if args.empty?
-      ## Print all Gears
-      gears_by_type = gears.each_with_object({}) do |gear, hsh|
-        (hsh[gear.type] ||= []) << gear
-      end
-      gears_by_type.keys.sort.each do |key|
-        grs = gears_by_type[key]
-        say "=== #{key}:"
-        say format_gears grs
-      end
-    else
-      ## Print a specific gear
-      query = args.first
-      gear = gears.find { |gear| gear.name == query }
-
-      if gear
-        say format_gears([gear])
-      else
-        say "Gear #{query} was not found."
+        ## Print all Gears
+        gears_by_type = gears.each_with_object({}) do |gear, hsh|
+          (hsh[gear.type] ||= []) << gear
+        end
+        gears_by_type.keys.sort.each do |key|
+          grs = gears_by_type[key]
+          say "=== #{key}:"
+          say format_gears grs
+        end
       end
-    end
-  end
-end
-alias_command "ps", "app:gears"
 
-command "app:restart" do |c|
-  c.syntax = "dawn restart"
-  c.description = "Restart the current App"
+      def self.restart
+        current_app.restart
+      end
 
-  c.action do |args, options|
-    app = current_app
-    app.restart
-    say "App #{app.name} has been restarted"
+    end
   end
 end
-alias_command "restart", "app:restart"
-
-end
-end
-end
-end

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

@@ -0,0 +1,19 @@
+require "dawn/cli/helpers"
+
+module Dawn
+  module CLI
+    module Auth
+
+      extend Dawn::CLI::Helpers
+
+      # "save login details to .netrc"
+      # usn = ask "Username: "
+      # psw = password "Password: "
+      def self.login(username, password)
+        Dawn.authenticate(username: username, password: password)
+        say " ! login details have been saved to your .netrc"
+      end
+
+    end
+  end
+end

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

@@ -1,49 +1,26 @@
-module Dawn
-module CLI
-class Application
-def domain_commands
+require "dawn/cli/helpers"
 
-command "domain:add" do |c|
-  c.syntax = "dawn domain:add <url>"
-  c.description = "Add a new domain to the current app"
+module Dawn
+  module CLI
+    module Domain
 
-  c.action do |args, options|
-    url = args.first
-    app = current_app
+      extend Dawn::CLI::Helpers
 
-    app.domains.create url: url
-  end
-end
+      # "List all domains for the current app"
+      def self.list
+        say format_domains(current_app.domains.all)
+      end
 
-command "domain:delete" do |c|
-  c.syntax = "dawn domain:delete <url>"
-  c.description = "Remove an existing domain from the current app"
+      # "Add a new domain to the current app"
+      def self.add(url)
+        current_app.domains.create(domain: { url: url })
+      end
 
-  c.action do |args, options|
-    url = args.first
-    app = current_app
+      # "Remove an existing domain from the current app"
+      def self.delete(url)
+        current_app.domains.delete(url: url)
+      end
 
-    domain = app.domains.all.find { |domain| domain.url == url }
-    if domain
-      domain.destroy
-    else
-      say "Domain (url: #{url}) could not be found"
     end
   end
 end
-
-command "domain:ls" do |c|
-  c.syntax = "dawn domain:ls"
-  c.description = "List all domains for the current app"
-
-  c.action do |args, options|
-    app = current_app
-
-    say format_domains(app.domains.all)
-  end
-end
-
-end
-end
-end
-end

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

@@ -1,50 +1,26 @@
-module Dawn
-module CLI
-class Application
-def drain_commands
+require "dawn/cli/helpers"
 
-command "drain:add" do |c|
-  c.syntax = "dawn drain:add <url>"
-  c.description = "Add a Drain url"
+module Dawn
+  module CLI
+    module Drain
 
-  c.action do |args, options|
-    url = args.first
-    app = current_app
+      extend Dawn::CLI::Helpers
 
-    drain = app.drains.create url: url
-  end
-end
+      # "List all drains for the current app"
+      def self.list
+        say format_drains(current_app.drains.all)
+      end
 
-command "drain:delete" do |c|
-  c.syntax = "dawn drain:delete <url>"
-  c.description = "Remove a Drain url"
+      # "Add a new drain to the current app"
+      def self.add(url)
+        current_app.drains.create(drain: { url: url })
+      end
 
-  c.action do |args, options|
-    url = args.first
-    app = current_app
+      # "Remove an existing drain from the current app"
+      def self.delete(url)
+        current_app.drains.delete(url: url)
+      end
 
-    drain = app.drains.all.find { |drain| drain.url == url }
-    if drain
-      drain.destroy
-    else
-      say "Drain (url: #{url}) could not be found"
     end
   end
 end
-
-command "drain:ls" do |c|
-  c.syntax = "dawn drain:ls"
-  c.description = "Lists all Drains for this App"
-
-  c.action do |args, options|
-    url = args.first
-    app = current_app
-    drains = app.drains.all
-    say format_drains(drains)
-  end
-end
-
-end
-end
-end
-end

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

@@ -1,62 +1,43 @@
-module Dawn
-module CLI
-class Application
-def env_commands
-
-command "env:set" do |c|
-  c.syntax = "dawn env:set [<key_name=value>..]"
-  c.description = "Set multiple ENV variables"
+require "dawn/cli/helpers"
 
-  c.action do |args, options|
-    env = current_app.env
-    vars = args.each_with_object({}) do |arg, hsh|
-      key, value = arg.split("=", 2)
-      hsh[key] = value
-    end
-    env.update(vars)
-    env.save
-    say "App ENV has been updated"
-  end
-end
+module Dawn
+  module CLI
+    module Env
 
-command "env:get" do |c|
-  c.syntax = "dawn env:get [<key_name> ..]"
-  c.description = "Get an ENV var, if none is given prints all the variables"
+      extend Dawn::CLI::Helpers
 
-  c.action do |args, options|
-    env = current_app.env
-    if args.empty?
-      env.each do |key, value|
-        say "#{key}: #{value}"
+      # displays all the current app's ENV variables
+      def self.list
+        current_app.env.each do |k, v|
+          say "#{k}=#{v}"
+        end
       end
-    else
-      args.each do |key|
-        value = env[key]
-        say "#{key}: #{value}"
+
+      # "Get an ENV var"
+      def self.get(*keys)
+        app = current_app
+        env = app.env
+        keys.each do |k|
+          say "#{k}=#{env[k]}"
+        end
       end
-    end
-  end
-end
 
-command "env:unset" do |c|
-  c.syntax = "dawn env:unset <key_name> [<key_name>..]"
-  c.description = "Deletes an ENV var"
+      # "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
+      end
 
-  c.action do |args, options|
-    env = current_app.env
-    dlt_keys = [] # list of the deleted keys
-    arg.each do |key|
-      if env.key?(key)
-        env.delete(key)
-        dlt_keys << key
+      # "Deletes an ENV var"
+      def self.unset(*keys)
+        app = current_app
+        keys.each do |k|
+          app.env.delete(k)
+        end
+        app.env.save
       end
+
     end
-    env.save
-    say "deleted #{dlt_keys.join(", ")}"
   end
 end
-
-end
-end
-end
-end

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

@@ -1,51 +1,34 @@
-module Dawn
-module CLI
-class Application
-def key_commands
-
-command "key:add" do |c|
-  c.syntax = "dawn key:add"
-  c.description = "Adds your local ssh_key"
-
-  c.action do |args, options|
-    filename = File.join(Dir.home, ".ssh/id_rsa.pub")
-    pubkey = File.read filename
-    key    = Dawn::Key.add(pubkey)
-  end
-end
-
-command "key:ls" do |c|
-  c.syntax = "dawn key:ls"
-  c.description = "Lists all your Keys currently on dawn"
-
-  c.action do |args, options|
-    keys = Dawn::Key.all
-    say format_keys(keys)
-  end
-end
-
-command "key:get" do |c|
-  c.syntax = "dawn key:get <key_id>"
-  c.description = "Retrieve a Key by ID"
+require "dawn/cli/helpers"
 
-  c.action do |args, options|
-    key_id = args.first
-    key = Dawn::Key.find(id: key_id)
-    say format_keys([key])
-  end
-end
-
-command "key:delete" do |c|
-  c.syntax = "dawn key:delete <key_id>"
-  c.description = "Delete a Key by ID"
-
-  c.action do |args, options|
-    key_id = args.first
-    Dawn::Key.destroy(id: key_id)
+module Dawn
+  module CLI
+    module Key
+
+      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)
+      end
+
+      # "Retrieve a Key by ID"
+      def self.get(id)
+        key = Dawn::Key.find(id: id)
+        say format_keys([key])
+      end
+
+      # "Delete a Key by ID"
+      def self.delete
+        Dawn::Key.destroy(id: id)
+      end
+
+    end
   end
 end
-
-end
-end
-end
-end

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

@@ -1,57 +1,25 @@
-module Dawn
-module CLI
-class Application
-def local_commands
+require "dawn/cli/helpers"
 
-#command "ping" do |c|
-#  c.syntax "dawn ping"
-#  c.description = "Pings the dawn server to determine if its working correctly"
-#  c.action do |args, options|
-#  end
-#end
+module Dawn
+  module CLI
+    module Local
 
-command "new" do |c|
-  c.syntax = "dawn new [<app_name>]"
-  c.description = "Create a new dawn App (with git; setup)"
+      extend Dawn::CLI::Helpers
 
-  c.action do |args, options|
-    appname = args.first
-    app = try_create_app appname
-    appname = app.name
+      def self.health_check
+        Dawn::API.health_check
+      end
 
-    if Dir.exists? appname
-      say " warning ! Directory #{appname} already exists"
-    else
-      FileUtils.mkdir_p appname
-      say "\tCREATE\t#{appname}"
-    end
+      # "Create a new dawn App (with git; setup)"
+      def self.create(appname=nil)
+        app = try_create_app appname
+        # since its possible for dawn to create a new app, with a random name
+        # setting the appname again based on the real app's name is required
+        appname = app.name
+        git_add_dawn_remote app
+        say "\tAPP\t#{app.name}"
+      end
 
-    Dir.chdir appname do
-      `git init`
-      git_add_dawn_remote app
     end
-    say "\tAPP\t#{appname}"
-  end
-end
-alias_command "create", "new"
-
-command "init" do |c|
-  c.syntax = "dawn init [<app_name>]"
-  c.description = "Setup an existing App with a dawn remote, if no <app_name> is given, the App directory's name will be used"
-
-  c.option "--name NAME", String, "name your App"
-  c.option "--random", "gives you App an awesome name"
-
-  c.action do |args, options|
-    appname = args.first || options.name || File.basename(Dir.getwd)
-    appname = nil if options.random
-    app = try_create_app appname
-    git_add_dawn_remote app
-    say "\tAPP\t#{app.name}"
   end
 end
-
-end
-end
-end
-end

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

@@ -0,0 +1,21 @@
+require "dawn/cli/helpers"
+
+module Dawn
+  module CLI
+    module Release
+
+      extend Dawn::CLI::Helpers
+
+      # "List all releases for the current app"
+      def self.list
+        say format_releases(current_app.releases.all)
+      end
+
+      # "Add a new release to the current app"
+      def self.add
+        current_app.releases.create(release:{})
+      end
+
+    end
+  end
+end

data/lib/dawn/cli/commands.rb

@@ -1,7 +1,8 @@
-require 'dawn/cli/commands/app'     # App management namespace
-require 'dawn/cli/commands/drain'   # App drain management namespace
-require 'dawn/cli/commands/env'     # App ENV management namespace
-require 'dawn/cli/commands/domain'  # App domains management namespace
-require 'dawn/cli/commands/key'     # Key management namespace
+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/login'   # Netrc setup and login command
+require 'dawn/cli/commands/release' # App Releases functions

data/lib/dawn/cli/{application.rb → helpers.rb}

@@ -1,32 +1,14 @@
 require 'dawn/api'
 require 'dawn/api/hosts'
+require 'dawn/cli/version'
 require 'dawn/cli/output_formatter' # CLI Console Formatters
-require 'dawn/cli/commands'         # CLI Commands
 
 module Dawn
   module CLI
-    class Application
+    module Helpers
 
-      include Commander::Methods
       include OutputFormatter
 
-      def run
-        # :name is optional, otherwise uses the basename of this executable
-        program :name, 'Dawn CLI'
-        program :version, Dawn::CLI::VERSION + "α"
-        program :description, 'CLI client for Dawn'
-
-        default_command 'help'
-
-        app_commands
-        domain_commands
-        drain_commands
-        env_commands
-        key_commands
-        local_commands
-        login_commands
-      end
-
       ## swiped from Heroku
       def has_git?
         %x{ git --version }
@@ -43,10 +25,10 @@ module Dawn
       def try_create_app(appname=nil)
         abort "dawn remote already exists, please remove it (dawn app:delete)" if git_dawn_remote?
         begin
-          app = Dawn::App.create name: appname
+          app = Dawn::App.create(app: { name: appname })
         rescue Excon::Errors::Conflict
-          app = Dawn::App.find name: appname
-          say " warning ! App (#{app.name}) already exists"
+          app = Dawn::App.find(name: appname)
+          puts " warning ! App (#{app.name}) already exists"
         end
         return app
       end
@@ -102,21 +84,16 @@ module Dawn
       end
 
       def current_app_name(options={})
-        @current_app ||= if options.key?(:app)
-          options[:app]
-        elsif ENV.key?("DAWN_APP")
-          ENV["DAWN_APP"]
-        elsif app_from_dir = extract_app_in_dir(Dir.pwd, options)
-          app_from_dir
-        else
-          abort "App could not be located!"
+        @current_app ||= begin
+          options[:app] || ENV["DAWN_APP"] ||
+          Dawn::CLI.selected_app || extract_app_in_dir(Dir.pwd, options) ||
+          abort("App could not be located!")
         end
       end
 
-      def current_app
-        app = Dawn::App.find name: current_app_name
-        abort "App (#{current_app_name}) was not found on the dawn server!" unless app
-        app
+      def current_app(options={})
+        name = current_app_name(options)
+        Dawn::App.find(name: name)
       end
 
     end

data/lib/dawn/cli/output_formatter.rb

@@ -1,3 +1,6 @@
+require 'time-lord'
+require 'terminal-table'
+
 module Dawn
   module CLI
     module OutputFormatter
@@ -11,8 +14,8 @@ module Dawn
                                     headings: ['ID', 'Fingerprint', 'Key'],
                                     style: table_style
         keys.each do |key|
-          table << [key.id, key.fingerprint, " ... "]#key.key[0, 20]] # truncate the key
-          table << :separator
+          table << [key.id, key.fingerprint, key.key] #{}" ... "]#key.key[0, 20]] # truncate the key
+          #table << :separator
         end
 
         table
@@ -25,7 +28,7 @@ module Dawn
         apps.each do |app|
           form = app.formation.map { |k,v| "#{k}: #{v}" }.join("\n")
           table << [app.id, app.name, form]
-          table << :separator
+          #table << :separator
         end
 
         table
@@ -37,7 +40,7 @@ module Dawn
                                     style: table_style
         domains.each do |domain|
           table << [domain.id, domain.url]
-          table << :separator
+          #table << :separator
         end
 
         table
@@ -49,7 +52,7 @@ module Dawn
                                     style: table_style
         drains.each do |drain|
           table << [drain.id, drain.url]
-          table << :separator
+          #table << :separator
         end
 
         table
@@ -68,7 +71,7 @@ module Dawn
             uptime = "just now"
           end
           table << [gear.id, gear.name, uptime]
-          table << :separator
+          #table << :separator
         end
 
         table
@@ -76,4 +79,4 @@ module Dawn
 
     end
   end
-end
+end

data/lib/dawn/cli/parser.rb

@@ -0,0 +1,266 @@
+require "docopt"
+require 'highline/import'
+
+module Dawn
+  module CLI
+DOC_TOP = %Q(Usage:
+  dawn --version
+  dawn [-a APPNAME] [-h] <command> [<argv>...]
+
+Commands:
+  create [<name>]
+  ls
+  ps
+  login
+  logs [-f]
+    -f, --follow               follow logs
+  app
+  domain
+  drain
+  env
+  key
+  release
+  run
+
+Options:
+  -a APPNAME, --app=APPNAME  specify app
+  -h, --help                 display help
+  --version                  print version
+)
+
+DOC_SUBCOMMAND = {}
+DOC_SUBCOMMAND["app"] = %Q(Usage:
+  dawn app            list all avaiable apps
+  dawn app <command>
+
+Commands:
+  delete
+  restart
+  scale <gear_modifier>
+
+GearModifier:
+  type=number
+  type+number
+  type-number
+)
+
+DOC_SUBCOMMAND["domain"] = %Q(Usage:
+  dawn domain              list all domains for current app
+  dawn domain [<command>]
+
+Commands:
+  add <url>
+  delete <url>
+)
+
+DOC_SUBCOMMAND["drain"] = %Q(Usage:
+  dawn drain              list all drains for current app
+  dawn drain [<command>]
+
+Commands:
+  add <url>
+  delete <url>
+)
+
+DOC_SUBCOMMAND["env"] = %Q(Usage:
+  dawn env              print the ENV for the current app
+  dawn env [<command>]
+
+Commands:
+  get <key_name>...
+  set <key_name=value>...
+  unset <key_name>...
+)
+
+DOC_SUBCOMMAND["key"] = %Q(Usage:
+  dawn key              list all keys deployed to dawn
+  dawn key [<command>]
+
+Commands:
+  add
+  delete <id>
+  get <id>
+)
+
+DOC_SUBCOMMAND["release"] = %Q(Usage:
+  dawn release              list all releases for the current app
+  dawn release [<command>]
+
+Commands:
+  add
+)
+
+    @@selected_app = nil
+
+    ###
+    # @return [String]
+    ###
+    def self.selected_app
+      @@selected_app
+    end
+
+    ###
+    # @param [String] appname
+    ###
+    def self.selected_app=(appname)
+      @@selected_app = appname
+    end
+
+    ###
+    # @param [String] basename
+    ###
+    def self.not_a_command(basename, command)
+      # oh look, git style error message
+      abort "#{basename}: '#{command}' is not a #{basename} command. See '#{basename} --help'."
+    end
+
+    ###
+    # @param [String] command
+    # @param [Hash] options
+    ###
+    def self.run_app_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::App.list
+      when "delete"
+        Dawn::CLI::App.delete
+      when "restart"
+        Dawn::CLI::App.restart
+      when "scale"
+        data = options["<argv>"].inject({}) do |str, hash|
+          if str =~ /(\S+)([+-=])(\d+)/
+            hash[$1] = [$2, $3.to_i]
+          end
+        end
+        Dawn::CLI::App.scale(data)
+      else
+        not_a_command("dawn app", command)
+      end
+    end
+
+    def self.run_domain_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::Domain.list
+      when "add"
+        url = options["<argv>"].first
+        Dawn::CLI::Domain.add(url)
+      when "delete"
+        url = options["<argv>"].first
+        Dawn::CLI::Domain.delete(url)
+      else
+        not_a_command("dawn domain", command)
+      end
+    end
+
+    def self.run_drain_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::Drain.list
+      when "add"
+        url = options["<argv>"].first
+        Dawn::CLI::Drain.add(url)
+      when "delete"
+        url = options["<argv>"].first
+        Dawn::CLI::Drain.delete(url)
+      else
+        not_a_command("dawn drain", command)
+      end
+    end
+
+    def self.run_env_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::Env.list
+      when "get"
+        keys = options["<argv>"]
+        Dawn::CLI::Env.get(*keys)
+      when "set"
+        data = options["<argv>"].each_with_object({}) do |str, hash|
+          if str =~ /(\S+)=(.*)/
+            key, value = $1, $2
+            hash[key] = value
+          end
+        end
+        Dawn::CLI::Env.set(data)
+      when "unset"
+        keys = options["<argv>"]
+        Dawn::CLI::Env.unset(*keys)
+      else
+        not_a_command("dawn env", command)
+      end
+    end
+
+    def self.run_key_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::Key.list
+      when "add"
+        Dawn::CLI::Key.add
+      when "get"
+        id = options["<argv>"].first
+        Dawn::CLI::Key.get(id)
+      when "delete"
+        id = options["<argv>"].first
+        Dawn::CLI::Key.delete(id)
+      else
+        not_a_command("dawn env", command)
+      end
+    end
+
+    def self.run_release_command(command, options)
+      case command.to_s
+      when ""
+        Dawn::CLI::Release.list
+      when "add"
+        Dawn::CLI::Release.add
+      else
+        not_a_command("dawn release", command)
+      end
+    end
+
+    def self.run_subcommand(command, argv)
+      if argv.empty?
+        subcommand = ""
+      else
+        result = Docopt.docopt(DOC_SUBCOMMAND[command], argv: argv,
+                               version: Dawn::CLI::VERSION, help: false)
+        subcommand = result["<command>"]
+      end
+      send("run_#{command}_command", subcommand, result)
+    end
+
+    def self.run(argv)
+      result = Docopt.docopt(DOC_TOP, version: Dawn::CLI::VERSION, argv: argv)
+      if result["--version"]
+        say "Dawn CLI #{Dawn::CLI::VERSION}"
+      else
+        self.selected_app = result["--app"]
+
+        command = result["<command>"]
+        command_argv = result["<argv>"]
+        case command
+        when "create"
+          Dawn::CLI::App.create command_argv.first
+        when "ls"
+          Dawn::CLI::App.list
+        when "ps"
+          Dawn::CLI::App.list_gears
+        when "login"
+          username = ask("Username: ")
+          password = ask("Password: ") { |q| q.echo = false }
+          Dawn::CLI::Auth.login username, password
+        when "logs"
+          Dawn::CLI::App.logs
+        when *DOC_SUBCOMMAND.keys
+          run_subcommand(command, command_argv)
+        else
+          not_a_command("dawn", command)
+        end
+      end
+    rescue Docopt::Exit => ex
+      abort ex.message
+    end
+
+  end
+end

data/lib/dawn/cli/patches.rb

@@ -1,7 +1,9 @@
+require 'terminal-table'
+
 class Terminal::Table
 
   ##
   # say uses to_str instead of to_s
   alias :to_str :to_s
 
-end
+end

data/lib/dawn/cli/version.rb

@@ -2,10 +2,10 @@ module Dawn
   module CLI
     module Version
       MAJOR = 0
-      MINOR = 7
+      MINOR = 9
       PATCH = 0
       BUILD = nil
-      STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".").freeze
+      STRING = [[MAJOR, MINOR, PATCH].compact.join("."), BUILD].compact.join("-").freeze
     end
     # backward compatibility
     VERSION = Version::STRING

data/lib/dawn/cli.rb

@@ -1,9 +1,5 @@
-require 'uri'
-require 'net/http'
-require 'time-lord'
-require 'terminal-table'
-
 require 'dawn/api'             # Dawn::Api
 require 'dawn/cli/version'     # CLI::Version information
 require 'dawn/cli/patches'     # Various Monkey Patches
-require 'dawn/cli/application' # Various Monkey Patches
+require 'dawn/cli/commands'    # CLI Commands
+require 'dawn/cli/parser'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dawn-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Blaž Hrastnik
@@ -9,22 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: time-lord
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 description: CLI for Dawn PaaS
 email: 
 executables:
@@ -74,18 +88,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
 - bin/dawn
 - lib/dawn/cli.rb
-- lib/dawn/cli/application.rb
 - lib/dawn/cli/commands.rb
 - lib/dawn/cli/commands/app.rb
+- lib/dawn/cli/commands/auth.rb
 - lib/dawn/cli/commands/domain.rb
 - lib/dawn/cli/commands/drain.rb
 - lib/dawn/cli/commands/env.rb
 - lib/dawn/cli/commands/key.rb
 - lib/dawn/cli/commands/local.rb
-- lib/dawn/cli/commands/login.rb
+- lib/dawn/cli/commands/release.rb
+- lib/dawn/cli/helpers.rb
 - lib/dawn/cli/output_formatter.rb
+- lib/dawn/cli/parser.rb
 - lib/dawn/cli/patches.rb
 - lib/dawn/cli/version.rb
 homepage: https://github.com/dawn/dawn-cli

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

@@ -1,21 +0,0 @@
-module Dawn
-module CLI
-class Application
-def login_commands
-
-command "login" do |c|
-  c.syntax = "dawn login"
-  c.description = "Login to dawn's API"
-
-  c.action do |args, options|
-    usn = ask "Username: "
-    psw = password "Password: "
-    Dawn.authenticate username: usn, password: psw
-    say " ! login details have been saved to your .netrc"
-  end
-end
-
-end
-end
-end
-end