dawn-cli 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c69df2b06d2b520437bb91ae452de45c88693ce
-  data.tar.gz: cbc1a3bd916fc0aab3651867f8b2ddf797142c11
+  metadata.gz: 5648f22bab9ddaf3fc4b15aa7d442e8cd14dde2d
+  data.tar.gz: 755487a68afc3f624344ad1fcb171147cbe9b3eb
 SHA512:
-  metadata.gz: 11d3f2f1ddd10804df98ab8f571a3f36de4369bc101bccc3c8619b6931eb65f21abe7e5563c79d5c48f8af195f2b0ebd0ea984c6388729ff46578c34d3b058f8
-  data.tar.gz: b1c12805372cca918d79124a7de6f66f44dc1a66c516143ce8d5a12fa125105e6cc4e61d9b0bd182879292854c48e2c345da8bbe23474e7f08bf71e06f3ec79c
+  metadata.gz: 32142f2d3d226bf03a43fc4b6fe6c3f73173d5a56a8a4c4df47eb20225c9d16ffd81e0d5d9909bb55a359e6313464c3a44cc22d7ac9e0047ea103e1571f0554f
+  data.tar.gz: ee71bb731ff703315c787c644680359c53a6958aed662a3325990947346daf39746902c5100cced416d8ad332bb3508efca9c5ec79aa5c39de9a54e7d5218eed

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

@@ -6,6 +6,16 @@ module Dawn
 
       extend Dawn::CLI::Helpers
 
+      # "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
+
       # "Displays a list of all the apps you have deployed to dawn"
       def self.list
         say format_apps(Dawn::App.all)

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

@@ -10,16 +10,6 @@ module Dawn
         Dawn::API.health_check
       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
-
     end
   end
 end

data/lib/dawn/cli/parser.rb

@@ -1,93 +1,131 @@
 require "docopt"
 require 'highline/import'
+require "dawn/cli/commands"
+require "dawn/cli/version"
 
 module Dawn
   module CLI
