heroku_san 4.2.1 → 4.2.2

data/lib/heroku_san/configuration.rb

@@ -2,6 +2,7 @@ module HerokuSan
   class Configuration
     attr_reader :config_file
     attr_accessor :configuration
+    attr_accessor :external_configuration
     attr_reader :options
 
     def initialize(configurable)
@@ -42,4 +43,4 @@ module HerokuSan
       end
     end
   end
-end
+end

data/lib/heroku_san/parser.rb

@@ -6,8 +6,9 @@ module HerokuSan
       @settings = parse_yaml(parseable.config_file)
       convert_from_heroku_san_format
       each_setting_has_a_config_section
-      merge_external_config
+      parseable.external_configuration = @settings.delete 'config_repo'
       parseable.configuration = @settings
+
     end
 
     def convert_from_heroku_san_format
@@ -23,15 +24,15 @@ module HerokuSan
       end
     end
 
-    def merge_external_config
-      extra_config = parse_external_config(settings.delete('config_repo'))
+    def merge_external_config!(parseable, stages)
+      extra_config = parse_external_config!(parseable.external_configuration)
       return unless extra_config
-      settings.keys.each do |name|
-        settings[name]['config'].merge!(extra_config[name]) if extra_config[name]
+      stages.each do |stage|
+        stage.config.merge!(extra_config[stage.name]) if extra_config[stage.name]
       end
     end
 
-    def parse_external_config(config_repo)
+    def parse_external_config!(config_repo)
       return if config_repo.nil?
       require 'tmpdir'
       Dir.mktmpdir do |dir|
@@ -54,4 +55,4 @@ module HerokuSan
       end
     end
   end
-end
+end

data/lib/heroku_san/project.rb

@@ -11,8 +11,12 @@ module HerokuSan
       @apps = []
     end
 
+    def stages
+      @stages ||= configuration.stages
+    end
+
     def configuration
-      @configuration ||= HerokuSan::Configuration.new(self).stages
+      @configuration ||= HerokuSan::Configuration.new(self)
     end
 
     def create_config
@@ -20,20 +24,20 @@ module HerokuSan
     end
 
     def all
-      configuration.keys
+      stages.keys
     end
-  
+
     def [](stage)
-      configuration[stage]
+      stages[stage]
     end
-  
+
     def <<(*app)
       app.flatten.each do |a|
         @apps << a if all.include?(a)
       end
       self
     end
-  
+
     def apps
       if @apps && !@apps.empty?
         @apps
@@ -43,15 +47,16 @@ module HerokuSan
           all
         else
           active_branch = self.git_active_branch
-          all.select do |app| 
+          all.select do |app|
             app == active_branch and ($stdout.puts("Defaulting to '#{app}' as it matches the current branch"); true)
           end
         end
       end
     end
-  
+
     def each_app
       raise NoApps if apps.empty?
+      HerokuSan::Parser.new.merge_external_config!(configuration, stages.values)
       apps.each do |stage|
         yield self[stage]
       end

data/lib/heroku_san/version.rb

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

data/spec/heroku_san/parser_spec.rb

@@ -53,36 +53,36 @@ describe HerokuSan::Parser do
   end
 
   describe "#merge_external_config" do
+    let(:stages) { [stub(name: 'production', config: prod_config), stub(name: 'staging', config: staging_config)] }
+    let(:prod_config) { mock('Production Config') }
+    let(:staging_config) { {'EXTRA' => 'bar'} }
     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)
+      let(:parseable) { stub external_configuration: nil }
+
+      it "doesn't change prod_config" do
+        prod_config.should_not_receive :merge!
+        parser.merge_external_config! parseable, stages
       end
     end
 
     context "with extra" do
+      let(:parseable) { stub external_configuration: 'config_repos' }
       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"}}})
+        prod_config.should_receive(:merge!).with extras['production']
+        parser.merge_external_config! parseable, [stages.first]
       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"}}})
+        parser.merge_external_config! parseable, [stages.last]
+        staging_config.should == {"EXTRA" => "foo"}
       end
     end
   end
-end
+end

data/spec/heroku_san/project_spec.rb

@@ -7,7 +7,7 @@ describe HerokuSan::Project do
   before do
     HerokuSan::Configuration.new(Configurable.new).tap do |config|
       config.configuration = {'production' => {}, 'staging' => {}, 'demo' => {}}
-      heroku_san.configuration = config.stages
+      heroku_san.configuration = config
     end
   end
 
@@ -42,8 +42,14 @@ describe HerokuSan::Project do
       end
     
       context "with only a single configured app" do        
+        before do
+          HerokuSan::Configuration.new(Configurable.new).tap do |config|
+            config.configuration = {'production' => {}}
+            heroku_san.configuration = config
+          end
+        end
+
         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]
@@ -75,4 +81,4 @@ describe HerokuSan::Project do
       end
     end
   end
-end
+end

data/spec/support/mocks.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2348527230697112228
+      hash: 68468035742296088
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The