pogo 2.32.14 → 2.39.2

data/lib/heroku/command/config.rb

@@ -46,11 +46,11 @@ class Heroku::Command::Config < Heroku::Command::Base
   #Example:
   #
   # $ heroku config:set A=one
-  # Setting config vars and restarting myapp... done, v123
+  # Setting config vars and restarting example... done, v123
   # A: one
   #
   # $ heroku config:set A=one B=two
-  # Setting config vars and restarting myapp... done, v123
+  # Setting config vars and restarting example... done, v123
   # A: one
   # B: two
   #
@@ -107,11 +107,11 @@ class Heroku::Command::Config < Heroku::Command::Base
   # unset one or more config vars
   #
   # $ heroku config:unset A
-  # Unsetting A and restarting myapp... done, v123
+  # Unsetting A and restarting example... done, v123
   #
   # $ heroku config:unset A B
-  # Unsetting A and restarting myapp... done, v123
-  # Unsetting B and restarting myapp... done, v124
+  # Unsetting A and restarting example... done, v123
+  # Unsetting B and restarting example... done, v124
   #
   def unset
     if args.empty?

data/lib/heroku/command/domains.rb

@@ -13,7 +13,7 @@ module Heroku::Command
     #Examples:
     #
     # $ heroku domains
-    # === Domain names for myapp
+    # === Domain names for example
     # example.com
     #
     def index
@@ -34,7 +34,7 @@ module Heroku::Command
     #Examples:
     #
     # $ heroku domains:add example.com
-    # Adding example.com to myapp... done
+    # Adding example.com to example... done
     #
     def add
       unless domain = shift_argument
@@ -53,7 +53,7 @@ module Heroku::Command
     #Examples:
     #
     # $ heroku domains:remove example.com
-    # Removing example.com from myapp... done
+    # Removing example.com from example... done
     #
     def remove
       unless domain = shift_argument
@@ -72,7 +72,7 @@ module Heroku::Command
     #Examples:
     #
     # $ heroku domains:clear
-    # Removing all domain names for myapp... done
+    # Removing all domain names for example... done
     #
     def clear
       validate_arguments!

data/lib/heroku/command/fork.rb

