heroku_san 1.2.0 → 1.2.1

data/README.rdoc

@@ -107,6 +107,10 @@ Issue Tracker:: http://github.com/fastestforward/heroku_san/issues
 * Michael Haddad (michael@ludditetechnology.com)
 * Les Hill (leshill@gmail.com)
 * Bryan Ash
+* Barry Hess (barry@bjhess.com)
+* Ryan Ahearn (ryan@craftsoftwaresolutions.com)
+* Jon Wood (jon@blankpad.net)
+* Mat Schaffer (mat@schaffer.me)
 
 == License
 

data/heroku_san.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_san}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Elijah Miller", "Glenn Roberts"]
+  s.authors = ["Elijah Miller", "Glenn Roberts", "Ryan Ahearn"]
   s.date = %q{2011-03-14}
   s.description = %q{Manage multiple Heroku instances/apps for a single Rails app using Rake}
   s.email = %q{elijah.miller@gmail.com}
@@ -22,19 +22,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ['>= 2'])
-      s.add_runtime_dependency(%q<heroku>)
+      s.add_runtime_dependency(%q<heroku>, ['>= 2'])
       s.add_development_dependency(%q<rails>, ['>= 3'])
       s.add_development_dependency(%q<aruba>)
       s.add_development_dependency(%q<cucumber>)
     else
       s.add_dependency(%q<rails>, ['>= 2'])
-      s.add_dependency(%q<heroku>)
+      s.add_dependency(%q<heroku>, ['>= 2'])
       s.add_dependency(%q<aruba>)
       s.add_dependency(%q<cucumber>)
     end
   else
     s.add_dependency(%q<rails>, ['>= 2'])
-    s.add_dependency(%q<heroku>)
+    s.add_dependency(%q<heroku>, ['>= 2'])
     s.add_dependency(%q<aruba>)
     s.add_dependency(%q<cucumber>)
   end

data/lib/heroku_san/tasks.rb

@@ -1,6 +1,6 @@
 HEROKU_CONFIG_FILE = Rails.root.join('config', 'heroku.yml')
 
-@app_settings = 
+@app_settings =
   if File.exists?(HEROKU_CONFIG_FILE)
     if defined?(ERB)
       YAML.load(ERB.new(File.read(HEROKU_CONFIG_FILE)).result)
@@ -26,7 +26,7 @@ def retrieve_configuration
     tmp_config_dir = Dir.mktmpdir
     tmp_config_file = File.join tmp_config_dir, 'config.yml'
     sh "git clone #{@config_repo} #{tmp_config_dir}"
-    @extra_config = 
+    @extra_config =
       if File.exists?(tmp_config_file)
         if defined?(ERB)
           YAML.load(ERB.new(File.read(tmp_config_file)).result)
@@ -151,7 +151,11 @@ namespace :heroku do
     else
       puts "Copied example config to config/heroku.yml"
       FileUtils.cp(example, HEROKU_CONFIG_FILE)
-      sh("#{ENV['EDITOR']} #{HEROKU_CONFIG_FILE}")
+      if ENV['EDITOR'].present?
+        sh("#{ENV['EDITOR']} #{HEROKU_CONFIG_FILE}")
+      else
+        puts "Please edit config/heroku.yml with your application's settings."
+      end
     end
   end
 
@@ -159,9 +163,11 @@ namespace :heroku do
   task :config do
     retrieve_configuration
     each_heroku_app do |name, app, repo, config|
-      (config).each do |var, value|
-        sh "heroku config:add --app #{app} #{var}=#{value}"
+      command = "heroku config:add --app #{app}"
+      config.each do |var, value|
+        command += " #{var}=#{value}"
       end
+      sh(command)
     end
   end
 
@@ -226,7 +232,7 @@ namespace :heroku do
 end
 
 desc "Pushes the given commit, migrates and restarts (default: HEAD)"
-task :deploy, :commit, :needs => :before_deploy do |t, args|
+task :deploy, [:commit] => [:before_deploy] do |t, args|
   each_heroku_app do |name, app, repo|
     push(args[:commit], repo)
     migrate(app)
@@ -239,7 +245,7 @@ namespace :deploy do
   task :force, :commit do |t, args|
     @git_push_arguments ||= []
     @git_push_arguments << '--force'
-    Rake::Task[:deploy].invoke(args)
+    Rake::Task[:deploy].invoke(args[:commit])
   end
 end
 
@@ -292,19 +298,37 @@ task :logs do
 end
 
 namespace :db do
+  desc 'Pull the Heroku database'
   task :pull do
+    dbconfig = YAML.load(ERB.new(File.read(Rails.root.join('config/database.yml'))).result)[Rails.env]
+    return if dbconfig['adapter'] != 'postgresql'
+
     each_heroku_app do |name, app, repo|
-      sh "heroku pgdumps:capture --app #{app}"
-      dump = `heroku pgdumps --app #{app}`.split("\n").last.split(" ").first
+      oldest = `heroku pgbackups --app #{app}`.split("\n")[2].split(" ").first
+      sh "heroku pgbackups:destroy #{oldest} --app #{app}"
+
+      sh "heroku pgbackups:capture --app #{app}"
+      dump = `heroku pgbackups --app #{app}`.split("\n").last.split(" ").first
       sh "mkdir -p #{Rails.root}/db/dumps"
-      file = "#{Rails.root}/db/dumps/#{dump}.sql.gz"
-      url = `heroku pgdumps:url --app #{app} #{dump}`.chomp
+      file = "#{Rails.root}/db/dumps/#{dump}"
+      url = `heroku pgbackups:url --app #{app} #{dump}`.chomp
       sh "wget", url, "-O", file
-      sh "rake db:drop db:create"
-      sh "gunzip -c #{file} | #{Rails.root}/script/dbconsole"
+
+      sh "rake db:setup"
+      sh "pg_restore --verbose --clean --no-acl --no-owner -h #{dbconfig['host']} -p #{dbconfig['port']} -U #{dbconfig['username']} -d #{dbconfig['database']} #{file}"
       sh "rake jobs:clear"
     end
   end
+
+  desc 'Push local database for Heroku database'
+  task :push do
+    dbconfig = YAML.load(ERB.new(File.read(Rails.root.join('config/database.yml'))).result)[Rails.env]
+    return if dbconfig['adapter'] != 'postgresql'
+
+    each_heroku_app do |name, app, repo|
+      sh "heroku db:push postgres://#{dbconfig['username']}:#{dbconfig['password']}@#{dbconfig['host']}/#{dbconfig['database']} --app #{app}"
+    end
+  end
 end
 
 def each_heroku_app

metadata

@@ -1,17 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku_san
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Elijah Miller
 - Glenn Roberts
+- Ryan Ahearn
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -27,9 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :runtime
   version_requirements: *id001
@@ -41,10 +34,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: "2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,9 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
         version: "3"
   type: :development
   version_requirements: *id003
@@ -69,9 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -83,9 +67,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -128,23 +109,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A bunch of useful Rake tasks for managing your Heroku apps