heroku_san 4.0.8 → 4.2.1

data/CHANGELOG.md

@@ -1,4 +1,13 @@
-# Change log (curated)
+# Change Log (curated)
+
+## v4.2.0
+
+  * Wrap API calls so that errors are reported in a more human-fiendly way
+  * Closes #105
+
+## v4.1.0
+
+  * Extracted `Parser` and `Configuration` classes from `Project`. This *should* be a feature-neutral version change. There are a few API additions, but they should not be needed by the general `heroku_san` population.
 
 ## v4.0.8
 
@@ -62,7 +71,7 @@
 
 ## v2.1.4
 
-  * Use heroku-api for client calls instead heroku gem
+  * Use heroku-api for client calls instead of heroku gem
 
 ## v2.1.3
 

data/lib/heroku_san/api.rb

@@ -0,0 +1,17 @@
+module HerokuSan
+  class API
+    def initialize(options = {})
+      @heroku_api = Heroku::API.new(options)
+    end
+
+    def method_missing(name, *args)
+      @heroku_api.send(name, *args)
+    rescue Heroku::API::Errors::ErrorWithResponse => error
+      status = error.response.headers["Status"]
+      msg = JSON.parse(error.response.body)['error'] rescue '???'
+      error.set_backtrace([])
+      $stderr.puts "\nHeroku API ERROR: #{status} (#{msg})\n\n"
+      raise error
+    end
+  end
+end

data/lib/heroku_san/configuration.rb

@@ -0,0 +1,45 @@
+module HerokuSan
+  class Configuration
+    attr_reader :config_file
+    attr_accessor :configuration
+    attr_reader :options
+
+    def initialize(configurable)
+      @config_file = configurable.config_file
+      default_options = {
+          'deploy' => HerokuSan::Deploy::Rails
+      }
+      @options = default_options.merge(configurable.options || {})
+    end
+
+    def parse
+      HerokuSan::Parser.new.parse(self)
+    end
+
+    def stages
+      configured? or parse
+      configuration.inject({}) do |stages, (stage, settings)|
+        stages[stage] = HerokuSan::Stage.new(stage, settings.merge('deploy' => (options[:deploy]||options['deploy'])))
+        stages
+      end
+    end
+
+    def configured?
+      !!configuration
+    end
+
+    def template
+      File.expand_path(File.join(File.dirname(__FILE__), '../templates', 'heroku.example.yml'))
+    end
+
+    def generate_config
+      # TODO: Convert true/false returns to success/exception
+      if File.exists?(config_file)
+        false
+      else
+        FileUtils.cp(template, config_file)
+        true
+      end
+    end
+  end
+end

data/lib/heroku_san/parser.rb

@@ -0,0 +1,57 @@
+module HerokuSan
+  class Parser
+    include Git
+    attr_accessor :settings
+    def parse(parseable)
+      @settings = parse_yaml(parseable.config_file)
+      convert_from_heroku_san_format
+      each_setting_has_a_config_section
+      merge_external_config
+      parseable.configuration = @settings
+    end
+
+    def convert_from_heroku_san_format
+      (settings.delete('apps') || {}).each_pair do |stage, app_name|
+        settings[stage] = {'app' => app_name}
+      end
+    end
+
+    def each_setting_has_a_config_section
+      settings.keys.each do |name|
+        settings[name] ||= {}
+        settings[name]['config'] ||= {}
+      end
+    end
+
+    def merge_external_config
+      extra_config = parse_external_config(settings.delete('config_repo'))
+      return unless extra_config
+      settings.keys.each do |name|
+        settings[name]['config'].merge!(extra_config[name]) if extra_config[name]
+      end
+    end
+
+    def parse_external_config(config_repo)
+      return if config_repo.nil?
+      require 'tmpdir'
+      Dir.mktmpdir do |dir|
+        git_clone config_repo, dir
+        parse_yaml File.join(dir, 'config.yml')
+      end
+    end
+
+      private
+
+    def parse_yaml(config_file)
+      if File.exists?(config_file)
+        if defined?(ERB)
+          YAML.load(ERB.new(File.read(config_file)).result)
+        else
+          YAML.load_file(config_file)
+        end
+      else
+        {}
+      end
+    end
+  end
+end