@@ -0,0 +1,160 @@
+require "heroku/client/cisaurus"
+require "heroku/command/base"
+
+module Heroku::Command
+
+  # clone an existing app
+  #
+  class Fork < Base
+
+    # fork [NEWNAME]
+    #
+    # Fork an existing app -- copy config vars and Heroku Postgres data, and re-provision add-ons to a new app.
+    # New app name should not be an existing app. The new app will be created as part of the forking process.
+    #
+    # -s, --stack  STACK   # specify a stack for the new app
+    # --region REGION      # specify a region
+    #
+    def index
+      
+      from = app
+      to = shift_argument || "#{from}-#{(rand*1000).to_i}"
+
+      from_info = api.get_app(from).body
+
+      to_info = action("Creating fork #{to}") do
+        api.post_app({
+          :name   => to,
+          :region => options[:region] || from_info["region"],
+          :stack  => options[:stack] || from_info["stack"],
+          :tier   => from_info["tier"] == "legacy" ? "production" : from_info["tier"]
+        }).body
+      end
+
+      action("Copying slug") do
+        job_location = cisaurus_client.copy_slug(from, to)
+        loop do
+          break if cisaurus_client.job_done?(job_location)
+          sleep 1
+        end
+      end
+
+      from_config = api.get_config_vars(from).body
+      from_addons = api.get_addons(from).body
+
+      from_addons.each do |addon|
+        print "Adding #{addon["name"]}... "
+        begin
+          to_addon = api.post_addon(to, addon["name"]).body
+          puts "done"
+        rescue Heroku::API::Errors::RequestFailed => ex
+          puts "skipped (%s)" % json_decode(ex.response.body)["error"]
+        rescue Heroku::API::Errors::NotFound
+          puts "skipped (not found)"
+        end
+        if addon["name"] =~ /^heroku-postgresql:/
+          from_var_name = "#{addon["attachment_name"]}_URL"
+          from_attachment = to_addon["message"].match(/Attached as (\w+)_URL\n/)[1]
+          if from_config[from_var_name] == from_config["DATABASE_URL"]
+            from_config["DATABASE_URL"] = api.get_config_vars(to).body["#{from_attachment}_URL"]
+          end
+          from_config.delete(from_var_name)
+
+          plan = addon["name"].split(":").last
+          unless %w(dev basic).include? plan
+            wait_for_db to, to_addon
+          end
+
+          check_for_pgbackups! from
+          check_for_pgbackups! to
+          migrate_db addon, from, to_addon, to
+        end
+      end
+
+      to_config = api.get_config_vars(to).body
+
+      action("Copying config vars") do
+        diff = from_config.inject({}) do |ax, (key, val)|
+          ax[key] = val unless to_config[key]
+          ax
+        end
+        api.put_config_vars to, diff
+      end
+
+      puts "Fork complete, view it at #{to_info['web_url']}"
+    end
+
+  private
+
+    def cisaurus_client
+      cisaurus_url = ENV["CISAURUS_HOST"] || "https://cisaurus.herokuapp.com"
+      @cisaurus_client ||= Heroku::Client::Cisaurus.new(cisaurus_url)
+    end
+
+    def check_for_pgbackups!(app)
+      unless api.get_addons(app).body.detect { |addon| addon["name"] =~ /^pgbackups:/ }
+        action("Adding pgbackups:plus to #{app}") do
+          api.post_addon app, "pgbackups:plus"
+        end
+      end
+    end
+
+    def migrate_db(from_addon, from, to_addon, to)
+      transfer = nil
+
+      action("Creating database backup from #{from} (this can take some time)") do
+        from_config = api.get_config_vars(from).body
+        from_attachment = from_addon["attachment_name"]
+        pgb = Heroku::Client::Pgbackups.new(from_config["PGBACKUPS_URL"])
+        transfer = pgb.create_transfer(from_config["#{from_attachment}_URL"], from_attachment, nil, "BACKUP", :expire => "true")
+        error transfer["errors"].values.flatten.join("\n") if transfer["errors"]
+        loop do
+          transfer = pgb.get_transfer(transfer["id"])
+          error transfer["errors"].values.flatten.join("\n") if transfer["errors"]
+          break if transfer["finished_at"]
+          sleep 1
+        end
+        print " "
+      end
+
+      action("Restoring database backup to #{to} (this can take some time)") do
+        to_config = api.get_config_vars(to).body
+        to_attachment = to_addon["message"].match(/Attached as (\w+)_URL\n/)[1]
+        pgb = Heroku::Client::Pgbackups.new(to_config["PGBACKUPS_URL"])
+        transfer = pgb.create_transfer(transfer["public_url"], "EXTERNAL_BACKUP", to_config["#{to_attachment}_URL"], to_attachment)
+        error transfer["errors"].values.flatten.join("\n") if transfer["errors"]
+        loop do
+          transfer = pgb.get_transfer(transfer["id"])
+          error transfer["errors"].values.flatten.join("\n") if transfer["errors"]
+          break if transfer["finished_at"]
+          sleep 1
+        end
+        print " "
+      end
+    end
+
+    def pg_api(starter=false)
+      host = starter ? "postgres-starter-api.heroku.com" : "postgres-api.heroku.com"
+      RestClient::Resource.new "https://#{host}/client/v11/databases", Heroku::Auth.user, Heroku::Auth.password
+    end
+
+    def wait_for_db(app, attachment)
+      attachments = api.get_attachments(app).body.inject({}) { |ax,att| ax.update(att["name"] => att["resource"]["name"]) }
+      attachment_name = attachment["message"].match(/Attached as (\w+)_URL\n/)[1]
+      action("Waiting for database to be ready (this can take some time)") do
+        loop do
+          begin
+            waiting = json_decode(pg_api["#{attachments[attachment_name]}/wait_status"].get.to_s)["waiting?"]
+            break unless waiting
+            sleep 5
+          rescue RestClient::ResourceNotFound
+          rescue Interrupt
+            exit 0
+          end
+        end
+        print " "
+      end
+    end
+
+  end
+end