-DOC_TOP = %Q(Usage:
-  dawn --version
-  dawn [-a APPNAME] [-h] <command> [<argv>...]
+DOC_TOP =
+%Q(usage: dawn [-a APPNAME] [-h] [<command>] [<argv>...]
+
+Options:
+  -a APPNAME, --app=APPNAME           specify app.
+  -h, --help                          display help.
+  --version                           print version.
 
 Commands:
-  create [<name>]
-  ls
-  ps
-  login
+  create [<name>]                     initialize a new app in this the wd.
+  ls                                  print all deployed apps.
+  ps                                  print all running gears for current app.
+  login                               setup your netrc login details for dawn.
   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
+    -f, --follow                      follow logs.
+  app                                 App control command.
+  domain                              Domain control command.
+  drain                               Drain control command.
+  env                                 ENV control command.
+  key                                 Key control command.
+  release                             Release control command.
+  run                                 run command on current app.
 )
 
 DOC_SUBCOMMAND = {}
-DOC_SUBCOMMAND["app"] = %Q(Usage:
-  dawn app            list all avaiable apps
-  dawn app <command>
+DOC_SUBCOMMAND["app"] =
+%Q(usage: dawn app
+       dawn app delete
+       dawn app restart
+       dawn app scale <gear_modifier>...
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  delete
-  restart
-  scale <gear_modifier>
-
-GearModifier:
-  type=number
-  type+number
-  type-number
+  delete                              remove the app from dawn.
+  restart                             self explanatory.
+  scale                               scale app services.
+                                        gear_modifier takes the format
+                                        type=number, type+number or type-number
+                                        EG: web=3 db+1
+
+  if no command is given, prints all available apps.
 )
 
-DOC_SUBCOMMAND["domain"] = %Q(Usage:
-  dawn domain              list all domains for current app
-  dawn domain [<command>]
+DOC_SUBCOMMAND["domain"] =
+%Q(usage: dawn domain
+       dawn domain add <url>
+       dawn domain delete <url>
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  add <url>
-  delete <url>
+  add                                 add a new domain to the current app.
+  delete                              remove a domain from the current app.
+
+  if no command is given, prints all domains for current app.
+
 )
 
-DOC_SUBCOMMAND["drain"] = %Q(Usage:
-  dawn drain              list all drains for current app
-  dawn drain [<command>]
+DOC_SUBCOMMAND["drain"] =
+%Q(usage: dawn drain
+  dawn drain add <url>
+  dawn drain delete <url>
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  add <url>
-  delete <url>
+  add                                 add a new log drain to current app.
+  delete                              remove a log drain from the current app.
+
+  if no command is given, prints all drains for current app.
 )
 
-DOC_SUBCOMMAND["env"] = %Q(Usage:
-  dawn env              print the ENV for the current app
-  dawn env [<command>]
+DOC_SUBCOMMAND["env"] =
+%Q(usage: dawn env
+       dawn env get <key_name>...
+       dawn env set <key_name=value>...
+       dawn env unset <key_name>...
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  get <key_name>...
-  set <key_name=value>...
-  unset <key_name>...
+  get                                 print filtered ENV variables.
+  set                                 set ENV variables.
+  unset                               unset ENV variables.
+
+  if no command is given, prints the ENV for the current app.
 )
 
-DOC_SUBCOMMAND["key"] = %Q(Usage:
-  dawn key              list all keys deployed to dawn
-  dawn key [<command>]
+DOC_SUBCOMMAND["key"] =
+%Q(usage: dawn key
+       dawn key add
+       dawn key delete <id>
+       dawn key get <id>
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  add
-  delete <id>
-  get <id>
+  add                                 add your current public key to dawn.
+  delete                              remove a key.
+  get                                 retrieve a key.
+
+  if no command is given, prints all keys deployed to dawn.
 )
 
-DOC_SUBCOMMAND["release"] = %Q(Usage:
-  dawn release              list all releases for the current app
-  dawn release [<command>]
+DOC_SUBCOMMAND["release"] =
+%Q(usage: dawn release
+       dawn release add
+
+Options:
+  -h, --help                          display help.
 
 Commands:
-  add
+  add                                 create a new release for the current app.
+
+  if no command is given, list all releases for the current app.
 )
 
     @@selected_app = nil
@@ -118,64 +156,52 @@ Commands:
     # @param [String] command
     # @param [Hash] options
     ###
-    def self.run_app_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::App.list
-      when "delete"
+    def self.run_app_command(options)
+      if options["delete"]
         Dawn::CLI::App.delete
-      when "restart"
+      elsif options["restart"]
         Dawn::CLI::App.restart
-      when "scale"
-        data = options["<argv>"].inject({}) do |str, hash|
+      elsif options["scale"]
+        data = options["<gear_modifier>"].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)
+        Dawn::CLI::App.list
       end
     end
 
-    def self.run_domain_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::Domain.list
-      when "add"
-        url = options["<argv>"].first
+    def self.run_domain_command(options)
+      if options["add"]
+        url = options["<url>"]
         Dawn::CLI::Domain.add(url)
-      when "delete"
-        url = options["<argv>"].first
+      elsif options["delete"]
+        url = options["<url>"]
         Dawn::CLI::Domain.delete(url)
       else
-        not_a_command("dawn domain", command)
+        Dawn::CLI::Domain.list
       end
     end
 
-    def self.run_drain_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::Drain.list
-      when "add"
-        url = options["<argv>"].first
+    def self.run_drain_command(options)
+      if options["add"]
+        url = options["<url>"]
         Dawn::CLI::Drain.add(url)
-      when "delete"
-        url = options["<argv>"].first
+      elsif options["delete"]
+        url = options["<url>"]
         Dawn::CLI::Drain.delete(url)
       else
-        not_a_command("dawn drain", command)
+        Dawn::CLI::Drain.list
       end
     end
 
-    def self.run_env_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::Env.list
-      when "get"
-        keys = options["<argv>"]
+    def self.run_env_command(options)
+      if options["get"]
+        keys = options["<key_name>"]
         Dawn::CLI::Env.get(*keys)
-      when "set"
+      elsif options["set"]
         data = options["<argv>"].each_with_object({}) do |str, hash|
           if str =~ /(\S+)=(.*)/
             key, value = $1, $2
@@ -183,80 +209,84 @@ Commands:
           end
         end
         Dawn::CLI::Env.set(data)
-      when "unset"
-        keys = options["<argv>"]
+      elsif options["unset"]
+        keys = options["<key_name>"]
         Dawn::CLI::Env.unset(*keys)
       else
-        not_a_command("dawn env", command)
+        Dawn::CLI::Env.list
       end
     end
 
-    def self.run_key_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::Key.list
-      when "add"
+    def self.run_key_command(options)
+      if options["add"]
         Dawn::CLI::Key.add
-      when "get"
-        id = options["<argv>"].first
+      elsif options["get"]
+        id = options["<id>"].first
         Dawn::CLI::Key.get(id)
-      when "delete"
-        id = options["<argv>"].first
+      elsif options["delete"]
+        id = options["<id>"].first
         Dawn::CLI::Key.delete(id)
       else
-        not_a_command("dawn env", command)
+        Dawn::CLI::Key.list
       end
     end
 
-    def self.run_release_command(command, options)
-      case command.to_s
-      when ""
-        Dawn::CLI::Release.list
-      when "add"
+    def self.run_release_command(options)
+      if options["add"]
         Dawn::CLI::Release.add
       else
+        Dawn::CLI::Release.list
         not_a_command("dawn release", command)
       end
     end
 
+    ###
+    # @param [String] command
+    # @param [Array<String>] argv
+    ###
     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>"]
+                               version: Dawn::CLI::VERSION, help: true)
       end
-      send("run_#{command}_command", subcommand, result)
+      send("run_#{command}_command", result)
     end
 
+    ###
+    # @param [Array<String>] argv
+    ###
     def self.run(argv)
-      result = Docopt.docopt(DOC_TOP, version: Dawn::CLI::VERSION, argv: argv)
-      if result["--version"]
-        say "Dawn CLI #{Dawn::CLI::VERSION}"
+      # initial run to retrieve command
+      result = Docopt.docopt(DOC_TOP, argv: argv,
+                             version: Dawn::CLI::VERSION, help: false)
+      command = result["<command>"]
+      # run the docopt again this time with help enabled if there was no command
+      unless command
+        result = Docopt.docopt(DOC_TOP, argv: argv,
+                               version: Dawn::CLI::VERSION, help: true)
+      end
+
+      # set the selected_app
+      self.selected_app = result["--app"]
+      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, argv)
       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
+        not_a_command("dawn", command)
       end
     rescue Docopt::Exit => ex
       abort ex.message

data/lib/dawn/cli/version.rb

@@ -3,7 +3,7 @@ module Dawn
     module Version
       MAJOR = 0
       MINOR = 9
-      PATCH = 0
+      PATCH = 1
       BUILD = nil
       STRING = [[MAJOR, MINOR, PATCH].compact.join("."), BUILD].compact.join("-").freeze
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dawn-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Blaž Hrastnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt