pogo 2.32.14 → 2.39.2

data/lib/heroku/command/pg.rb

@@ -93,15 +93,11 @@ class Heroku::Command::Pg < Heroku::Command::Base
     end
     validate_arguments!
 
-    attachment = hpg_resolve(db) unless db == "SHARED_DATABASE"
+    attachment = hpg_resolve(db)
     return unless confirm_command
 
-    if db == "SHARED_DATABASE"
-      action("Resetting SHARED_DATABASE") { heroku.database_reset(app) }
-    else
-      action("Resetting #{attachment.display_name}") do
-        hpg_client(attachment).reset
-      end
+    action("Resetting #{attachment.display_name}") do
+      hpg_client(attachment).reset
     end
   end
 
@@ -181,6 +177,9 @@ class Heroku::Command::Pg < Heroku::Command::Base
       uri = URI.parse( attachment.url )
       display "Connection info string:"
       display "   \"dbname=#{uri.path[1..-1]} host=#{uri.host} port=#{uri.port || 5432} user=#{uri.user} password=#{uri.password} sslmode=require\""
+      display "Connection URL:"
+      display "    " + attachment.url
+
     end
   end
 
@@ -218,15 +217,7 @@ private
   end
 
   def hpg_info(attachment, extended=false)
-    if attachment.resource_name == "SHARED_DATABASE"
-      data = api.get_app(app).body
-      {:info => [{
-        'name'    => 'Data Size',
-        'values'  => [format_bytes(data['database_size'])]
-      }]}
-    else
-      hpg_client(attachment).get_database(extended)
-    end
+    hpg_client(attachment).get_database(extended)
   end
 
   def hpg_info_display(item)

data/lib/heroku/command/pgbackups.rb

@@ -20,10 +20,11 @@ module Heroku::Command
       pgbackup_client.get_transfers.each { |t|
         next unless backup_types.member?(t['to_name']) && !t['error_at'] && !t['destroyed_at']
         backups << {
-          'id' => backup_name(t['to_url']),
-          'created_at' => t['created_at'],
-          'size' => t['size'],
-          'database' => t['from_name']
+          'id'          => backup_name(t['to_url']),
+          'created_at'  => t['created_at'],
+          'status'      => transfer_status(t),
+          'size'        => t['size'],
+          'database'    => t['from_name']
         }
       }
 
@@ -32,8 +33,8 @@ module Heroku::Command
       else
         display_table(
           backups,
-          %w{ id created_at size database },
-          ["ID", "Backup Time", "Size", "Database"]
+          %w{ id created_at status size database },
+          ["ID", "Backup Time", "Status", "Size", "Database"]
         )
       end
     end
@@ -90,6 +91,7 @@ module Heroku::Command
 
       if backup["error_at"]
         message  =   "An error occurred and your backup did not finish."
+        message += "\nPlease run `heroku logs --ps pgbackups` for details."
         message += "\nThe database is not yet online. Please try again." if backup['log'] =~ /Name or service not known/
         message += "\nThe database credentials are incorrect."           if backup['log'] =~ /psql: FATAL:/
         error(message)
@@ -157,7 +159,11 @@ module Heroku::Command
 
         if restore["error_at"]
           message  =   "An error occurred and your restore did not finish."
-          message += "\nThe backup url is invalid. Use `pgbackups:url` to generate a new temporary URL." if restore['log'] =~ /Invalid dump format: .*: XML  document text/
+          if restore['log'] =~ /Invalid dump format: .*: XML  document text/
+            message += "\nThe backup url is invalid. Use `pgbackups:url` to generate a new temporary URL."
+          else
+            message += "\nPlease run `heroku logs --ps pgbackups` for details."
+          end
           error(message)
         end
       end
@@ -183,6 +189,17 @@ module Heroku::Command
 
     protected
 
