heroku_san 3.0.1 → 3.0.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log (curated)
 
+## v3.0.2
+
+  * Fix config:list bug (#90)
+
 ## v3.0.1
 
   * Fix deploy:force bugs (#84 & #85)

data/heroku_san.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<cucumber>)
       s.add_development_dependency(%q<rake>)
       s.add_development_dependency(%q<bundler>, ['~> 1.1  '])
+      s.add_development_dependency('git-smart')
     else
       s.add_dependency(%q<rails>, ['>= 2'])
       s.add_dependency(%q<heroku>, ['>= 2'])

data/lib/heroku_san/tasks.rb

@@ -22,7 +22,7 @@ namespace :heroku do
   task 'stage:all' do
     HerokuSan.project << HerokuSan.project.all
   end
-  
+
   desc "Creates the Heroku app"
   task :create do
     each_heroku_app do |stage|
@@ -88,7 +88,9 @@ namespace :heroku do
   desc 'Add config:vars to each application.'
   task :config do
     each_heroku_app do |stage|
-      puts y(stage.push_config)
+      stage.push_config.each do |(key,value)|
+        puts "#{key}: #{value}"
+      end
     end
   end
 
@@ -96,7 +98,10 @@ namespace :heroku do
   task :addons do
     each_heroku_app do |stage|
       addons = stage.install_addons
-      puts y("#{stage.name} addons" => addons.map { |addon| addon['configured'] ? addon['name'] : { addon['name'] => "Configure at https://api.heroku.com/myapps/#{stage.app}/addons/#{addon['name']}" } })
+      puts "#{stage.name} addons"
+      addons.each do |addon| 
+        puts "  - " + addon['name'] + (addon['configured'] ? "" : " # Configure at https://api.heroku.com/myapps/#{stage.app}/addons/#{addon['name']}")
+      end
     end
   end
 
@@ -145,7 +150,9 @@ namespace :heroku do
     task :list do
       each_heroku_app do |stage|
         puts "#{stage.name}:"
-        puts y(stage.long_config)
+        stage.long_config.each do |(key,value)|
+          puts "#{key}: #{value}"
+        end
       end
     end
 
@@ -154,12 +161,14 @@ namespace :heroku do
       task :local do
         each_heroku_app do |stage|
           puts "#{stage.name}:"
-          puts y(stage.config)
+          stage.config.each do |(key,value)|
+            puts "#{key}: #{value}"
+          end
         end
       end
     end
   end
-  
+
   desc 'Runs a rake task remotely'
   task :rake, [:task] do |t, args|
     each_heroku_app do |stage|
@@ -287,11 +296,11 @@ namespace :heroku do
     desc "Pull database from stage to local dev database"
     task :pull do
       each_heroku_app do |stage|
-        sh "heroku pgdumps:capture --app #{stage.app}"
-        dump = `heroku pgdumps --app #{stage.app}`.split("\n").last.split(" ").first
+        sh "heroku pgbackups:capture --expire --app #{stage.app}"
+        dump = `heroku pgbackups --app #{stage.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 #{stage.app} #{dump}`.chomp
+        url = `heroku pgbackups:url --app #{stage.app} #{dump}`.chomp
         sh "wget", url, "-O", file
         sh "rake db:drop db:create"
         sh "gunzip -c #{file} | #{Rails.root}/script/dbconsole"
@@ -299,7 +308,7 @@ namespace :heroku do
       end
     end
   end
-  
+
   desc "Run a bash shell on Heroku"
   task :shell do
     each_heroku_app do |stage|
@@ -342,4 +351,4 @@ rescue HerokuSan::NoApps => e
     rake all heroku:share"
 
   exit(1)
-end
+end

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/spec/heroku_san/stage_spec.rb

@@ -268,24 +268,24 @@ describe HerokuSan::Stage do
   describe "#installed_addons" do
     it "returns the list of installed addons" do
       with_app(subject, 'name' => subject.app) do |app_data|
-        subject.installed_addons.map{|a|a['name']}.should =~ %w[logging:basic shared-database:5mb]
+        subject.installed_addons.map{|a|a['name']}.should include *%w[shared-database:5mb]
       end
     end
   end
 
   describe '#install_addons' do
-    subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => ["custom_domains:basic", "ssl:piggyback"]})}
+    subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[custom_domains:basic ssl:piggyback]})}
 
     it "installs the addons" do
       with_app(subject, 'name' => subject.app) do |app_data| 
-        subject.install_addons.map{|a| a['name']}.should =~ %w[logging:basic shared-database:5mb custom_domains:basic ssl:piggyback]
+        subject.install_addons.map{|a| a['name']}.should include *%w[custom_domains:basic ssl:piggyback]
         subject.installed_addons.map{|a|a['name']}.should =~ subject.install_addons.map{|a| a['name']}
       end
     end
     it "only installs missing addons" do
-      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => ["logging:basic","custom_domains:basic", "ssl:piggyback"]})
+      subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "bamboo-ree-1.8.7", "addons" => %w[shared-database:5mb custom_domains:basic ssl:piggyback]})
       with_app(subject, 'name' => subject.app) do |app_data| 
-        subject.install_addons.map{|a| a['name']}.should =~ %w[logging:basic shared-database:5mb custom_domains:basic ssl:piggyback]
+        subject.install_addons.map{|a| a['name']}.should include *%w[shared-database:5mb custom_domains:basic ssl:piggyback]
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Elijah Miller
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-16 00:00:00 -07:00
+date: 2012-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,19 @@ dependencies:
         version: "1.1"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: git-smart
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []