zillabyte-cli 0.1.1 → 0.1.2

data/lib/zillabyte/cli/{relations.rb → data.rb}

@@ -2,34 +2,35 @@ require "zillabyte/cli/base"
 require "zillabyte/cli/helpers/table_output_builder"
 require "csv"
 require "open-uri"
-require "aws-sdk"
 require "json"
 require "base64"
 
 
-# manage custom relations
+# manage custom datasets
 #
-class Zillabyte::Command::Relations < Zillabyte::Command::Base
+class Zillabyte::Command::Data < Zillabyte::Command::Base
 
   MAX_POLL_SECONDS = 60 * 5
   POLL_SLEEP = 1
   APPENDS_ROWS_SLICE = 5_000;
 
-  # relations
+  # data
   #
-  # lists your custom relations 
-  # --output_type OUTPUT_TYPE                   # specify an output type i.e. json
+  # Lists your custom datasets.
+  #
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   # 
   def index
     self.list
   end
   
 
-  # relations
+  # data
   #   
-  # lists your custom relations 
+  # Lists your custom datasets.
   # 
-  #  --output_type OUTPUT_TYPE # The output format type
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
+  #
   def list
     type = options[:output_type] || nil
 
@@ -48,20 +49,20 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       vals 
     end
 
-    display "relations\n" if type.nil? && rows.size > 0
+    display "datasets\n" if type.nil? && rows.size > 0
     display TableOutputBuilder.build_table(headings, rows, type)
-    display "Total number of relations: "+rows.length.to_s if type.nil?
+    display "Total number of datasets: "+rows.length.to_s if type.nil?
 
   end
-  alias_command "rl:list", "relations:list"
 
 
-  # relations:delete ID
+  # data:delete ID
   # 
-  # deletes a relation 
+  # Deletes a dataset.
   # 
-  # -f, --force         # Delete without asking for confirmation
-  # --output_type OUTPUT_TYPE     # The output format type
+  # -f, --force                                 # Delete without asking for confirmation
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
+  #
   def delete 
     id = options[:id] || shift_argument
     forced = options[:force]
@@ -74,10 +75,10 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       end
 
       while true
-        display "This operation cannot be undone. Are you sure you want to delete this relation? (yes/no):", false
+        display "This operation cannot be undone. Are you sure you want to delete this dataset? (yes/no):", false
         confirm = ask
         break if confirm == "yes" || confirm == "no"
-        display "Please enter 'yes' to delete the relation or 'no' to exit"
+        display "Please enter 'yes' to delete the dataset or 'no' to exit"
       end
     end
 
@@ -96,20 +97,19 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       end
     end
   end
-  alias_command "rl:delete", "relations:delete"
 
 
-  # relations:create NAME
+  # data:create NAME
   #
-  # creates a new relation
+  # Creates a new dataset.
   #
-  # --schema SCHEMA              # Column names and types in the format "field_1:output_type_1,field_2:output_type_2,..."
-  # --public SCOPE               # Make the relation public
-  # --file FILE                  # A data file 
-  # --filetype FILETYPE          # File format type, defaults to csv
-  # --description DESCRIPTION    # Description of relation contents
-  # --aliases ALIASES            # Relation name aliases in the format "alias_1,alias_2,..."
-  # --output_type OUTPUT_TYPE                  # The output format type
+  # --schema SCHEMA                             # Column names and types in the format "field_1:output_type_1,field_2:output_type_2,..."
+  # --public SCOPE                              # Make the dataset public
+  # --file FILE                                 # A data file 
+  # --filetype FILETYPE                         # File format type, defaults to csv
+  # --description DESCRIPTION                   # Description of dataset contents
+  # --aliases ALIASES                           # Dataset name aliases in the format "alias_1,alias_2,..."
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def create
 
@@ -126,9 +126,9 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     aliases = options[:aliases] || nil
 
     if type.nil?
-      hash = get_relation_properties(schema,is_public,description,aliases)
+      hash = get_dataset_properties(schema,is_public,description,aliases)
     else
-      hash = hash_relation_properties(schema,is_public,description,aliases, type)
+      hash = hash_dataset_properties(schema,is_public,description,aliases, type)
     end
 
     if file
@@ -144,19 +144,19 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       if type == "json"
         display "{}"
       else
-        display "relation ##{res['id']} #{res['action']}. size: #{res['size'] || 0} rows."
+        display "dataset ##{res['id']} #{res['action']}. size: #{res['size'] || 0} rows."
       end
     end
 
   end
-  alias_command "rl:create", "relations:create"
   
   
-  # relations:append ID FILE
+  # data:append ID FILE
+  #
+  # Adds data to an existing dataset.
   #
-  # adds data to an existing relation
-  # --filetype FILETYPE                 # Input File format type, defaults to csv
-  # --output_type OUTPUT_TYPE                     # Output formatting type i.e. json
+  # --filetype FILETYPE                         # Input File format type, defaults to csv
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def append
 
@@ -169,14 +169,16 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     error("no id given", type) if id.nil?
     error("no file given", type) if file.nil?
     
-    relation = self.api.data.get(id, options)
-    columns = relation["columns"].map{|col| {col["index"] => col["type"]}}
+    dataset = self.api.data.get(id, options)
+    columns = dataset["columns"].map{|col| {col["index"] => col["type"]}}
     raw_rows = sanity_check_file(file,filetype,{"columns" => columns}, type)
    
     total_rows = 0 
     display("uploading content.", false)
     raw_rows.each_slice(APPENDS_ROWS_SLICE) do |rows|
       
+      
+      # TODO: post to direct signed s3 (http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/PresignedPost.html)
       display(".", false)
       res = self.api.data.append(id, {:gzip_rows => Base64.encode64(gzip(rows.to_json()))})
       # res = self.api.data.append(id, {:rows => rows})
@@ -188,19 +190,17 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     if type == "json"
       display({:rows => total_rows}.to_json)
     else
-      display "relation ##{id} appended #{total_rows} rows"
+      display "dataset ##{id} appended #{total_rows} rows"
     end
 
   end
-  alias_command "append", "relations:append"
-  alias_command "rl:append", "relations:append"
 
-  # relations:pull ID OUTPUT
+  # data:pull ID OUTPUT
   #
-  # pulls relation data into OUTPUT.gz
+  # Pulls dataset into OUTPUT.gz.
   #
-  #  --cycle_id [cycle_id]              # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle
-  #  --output_type OUTPUT_TYPE                        # specify a communication format (i.e json) for programmatic interaction
+  # --cycle_id [cycle_id]                       # Retrieve data generated during specified cycle if dataset is associated with an app [default: last cycle]
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def pull
 
@@ -214,54 +214,23 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
     res = self.api.data.pull(id, options)
 
-    if(res["uri"])
-      display "Waiting for download." if type.nil?
-      File.open(file, "w") do |f|
-        f.write open(res["uri"]).read
-      end
-    elsif(res["s3_credentials"])
-      display "Request sent. Depending on the size of your file, this may take a while." if type.nil?
-      s3 = AWS::S3.new(res["s3_credentials"])
-      bucket = s3.buckets[res["s3_bucket"]]
-      obj = bucket.objects.with_prefix("#{res["s3_file_key"]}/")
-
-      while(true)
-        keys = obj.collect(&:key)
-        if keys.length > 0 and keys.include?("#{res["s3_file_key"]}/manifest")
-          display "Starting to write to file..." if type.nil?
-          File.open(file, "w") do |f|
-            obj.each do |o|
-              if o.key == "#{res["s3_file_key"]}/manifest"
-                next
-              end
-              f.write(o.read)
-            end
-          end
-          break
-        else
-          sleep(3)
-          obj = bucket.objects.with_prefix("#{res["s3_file_key"]}/")
-        end
-      end
-    end
+    handle_downloading_manifest(file, res, type)
 
     if type == "json"
       display "{}"
     else
-      display "pulled data from relation ##{id} to file #{file}"
+      display "finished pulling dataset ##{id} to file"
     end
 
   end
-  alias_command "rl:pull", "relations:pull"
 
-  # relations:pull:s3 ID S3_KEY S3_SECRET S3_BUCKET s3_FILE_KEY
+  # data:pull:s3 ID S3_KEY S3_SECRET S3_BUCKET s3_FILE_KEY
   #
-  # pulls relation data to S3_BUCKET/FILE_KEY/part***.gz
+  # Pulls dataset to S3_BUCKET/FILE_KEY/part***.gz.
   #
-  #  --cycle_id [cycle_id]                                # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle)
-  #  -t, --output_type OUTPUT_TYPE                                      # the output format types
+  # --cycle_id [cycle_id]                       # Retrieve data generated during specified cycle if dataset is associated with an app [default: last cycle]
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
-
   def pull_to_s3
 
     id = options[:id] || shift_argument
@@ -286,24 +255,27 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
     if type == "json"
       display "{}"
     else
-      display "downloading relation data to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
-      display "if the relation is large, this may take a while, please check your s3 account after a few minutes"
+      display "downloading dataset to s3://#{res["s3_bucket"]}/#{res["s3_file_key"]}/"
+      display "if the dataset is large, this may take a while, please check your s3 account after a few minutes"
     end
   end
-  alias_command "relations:pull:s3", "relations:pull_to_s3"
-  alias_command "rl:pull:s3", "relations:pull_to_s3"
+  alias_command "data:pull:s3", "data:pull_to_s3"
 
 
-  # relations:show ID
+  # data:show ID
+  #
+  # Shows a sample of the dataset. See 'zillabyte queries' for 
+  # more elaborate functionality.
   #
-  # shows a sample of the data in a relation. see 'zillabyte queries' for more elaborate functionality
+  # --cycle_id [cycle_id]                       # Retrieve data generated during specified cycle if dataset is associated with an app [default: last cycle]
+  # --no_truncation                             # Don't truncate long strings
+  # --meta                                      # Show metadata columns (since, confidence, source)
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
-  #  --cycle_id [cycle_id]   # retrieve data generated for that cycle, only if this relation is associated with an app. (defaults to the last cycle)
-  #  --no_truncation         # don't truncate long strings
-  #  --output_type OUTPUT_TYPE             # the type of the output
   def show
     name = options[:name] || shift_argument
     type = options[:output_type]
+    show_meta = options[:meta] || false
     error "no id given" if name.nil?
     
     # Initial request..
@@ -354,6 +326,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       headings = []
       concrete_headings = res["rows"].first.keys
       concrete_headings.delete("id")
+      META_COLUMNS.each {|c| concrete_headings.delete c} if (!show_meta)
       concrete_headings.each do |ch|
         has_alias = false
         (res['column_aliases'] || []).each do |al|
@@ -386,24 +359,23 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
       if type == "json"
         display "{}"
       else
-        display "empty relation"
+        display "empty dataset"
       end
     end
     
   end
-  alias_command "rl:show", "relations:show"
 
 
   private
 
 
-  def hash_relation_properties(schema, is_public, description, aliases, type)
+  def hash_dataset_properties(schema, is_public, description, aliases, type)
     if !aliases.nil?
       aliases = aliases.strip.split(",").map{|x| x.strip}.uniq
       aliases.each do |a|
         if(!(a =~ /^[a-zA-Z0-9\_]+$/i))
           error_message = "(\"#{a}\" contains illegal characters. Only letters, numbers and underscore are allowed in alias names."
-          error_message += "If you would like to give alias names to your relation, please enter them below. (comma separated, only letters, number and underscore allowed)"
+          error_message += "If you would like to give alias names to your dataset, please enter them below. (comma separated, only letters, number and underscore allowed)"
           error(error_message, type)
         end
       end
@@ -443,7 +415,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
 
 
-  def get_relation_properties(schema, is_public, description = "", aliases = nil)
+  def get_dataset_properties(schema, is_public, description = "", aliases = nil)
     
     description ||= ""
     valid_types=["string", "integer", "float"]
@@ -486,7 +458,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
     if is_public.nil?
       while true
-        display "Would you like your relation to be public? (yes or no)"
+        display "Would you like your dataset to be public? (yes or no)"
         pp = ask.strip.downcase
         if(pp == "yes" or pp == "y")
           is_public = "public"
@@ -523,7 +495,7 @@ class Zillabyte::Command::Relations < Zillabyte::Command::Base
 
         CSV.foreach(file) do |row|
           if row.size != n_columns
-            error("relation expect #{n_columns} column(s). Found a row with #{row.size}::\n #{row}", type)
+            error("dataset expects #{n_columns} column(s). Found a row with #{row.size}::\n #{row}", type)
           end
 
           float_cols.each do |i|