data/lib/heroku_san/project.rb

@@ -1,37 +1,30 @@
 module HerokuSan
   class Project
-    attr_reader :config_file
-  
     include Git
-    
-    def initialize(config_file, options = {})
-      @apps = []
+    attr_reader :config_file
+    attr_reader :options
+    attr_writer :configuration
+
+    def initialize(config_file = nil, options = {})
       @config_file = config_file
-      @app_settings = {}
-      config = parse(@config_file)
-      config.each do |stage, settings|
-        # TODO: Push this eval later (j.i.t.)
-        @app_settings[stage] = HerokuSan::Stage.new(stage, settings.merge('deploy' => (options[:deploy]||options['deploy'])))
-      end
+      @options = options
+      @apps = []
+    end
+
+    def configuration
+      @configuration ||= HerokuSan::Configuration.new(self).stages
     end
 
     def create_config
-      # TODO: Convert true/false returns to success/exception
-      template = File.expand_path(File.join(File.dirname(__FILE__), '../templates', 'heroku.example.yml'))
-      if File.exists?(@config_file)
-        false
-      else
-        FileUtils.cp(template, @config_file)
-        true
-      end
+      HerokuSan::Configuration.new(self).generate_config
     end
-  
+
     def all
-      @app_settings.keys
+      configuration.keys
     end
   
     def [](stage)
-      @app_settings[stage]
+      configuration[stage]
     end
   
     def <<(*app)
@@ -51,7 +44,7 @@ module HerokuSan
         else
           active_branch = self.git_active_branch
           all.select do |app| 
-            app == active_branch and ($stdout.puts("Defaulting to '#{app}' as it matches the current branch") || true)
+            app == active_branch and ($stdout.puts("Defaulting to '#{app}' as it matches the current branch"); true)
           end
         end
       end
@@ -60,54 +53,8 @@ module HerokuSan
     def each_app
       raise NoApps if apps.empty?
       apps.each do |stage|
-        yield(self[stage])
-      end
-    end
-    
-  private
-    
-    def parse_yaml(config_file)
-      if File.exists?(config_file)
-        if defined?(ERB)
-          YAML.load(ERB.new(File.read(config_file)).result)
-        else
-          YAML.load_file(config_file)
-        end
-      else
-        {}
-      end
-    end
-  
-    def parse(config_file)
-      app_settings = parse_yaml(config_file)
-    
-      # support heroku_san format
-      if app_settings.has_key? 'apps'
-        app_settings = app_settings['apps']
-        app_settings.each_pair do |stage, app_name|
-          app_settings[stage] = {'app' => app_name}
-        end
-      end
-    
-      # load external config
-      if (config_repo = app_settings.delete('config_repo'))
-        require 'tmpdir'
-        tmp_config_dir = Dir.mktmpdir
-        tmp_config_file = File.join tmp_config_dir, 'config.yml'
-        git_clone(config_repo, tmp_config_dir)
-        extra_config = parse_yaml(tmp_config_file)
-      else
-        extra_config = {}
+        yield self[stage]
       end
-    
-      # make sure each app has a 'config' section & merge w/extra
-      app_settings.keys.each do |name|
-        app_settings[name] ||= {}
-        app_settings[name]['config'] ||= {}
-        app_settings[name]['config'].merge!(extra_config[name]) if extra_config[name]
-      end  
-    
-      app_settings  
     end
   end
 end

data/lib/heroku_san/stage.rb

@@ -5,19 +5,21 @@ MOCK = false unless defined?(MOCK)
 
 module HerokuSan
   class Stage
-    attr_reader :name
     include Git
-    
+    attr_reader :name
+    attr_reader :options
+
     def initialize(stage, options = {})
-      default_options = {
-        'deploy' => HerokuSan::Deploy::Rails
-      }
       @name = stage
-      @options = default_options.merge(options)
+      @options = options
+    end
+
+    def ==(other)
+      other.name == name && other.options == options
     end
     
     def heroku
-      @heroku ||= Heroku::API.new(:api_key => auth_token, :mock => MOCK)
+      @heroku ||= HerokuSan::API.new(:api_key => auth_token, :mock => MOCK)
     end
 
     def app

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.0.8"
+  VERSION = "4.2.1"
 end

data/lib/heroku_san.rb

@@ -1,7 +1,10 @@
 require File.join(File.dirname(__FILE__), 'railtie.rb') if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 require 'git'
+require 'heroku_san/api'
 require 'heroku_san/stage'
+require 'heroku_san/parser'
 require 'heroku_san/project'
+require 'heroku_san/configuration'
 require 'heroku_san/deploy/rails'
 require 'heroku_san/deploy/sinatra'
 

data/spec/fixtures/extended_config.yml

@@ -3,5 +3,7 @@ production:
   app: awesomeapp
 staging:
   app: awesomeapp-staging
-demo: 
+  config:
+    EXTRA: 'bar'
+demo:
   app: awesomeapp-demo

data/spec/git_spec.rb

@@ -25,6 +25,13 @@ describe GitTest do
       subject.should_receive(:sh).with("git update-ref -d refs/heroku_san/deploy")
       subject.git_push(nil, 'git@heroku.com:awesomeapp.git', %w[--force -v])
     end
+
+    it "propagates any errors, but still cleans up" do
+      subject.should_receive(:sh).with("git update-ref refs/heroku_san/deploy HEAD^{commit}")
+      subject.should_receive(:sh).with("git push git@heroku.com:awesomeapp.git  refs/heroku_san/deploy:refs/heads/master").and_raise
+      subject.should_receive(:sh).with("git update-ref -d refs/heroku_san/deploy")
+      expect { subject.git_push(nil, 'git@heroku.com:awesomeapp.git') }.to raise_error
+    end
   end
 
   describe "#git_tag" do
@@ -32,12 +39,14 @@ describe GitTest do
       subject.should_receive("`").with("git tag -l 'pattern*'") { "x\n\y\n\z\n" }
       subject.git_tag('pattern*').should == "z"
     end
+
     it "raises exception if no tags match the pattern" do
       subject.should_receive("`").with("git tag -l 'pattern*'") { "\n" }
       expect {
         subject.git_tag('pattern*')
       }.to raise_error(Git::NoTagFoundError)
     end
+
     it "returns nil for a nil glob" do
       subject.should_not_receive("`").with("git tag -l ''") { "\n" }
       subject.git_tag(nil).should == nil
@@ -49,6 +58,7 @@ describe GitTest do
       subject.should_receive("`").with("git rev-parse prod/1234567890") { "sha\n" }
       subject.git_rev_parse('prod/1234567890').should == "sha"
     end
+
     it "returns nil for a blank tag" do
       subject.should_not_receive("`").with("git rev-parse ") { "\n" }
       subject.git_rev_parse(nil).should == nil

data/spec/heroku_san/api_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+# https://github.com/fastestforward/heroku_san/issues/105
+describe HerokuSan::API do
+  subject(:api) { HerokuSan::API.new(:api_key => 'key', :mock => true)}
+  it "is a proxy to the Heroku::API" do
+    Heroku::API.any_instance.should_receive(:api_method).with(1, 2, {:arg => 3}) {true}
+    api.api_method(1, 2, {:arg => 3}).should be_true
+  end
+
+  it "reports Excon errors in a more human readable format" do
+    error_message = 'Name is already taken'
+    status_message = '000 Status'
+    response = mock("Response", :body => %Q[{"error":"#{error_message}"}], :headers => {'Status' => status_message})
+    Heroku::API.any_instance.should_receive(:api_method).and_raise(Heroku::API::Errors::ErrorWithResponse.new("excon message", response))
+
+    $stderr.should_receive(:puts).with("\nHeroku API ERROR: #{status_message} (#{error_message})\n\n")
+
+    expect {
+      api.api_method
+    }.to raise_error(Heroku::API::Errors::ErrorWithResponse, "excon message") {|error|
+      error.backtrace.should == []
+    }
+  end
+end

data/spec/heroku_san/configuration_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe HerokuSan::Configuration do
+  let(:configurable) { Configurable.new }
+  let(:configuration) { HerokuSan::Configuration.new(configurable) }
+
+  describe "#stages" do
+    it "creates a configuration hash" do
+      configuration.configuration = {'production' => {}}
+      configuration.stages.should == {
+          'production' => HerokuSan::Stage.new('production', 'deploy' => HerokuSan::Deploy::Rails)
+      }
+    end
+
+    it "configures the deploy strategy" do
+      configurable.options = {'deploy' => HerokuSan::Deploy::Base}
+      configuration.configuration = {'production' => {}}
+      configuration.stages.should == {
+          'production' => HerokuSan::Stage.new('production', 'deploy' => HerokuSan::Deploy::Base)
+      }
+    end
+  end
+
+  describe "#generate_config" do
+    context "unknown project" do
+      it "creates a new file using the example file" do
+        Dir.mktmpdir do |dir|
+          configurable.config_file = tmp_config_file = File.join(dir, 'config.yml')
+          FileUtils.should_receive(:cp).with(configuration.template, tmp_config_file)
+          configuration.generate_config.should be_true
+        end
+      end
+
+      it "does not overwrite an existing file" do
+        FileUtils.should_not_receive(:cp)
+        configurable.config_file = fixture("example.yml")
+        configuration.generate_config.should be_false
+      end
+    end
+  end
+end

