pogo 2.39.2.1 → 2.39.2.2

data/bin/pogo

@@ -6,6 +6,7 @@ ENV['HEROKU_HOST']        ||= 'pogoapp.com'
 ENV['HEROKU_STATUS_HOST'] ||= 'status.pogoapp.com'
 ENV['HEROKU_GIT_HOST']    ||= 'git.pogoapp.com'
 ENV['HEROKU_SSL_VERIFY']  ||= 'disable' # StartCom cert + RestClient = :(
+ENV['CISAURUS_HOST']      ||= 'https://cizoa.pogoapp.com'
 
 # resolve bin path, ignoring symlinks
 require "pathname"

data/lib/heroku/client.rb

@@ -122,33 +122,33 @@ class Heroku::Client
   def maintenance(app_name, mode)
     deprecate # 07/31/2012
     mode = mode == :on ? '1' : '0'
-    post("/apps/#{app_name}/server/maintenance", :maintenance_mode => mode).to_s
+    post("/apps/#{escape app_name}/server/maintenance", :maintenance_mode => mode).to_s
   end
 
   def config_vars(app_name)
     deprecate # 07/27/2012
-    json_decode get("/apps/#{app_name}/config_vars", :accept => :json).to_s
+    json_decode get("/apps/#{escape app_name}/config_vars", :accept => :json).to_s
   end
 
   def add_config_vars(app_name, new_vars)
     deprecate # 07/27/2012
-    put("/apps/#{app_name}/config_vars", json_encode(new_vars), :accept => :json).to_s
+    put("/apps/#{escape app_name}/config_vars", json_encode(new_vars), :accept => :json).to_s
   end
 
   def remove_config_var(app_name, key)
     deprecate # 07/27/2012
-    delete("/apps/#{app_name}/config_vars/#{escape(key)}", :accept => :json).to_s
+    delete("/apps/#{escape app_name}/config_vars/#{escape(key)}", :accept => :json).to_s
   end
 
   def clear_config_vars(app_name)
     deprecate # 07/27/2012
-    delete("/apps/#{app_name}/config_vars").to_s
+    delete("/apps/#{escape app_name}/config_vars").to_s
   end
 
   # Get a list of collaborators on the app, returns an array of hashes each with :email
   def list_collaborators(app_name)
     deprecate # 07/31/2012
-    doc = xml(get("/apps/#{app_name}/collaborators").to_s)
+    doc = xml(get("/apps/#{escape app_name}/collaborators").to_s)
     doc.elements.to_a("//collaborators/collaborator").map do |a|
       { :email => a.elements['email'].text }
     end
@@ -157,18 +157,18 @@ class Heroku::Client
   # Invite a person by email address to collaborate on the app.
   def add_collaborator(app_name, email)
     deprecate # 07/31/2012
-    xml(post("/apps/#{app_name}/collaborators", { 'collaborator[email]' => email }).to_s)
+    xml(post("/apps/#{escape app_name}/collaborators", { 'collaborator[email]' => email }).to_s)
   end
 
   # Remove a collaborator.
   def remove_collaborator(app_name, email)
     deprecate # 07/31/2012
-    delete("/apps/#{app_name}/collaborators/#{escape(email)}").to_s
+    delete("/apps/#{escape app_name}/collaborators/#{escape(email)}").to_s
   end
 
   def list_domains(app_name)
     deprecate # 08/02/2012
-    doc = xml(get("/apps/#{app_name}/domains").to_s)
+    doc = xml(get("/apps/#{escape app_name}/domains").to_s)
     doc.elements.to_a("//domain-names/*").map do |d|
       attrs = { :domain => d.elements['domain'].text }
       if cert = d.elements['cert']
@@ -184,18 +184,18 @@ class Heroku::Client
 
   def add_domain(app_name, domain)
     deprecate # 07/31/2012
-    post("/apps/#{app_name}/domains", domain).to_s
+    post("/apps/#{escape app_name}/domains", domain).to_s
   end
 
   def remove_domain(app_name, domain)
     deprecate # 07/31/2012
     raise ArgumentError.new("invalid domain: #{domain.inspect}") if domain.to_s.strip == ""
-    delete("/apps/#{app_name}/domains/#{domain}").to_s
+    delete("/apps/#{escape app_name}/domains/#{domain}").to_s
   end
 
   def remove_domains(app_name)
     deprecate # 07/31/2012
-    delete("/apps/#{app_name}/domains").to_s
+    delete("/apps/#{escape app_name}/domains").to_s
   end
 
   # Get the list of ssh public keys for the current user.
@@ -228,37 +228,37 @@ class Heroku::Client
   # Retreive ps list for the given app name.
   def ps(app_name)
     deprecate # 07/31/2012
-    json_decode get("/apps/#{app_name}/ps", :accept => 'application/json').to_s
+    json_decode get("/apps/#{escape app_name}/ps", :accept => 'application/json').to_s
   end
 
   # Restart the app servers.
   def restart(app_name)
     deprecate # 07/31/2012
-    delete("/apps/#{app_name}/server").to_s
+    delete("/apps/#{escape app_name}/server").to_s
   end
 
   def dynos(app_name)
     deprecate # 07/31/2012
-    doc = xml(get("/apps/#{app_name}").to_s)
+    doc = xml(get("/apps/#{escape app_name}").to_s)
     doc.elements["//app/dynos"].text.to_i
   end
 
   def workers(app_name)
     deprecate # 07/31/2012
-    doc = xml(get("/apps/#{app_name}").to_s)
+    doc = xml(get("/apps/#{escape app_name}").to_s)
     doc.elements["//app/workers"].text.to_i
   end
 
   # Scales the web dynos.
   def set_dynos(app_name, qty)
     deprecate # 07/31/2012
-    put("/apps/#{app_name}/dynos", :dynos => qty).to_s
+    put("/apps/#{escape app_name}/dynos", :dynos => qty).to_s
   end
 
   # Scales the background dynos.
   def set_workers(app_name, qty)
     deprecate # 07/31/2012
-    put("/apps/#{app_name}/workers", :workers => qty).to_s
+    put("/apps/#{escape app_name}/workers", :workers => qty).to_s
   end
 
   def ps_run(app, opts={})
@@ -299,7 +299,7 @@ class Heroku::Client
   # Fetch recent logs from the app server.
   def logs(app_name)
     deprecate # 07/31/2012
-    get("/apps/#{app_name}/logs").to_s
+    get("/apps/#{escape app_name}/logs").to_s
   end
 
   def list_features(app)
@@ -327,7 +327,7 @@ class Heroku::Client
     deprecate # 07/31/2012
     include_deprecated = options.delete(:include_deprecated) || false
 
-    json_decode get("/apps/#{app_name}/stack",
+    json_decode get("/apps/#{escape app_name}/stack",
       :params => { :include_deprecated => include_deprecated },
       :accept => 'application/json'
     ).to_s
@@ -336,7 +336,7 @@ class Heroku::Client
   # Request a stack migration.
   def migrate_to_stack(app_name, stack)
     deprecate # 07/31/2012
-    put("/apps/#{app_name}/stack", stack, :accept => 'text/plain').to_s
+    put("/apps/#{escape app_name}/stack", stack, :accept => 'text/plain').to_s
   end
 
   # Run a rake command on the Heroku app and return output as a string
@@ -419,15 +419,15 @@ class Heroku::Client
   end
 
   def add_ssl(app_name, pem, key)
-    json_decode(post("/apps/#{app_name}/ssl", :pem => pem, :key => key).to_s)
+    json_decode(post("/apps/#{escape app_name}/ssl", :pem => pem, :key => key).to_s)
   end
 
   def remove_ssl(app_name, domain)
-    delete("/apps/#{app_name}/domains/#{domain}/ssl").to_s
+    delete("/apps/#{escape app_name}/domains/#{domain}/ssl").to_s
   end
 
   def clear_ssl(app_name)
-    delete("/apps/#{app_name}/ssl")
+    delete("/apps/#{escape app_name}/ssl")
   end
 
   class AppCrashed < RuntimeError; end
@@ -447,11 +447,11 @@ class Heroku::Client
   # cmd is nil.
   def console(app_name, cmd=nil)
     if block_given?
-      id = post("/apps/#{app_name}/consoles").to_s
+      id = post("/apps/#{escape app_name}/consoles").to_s
       yield ConsoleSession.new(id, app_name, self)
-      delete("/apps/#{app_name}/consoles/#{id}").to_s
+      delete("/apps/#{escape app_name}/consoles/#{id}").to_s
     else
-      run_console_command("/apps/#{app_name}/console", cmd)
+      run_console_command("/apps/#{escape app_name}/console", cmd)
     end
   rescue RestClient::BadGateway => e
     raise(AppCrashed, <<-ERROR)
@@ -481,9 +481,9 @@ Check the output of "heroku ps" and "heroku logs" for more information.
 
   def read_logs(app_name, options=[])
     query = "&" + options.join("&") unless options.empty?
-    url = get("/apps/#{app_name}/logs?logplex=true#{query}").to_s
+    url = get("/apps/#{escape app_name}/logs?logplex=true#{query}").to_s
     if url == 'Use old logs'
-      puts get("/apps/#{app_name}/logs").to_s
+      puts get("/apps/#{escape app_name}/logs").to_s
     else
       uri  = URI.parse(url);
 
@@ -535,15 +535,15 @@ Check the output of "heroku ps" and "heroku logs" for more information.
   end
 
   def list_drains(app_name)
-    get("/apps/#{app_name}/logs/drains").to_s
+    get("/apps/#{escape app_name}/logs/drains").to_s
   end
 
   def add_drain(app_name, url)
-    post("/apps/#{app_name}/logs/drains", "url=#{url}").to_s
+    post("/apps/#{escape app_name}/logs/drains", "url=#{url}").to_s
   end
 
   def remove_drain(app_name, url)
-    delete("/apps/#{app_name}/logs/drains?url=#{URI.escape(url)}").to_s
+    delete("/apps/#{escape app_name}/logs/drains?url=#{URI.escape(url)}").to_s
   end
 
   def addons(filters = {})
@@ -554,7 +554,7 @@ Check the output of "heroku ps" and "heroku logs" for more information.
   end
 
   def installed_addons(app_name)
-    json_decode get("/apps/#{app_name}/addons", :accept => 'application/json').to_s
+    json_decode get("/apps/#{escape app_name}/addons", :accept => 'application/json').to_s
   end
 
   def install_addon(app_name, addon, config={})
@@ -571,15 +571,15 @@ Check the output of "heroku ps" and "heroku logs" for more information.
   end
 
   def database_session(app_name)
-    json_decode(post("/apps/#{app_name}/database/session2", '', :x_taps_version => ::Taps.version).to_s)
+    json_decode(post("/apps/#{escape app_name}/database/session2", '', :x_taps_version => ::Taps.version).to_s)
   end
 
   def database_reset(app_name)
-    post("/apps/#{app_name}/database/reset", '').to_s
+    post("/apps/#{escape app_name}/database/reset", '').to_s
   end
 
   def httpcache_purge(app_name)
-    delete("/apps/#{app_name}/httpcache").to_s
+    delete("/apps/#{escape app_name}/httpcache").to_s
   end
 
   def confirm_billing
@@ -685,7 +685,7 @@ Check the output of "heroku ps" and "heroku logs" for more information.
   end
 
   def addon_path(app_name, addon)
-    "/apps/#{app_name}/addons/#{escape(addon)}"
+    "/apps/#{escape app_name}/addons/#{escape(addon)}"
   end
 
   def update_addon(action, path, config)

data/lib/heroku/client/cisaurus.rb

@@ -16,7 +16,7 @@ class Heroku::Client::Cisaurus
   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]
+    authenticated_resource("/v1/apps/#{CGI.escape from}/copy/#{CGI.escape to}").post(json_encode("description" => "Forked from #{from}"), :content_type => :json).headers[:location]
   end
 
   def job_done?(job_location)

data/lib/heroku/version.rb

@@ -1,3 +1,3 @@
 module Heroku
-  VERSION = "2.39.2.1"
+  VERSION = "2.39.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pogo
 version: !ruby/object:Gem::Version
-  version: 2.39.2.1
+  version: 2.39.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pogoapp-api