pogo 2.32.14 → 2.39.2

data/README.md

@@ -68,6 +68,4 @@ Released under the MIT license; see the file License.
 
 Created by Adam Wiggins
 
-Maintained by Wesley Beary
-
 [Other Contributors](https://github.com/heroku/heroku/contributors)

data/lib/heroku/auth.rb

@@ -305,7 +305,9 @@ class Heroku::Auth
     end
 
     def base_host(host)
-      URI.parse(full_host(host)).host.split(".")[-2..-1].join(".")
+      parts = URI.parse(full_host(host)).host.split(".")
+      return parts.first if parts.size == 1
+      parts[-2..-1].join(".")
     end
 
     def full_host(host)

data/lib/heroku/client.rb

@@ -14,7 +14,7 @@ require 'heroku/client/ssl_endpoint'
 #
 #   require 'heroku'
 #   heroku = Heroku::Client.new('me@example.com', 'mypass')
-#   heroku.create('myapp')
+#   heroku.create()
 #
 class Heroku::Client
 
@@ -249,13 +249,13 @@ class Heroku::Client
     doc.elements["//app/workers"].text.to_i
   end
 
-  # Scales the web processes.
+  # Scales the web dynos.
   def set_dynos(app_name, qty)
     deprecate # 07/31/2012
     put("/apps/#{app_name}/dynos", :dynos => qty).to_s
   end
 
-  # Scales the background processes.
+  # Scales the background dynos.
   def set_workers(app_name, qty)
     deprecate # 07/31/2012
     put("/apps/#{app_name}/workers", :workers => qty).to_s
@@ -546,8 +546,11 @@ Check the output of "heroku ps" and "heroku logs" for more information.
     delete("/apps/#{app_name}/logs/drains?url=#{URI.escape(url)}").to_s
   end
 
-  def addons
-    json_decode get("/addons", :accept => 'application/json').to_s
+  def addons(filters = {})
+    url = "/addons"
+    params = filters.map{|k,v| "#{k}=#{v}"}.join("&")
+    params = nil if params.empty?
+    json_decode get([url,params].compact.join("?"), :accept => 'application/json').to_s
   end
 
   def installed_addons(app_name)

data/lib/heroku/client/cisaurus.rb

@@ -0,0 +1,25 @@
+require "heroku/client"
+
+class Heroku::Client::Cisaurus
+
+  include Heroku::Helpers
+
+  def initialize(uri)
+    require 'rest_client'
+    @uri = URI.parse(uri)
+  end
+
+  def authenticated_resource(path)
+    host = "#{@uri.scheme}://#{@uri.host}"
+    host += ":#{@uri.port}" if @uri.port
+    RestClient::Resource.new("#{host}#{path}", "", Heroku::Auth.api_key)
+  end
+
+  def copy_slug(from, to)
+    authenticated_resource("/v1/apps/#{from}/copy/#{to}").post(json_encode("description" => "Forked from #{from}"), :content_type => :json).headers[:location]
+  end
+
+  def job_done?(job_location)
+    202 != authenticated_resource(job_location).get.code
+  end
+end

data/lib/heroku/client/heroku_postgresql.rb

@@ -18,9 +18,6 @@ class Heroku::Client::HerokuPostgresql
   attr_reader :attachment
   def initialize(attachment)
     @attachment = attachment
-    if attachment.resource_name == 'SHARED_DATABASE'
-      error('This command is not available for shared database')
-    end
     require 'rest_client'
   end
 

data/lib/heroku/client/rendezvous.rb

@@ -30,7 +30,8 @@ class Heroku::Client::Rendezvous
 
     ssl_socket = Timeout.timeout(connect_timeout) do
       ssl_context = OpenSSL::SSL::SSLContext.new
-
+      ssl_context.ssl_version = :TLSv1
+      
       if Heroku::Auth.verify_host?(host)
         ssl_context.ca_file     = File.expand_path("../../../../data/cacert.pem", __FILE__)
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/heroku/command.rb

@@ -107,7 +107,7 @@ module Heroku
 
     global_option :confirm, "--confirm APP"
     global_option :help,    "-h", "--help"
-    global_option :remote,  "--remote REMOTE"
+    global_option :remote,  "-r", "--remote REMOTE"
 
     def self.prepare_run(cmd, args=[])
       command = parse(cmd)

data/lib/heroku/command/addons.rb

@@ -42,8 +42,17 @@ module Heroku::Command
     #
     # list all available addons
     #
+    # --region REGION      # specify a region for addon availability
+    #
+    #Example:
+    #
+    # $ heroku addons:list --region eu
+    # === available
+    # adept-scale:battleship, corvette...
+    # adminium:enterprise, petproject...
+    #
     def list
-      addons = heroku.addons
+      addons = heroku.addons(options)
       if addons.empty?
         display "No addons available currently"
       else
@@ -177,7 +186,7 @@ module Heroku::Command
     end
 
     def app_addon_url(addon)
-      "https://api.#{heroku.host}/myapps/#{app}/addons/#{addon}"
+      "https://api.#{heroku.host}/apps/#{app}/addons/#{addon}"
     end
 
     def partition_addons(addons)

data/lib/heroku/command/apps.rb

@@ -12,11 +12,11 @@ class Heroku::Command::Apps < Heroku::Command::Base
   #
   # $ heroku apps
   # === My Apps
-  # myapp1
-  # myapp2
+  # example
+  # example2
   #
   # === Collaborated Apps
-  # theirapp1   other@owner.name
+  # theirapp   other@owner.name
   #
   def index
     validate_arguments!
@@ -27,13 +27,33 @@ class Heroku::Command::Apps < Heroku::Command::Base
       end
 
       unless my_apps.empty?
-        styled_header("My Apps")
-        styled_array(my_apps.map { |app| app["name"] })
+        non_legacy_apps = my_apps.select do |app|
+          app["tier"] != "legacy"
+        end
+
+        unless non_legacy_apps.empty?
+          production_basic_apps, dev_legacy_apps = my_apps.partition do |app|
+            ["production", "basic"].include?(app["tier"])
+          end
+
+          unless production_basic_apps.empty?
+            styled_header("Basic & Production Apps")
+            styled_array(production_basic_apps.map { |app| regionized_app_name(app) })
+          end
+
+          unless dev_legacy_apps.empty?
+            styled_header("Dev & Legacy Apps")
+            styled_array(dev_legacy_apps.map { |app| regionized_app_name(app) })
+          end
+        else
+          styled_header("My Apps")
+          styled_array(my_apps.map { |app| regionized_app_name(app) })
+        end
       end
 
       unless collaborated_apps.empty?
         styled_header("Collaborated Apps")
-        styled_array(collaborated_apps.map { |app| [app["name"], app["owner_email"]] })
+        styled_array(collaborated_apps.map { |app| [regionized_app_name(app), app["owner_email"]] })
       end
     else
       display("You have no apps.")
@@ -51,13 +71,13 @@ class Heroku::Command::Apps < Heroku::Command::Base
   #Examples:
   #
   # $ heroku apps:info
-  # === myapp
-  # Git URL:   git@heroku.com:myapp.git
+  # === example
+  # Git URL:   git@heroku.com:example.git
   # Repo Size: 5M
   # ...
   #
   # $ heroku apps:info --shell
-  # git_url=git@heroku.com:myapp.git
+  # git_url=git@heroku.com:example.git
   # repo_size=5000000
   # ...
   #
@@ -125,6 +145,10 @@ class Heroku::Command::Apps < Heroku::Command::Base
 
       data["Owner Email"] = app_data["owner_email"]
 
+      if app_data["region"]
+        data["Region"] = app_data["region"]
+      end
+
       if app_data["repo_size"]
         data["Repo Size"] = format_bytes(app_data["repo_size"])
       end
@@ -140,6 +164,10 @@ class Heroku::Command::Apps < Heroku::Command::Base
 
       data["Web URL"] = app_data["web_url"]
 
+      if app_data["tier"]
+        data["Tier"] = app_data["tier"].capitalize
+      end
+
       styled_hash(data)
     end
   end
@@ -155,6 +183,8 @@ class Heroku::Command::Apps < Heroku::Command::Base
   # -n, --no-remote            # don't create a git remote
   # -r, --remote REMOTE        # the git remote to create, default "heroku"
   # -s, --stack STACK          # the stack on which to create the app
+  #     --region REGION        # specify region for this app to run in
+  # -t, --tier TIER            # HIDDEN: the tier for this app
   #
   #Examples:
   #
@@ -167,18 +197,26 @@ class Heroku::Command::Apps < Heroku::Command::Base
   # http://floating-dragon-42.herokuapp.com/ | git@heroku.com:floating-dragon-42.git
   #
   # # specify a name
-  # $ heroku apps:create myapp
-  # Creating myapp... done, stack is cedar
-  # http://myapp.heroku.com/ | git@heroku.com:myapp.git
+  # $ heroku apps:create example
+  # Creating example... done, stack is cedar
+  # http://example.heroku.com/ | git@heroku.com:example.git
   #
   # # create a staging app
-  # $ heroku apps:create myapp-staging --remote staging
+  # $ heroku apps:create example-staging --remote staging
+  #
+  # # create an app in the eu region
+  # $ heroku apps:create --region eu
   #
   def create
     name    = shift_argument || options[:app] || ENV['HEROKU_APP']
     validate_arguments!
 
-    info    = api.post_app({ "name" => name, "stack" => options[:stack] }).body
+    info    = api.post_app({
+      "name" => name,
+      "region" => options[:region],
+      "stack" => options[:stack],
+      "tier" => options[:tier]
+    }).body
     begin
       action("Creating #{info['name']}") do
         if info['create_status'] == 'creating'
@@ -189,7 +227,11 @@ class Heroku::Command::Apps < Heroku::Command::Base
             end
           end
         end
-        status("stack is #{info['stack']}")
+        if info['region']
+          status("region is #{info['region']}")
+        else
+          status("stack is #{info['stack']}")
+        end
       end
 
       (options[:addons] || "").split(",").each do |addon|
@@ -222,8 +264,8 @@ class Heroku::Command::Apps < Heroku::Command::Base
   #
   #Example:
   #
-  # $ heroku apps:rename myapp-newname
-  # http://myapp-newname.herokuapp.com/ | git@heroku.com:myapp-newname.git
+  # $ heroku apps:rename example-newname
+  # http://example-newname.herokuapp.com/ | git@heroku.com:example-newname.git
   # Git remote heroku updated
   #
   def rename
@@ -261,7 +303,7 @@ class Heroku::Command::Apps < Heroku::Command::Base
   #Example:
   #
   # $ heroku apps:open
-  # Opening myapp... done
+  # Opening example... done
   #
   def open
     validate_arguments!
@@ -278,8 +320,8 @@ class Heroku::Command::Apps < Heroku::Command::Base
   #
   #Example:
   #
-  # $ heroku apps:destroy -a myapp --confirm myapp
-  # Destroying myapp (including all add-ons)... done
+  # $ heroku apps:destroy -a example --confirm example
+  # Destroying example (including all add-ons)... done
   #
   def destroy
     @app = shift_argument || options[:app] || options[:confirm]
@@ -308,4 +350,47 @@ class Heroku::Command::Apps < Heroku::Command::Base
   alias_command "destroy", "apps:destroy"
   alias_command "apps:delete", "apps:destroy"
 
+  # apps:upgrade TIER
+  #
+  # HIDDEN: upgrade an app's pricing tier
+  #
+  def upgrade
+    tier = shift_argument
+    error("Usage: heroku apps:upgrade TIER\nMust specify TIER to upgrade.") if tier.nil? || tier.empty?
+    validate_arguments!
+
+    action("Upgrading #{app} to #{tier}") do
+      api.put_app(app, "tier" => tier)
+    end
+  end
+
+  alias_command "upgrade", "apps:upgrade"
+
+  # apps:downgrade TIER
+  #
+  # HIDDEN: downgrade an app's pricing tier
+  #
+  def downgrade
+    tier = shift_argument
+    error("Usage: heroku apps:downgrade TIER\nMust specify TIER to downgrade.") if tier.nil? || tier.empty?
+    validate_arguments!
+
+    action("Upgrading #{app} to #{tier}") do
+      api.put_app(app, "tier" => tier)
+    end
+  end
+
+  alias_command "downgrade", "apps:downgrade"
+
+  private
+
+  def regionized_app_name(app)
+    # temporary, show region for non-us apps
+    if app["region"] && app["region"] != 'us'
+      "#{app["name"]} (#{app["region"]})"
+    else
+      app["name"]
+    end
+  end
+
 end

data/lib/heroku/command/base.rb

@@ -205,7 +205,7 @@ protected
     return unless File.exists?(".git")
     git("remote -v").split("\n").each do |remote|
       name, url, method = remote.split(/\s/)
-      if url =~ /^git@#{Heroku::Auth.git_host}:([\w\d-]+)\.git$/
+      if url =~ /^git@#{Heroku::Auth.git_host}(?:[\.\w]*):([\w\d-]+)\.git$/
         remotes[name] = $1
       end
     end

data/lib/heroku/command/certs.rb

@@ -1,19 +1,23 @@
 require "heroku/command/base"
+require "excon"
 
 # manage ssl endpoints for an app
 #
 class Heroku::Command::Certs < Heroku::Command::Base
+  SSL_DOCTOR = Excon.new(ENV["SSL_DOCTOR_URL"] || "https://ssl-doctor.herokuapp.com/")
+
+  class UsageError < StandardError; end
 
   # certs
   #
-  # list ssl endpoints for an app
+  # List ssl endpoints for an app.
   #
   def index
     endpoints = heroku.ssl_endpoint_list(app)
 
     if endpoints.empty?
       display "#{app} has no SSL Endpoints."
-      display "Use `heroku certs:add PEM KEY` to add one."
+      display "Use `heroku certs:add CRT KEY` to add one."
     else
       endpoints.map! do |endpoint|
         {
@@ -31,28 +35,70 @@ class Heroku::Command::Certs < Heroku::Command::Base
     end
   end
 
-  # certs:add PEM KEY
+  # certs:chain CRT [CRT ...]
   #
-  # add an ssl endpoint to an app
+  # Print the ordered and complete chain for the given certificate.
   #
-  def add
-    fail("Usage: heroku certs:add PEM KEY\nMust specify PEM and KEY to add cert.") if args.size < 2
-    pem = File.read(args[0]) rescue error("Unable to read #{args[0]} PEM")
-    key = File.read(args[1]) rescue error("Unable to read #{args[1]} KEY")
+  # Optional intermediate certificates may be given too, and will
+  # be used during chain resolution.
+  #
+  def chain
+    puts read_crt_through_ssl_doctor
+  rescue UsageError
+    fail("Usage: heroku certs:chain CRT [CRT ...]\nMust specify at least one certificate file.")
+  end
 
-    endpoint = action("Adding SSL Endpoint to #{app}") do
-      heroku.ssl_endpoint_add(app, pem, key)
-    end
+  # certs:key CRT KEY [KEY ...]
+  #
+  # Print the correct key for the given certificate.
+  #
+  # You must pass one single certificate, and one or more keys.
+  # The first key that signs the certificate will be printed back.
+  #
+  def key
+    crt, key = read_crt_and_key_through_ssl_doctor("Testing for signing key")
+    puts key
+  rescue UsageError
+    fail("Usage: heroku certs:key CRT KEY [KEY ...]\nMust specify one certificate file and at least one key file.")
+  end
 
+  # certs:add CRT KEY
+  #
+  # Add an ssl endpoint to an app.
+  #
+  #   --bypass  # bypass the trust chain completion step
+  #
+  def add
+    crt, key = read_crt_and_key
+    endpoint = action("Adding SSL Endpoint to #{app}") { heroku.ssl_endpoint_add(app, crt, key) }
     display_warnings(endpoint)
     display "#{app} now served by #{endpoint['cname']}"
     display "Certificate details:"
     display_certificate_info(endpoint)
+  rescue UsageError
+    fail("Usage: heroku certs:add CRT KEY\nMust specify CRT and KEY to add cert.")
+  end
+
+  # certs:update CRT KEY
+  #
+  # Update an SSL Endpoint on an app.
+  #
+  #   --bypass  # bypass the trust chain completion step
+  #
+  def update
+    crt, key = read_crt_and_key
+    cname    = options[:endpoint] || current_endpoint
+    endpoint = action("Updating SSL Endpoint #{cname} for #{app}") { heroku.ssl_endpoint_update(app, cname, crt, key) }
+    display_warnings(endpoint)
+    display "Updated certificate details:"
+    display_certificate_info(endpoint)
+  rescue UsageError
+    fail("Usage: heroku certs:update CRT KEY\nMust specify CRT and KEY to update cert.")
   end
 
   # certs:info
   #
-  # show certificate information for an ssl endpoint
+  # Show certificate information for an ssl endpoint.
   #
   def info
     cname = options[:endpoint] || current_endpoint
@@ -66,7 +112,7 @@ class Heroku::Command::Certs < Heroku::Command::Base
 
   # certs:remove
   #
-  # remove an SSL Endpoint from an app
+  # Remove an SSL Endpoint from an app.
   #
   def remove
     cname = options[:endpoint] || current_endpoint
@@ -76,29 +122,9 @@ class Heroku::Command::Certs < Heroku::Command::Base
     display "NOTE: Billing is still active. Remove SSL Endpoint add-on to stop billing."
   end
 
-  # certs:update PEM KEY
-  #
-  # update an SSL Endpoint on an app
-  #
-  def update
-    fail("Usage: heroku certs:update PEM KEY\nMust specify PEM and KEY to update cert.") if args.size < 2
-    pem = File.read(args[0]) rescue error("Unable to read #{args[0]} PEM")
-    key = File.read(args[1]) rescue error("Unable to read #{args[1]} KEY")
-    app = self.app
-    cname = options[:endpoint] || current_endpoint
-
-    endpoint = action("Updating SSL Endpoint #{cname} for #{app}") do
-      heroku.ssl_endpoint_update(app, cname, pem, key)
-    end
-
-    display_warnings(endpoint)
-    display "Updated certificate details:"
-    display_certificate_info(endpoint)
-  end
-
   # certs:rollback
   #
-  # rollback an SSL Endpoint for an app
+  # Rollback an SSL Endpoint for an app.
   #
   def rollback
     cname = options[:endpoint] || current_endpoint
@@ -145,4 +171,39 @@ class Heroku::Command::Certs < Heroku::Command::Base
     end
   end
 
+  def display(msg = "", new_line = true)
+    super if $stdout.tty?
+  end
+
+  def post_to_ssl_doctor(path, action_text = nil)
+    raise UsageError if args.size < 1
+    action_text ||= "Resolving trust chain"
+    action(action_text) do
+      input = args.map { |arg| File.read(arg) rescue error("Unable to read #{args[0]} file") }.join("\n")
+      SSL_DOCTOR.post(:path => path, :body => input, :headers => {'Content-Type' => 'application/octet-stream'}, :expects => 200).body
+    end
+  rescue Excon::Errors::BadRequest, Excon::Errors::UnprocessableEntity => e
+    error(e.response.body)
+  end
+
+  def read_crt_and_key_through_ssl_doctor(action_text = nil)
+    crt_and_key = post_to_ssl_doctor("resolve-chain-and-key", action_text)
+    Heroku::OkJson.decode(crt_and_key).values_at("pem", "key")
+  end
+
+  def read_crt_through_ssl_doctor(action_text = nil)
+    post_to_ssl_doctor("resolve-chain", action_text)
+  end
+
+  def read_crt_and_key_bypassing_ssl_doctor
+    raise UsageError if args.size != 2
+    crt = File.read(args[0]) rescue error("Unable to read #{args[0]} CRT")
+    key = File.read(args[1]) rescue error("Unable to read #{args[1]} KEY")
+    [crt, key]
+  end
+
+  def read_crt_and_key
+    options[:bypass] ? read_crt_and_key_bypassing_ssl_doctor : read_crt_and_key_through_ssl_doctor
+  end
+
 end