data/spec/heroku_san/parser_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe HerokuSan::Parser do
+  let(:parser) { subject }
+
+  describe '#parse' do
+    context 'using the new format' do
+      let(:parseable) { Parseable.new(fixture("example.yml")) }
+
+      it "returns a list of apps" do
+        parser.parse(parseable)
+
+        parseable.configuration.keys.should =~ %w[production staging demo]
+        parseable.configuration['production'].should == {'app' => 'awesomeapp', 'tag' => 'production/*', 'config' => {'BUNDLE_WITHOUT' => 'development:test', 'GOOGLE_ANALYTICS' => 'UA-12345678-1'}}
+        parseable.configuration['staging'].should == {'app' => 'awesomeapp-staging', 'stack' => 'bamboo-ree-1.8.7', 'config' => {'BUNDLE_WITHOUT' => 'development:test'}}
+        parseable.configuration['demo'].should == {'app' => 'awesomeapp-demo', 'stack' => 'cedar', 'config' => {'BUNDLE_WITHOUT' => 'development:test'}}
+      end
+    end
+
+    context "using the old heroku_san format" do
+      let(:parseable) { Parseable.new(fixture("old_format.yml")) }
+
+      it "returns a list of apps" do
+        parser.parse(parseable)
+
+        parseable.configuration.keys.should =~ %w[production staging demo]
+        parseable.configuration.should == {
+            'production' => {'app' => 'awesomeapp', 'config' => {}},
+            'staging' => {'app' => 'awesomeapp-staging', 'config' => {}},
+            'demo' => {'app' => 'awesomeapp-demo', 'config' => {}}
+        }
+      end
+    end
+  end
+
+  describe "#convert_from_heroku_san_format" do
+    let(:old_format) { {'apps' => {'production' => 'awesomeapp', 'staging' => 'awesomeapp-staging', 'demo' => 'awesomeapp-demo'}} }
+    let(:new_format) { {'production' => {'app' => 'awesomeapp'}, 'staging' => {'app' => 'awesomeapp-staging'}, 'demo' => {'app' => 'awesomeapp-demo'}} }
+
+    it "converts to the new hash" do
+      parser.settings = old_format
+      expect {
+        parser.convert_from_heroku_san_format
+      }.to change(parser, :settings).to(new_format)
+    end
+
+    it "doesn't change new format" do
+      parser.settings = new_format
+      expect {
+        parser.convert_from_heroku_san_format
+      }.not_to change(parser, :settings)
+    end
+  end
+
+  describe "#merge_external_config" do
+    let(:extras) { {'production' => {'EXTRA' => 'bar'}, 'staging' => {'EXTRA' => 'foo'}} }
+
+    context "with no extras" do
+      it "doesn't change settings" do
+        parser.settings = {'production' => {'config' => {}}}
+        expect {
+          parser.merge_external_config
+        }.not_to change(parser, :settings)
+      end
+    end
+
+    context "with extra" do
+      before(:each) do
+        parser.should_receive(:git_clone).with('config_repos', anything)
+        parser.should_receive(:parse_yaml).and_return(extras)
+      end
+
+      it "merges extra configuration bits" do
+        parser.settings = {'config_repo' => 'config_repos', 'production' => {'config' => {}}}
+        expect {
+          parser.merge_external_config
+        }.to change(parser, :settings).to({"production" => {"config" => {"EXTRA" => "bar"}}})
+      end
+
+      it "overrides the main configuration" do
+        parser.settings = {'config_repo' => 'config_repos', 'staging' => {'config' => {'EXTRA' => 'bar'}}}
+        expect {
+          parser.merge_external_config
+        }.to change(parser, :settings).to({"staging" => {"config" => {"EXTRA" => "foo"}}})
+      end
+    end
+  end
+end

data/spec/heroku_san/project_spec.rb

@@ -2,26 +2,15 @@ require 'spec_helper'
 require 'tmpdir'
 
 describe HerokuSan::Project do
-  let(:heroku_config_file) { File.join(SPEC_ROOT, "fixtures", "example.yml") }
-  let(:heroku_san) { HerokuSan::Project.new(heroku_config_file) }
+  let(:heroku_san) { HerokuSan::Project.new }
   subject { heroku_san }
-
-  describe ".new" do
-    its(:all) { should =~ %w[production staging demo] }
-    specify "with a missing config file has no stages" do
-      heroku_san = HerokuSan::Project.new("/u/should/never/get/here")
-      heroku_san.all.should == []
-    end
-  
-    specify "with a deploy option configures each stage with the strategy" do
-      heroku_san = HerokuSan::Project.new(heroku_config_file, :deploy => HerokuSan::Deploy::Base)
-      heroku_san << heroku_san.all
-      heroku_san.each_app do |stage|
-        stage.instance_variable_get('@options')['deploy'].should == HerokuSan::Deploy::Base
-      end
+  before do
+    HerokuSan::Configuration.new(Configurable.new).tap do |config|
+      config.configuration = {'production' => {}, 'staging' => {}, 'demo' => {}}
+      heroku_san.configuration = config.stages
     end
   end
-  
+
   describe "#apps constructs the deploy list" do
     it "appends known shorthands to apps" do
       heroku_san.apps.should == []
@@ -53,8 +42,8 @@ describe HerokuSan::Project do
       end
     
       context "with only a single configured app" do        
-        let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "single_app.yml")) }
         it "returns the app" do
