diff --git a/Gemfile b/Gemfile index e7f1f535..74fa4990 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'custom_fields', '1.0.0.beta.9' gem 'fog', '0.3.7' gem 'mimetype-fu' gem 'actionmailer_with_request', :git => 'git://github.com/eric1234/actionmailer_with_request.git' -gem 'heroku', '1.18.2' +gem 'heroku', '1.19.1' # '1.18.2' gem 'bushido' gem 'httparty', '>= 0.6.1' gem 'RedCloth', '4.2.7' diff --git a/Gemfile.lock b/Gemfile.lock index f94c3e01..4d0c0259 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM autotest (4.4.6) ZenTest (>= 4.4.1) bcrypt-ruby (2.1.4) - bson (1.2.4) + bson (1.3.0) bson_ext (1.2.4) builder (2.1.2) bushido (0.0.12) @@ -109,7 +109,7 @@ GEM diff-lcs (1.1.2) erubis (2.6.6) abstract (>= 1.0.0) - excon (0.6.0) + excon (0.6.1) factory_girl (1.3.3) factory_girl_rails (1.0.1) factory_girl (~> 1.3) @@ -135,8 +135,8 @@ GEM growl-glue (1.0.7) haml (3.0.25) has_scope (0.5.0) - heroku (1.18.2) - json (~> 1.5.1) + heroku (1.19.1) + activesupport (>= 2.1.0) launchy (~> 0.3.2) rest-client (>= 1.4.0, < 1.7.0) highline (1.6.1) @@ -175,8 +175,8 @@ GEM mime-types (1.16) mimemagic (0.1.8) mimetype-fu (0.1.2) - mongo (1.2.4) - bson (>= 1.2.4) + mongo (1.3.0) + bson (>= 1.3.0) mongoid (2.0.0.rc.7) activemodel (~> 3.0) mongo (~> 1.2) @@ -289,7 +289,7 @@ DEPENDENCIES formtastic (~> 1.2.3) growl-glue haml (= 3.0.25) - heroku (= 1.18.2) + heroku (= 1.19.1) httparty (>= 0.6.1) inherited_resources (~> 1.1.2) launchy diff --git a/lib/locomotive/hosting/heroku.rb b/lib/locomotive/hosting/heroku.rb index 5f23290c..1f58c34e 100644 --- a/lib/locomotive/hosting/heroku.rb +++ b/lib/locomotive/hosting/heroku.rb @@ -35,7 +35,7 @@ module Locomotive self.enhance_site_model_with_heroku - puts "HEROKU NAME = #{ENV['APP_NAME'].inspect} / #{ENV.inspect}" + puts "HEROKU NAME = #{self.config.heroku[:name]} / #{ENV['APP_NAME'].inspect} / #{ENV.inspect}" # "cache" domains for better performance self.heroku_domains = self.heroku_connection.list_domains(self.config.heroku[:name]).collect { |h| h[:domain] } @@ -45,6 +45,8 @@ module Locomotive login = self.config.heroku[:login] || ENV['HEROKU_LOGIN'] password = self.config.heroku[:password] || ENV['HEROKU_PASSWORD'] + puts "LOGIN = #{login} / PASSWORD = #{password}" + self.heroku_connection = ::Heroku::Client.new(login, password) end