Merge remote-tracking branch 'github/master'

addons.rb

@@ -11,6 +11,14 @@ def configure_addon(label, &install_or_upgrade)
             db = Resolver.new(val, config_vars)
             display db.message if db.message
             abort_with_database_list(val) unless db[:url]
+
+            db = HerokuPostgresql::Client10.new(db[:url]).get_database
+            db_plan = db[:plan]
+            version = db[:postgresql_version]
+            abort " !  PostgreSQL v#{version} cannot be #{opt}ed. Please upgrade to a newer version." if '8' == version.split(/\./).first
+            addon_plan = args.first.split(/:/)[1] || 'ronin'
+            abort " !  Only another #{db_plan} can #{opt} #{db[:name]}" unless db_plan == addon_plan
+
             args << "#{opt}=#{db[:url]}"
           end
         end

client.rb

@@ -1,5 +1,9 @@
 require "heroku/helpers"
-require "heroku/json"
+begin
+  require "heroku/json"
+rescue LoadError
+  require "json/pure"
+end
 require 'digest/sha2'
 
 module HerokuPostgresql

pg.rb

@@ -94,7 +94,14 @@ def wait_for(db)
             redisplay("The #{name} encountered an error", true)
             break
           else
-            redisplay("#{state.capitalize} #{name} #{spinner(ticks)}", false)
+            if state == "downloading"
+              msg = "(#{database[:database_dir_size]} bytes)"
+            elsif state == "standby"
+                msg = "(#{database[:current_transaction]}/#{database[:target_transaction]})"
+            else
+              msg = ''
+            end
+            redisplay("#{state.capitalize} #{name} #{spinner(ticks)} #{msg}", false)
           end
         end
       end