heroku-rails 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,5 +1,11 @@
 Heroku Rails
 
+v0.4.4
+============================================
+Fix heroku rake
+Upgrade heroku authorization
+Fix deprecation warning
+
 v0.2.0
 ============================================
 Added Heroku Settings tasks, and rails generators
@@ -29,4 +35,4 @@ Glenn Roberts
 
 v0.0.1.
 ============================================
-Initial release.
+Initial release.

data/Gemfile

@@ -6,5 +6,4 @@ gem "ruby-debug19", :platforms => :mri_19
 
 gem "autotest", ">= 0"
 gem "growl-glue", ">= 0"
-
-gem "rake", "0.8.7"
+gem "rdoc"

data/Gemfile.lock

@@ -1,44 +1,52 @@
 PATH
   remote: .
   specs:
-    heroku-rails (0.4.3)
-      heroku (>= 1.11.0)
+    heroku-rails (0.4.4)
+      heroku (>= 2.15.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
-    addressable (2.2.6)
+    ZenTest (4.8.2)
+    addressable (2.3.2)
     archive-tar-minitar (0.5.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
-    columnize (0.3.5)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
+    excon (0.15.4)
     growl-glue (1.0.7)
-    heroku (2.15.1)
+    heroku (2.30.1)
+      heroku-api (~> 0.3.1)
       launchy (>= 0.3.2)
+      netrc (~> 0.7.5)
       rest-client (~> 1.6.1)
       rubyzip
-      term-ansicolor (~> 1.0.5)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
+    heroku-api (0.3.1)
+      excon (~> 0.15.4)
+    json (1.7.4)
+    launchy (2.1.1)
+      addressable (~> 2.3)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mime-types (1.17.2)
-    rake (0.8.7)
-    rbx-require-relative (0.0.5)
+    mime-types (1.19)
+    netrc (0.7.5)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12)
+      json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -54,8 +62,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.5)
-    term-ansicolor (1.0.7)
+    rubyzip (0.9.9)
 
 PLATFORMS
   ruby
@@ -64,7 +71,8 @@ DEPENDENCIES
   autotest
   growl-glue
   heroku-rails!
-  rake (= 0.8.7)
+  rake (~> 0.9.2)
+  rdoc
   rspec (~> 2.0)
   ruby-debug
   ruby-debug19

data/Rakefile

@@ -2,10 +2,10 @@ require "bundler"
 Bundler.setup
 
 require 'rake'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 gemspec = eval(File.read('heroku-rails.gemspec'))
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
   pkg.gem_spec = gemspec
 end
 
@@ -22,17 +22,17 @@ end
 require "rspec"
 require "rspec/core/rake_task"
 
-Rspec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new('spec:progress') do |spec|
+RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.rspec_opts = %w(--format progress)
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-require "rake/rdoctask"
-Rake::RDocTask.new do |rdoc|
+require "rdoc/task"
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
   rdoc.title = "Heroku Rails #{gemspec.version}"
   rdoc.rdoc_files.include("README*")
@@ -40,4 +40,4 @@ Rake::RDocTask.new do |rdoc|
 end
 
 
-task :default => :spec
+task :default => :spec

data/heroku-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "heroku-rails"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.authors = ["Elijah Miller", "Glenn Roberts", "Jacques Crocker"]
   s.summary = "Deployment and configuration tools for Heroku/Rails"
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
     "CHANGELOG"
   ]
 
-  s.add_runtime_dependency "heroku", ">= 1.11.0"
+  s.add_runtime_dependency "heroku", ">= 2.15.0"
   s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rake", "~> 0.9.2"
 end
-

data/lib/heroku-rails/config.rb

@@ -40,6 +40,14 @@ module HerokuRails
       stacks[app_env] || stacks['all']
     end
 
+    def rake_cmd(app_env)
+      if self.stack(app_env) =~ /cedar/i
+        'heroku run rake'
+      else
+        'heroku rake'
+      end
+    end
+
     # pull out the config setting hash for a particular app environment
     def config(app_env)
       config = self.settings['config'] || {}
@@ -75,4 +83,4 @@ module HerokuRails
       (all + (setting[app] || [])).uniq
     end
   end
-end
+end

data/lib/heroku-rails/runner.rb

@@ -8,20 +8,7 @@ module HerokuRails
     end
 
     def authorize
-      return if @heroku
-
-      # setup heroku username and password so we can start up a heroku client
-      credentials_path = File.expand_path("~/.heroku/credentials")
-
-      # read in the username,password so we can build the client
-      if File.exists?(credentials_path)
-        auth = File.read(credentials_path)
-        username, password = auth.split("\n")
-        @heroku = Heroku::Client.new(username, password)
-      else
-        puts "Heroku not set up. Run `heroku list` in order to input your credentials and try again"
-        exit(1)
-      end
+      @heroku ||= Heroku::Auth.client
     end
 
     # add a specific environment to the run list
