heroku_san 2.1.4 → 2.2.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log (curated)
 
+## v2.2.1
+
+  * New feature: addons from [Matt Burke](https://github.com/spraints)
+
 ## v2.1.4
 
   * Use heroku-api for client calls instead heroku gem

data/README.rdoc

@@ -69,6 +69,8 @@ Need to add remotes for each app?
 
 A full list of tasks provided:
 
+  rake heroku:addons                # Install addons for the application.
+  rake heroku:addons:local          # List configured addons, without installing them
   rake heroku:apps                  # Lists configured apps
   rake heroku:apps:local            # Lists configured apps without hitting heroku
   rake heroku:config                # Add config:vars to each application.
@@ -133,6 +135,7 @@ Issue Tracker:: http://github.com/fastestforward/heroku_san/issues
 * Mat Schaffer (mat@schaffer.me)
 * Jonathan Hironaga (jonathan.hironaga@halogennetwork.com)
 * Ken Mayer (ken@bitwrangler.com)
+* Matt Burke (https://github.com/spraints)
 
 == License
 

data/cucumber.yml

@@ -1,2 +1,2 @@
-default: --tags ~@slow_process
-remote: --tags @slow_process
+default: --tags ~@slow_process --no-source
+remote: --tags @slow_process --no-source

data/features/remote.feature

@@ -27,4 +27,5 @@ Feature: heroku_san can control a project on Heroku
     And I turn maintenance off
     And I restart my project
     And I list all apps on Heroku
+    And I install an addon
     Then heroku_san is green

data/features/step_definitions/remote_steps.rb

@@ -131,6 +131,24 @@ When /^I list all apps on Heroku$/ do
   assert_partial_output "@ #{sha} master", output
 end
 
+When /^I install an addon$/ do
+  # Install the campfire addon.
+  overwrite_file 'config/heroku.yml', <<END_CONFIG
+test_app:
+  app: #{@app}
+  addons:
+    - deployhooks:campfire
+END_CONFIG
+  run_simple 'rake test_app heroku:addons'
+  output = stdout_from 'rake test_app heroku:addons'
+  # The output should show the default addons...
+  assert_partial_output "shared-database:5mb", output
+  # ... and the new one ...
+  assert_partial_output "deployhooks:campfire", output
+  # ... with a note about needing to configure it.
+  assert_partial_output "https://api.heroku.com/myapps/#{@app}/addons/deployhooks:campfire", output
+end
+
 Then /^heroku_san is green$/ do
   run_simple "heroku apps:destroy #{@app} --confirm #{@app}"
 end

data/lib/heroku_san/stage.rb

@@ -37,6 +37,10 @@ module HerokuSan
     def config
       @options['config'] ||= {}
     end
+
+    def addons
+      (@options['addons'] ||= []).flatten
+    end
     
     def run(command, args = nil)
       if stack =~ /cedar/
@@ -99,6 +103,18 @@ module HerokuSan
       heroku.put_config_vars(app, params).body
     end
 
+    def installed_addons
+      heroku.get_addons(app).body
+    end
+
+    def install_addons
+      addons_to_install = addons - installed_addons.map{|a|a['name']}
+      addons_to_install.each do |addon|
+        heroku.post_addon(app, addon)
+      end
+      installed_addons
+    end
+
     def restart
       "restarted" if heroku.post_ps_restart(app).body == 'ok'
     end

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "2.1.4"
+  VERSION = "2.2.2"
 end

data/lib/tasks.rb

@@ -86,6 +86,26 @@ namespace :heroku do
     end
   end
 
+  desc 'Install addons for the application.'
+  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']}" } })
+    end
+  end
+
+  namespace :addons do
+    desc 'List configured addons, without installing them'
+    task :local do
+      each_heroku_app do |stage|
+        puts "Configured addons for #{stage.name}:"
+        stage.addons.each do |addon|
+          puts "  - #{addon}"
+        end
+      end
+    end
+  end
+
   desc 'Creates an example configuration file'
   task :create_config do
     filename = %Q{#{@heroku_san.config_file.to_s}}

data/spec/heroku_san/stage_spec.rb

@@ -14,7 +14,8 @@ describe HerokuSan::Stage do
       {"stack" => "cedar", 
        "app"   => "awesomeapp-demo", 
        "tag"   => "demo/*", 
-       "config"=> {"BUNDLE_WITHOUT"=>"development:test"}
+       "config"=> {"BUNDLE_WITHOUT"=>"development:test"},
+       "addons"=> ['one:addon', 'two:addons'],
       })}
 
     its(:name)   { should == 'production' }
@@ -23,6 +24,7 @@ describe HerokuSan::Stage do
     its(:tag)    { should == "demo/*" }
     its(:config) { should == {"BUNDLE_WITHOUT"=>"development:test"} }
     its(:repo)   { should == 'git@heroku.com:awesomeapp-demo.git' }
+    its(:addons) { should == ['one:addon', 'two:addons'] }
   end
   
   describe "#app" do
@@ -38,7 +40,7 @@ describe HerokuSan::Stage do
   describe "#stack" do
     it "returns the name of the stack from Heroku" do
       subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp"})
-      with_app(subject, 'name' => 'awesomeapp') do |app_data|
+      with_app(subject, 'name' => subject.app) do |app_data|
         subject.stack.should == 'bamboo-mri-1.9.2'
       end
     end
@@ -49,6 +51,26 @@ describe HerokuSan::Stage do
     end
   end
 
+  describe '#addons' do
+    subject { HerokuSan::Stage.new('production', {'addons' => addons}) }
+    context 'default' do
+      let(:addons) { nil }
+      its(:addons) { should == [] }
+    end
+    context 'nested' do
+      # This is for when you do:
+      # default_addons: &default_addons
+      #   - a
+      #   - b
+      # env:
+      #   addons:
+      #   - *default_addons
+      #   - other
+      let(:addons) { [ ['a', 'b'], 'other' ] }
+      its(:addons) { should == [ 'a', 'b', 'other' ] }
+    end
+  end
+
   describe "#run" do
     it "runs commands using the pre-cedar format" do
       subject.should_receive(:sh).with("heroku run:rake foo bar bleh --app awesomeapp")
@@ -223,4 +245,29 @@ describe HerokuSan::Stage do
       subject.revision.should == ''
     end
   end
-end
+  
+  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]
+      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"]})}
+
+    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.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"]})
+      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]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails