rubber 3.0.0 → 3.0.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+3.0.1 (04/27/2015)
+
+Improvements:
+============
+
+[core] Force reload of Rubber config between Spring sessions in Rails 4+. <ef18da4>
+
+
 3.0.0 (04/24/2015)
 
 This is a major Rubber release in 3 years.  Most of the Rubber internals haven't changed from the 2.x series.  However,

data/lib/rubber.rb

@@ -13,8 +13,8 @@ module Rubber
 
     @@root = project_root
     @@env = project_env
-    Object.const_set('RUBBER_ENV', project_env)
-    Object.const_set('RUBBER_ROOT', File.expand_path(project_root))
+    Object.const_set(:RUBBER_ENV, project_env)
+    Object.const_set(:RUBBER_ROOT, File.expand_path(project_root))
 
     if ! defined?(Rails) && ! Rubber::Util::is_bundler?
       # pull in basic rails env.  rubber only needs RAILS_ROOT and RAILS_ENV.
@@ -34,8 +34,8 @@ module Rubber
     end
 
     # conveniences for backwards compatibility with old names
-    Object.const_set('RUBBER_CONFIG', self.config)
-    Object.const_set('RUBBER_INSTANCES', self.instances)
+    Object.const_set(:RUBBER_CONFIG, self.config)
+    Object.const_set(:RUBBER_INSTANCES, self.instances)
 
   end
 
@@ -80,6 +80,18 @@ module Rubber
     # create a new instance per thread
     Rubber::ThreadSafeProxy.new { Rubber::Cloud::get_provider(self.config.cloud_provider || "aws", self.config, capistrano) }
   end
+
+  def self.reset
+    [:RUBBER_ENV, :RUBBER_ROOT, :RUBBER_CONFIG, :RUBBER_INSTANCES].each do |const|
+      Object.send(:remove_const, const) if Object.constants.include?(const)
+    end
+
+    Rubber::Configuration.reset
+
+    synchronize do
+      @config = nil
+    end
+  end
   
 end
 

data/lib/rubber/configuration.rb

@@ -5,15 +5,20 @@ require 'rubber/generator'
 
 module Rubber
   module Configuration
+    extend MonitorMixin
 
     @@configurations = {}
 
     def self.get_configuration(env=nil, root=nil)
       key = "#{env}-#{root}"
-      unless @@configurations[key]
-        @@configurations[key] = ConfigHolder.new(env, root)
-        @@configurations[key].load()
+
+      synchronize do
+        unless @@configurations[key]
+          @@configurations[key] = ConfigHolder.new(env, root)
+          @@configurations[key].load()
+        end
       end
+
       return @@configurations[key]
     end
 
@@ -30,6 +35,12 @@ module Rubber
       Rubber::Configuration.get_configuration(Rubber.env).instance
     end
 
+    def self.reset
+      synchronize do
+        @@configurations.clear
+      end
+    end
+
     class ConfigHolder
       def initialize(env=nil, root=nil)
         @env = env

data/lib/rubber/railtie.rb

@@ -2,13 +2,16 @@ require 'rubber'
 require 'rails'
 
 module Rubber
-
   class Railtie < Rails::Railtie
-
     config.before_configuration do
       Rubber::initialize(Rails.root, Rails.env)
     end
-
   end
+end
 
+if defined?(Spring)
+  Spring.after_fork do
+    Rubber.reset
+    Rubber::initialize(Rails.root, Rails.env)
+  end
 end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -720,7 +720,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1209637678339755634
+      hash: 1883985794562211035
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2