@@ -36,7 +23,7 @@ module HerokuRails
 
     # setup apps (create if necessary)
     def setup_apps
-      authorize unless @heroku
+      authorize
 
       # get a list of all my current apps on Heroku (so we don't create dupes)
       @my_apps = @heroku.list.map{|a| a.first}
@@ -52,7 +39,7 @@ module HerokuRails
 
     # setup the stacks for each app (migrating if necessary)
     def setup_stacks
-      authorize unless @heroku
+      authorize
       each_heroku_app do |heroku_env, app_name, repo|
         # get the intended stack setting
         stack = @config.stack(heroku_env)
@@ -70,7 +57,7 @@ module HerokuRails
 
     # setup the list of collaborators
     def setup_collaborators
-      authorize unless @heroku
+      authorize
       each_heroku_app do |heroku_env, app_name, repo|
         # get the remote info about the app from heroku
         heroku_app_info = @heroku.info(app_name) || {}
@@ -110,7 +97,7 @@ module HerokuRails
 
     # setup configuration
     def setup_config
-      authorize unless @heroku
+      authorize
       each_heroku_app do |heroku_env, app_name, repo|
         # get the configuration that we are aiming towards
         new_config = @config.config(heroku_env)
@@ -144,7 +131,7 @@ module HerokuRails
 
     # setup the addons for heroku
     def setup_addons
-      authorize unless @heroku
+      authorize
       each_heroku_app do |heroku_env, app_name, repo|
         # get the addons that we are aiming towards
         addons = @config.addons(heroku_env)
@@ -186,7 +173,7 @@ module HerokuRails
 
     # setup the domains for heroku
     def setup_domains
-      authorize unless @heroku
+      authorize
       each_heroku_app do |heroku_env, app_name, repo|
         # get the domains that we are aiming towards
         domains = @config.domains(heroku_env)
@@ -268,15 +255,13 @@ module HerokuRails
     end
 
     def output_destroy_commands(app)
-      if @destroy_commands.present?
-        puts "The #{app} had a few things removed from the heroku.yml."
-        puts "If they are no longer neccessary, then run the following commands:\n\n"
-        (@destroy_commands || []).each do |destroy_cmd|
-          puts destroy_cmd
-        end
-        puts "\n\nthese commands may cause data loss so make sure you know that these are necessary"
-        # clear destroy commands
+      puts "The #{app} had a few things removed from the heroku.yml."
+      puts "If they are no longer neccessary, then run the following commands:\n\n"
+      (@destroy_commands || []).each do |destroy_command|
+        puts destroy_command
       end
+      puts "\n\nthese commands may cause data loss so make sure you know that these are necessary"
+      # clear destroy commands
       @destroy_commands = []
     end
 
@@ -285,4 +270,4 @@ module HerokuRails
     end
 
   end
-end
+end

data/lib/heroku/rails/tasks.rb

@@ -62,10 +62,12 @@ namespace :heroku do
       Rake::Task["heroku:before_each_deploy"].reenable
       Rake::Task["heroku:before_each_deploy"].invoke(app_name)
 
+      rake_cmd = HEROKU_CONFIG.rake_cmd(heroku_env)
+
       branch = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
       if branch.present?
         @git_push_arguments ||= []
-        system_with_echo "git push #{repo} #{@git_push_arguments.join(' ')} #{branch}:master && heroku restart --app #{app_name}"
+        system_with_echo "git push #{repo} #{@git_push_arguments.join(' ')} #{branch}:master && #{rake_cmd} --app #{app_name} db:migrate && heroku restart --app #{app_name}"
       else
         puts "Unable to determine the current git branch, please checkout the branch you'd like to deploy"
         exit(1)
@@ -179,7 +181,8 @@ namespace :heroku do
     desc "Migrates and restarts remote servers"
     task :migrate do
       HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
-        system_with_echo "heroku rake --app #{app_name} db:migrate && heroku restart --app #{app_name}"
+        rake_cmd = HEROKU_CONFIG.rake_cmd(heroku_env)
+        system_with_echo "#{rake_cmd} --app #{app_name} db:migrate && heroku restart --app #{app_name}"
       end
     end
 
@@ -200,4 +203,4 @@ namespace :heroku do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000Z
+date: 2012-07-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2152235900 !ruby/object:Gem::Requirement
+  requirement: &70366282766080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.15.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152235900
+  version_requirements: *70366282766080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152234080 !ruby/object:Gem::Requirement
+  requirement: &70366282757360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,18 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2152234080
+  version_requirements: *70366282757360
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70366282754740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
+  prerelease: false
+  version_requirements: *70366282754740
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake.
   It's the Capistrano for Heroku, without the suck.
 email: railsjedi@gmail.com
@@ -81,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1070963580858279242
+      hash: 3344456155800977380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1070963580858279242
+      hash: 3344456155800977380
 requirements: []
 rubyforge_project: none
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Deployment and configuration tools for Heroku/Rails