data/lib/zillabyte/cli/flows.rb

@@ -21,10 +21,10 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:status [DIR]
   # 
-  # fetches detailed status of the flow
+  # Fetches detailed status of the flow.
   # 
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  # --directory DIR # Directory of the flow
+  # --directory DIR                             # Flow directory
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def status
 
@@ -56,11 +56,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:pull ID DIR
   #
-  # pulls a flow source to a directory.
+  # Pulls a flow source to a directory.
   #
-  # --force # pulls even if the directory exists
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  # --directory DIR # Directory of the flow
+  # --force                                     # Pulls even if the directory exists
+  # --directory DIR                             # Flow directory
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   # Examples:
   #
@@ -107,13 +107,21 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:prep [DIR]
   # 
-  # performs any necessary initialization for the flow
+  # Performs any necessary initialization for the flow.
   # 
-  # --directory DIR       # flow directory
-  # --output_type OUTPUT_TYPE           # specify an output type i.e. json
+  # --directory DIR                             # Flow directory
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
+  # --mode MODE                                 # Specify development or production mode for dependencies #HIDDEN
   #   
-  def prep
-
+  def prep()
+    mode, bundle_flags = case options[:mode]
+    when nil, "development"
+      [:development, ""]
+    when "production"
+      [:production, "--deployment"]
+    else
+      error("Unsupported mode #{options[:mode].inspect()}.  Zillabyte currently supports development and production.")
+    end
     type = options[:output_type]
     dir = options[:directory] || shift_argument
     if dir.nil?
@@ -130,12 +138,10 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
     case meta["language"]
     when "ruby"
-
       # Execute in the bundler context
       full_script = File.join(dir, meta["script"])
-      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install"
+      cmd = "cd \"#{meta['home_dir']}\"; unset BUNDLE_GEMFILE; unset RUBYOPT; bundle install #{bundle_flags}"
       exec(cmd)
-      
     when "python"
       vDir = "#{meta['home_dir']}/vEnv"
       lock_file = meta['home_dir']+"/zillabyte_thread_lock_file"
@@ -158,11 +164,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:logs ID [OPERATION_NAME]
   #
-  # streams logs from the distributed workers
+  # Streams logs for the flow from our cluster.
   # 
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  # --operation OPERATION_NAME # specify the operation to show logs for
-  # -v, --verbose LEVEL  # sets the verbosity (error, info, debug) (default: info)
+  # --operation OPERATION_NAME                  # Specify the operation to show logs for
+  # -v, --verbose LEVEL                         # Sets the verbosity (error, info, debug) [default: info]
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def logs
 
@@ -193,8 +199,9 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:errors ID
   #
-  # show recent errors generated by the flow
-  # --output_type OUTPUT_TYPE           # specify an output type i.e. json
+  # Show recent errors generated by the flow.
+  #
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def errors
 
@@ -256,11 +263,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:live_run [OPERATION_NAME] [PIPE_NAME] [DIR]
   #
-  # runs a local flow with live data
+  # Runs a local flow with live data.
   # 
-  # --config CONFIG_FILE # use the given config file
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  # --directory DIR # Directory of the flow
+  # --config CONFIG_FILE                        # Use the given config file
+  # --directory DIR                             # Flow directory
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def live_run
 
@@ -292,11 +299,11 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:info [DIR]
   # 
-  # outputs the info for the flow in the dir.
+  # Outputs the info for the flow in the dir.
   # 
-  # --pretty # Pretty prints the info output
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  # --directory DIR # Directory of the flow
+  # --pretty                                    # Pretty prints the info output
+  # --directory DIR                             # Flow directory
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def info
 
@@ -330,10 +337,10 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:delete ID
   #
-  # deletes a flow. if the flow is running, this command will kill it. 
+  # Deletes a flow. If the flow is running, this command will kill it. 
   #
-  # -f, --force # don't ask for confirmation
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
+  # -f, --force                                 # Don't ask for confirmation
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def delete
     id = options[:id] || shift_argument
@@ -412,9 +419,6 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   end
 
 
-  #
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  #
   def self.get_info(cmd, info_file, dir, options = {})
     type = options[:output_type]
 
@@ -457,18 +461,16 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
   end
 
 
-
-
   # flows:test
   #
-  # tests a local flow with sample data
+  # Tests a local flow with sample data.
   # 
-  # --config CONFIG_FILE            # use the given config file
-  # --input INPUT_FILE            # writes sink output to a file
-  # --output OUTPUT_FILE            # writes sink output to a file
-  # --cycles CYCLES                 # number of cycles to emit (default 1)
-  # --directory DIR                 # flow directory
-  # -i, --interactive   # allow user to control input and read output
+  # --config CONFIG_FILE                        # Use the given config file
+  # --input INPUT_FILE                          # Uses a CSV for component input (only applicable for components)
+  # --output OUTPUT_FILE                        # Writes sink output to a file
+  # --cycles CYCLES                             # Number of cycles to emit [default 1] (only applicable for apps)
+  # --directory DIR                             # Flow directory
+  # -i, --interactive                           # Interactively control input and read output (only applicable for apps)
   #
   def test
      dir = options[:directory]
@@ -514,10 +516,10 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   # flows:kill ID
   #
-  # kills the given flow
+  # Kills the given flow.
   # 
-  # --config CONFIG_FILE # use the given config file
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
+  # --config CONFIG_FILE                        # Use the given config file
+  # --output_type OUTPUT_TYPE                   # Specify an output type i.e. json #HIDDEN
   #
   def kill
     id = options[:id] || shift_argument
@@ -578,9 +580,7 @@ class Zillabyte::Command::Flows < Zillabyte::Command::Base
 
   private 
   
-  #
-  # --output_type OUTPUT_TYPE # specify an output type i.e. json
-  #
+
   def command(arg="--execute_live", type = nil, dir = Dir.pwd, ignore_stderr = false)
     meta = Zillabyte::CLI::Config.get_config_info(dir, self, options)
 

data/lib/zillabyte/cli/git.rb

@@ -6,14 +6,13 @@ class Zillabyte::Command::Git < Zillabyte::Command::Base
 
   # git:remote [OPTIONS]
   #
-  # adds a git remote to an app repo
+  # Adds a git remote to an app repo.
+  # If OPTIONS are specified they will be passed to git remote add.
   #
-  # if OPTIONS are specified they will be passed to git remote add
+  # -r, --remote REMOTE                         # The git remote to create, default "Zillabyte"
+  # -n, --name NAME                             # The name of the app, default current directory's name
   #
-  # -r, --remote REMOTE        # the git remote to create, default "Zillabyte"
-  # -n, --name NAME            # the name of the app, default current directory's name
-  #
-  #Examples:
+  # Examples:
   #
   # $ zillabyte git:remote -a example
   # Git remote zillabyte added
@@ -32,4 +31,4 @@ class Zillabyte::Command::Git < Zillabyte::Command::Base
     
   end
 
-end
+end

data/lib/zillabyte/cli/help.rb

@@ -4,14 +4,13 @@ require "zillabyte/cli/base"
 #
 class Zillabyte::Command::Help < Zillabyte::Command::Base
 
-  PRIMARY_NAMESPACES = %w( relations query apps components logs )
+  PRIMARY_NAMESPACES = %w( data query apps components logs )
   
   # help
   def index(*direct_args)
     
     if command = args.shift || direct_args.shift
       if command == "aliases"
-        puts
         puts "Useful aliases: "
         puts 
         summary_for_aliases(Zillabyte::Command.command_aliases)
@@ -85,8 +84,8 @@ private
 
   def summary_for_aliases(command_aliases)
     used_aliases = command_aliases.select{|c,a| !c.include?("-") and !c.include?(":") and !skip_command?(commands[a])}
-    a_size = longest(used_aliases.map { |al,al_to| al }) + 4
-    a_to_size = longest(used_aliases.map { |al,al_to| al_to }) + 4
+    a_size = longest(used_aliases.map { |al,al_to| al }) + 6
+    a_to_size = longest(used_aliases.map { |al,al_to| al_to }) + 6
     used_aliases.sort_by{|k,v| v}.each do |command_alias, alias_to|
 
       if command_alias.include?("-") or command_alias.include?(":")
@@ -149,7 +148,6 @@ private
         puts
         puts " " + legacy_help_for_command(name).to_s
       end
-      puts
     end
 
     namespace_commands = commands_for_namespace(name).reject do |command|