data/lib/heroku/command/git.rb

@@ -4,36 +4,35 @@ require "heroku/command/base"
 #
 class Heroku::Command::Git < Heroku::Command::Base
 
-  # git:clone [OPTIONS]
+  # git:clone APP [DIRECTORY]
   #
-  # clones an app repo
+  # clones a heroku app to your local machine at DIRECTORY (defaults to app name)
   #
-  # if OPTIONS are specified they will be passed to git clone
-  #
-  # -n, --no-remote            # don't create a git remote
-  # -r, --remote REMOTE        # the git remote to create, default "heroku"
+  # -r, --remote REMOTE  # the git remote to create, default "heroku"
   #
   #Examples:
   #
-  # $ heroku git:clone -a myapp
-  # Cloning into 'myapp'...
-  # Git remote heroku added
+  # $ heroku git:clone example
+  # Cloning from app 'example'...
+  # Cloning into 'example'...
+  # remote: Counting objects: 42, done.
+  # ...
   #
   def clone
-    git_options = args.join(" ")
-    remote = options[:remote] || 'heroku'
+    remote = options[:remote] || "heroku"
 
-    app_data = api.get_app(app).body
+    name = options[:app] || shift_argument || error("Usage: heroku git:clone APP [DIRECTORY]")
+    directory = shift_argument
+    validate_arguments!
 
-    display git("clone #{app_data['git_url']} #{git_options}")
+    git_url = api.get_app(name).body["git_url"]
 
-    unless $?.exitstatus > 0 || options[:no_remote].is_a?(FalseClass)
-      FileUtils.chdir(app_data['name']) do
-        create_git_remote(remote, app_data['git_url'])
-      end
-    end
+    puts "Cloning from app '#{name}'..."
+    system "git clone -o #{remote} #{git_url} #{directory}".strip
   end
 
+  alias_command "clone", "git:clone"
+
   # git:remote [OPTIONS]
   #
   # adds a git remote to an app repo
@@ -44,10 +43,10 @@ class Heroku::Command::Git < Heroku::Command::Base
   #
   #Examples:
   #
-  # $ heroku git:remote -a myapp
+  # $ heroku git:remote -a example
   # Git remote heroku added
   #
-  # $ heroku git:remote -a myapp
+  # $ heroku git:remote -a example
   # !    Git remote heroku already exists
   #
   def remote

data/lib/heroku/command/help.rb

@@ -87,6 +87,18 @@ private
     nil
   end
 
+  def skip_namespace?(ns)
+    return true if ns[:description] =~ /DEPRECATED:/
+    return true if ns[:description] =~ /HIDDEN:/
+    false
+  end
+
+  def skip_command?(command)
+    return true if command[:help] =~ /DEPRECATED:/
+    return true if command[:help] =~ /^ HIDDEN:/
+    false
+  end
+
   def primary_namespaces
     PRIMARY_NAMESPACES.map { |name| namespaces[name] }.compact
   end
@@ -98,6 +110,7 @@ private
   def summary_for_namespaces(namespaces)
     size = longest(namespaces.map { |n| n[:name] })
     namespaces.sort_by {|namespace| namespace[:name]}.each do |namespace|
+      next if skip_namespace?(namespace)
       name = namespace[:name]
       namespace[:description] ||= legacy_help_for_namespace(name)
       puts "  %-#{size}s  # %s" % [ name, namespace[:description] ]
@@ -123,7 +136,7 @@ private
     unless namespace_commands.empty?
       size = longest(namespace_commands.map { |c| c[:banner] })
       namespace_commands.sort_by { |c| c[:banner].to_s }.each do |command|
-        next if command[:help] =~ /DEPRECATED/
+        next if skip_command?(command)
         command[:summary] ||= legacy_help_for_command(command[:command])
         puts "  %-#{size}s  # %s" % [ command[:banner], command[:summary] ]
       end
@@ -139,7 +152,10 @@ private
       puts "Usage: heroku #{command[:banner]}"
 
       if command[:help].strip.length > 0