+    def transfer_status(t)
+      if t['finished_at']
+        "Finished @ #{t["finished_at"]}"
+      elsif t['started_at']
+        step = t['progress'] && t['progress'].split[0]
+        step.nil? ? 'Unknown' : step_map[step]
+      else
+        "Unknown"
+      end
+    end
+
     def config_vars
       @config_vars ||= api.get_config_vars(app).body
     end
@@ -207,6 +224,7 @@ module Heroku::Command
       error <<-EOM
 Failed to query the PGBackups status API. Your backup may still be running.
 Verify the status of your backup with `heroku pgbackups -a #{app}`
+You can also watch progress with `heroku logs --tail --ps pgbackups -a #{app}`
       EOM
     end
 
@@ -228,7 +246,7 @@ Verify the status of your backup with `heroku pgbackups -a #{app}`
         begin
           sleep(sleep_time)
           transfer = pgbackup_client.get_transfer(transfer["id"])
-        rescue RestClient::ServiceUnavailable, RestClient::ServerBrokeConnection
+        rescue
           if sleep_time > 300
             poll_error(app)
           else
@@ -243,15 +261,8 @@ Verify the status of your backup with `heroku pgbackups -a #{app}`
       return transfer
     end
 
-    def update_display(transfer)
-      @ticks            ||= 0
-      @last_updated_at  ||= 0
-      @last_logs        ||= []
-      @last_progress    ||= ["", 0]
-
-      @ticks += 1
-
-      step_map = {
+    def step_map
+      @step_map ||= {
         "dump"      => "Capturing",
         "upload"    => "Storing",
         "download"  => "Retrieving",
@@ -259,6 +270,15 @@ Verify the status of your backup with `heroku pgbackups -a #{app}`
         "gunzip"    => "Uncompressing",
         "load"      => "Restoring",
       }
+    end
+
+    def update_display(transfer)
+      @ticks            ||= 0
+      @last_updated_at  ||= 0
+      @last_logs        ||= []
+      @last_progress    ||= ["", 0]
+
+      @ticks += 1
 
       if !transfer["log"]
         @last_progress = ['pending', nil]

data/lib/heroku/command/ps.rb

@@ -1,6 +1,6 @@
 require "heroku/command/base"
 
-# manage processes (dynos, workers)
+# manage dynos (dynos, workers)
 #
 class Heroku::Command::Ps < Heroku::Command::Base
 
@@ -80,12 +80,12 @@ class Heroku::Command::Ps < Heroku::Command::Base
 
   # ps
   #
-  # list processes for an app
+  # list dynos for an app
   #
   #Example:
   #
   # $ heroku ps
-  # === run: one-off processes
+  # === run: one-off dyno
   # run.1: up for 5m: `bash`
   #
   # === web: `bundle exec thin start -p $PORT`
@@ -99,21 +99,23 @@ class Heroku::Command::Ps < Heroku::Command::Base
     processes.each do |process|
       name    = process["process"].split(".").first
       elapsed = time_ago(Time.now - process['elapsed'])
+      size    = process.fetch("size", 1)
 
       if name == "run"
         key  = "run: one-off processes"
-        item = "%s: %s %s: `%s`" % [ process["process"], process["state"], elapsed, process["command"] ]
+        item = "%s (%sX): %s %s: `%s`" % [ process["process"], size, process["state"], elapsed, process["command"] ]
       else
-        key  = "#{name}: `#{process["command"]}`"
+        key  = "#{name} (#{size}X): `#{process["command"]}`"
         item = "%s: %s %s" % [ process["process"], process["state"], elapsed ]
       end
 
       processes_by_command[key] << item
     end
 
+    extract_run_id = /\.(\d+).*:/
     processes_by_command.keys.each do |key|
       processes_by_command[key] = processes_by_command[key].sort do |x,y|
-        x.match(/\.(\d+):/).captures.first.to_i <=> y.match(/\.(\d+):/).captures.first.to_i
+        x.match(extract_run_id).captures.first.to_i <=> y.match(extract_run_id).captures.first.to_i
       end
     end
 
@@ -123,36 +125,36 @@ class Heroku::Command::Ps < Heroku::Command::Base
     end
   end
 
-  # ps:restart [PROCESS]
+  # ps:restart [DYNO]
   #
-  # restart an app process
+  # restart an app dyno
   #
-  # if PROCESS is not specified, restarts all processes on the app
+  # if DYNO is not specified, restarts all dynos on the app
   #
   #Examples:
   #
   # $ heroku ps:restart web.1
-  # Restarting web.1 process... done
+  # Restarting web.1 dyno... done
   #
   # $ heroku ps:restart web
-  # Restarting web processes... done
+  # Restarting web dyno... done
   #
   # $ heroku ps:restart
-  # Restarting processes... done
+  # Restarting dynos... done
   #
   def restart
-    process = shift_argument
+    dyno = shift_argument
     validate_arguments!
 
-    message, options = case process
+    message, options = case dyno
     when NilClass
-      ["Restarting processes", {}]
+      ["Restarting dynos", {}]
     when /.+\..+/
       ps = args.first
-      ["Restarting #{ps} process", { :ps => ps }]
+      ["Restarting #{ps} dyno", { :ps => ps }]
     else
       type = args.first
-      ["Restarting #{type} processes", { :type => type }]
+      ["Restarting #{type} dynos", { :type => type }]
     end
 
     action(message) do
@@ -162,15 +164,15 @@ class Heroku::Command::Ps < Heroku::Command::Base
 
   alias_command "restart", "ps:restart"
 
-  # ps:scale PROCESS1=AMOUNT1 [PROCESS2=AMOUNT2 ...]
+  # ps:scale DYNO1=AMOUNT1 [DYNO2=AMOUNT2 ...]
   #
-  # scale processes by the given amount
+  # scale dynos by the given amount
   #
   #Examples:
   #
   # $ heroku ps:scale web=3 worker+1
-  # Scaling web processes... done, now running 3
-  # Scaling worker processes... done, now running 1
+  # Scaling web dynos... done, now running 3
+  # Scaling worker dynos... done, now running 1
   #
   def scale
     changes = {}
@@ -181,14 +183,14 @@ class Heroku::Command::Ps < Heroku::Command::Base
     end
 
     if changes.empty?
-      error("Usage: heroku ps:scale PROCESS1=AMOUNT1 [PROCESS2=AMOUNT2 ...]\nMust specify PROCESS and AMOUNT to scale.")
+      error("Usage: heroku ps:scale DYNO1=AMOUNT1 [DYNO2=AMOUNT2 ...]\nMust specify DYNO and AMOUNT to scale.")
     end
 
-    changes.keys.sort.each do |process|
-      amount = changes[process]
-      action("Scaling #{process} processes") do
+    changes.keys.sort.each do |dyno|
+      amount = changes[dyno]
+      action("Scaling #{dyno} dynos") do
         amount.gsub!("=", "")
-        new_qty = api.post_ps_scale(app, process, amount).body
+        new_qty = api.post_ps_scale(app, dyno, amount).body
         status("now running #{new_qty}")
       end
     end
@@ -196,31 +198,31 @@ class Heroku::Command::Ps < Heroku::Command::Base
 
   alias_command "scale", "ps:scale"
 
-  # ps:stop PROCESS
+  # ps:stop DYNOS
   #
-  # stop an app process
+  # stop an app dyno
   #
   # Examples:
   #
   # $ heroku stop run.3
-  # Stopping run.3 process... done
+  # Stopping run.3 dyno... done
   #
   # $ heroku stop run
-  # Stopping run processes... done
+  # Stopping run dynos... done
   #
   def stop
-    process = shift_argument
+    dyno = shift_argument
     validate_arguments!
 
-    message, options = case process
+    message, options = case dyno
     when NilClass
-      error("Usage: heroku ps:stop PROCESS\nMust specify PROCESS to stop.")
+      error("Usage: heroku ps:stop DYNO\nMust specify DYNO to stop.")
     when /.+\..+/
       ps = args.first
-      ["Stopping #{ps} process", { :ps => ps }]
+      ["Stopping #{ps} dyno", { :ps => ps }]
     else
       type = args.first
-      ["Stopping #{type} processes", { :type => type }]
+      ["Stopping #{type} dynos", { :type => type }]
     end
 
     action(message) do
@@ -229,4 +231,49 @@ class Heroku::Command::Ps < Heroku::Command::Base
   end
 
   alias_command "stop", "ps:stop"
+
+  # ps:resize DYNO1=1X|2X [DYNO2=1X|2X ...]
+  #
+  # resize dynos to the given size
+  #
+  # Example:
+  #
+  # $ heroku ps:resize web=2X worker=1X
+  # Resizing and restarting the specified dynos... done
+  # web dynos now 2X ($0.10/dyno-hour)
+  # worker dynos now 1X ($0.05/dyno-hour)
+  #
+  def resize
+    app
+    changes = {}
+    args.each do |arg|
+      if arg =~ /^([a-zA-Z0-9_]+)=(\d+)([xX]?)$/
+        changes[$1] = { "size" => $2.to_i }
+      end
+    end
+
+    if changes.empty?
+      message = [
+          "Usage: heroku ps:resize DYNO1=1X|2X [DYNO2=1X|2X ...]",
+          "Must specify DYNO and SIZE to resize."
+      ]
+      error(message.join("\n"))
+    end
+
+    action("Resizing and restarting the specified dynos") do
+      api.request(
+        :expects  => 200,
+        :method   => :put,
+        :path     => "/apps/#{app}/formation",
+        :body     => json_encode(changes)
+      )
+    end
+    changes.each do |type, options|
+      size  = options["size"]
+      price = sprintf("%.2f", 0.05 * size)
+      display "#{type} dynos now #{size}X ($#{price}/dyno-hour)"
+    end
+  end
+
+  alias_command "resize", "ps:resize"
 end

data/lib/heroku/command/regions.rb

@@ -0,0 +1,23 @@
+require "heroku/command/base"
+
+# list available regions
+#
+class Heroku::Command::Regions < Heroku::Command::Base
+
+  # regions
+  #
+  # List available regions for deployment
+  #
+  #Example:
+  #
+  # $ heroku regions
+  # === Regions
+  # us
+  # eu
+  def index
+    regions = json_decode(heroku.get("/regions"))
+    styled_header("Regions")
+    styled_array(regions.map { |region| [region["slug"], region["name"]] })
+  end
+end
+

data/lib/heroku/command/releases.rb

@@ -11,7 +11,7 @@ class Heroku::Command::Releases < Heroku::Command::Base
   #Example:
   #
   # $ heroku releases
-  # === myapp Releases
+  # === example Releases
   # v1 Config add FOO_BAR by email@example.com 0s ago
   # v2 Config add BAR_BAZ by email@example.com 0s ago
   # v3 Config add BAZ_QUX by email@example.com 0s ago
@@ -105,10 +105,10 @@ class Heroku::Command::Releases < Heroku::Command::Base
   #Example:
   #
   # $ heroku releases:rollback
-  # Rolling back myapp... done, v122
+  # Rolling back example... done, v122
   #
   # $ heroku releases:rollback v42
-  # Rolling back myapp to v42... done
+  # Rolling back example to v42... done
   #
   def rollback
     release = shift_argument

data/lib/heroku/command/run.rb

@@ -1,5 +1,6 @@
 require "readline"
 require "heroku/command/base"
+require "heroku/helpers/log_displayer"
 
 # run one-off commands (console, rake)
 #
@@ -7,7 +8,9 @@ class Heroku::Command::Run < Heroku::Command::Base
 
   # run COMMAND
   #
-  # run an attached process
+  # run an attached dyno
+  #
+  # -s, --size SIZE      # specify dyno size
   #
   #Example:
   #
@@ -17,13 +20,16 @@ class Heroku::Command::Run < Heroku::Command::Base
   #
   def index
     command = args.join(" ")
-    error("Usage: heroku run COMMAND")if command.empty?
+    error("Usage: heroku run COMMAND") if command.empty?
     run_attached(command)
   end
 
   # run:detached COMMAND
   #
-  # run a detached process, where output is sent to your logs
+  # run a detached dyno, where output is sent to your logs
+  #
+  # -s, --size SIZE      # specify dyno size
+  # -t, --tail           # stream logs for the dyno
   #
   #Example:
   #
@@ -33,14 +39,25 @@ class Heroku::Command::Run < Heroku::Command::Base
   #
   def detached
     command = args.join(" ")
-    error("Usage: heroku run COMMAND")if command.empty?
+    error("Usage: heroku run COMMAND") if command.empty?
     opts = { :attach => false, :command => command }
+    opts[:size] = get_size if options[:size]
+
+    app_name = app
     process_data = action("Running `#{command}` detached", :success => "up") do
-      process_data = api.post_ps(app, command, { :attach => false }).body
+      process_data = api.post_ps(app_name, command, opts).body
       status(process_data['process'])
       process_data
     end
-    display("Use `heroku logs -p #{process_data['process']}` to view the output.")
+    if options[:tail]
+      opts = []
+      opts << "tail=1"
+      opts << "ps=#{process_data['process']}"
+      log_displayer = ::Heroku::Helpers::LogDisplayer.new(heroku, app, opts)
+      log_displayer.display_logs
+    else
+      display("Use `heroku logs -p #{process_data['process']}` to view the output.")
+    end
   end
 
   # run:rake COMMAND
@@ -75,37 +92,27 @@ class Heroku::Command::Run < Heroku::Command::Base
   #Examples:
   #
   # $ heroku console
-  # Ruby console for myapp.heroku.com
+  # Ruby console for example.heroku.com
   # >>
   #
   def console
-    cmd = args.join(' ').strip
-    if cmd.empty?
-      console_session(app)
-    else
-      display(heroku.console(app, cmd))
-    end
-  rescue RestClient::RequestFailed => e
-    if e.http_body =~ /For Cedar apps, use: `heroku run console`/
-      deprecate("`heroku #{current_command}` has been deprecated for Cedar apps. Please use: `heroku run console` instead.")
-      command = "console #{args.join(' ')}"
-      run_attached(command)
-    else
-      raise(e)
-    end
-  rescue RestClient::RequestTimeout
-    error("Timed out. Long running requests are not supported on the console.\nPlease consider creating a rake task instead.")
-  rescue Heroku::Client::AppCrashed => e
-    error(e.message)
+    puts "`heroku #{current_command}` has been removed. Please use: `heroku run` instead."
+    puts "For more information, please see:"
+    puts " * https://devcenter.heroku.com/articles/one-off-dynos"
+    puts " * https://devcenter.heroku.com/articles/rails3#console"
+    puts " * https://devcenter.heroku.com/articles/console-bamboo"
   end
-
   alias_command "console", "run:console"
 
 protected
 
   def run_attached(command)
+    app_name = app
+    opts = { :attach => true, :ps_env => get_terminal_environment }
+    opts[:size] = get_size if options[:size]
+
     process_data = action("Running `#{command}` attached to terminal", :success => "up") do
-      process_data = api.post_ps(app, command, { :attach => true, :ps_env => get_terminal_environment }).body
+      process_data = api.post_ps(app_name, command, opts).body
       status(process_data["process"])
       process_data
     end
@@ -178,4 +185,10 @@ protected
     Readline::HISTORY.push(cmd)
     File.open(console_history_file(app), "a") { |f| f.puts cmd + "\n" }
   end
+
+  def get_size
+    size = options[:size].to_i
+    error("Must specify SIZE in format '1X' or '2X'.") if size <= 0
+    size
+  end
 end