+          heroku_san.configuration= {'production' => {}}
           $stdout.should_receive(:puts).with('Defaulting to "production" since only one app is defined')
           expect {
             heroku_san.apps.should == %w[production]
@@ -66,7 +55,7 @@ describe HerokuSan::Project do
   
   describe "#each_app" do    
     it "raises an error is no apps were specified" do
-      expect { heroku_san.each_app do true; end }.to raise_error HerokuSan::NoApps
+      expect { heroku_san.each_app do true end }.to raise_error HerokuSan::NoApps
     end
     
     it "yields to a block with args" do
@@ -86,36 +75,4 @@ describe HerokuSan::Project do
       end
     end
   end
-
-  context "using the heroku_san format" do
-    let(:heroku_san) { HerokuSan::Project.new(File.join(SPEC_ROOT, "fixtures", "old_format.yml")) }
-
-    it "returns a list of apps" do
-      heroku_san.all.should =~ %w[production staging demo]
-    end
-  end
-        
-  describe "#create_config" do
-    context "unknown project" do
-      let(:template_config_file) do
-        path = File.join(SPEC_ROOT, "..", "lib/templates", "heroku.example.yml")
-        (File.respond_to? :realpath) ? File.realpath(path) : path
-      end
-
-      it "creates a new file using the example file" do
-        Dir.mktmpdir do |dir|
-          tmp_config_file = File.join dir, 'config.yml'
-          heroku_san = HerokuSan::Project.new(tmp_config_file)
-          FileUtils.should_receive(:cp).with(File.expand_path(template_config_file), tmp_config_file)
-          heroku_san.create_config.should be_true
-        end
-      end
-    
-      it "does not overwrite an existing file" do
-        FileUtils.should_not_receive(:cp)
-        heroku_san.create_config.should be_false
-      end
-    end    
-  end    
-
 end

data/spec/heroku_san/stage_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe HerokuSan::Stage do
   include Git
-  subject { HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})}
+  subject { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"})}
   STOCK_CONFIG = {"BUNDLE_WITHOUT"=>"development:test", "LANG"=>"en_US.UTF-8", "RACK_ENV"=>"production"}
   before do
     HerokuSan::Stage.any_instance.stub(:preflight_check_for_cli)
@@ -44,7 +44,7 @@ describe HerokuSan::Stage do
       end
     end
   
-    it "returns the stack name from the config if it is set there" do
+    it "returns the stack name from the config when it is set there" do
       subject = HerokuSan::Stage.new('production', {"app" => "awesomeapp", "stack" => "cedar"})
       subject.stack.should == 'cedar'
     end
@@ -117,6 +117,7 @@ describe HerokuSan::Stage do
         subject.deploy
       end
     end
+
     context "using a custom strategy" do
       class TestDeployStrategy < HerokuSan::Deploy::Base
         def deploy; end
@@ -149,7 +150,7 @@ describe HerokuSan::Stage do
     end
     
     context "with a block" do
-      it "wraps it in a maitenance mode" do
+      it "wraps it in a maintenance mode" do
         with_app(subject, 'name' => subject.app) do |app_data|
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '1').ordered
           reactor = mock("Reactor"); reactor.should_receive(:scram).with(:now).ordered
@@ -158,6 +159,7 @@ describe HerokuSan::Stage do
           subject.maintenance {reactor.scram(:now)} 
         end
       end
+
       it "ensures that maintenance mode is turned off" do
         with_app(subject, 'name' => subject.app) do |app_data|
           subject.heroku.should_receive(:post_app_maintenance).with(subject.app, '1').ordered
@@ -174,18 +176,22 @@ describe HerokuSan::Stage do
     after do
       subject.heroku.delete_app(@app)
     end
+
     it "uses the provided name" do
       (@app = subject.create).should == 'awesomeapp'
     end
+
     it "creates an app on heroku" do
       subject = HerokuSan::Stage.new('production')
       (@app = subject.create).should =~ /generated-name-\d+/
     end
+
     it "uses the default stack if none is given" do
       subject = HerokuSan::Stage.new('production')
       (@app = subject.create).should =~ /generated-name-\d+/
       subject.heroku.get_stack(@app).body.detect{|stack| stack['current']}['name'].should == 'bamboo-mri-1.9.2'
-    end    
+    end
+
     it "uses the stack from the config" do
       (@app = subject.create).should == 'awesomeapp'
       subject.heroku.get_stack(@app).body.detect{|stack| stack['current']}['name'].should == 'cedar'
@@ -200,6 +206,22 @@ describe HerokuSan::Stage do
     end
   end
 
+  describe "#push_config" do
+    it "updates the configuration settings on Heroku" do
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
+      with_app(subject, 'name' => subject.app) do |app_data|
+        subject.push_config.should == STOCK_CONFIG.merge('FOO' => 'bar', 'DOG' => 'emu')
+      end
+    end
+
+    it "pushes the options hash" do
+      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
+      with_app(subject, 'name' => subject.app) do |app_data|
+        subject.push_config('RACK_ENV' => 'magic').should == STOCK_CONFIG.merge('RACK_ENV' => 'magic')
+      end
+    end
+  end
+
   describe "#restart" do
     it "restarts an app" do
       with_app(subject, 'name' => subject.app) do |app_data|
@@ -213,33 +235,20 @@ describe HerokuSan::Stage do
       subject.should_receive(:system).with("heroku", "logs", "--app", "awesomeapp") { true }
       subject.logs
     end
+
     it "tails log files" do
       subject.should_receive(:system).with("heroku", "logs", "--tail", "--app", "awesomeapp") { true }
       subject.logs(:tail)
     end
   end
 
-  describe "#push_config" do
-    it "updates the configuration settings on Heroku" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
-      with_app(subject, 'name' => subject.app) do |app_data|
-        subject.push_config.should == STOCK_CONFIG.merge('FOO' => 'bar', 'DOG' => 'emu')
-      end
-    end
-    it "pushes the options hash" do
-      subject = HerokuSan::Stage.new('test', {"app" => "awesomeapp", "config" => {'FOO' => 'bar', 'DOG' => 'emu'}})
-      with_app(subject, 'name' => subject.app) do |app_data|
-        subject.push_config('RACK_ENV' => 'magic').should == STOCK_CONFIG.merge('RACK_ENV' => 'magic')
-      end
-    end
-  end
-
   describe "#revision" do
     it "returns the named remote revision for the stage" do
       subject.should_receive(:git_revision).with(subject.repo) {"sha"}
       subject.should_receive(:git_named_rev).with('sha') {"sha production/123456"}
       subject.revision.should == 'sha production/123456'
     end
+
     it "returns nil if the stage has never been deployed" do
       subject.should_receive(:git_revision).with(subject.repo) {nil}
       subject.should_receive(:git_named_rev).with(nil) {''}
@@ -264,6 +273,7 @@ describe HerokuSan::Stage do
         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" => %w[shared-database:5mb custom_domains:basic ssl:piggyback]})
       with_app(subject, 'name' => subject.app) do |app_data| 

data/spec/spec_helper.rb

@@ -20,4 +20,8 @@ RSpec.configure do |config|
   config.mock_with :rspec
 end
 
+def fixture(filename)
+  File.join(SPEC_ROOT, "fixtures", filename)
+end
+
 require File.join(SPEC_ROOT, '/../lib/heroku_san')

data/spec/support/mocks.rb

@@ -0,0 +1,2 @@
+Configurable = Struct.new(:config_file, :configuration, :options)
+Parseable = Struct.new(:config_file, :configuration)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.0.8
+  version: 4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -202,10 +202,13 @@ files:
 - lib/generators/heroku_san_generator.rb
 - lib/git.rb
 - lib/heroku_san.rb
+- lib/heroku_san/api.rb
+- lib/heroku_san/configuration.rb
 - lib/heroku_san/deploy/base.rb
 - lib/heroku_san/deploy/noop.rb
 - lib/heroku_san/deploy/rails.rb
 - lib/heroku_san/deploy/sinatra.rb
+- lib/heroku_san/parser.rb
 - lib/heroku_san/project.rb
 - lib/heroku_san/stage.rb
 - lib/heroku_san/tasks.rb
@@ -216,15 +219,17 @@ files:
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
-- spec/fixtures/single_app.yml
 - spec/git_spec.rb
+- spec/heroku_san/api_spec.rb
+- spec/heroku_san/configuration_spec.rb
 - spec/heroku_san/deploy/base_spec.rb
 - spec/heroku_san/deploy/rails_spec.rb
+- spec/heroku_san/parser_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
-- spec/issues/issue_105_spec.rb
 - spec/spec_helper.rb
 - spec/support/heroku.rb
+- spec/support/mocks.rb
 homepage: http://github.com/fastestforward/heroku_san
 licenses:
 - MIT
@@ -240,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3786976856768330652
+      hash: -2348527230697112228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,12 +269,14 @@ test_files:
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
-- spec/fixtures/single_app.yml
 - spec/git_spec.rb
+- spec/heroku_san/api_spec.rb
+- spec/heroku_san/configuration_spec.rb
 - spec/heroku_san/deploy/base_spec.rb
 - spec/heroku_san/deploy/rails_spec.rb
+- spec/heroku_san/parser_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
-- spec/issues/issue_105_spec.rb
 - spec/spec_helper.rb
 - spec/support/heroku.rb
+- spec/support/mocks.rb

data/spec/fixtures/single_app.yml

@@ -1,6 +0,0 @@
-production: 
-  app: awesomeapp
-  tag: production/*
-  config:
-    BUNDLE_WITHOUT: "development:test"
-    GOOGLE_ANALYTICS: "UA-12345678-1"

data/spec/issues/issue_105_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-# https://github.com/fastestforward/heroku_san/issues/105
-
-=begin
-Expected(202) <=> Actual(422 Unprocessable Entity)
-  request => {:connect_timeout=>60, :headers=>{"Accept"=>"application/json", "Accept-Encoding"=>"gzip", "Authorization"=>"Basic OjUwZTc4NjgxZDhmYzcxZDI3Yzc5ZTM3MTZhNDk3Nzk1MzU2Mzk4ZTM=", "User-Agent"=>"heroku-rb/0.1.8", "X-Heroku-API-Version"=>"3", "X-Ruby-Version"=>"1.9.2", "X-Ruby-Platform"=>"x86_64-darwin10.8.0", "Host"=>"api.heroku.com:443", "Content-Length"=>0}, :instrumentor_name=>"excon", :mock=>false, :read_timeout=>60, :retry_limit=>4, :ssl_ca_file=>"/Users/kmayer/.rvm/gems/ruby-1.9.2-p320/gems/excon-0.13.4/data/cacert.pem", :ssl_verify_peer=>true, :write_timeout=>60, :host=>"api.heroku.com", :path=>"/apps", :port=>"443", :query=>{"app[name]"=>"stark-window-5734"}, :scheme=>"https", :expects=>202, :method=>:post}
-  response => #<Excon::Response:0x00000100e07288 @body="{\"error\":\"Name is already taken\"}", @headers={"Cache-Control"=>"no-cache", "Content-Type"=>"application/json; charset=utf-8", "Date"=>"Sun, 29 Jul 2012 19:24:33 GMT", "Server"=>"nginx/1.0.14", "Status"=>"422 Unprocessable Entity", "Strict-Transport-Security"=>"max-age=500", "X-RateLimit-Limit"=>"486", "X-RateLimit-Remaining"=>"485", "X-RateLimit-Reset"=>"1343589933", "X-Runtime"=>"426", "Content-Length"=>"33", "Connection"=>"keep-alive"}, @status=422>
-=end
-
-describe "Handle Excon exceptions" do
-  it "should report the error in a more readable format"
-end