-        puts command[:help].split("\n")[1..-1].join("\n")
+        help = command[:help].split("\n").reject do |line|
+          line =~ /HIDDEN/
+        end
+        puts help[1..-1].join("\n")
       else
         puts
         puts " " + legacy_help_for_command(name).to_s

data/lib/heroku/command/keys.rb

@@ -95,7 +95,7 @@ module Heroku::Command
     #
     #Examples:
     #
-    # $ heroku keys:cleare
+    # $ heroku keys:clear
     # Removing all SSH keys... done
     #
     def clear

data/lib/heroku/command/labs.rb

@@ -15,7 +15,7 @@ class Heroku::Command::Labs < Heroku::Command::Base
   #
   # === App Features (glacial-retreat-5913)
   # [ ] preboot            Provide seamless web dyno deploys
-  # [ ] user-env-compile   Add user config vars to the environment during slug compilation  # $ heroku labs -a myapp
+  # [ ] user-env-compile   Add user config vars to the environment during slug compilation  # $ heroku labs -a example
   #
   def index
     validate_arguments!

data/lib/heroku/command/logs.rb

@@ -1,4 +1,5 @@
 require "heroku/command/base"
+require "heroku/helpers/log_displayer"
 
 # display logs for an app
 #
@@ -28,25 +29,8 @@ class Heroku::Command::Logs < Heroku::Command::Base
     opts << "ps=#{URI.encode(options[:ps])}"         if options[:ps]
     opts << "source=#{URI.encode(options[:source])}" if options[:source]
 
-    @assigned_colors = {}
-    @line_start = true
-    @token = nil
-
-    heroku.read_logs(app, opts) do |chunk|
-      unless chunk.empty?
-        if STDOUT.isatty && ENV.has_key?("TERM")
-          display(colorize(chunk))
-        else
-          display(chunk)
-        end
-      end
-    end
-  rescue Errno::EPIPE
-  rescue Interrupt => interrupt
-    if STDOUT.isatty && ENV.has_key?("TERM")
-      display("\e[0m")
-    end
-    raise(interrupt)
+    log_displayer = ::Heroku::Helpers::LogDisplayer.new(heroku, app, opts)
+    log_displayer.display_logs
   end
 
   # logs:drains
@@ -58,41 +42,4 @@ class Heroku::Command::Logs < Heroku::Command::Base
     display("~ `heroku logs:drains` has been deprecated and replaced with `heroku drains`")
     Heroku::Command::Drains.new.index
   end
-
-  protected
-
-  COLORS = %w( cyan yellow green magenta red )
-  COLOR_CODES = {
-    "red"     => 31,
-    "green"   => 32,
-    "yellow"  => 33,
-    "magenta" => 35,
-    "cyan"    => 36,
-  }
-
-  def colorize(chunk)
-    lines = []
-    chunk.split("\n").map do |line|
-      if parsed_line = parse_log(line)
-        header, identifier, body = parsed_line
-        @assigned_colors[identifier] ||= COLORS[@assigned_colors.size % COLORS.size]
-        lines << [
-          "\e[#{COLOR_CODES[@assigned_colors[identifier]]}m",
-          header,
-          "\e[0m",
-          body,
-        ].join("")
-      elsif not line.empty?
-        lines << line
-      end
-    end
-    lines.join("\n")
-  end
-
-  def parse_log(log)
-    return unless parsed = log.match(/^(.*\[(\w+)([\d\.]+)?\]:)(.*)?$/)
-    [1, 2, 4].map { |i| parsed[i] }
-  end
-
 end
-

data/lib/heroku/command/maintenance.rb

@@ -31,7 +31,7 @@ class Heroku::Command::Maintenance < Heroku::Command::Base
   #Example:
   #
   # $ heroku maintenance:on
-  # Enabling maintenance mode for myapp
+  # Enabling maintenance mode for example
   #
   def on
     validate_arguments!
@@ -48,7 +48,7 @@ class Heroku::Command::Maintenance < Heroku::Command::Base
   #Example:
   #
   # $ heroku maintenance:off
-  # Disabling maintenance mode for myapp
+  # Disabling maintenance mode for example
   #
   def off
     validate_arguments!