radiant 1.0.0.rc3 → 1.0.0.rc4

data/lib/generators/language_extension/language_extension_generator.rb

@@ -20,6 +20,8 @@ class LanguageExtensionGenerator < Rails::Generator::NamedBase
       # m.template 'tasks.rake',            "#{extension_path}/lib/tasks/#{extension_file_name}_tasks.rake"
       m.template 'lang.yml',              "#{extension_path}/config/locales/#{localization_name}.yml"
       m.template 'available_tags.yml',    "#{extension_path}/config/locales/#{localization_name}_available_tags.yml"
+      m.template 'lib.rb',                "#{extension_path}/lib/radiant-#{file_name}_language_pack-extension.rb"
+      m.template 'gemspec.rb',            "#{extension_path}/radiant-#{file_name}_language_pack-extension.gemspec"
     end
     
   end
@@ -32,6 +34,26 @@ class LanguageExtensionGenerator < Rails::Generator::NamedBase
     class_name.to_name('Extension')
   end
   
+  def author_info
+    @author_info ||= begin
+      Git.global_config
+    rescue NameError
+      {}
+    end
+  end
+
+  def homepage
+    author_info['github.user'] ? "http://github.com/#{author_info['github.user']}/radiant-#{file_name}-extension" : "http://example.com/#{file_name}"
+  end
+
+  def author_email
+    author_info['user.email'] || 'your email'
+  end
+
+  def author_name
+    author_info['user.name'] || 'Your Name'
+  end
+  
   def add_options!(opt)
     # opt.separator ''
     # opt.separator 'Options:'

data/lib/generators/language_extension/templates/available_tags.yml

@@ -1,5 +1,5 @@
 ---
-<%= localization_name %>::
+<%= localization_name %>:
   desc: 
     author:
       Renders the name of the author of the current page.

data/lib/generators/language_extension/templates/extension.rb

@@ -1,8 +1,12 @@
+# Uncomment this if you reference any of your controllers in activate
+# require_dependency "application_controller"
+require "radiant-<%= file_name %>_language_pack-extension"
+
 class <%= class_name %> < Radiant::Extension
-  version "1.0"
-  description "<%= localization_name %> language pack for Radiant CMS"
-  url "http://yourwebsite.com/<%= file_name %>"
-    
+  version     Radiant<%= class_name %>::VERSION
+  description Radiant<%= class_name %>::DESCRIPTION
+  url         Radiant<%= class_name %>::URL
+
   def activate
   end
-end
+end

data/lib/generators/language_extension/templates/gemspec.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "radiant-<%= file_name %>_language_pack-extension"
+
+Gem::Specification.new do |s|
+  s.name        = "radiant-<%= file_name %>_language_pack-extension"
+  s.version     = Radiant<%= class_name %>::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = Radiant<%= class_name %>::AUTHORS
+  s.email       = Radiant<%= class_name %>::EMAIL
+  s.homepage    = Radiant<%= class_name %>::URL
+  s.summary     = Radiant<%= class_name %>::SUMMARY
+  s.description = Radiant<%= class_name %>::DESCRIPTION
+
+  ignores = if File.exist?('.gitignore')
+    File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
+  else
+    []
+  end
+  s.files         = Dir['**/*'] - ignores
+  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
+  # s.executables   = Dir['bin/*'] - ignores
+  s.require_paths = ["lib"]
+end

data/lib/generators/language_extension/templates/lang.yml

@@ -149,7 +149,7 @@
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following snippet?'
     users: 
       remove_warning: 'Are you sure you want to <strong class="warning">permanently remove</strong> the following user?'
-  this_file_language: "English" 
+  this_file_language: "<%= file_name.capitalize %>" 
   time:
     am: 'am'
     formats:

data/lib/generators/language_extension/templates/lib.rb

@@ -0,0 +1,8 @@
+module Radiant<%= class_name %>
+  VERSION     = "1.0.0"
+  SUMMARY     = "<%= localization_name.capitalize %> language pack for Radiant CMS"
+  DESCRIPTION = "Adds <%= localization_name.capitalize %> translations to the Radiant CMS interface."
+  URL         = "<%= homepage %>"
+  AUTHORS     = ["<%= author_name %>"]
+  EMAIL       = ["<%= author_email %>"]
+end

data/lib/plugins/string_extensions/lib/string_extensions.rb

@@ -1,3 +1,5 @@
+require 'stringex'
+
 class String
   def symbolize
     self.gsub(/[^A-Za-z0-9]+/, "_").gsub(/(^_+|_+$)/, "").underscore.to_sym
@@ -13,7 +15,7 @@ class String
 
   unless methods.include?('parameterize')
     def parameterize(sep = '-')
-      ActiveSupport::Inflector.parameterize(self, sep)
+      remove_formatting.downcase.replace_whitespace(sep).collapse(sep)
     end
   end
   

data/lib/radiant.rb

@@ -6,7 +6,7 @@ unless defined? Radiant::Version
       Major = '1'
       Minor = '0'
       Tiny  = '0'
-      Patch = 'rc3' # set to nil for normal release
+      Patch = 'rc4' # set to nil for normal release
 
       class << self
         def to_s

data/lib/radiant/admin_ui/region_partials.rb

@@ -10,6 +10,11 @@ class Radiant::AdminUI::RegionPartials
   
   def method_missing(method, *args, &block)
     if block_given?
+      # Ruby 1.9.2 yields self in instance_eval... see https://gist.github.com/479572
+      # lambdas are as strict as methods in 1.9.x, making sure that the args match, Procs are not.
+      if RUBY_VERSION =~ /^1\.9/ and block.lambda? and block.arity != 1
+        raise "You can only pass a proc ('Proc.new') or a lambda that takes exactly one arg (for self) to Radiant::AdminUI::RegionPartials' method_missing."
+      end
       @partials[method.to_s] = @template.capture(&block)
     else
       @partials[method.to_s]

data/lib/radiant/cache.rb

@@ -89,7 +89,8 @@ module Radiant
   end
 end
 
-# Add our classes as fake constants in the right place
+# Rack::Cache will look for a constant matching the uri scheme given to the :metastore and :entitystore options
+# when initialising the Middleware
 class Rack::Cache::EntityStore
   RADIANT = Radiant::Cache::EntityStore
 end

data/lib/radiant/extension/script.rb

@@ -41,7 +41,7 @@ Supports:       Radiant #{supports_radiant_version}
         extension = command[2]
         task = "radiant:extensions:#{extension}:#{command[3].split[0]}"
       else
-        extension = task = command.to_s
+        extension = task = command[0]
       end
       rake_file = File.join(RAILS_ROOT, 'vendor', 'extensions', extension) + '/lib/tasks/' + extension + '_extension_tasks.rake'
       load rake_file if File.exist? rake_file
@@ -343,7 +343,7 @@ module Radiant
       class Help
         def initialize(args=[])
           command = args.shift
-          command = 'help' unless self.class.instance_methods(false).include?(command)
+          command = 'help' unless self.class.instance_methods(false).collect {|im| im.to_s}.include?(command.to_s)
           send(command)
         end
 
@@ -387,7 +387,7 @@ module Radiant
 
         private
           def command_names
-            (Radiant::Extension::Script.constants - ['Util']).sort.map {|n| n.underscore }.join(", ")
+            (Radiant::Extension::Script.constants - ['Util']).sort.map {|n| n.to_s.underscore }.join(", ")
           end
       end
     end

data/lib/radiant/extension_loader.rb

@@ -48,7 +48,7 @@ module Radiant
     #   extension_loader.paths(:controller)    #=> ['extension/app/controllers', 'extension/app/controllers']
     #   extension_loader.paths(:eager_load)    #=> ['extension/app/controllers', 'extension/app/models', 'extension/app/helpers']
     #
-    # For compatibility with the old loader, there are also corresponding +type_paths+ 
+    # For compatibility with the old loader, there are corresponding +type_paths+ methods.
     # There are also (deprecated) +add_type_paths+ methods. 
     #
     def paths(type)
@@ -57,7 +57,7 @@ module Radiant
 
     # Loads but does not activate all the extensions that have been enabled, in the configured order 
     # (which defaults to alphabetically). If an extension fails to load an error will be logged
-    # but application startup will not halt. If an extension doesn't exist, a LoadError will be raised
+    # but application startup will continue. If an extension doesn't exist, a LoadError will be raised
     # and startup will halt.
     #
     def load_extensions
@@ -114,6 +114,8 @@ module Radiant
         ExtensionPath.from_path(path, name)
       end
     
+      # For compatibility with old calls probably still to be found in some extensions.
+      #
       %w{controller model view metal plugin load locale}.each do |type|
         define_method("#{type}_paths".to_sym) do
           paths(type)

data/lib/radiant/extension_path.rb

@@ -126,6 +126,14 @@ module Radiant
       check_subdirectory("app/metal")
     end
 
+    # Returns a list of all the rake task files found within this extension root.
+    #
+    def rake_task_paths
+      if check_subdirectory("lib/tasks")
+        Dir[File.join("#{path}","lib/tasks/**","*.rake")] 
+      end
+    end
+
     # Returns a list of extension subdirectories that should be marked for eager loading. At the moment that
     # includes all the controller, model and helper paths. The main purpose here is to ensure that extension
     # controllers are loaded before running cucumber features, and there may be a better way to achieve that.
@@ -158,7 +166,7 @@ module Radiant
       #
       def enabled
         enabled_extensions = Radiant.configuration.enabled_extensions
-        @@known_paths.values_at(*enabled_extensions)
+        @@known_paths.values_at(*enabled_extensions).compact
       end
       
       # Returns a list of the root paths to all the enabled extensions, in the configured order.
@@ -172,7 +180,7 @@ module Radiant
           enabled.map{|ep| ep.send(m)}.flatten.compact
         end
       end
-      [:locale_paths, :view_paths, :metal_paths].each do |m|
+      [:locale_paths, :view_paths, :metal_paths, :rake_task_paths].each do |m|
         define_method(m) do
           enabled.map{|ep| ep.send(m)}.flatten.compact.reverse
         end

data/lib/radiant/initializer.rb

@@ -49,10 +49,9 @@ module Radiant
     # * to notice that some gems and plugins are in fact radiant extensions 
     # * to notice that some radiant extensions add load paths (for plugins, controllers, metal, etc)
     
-    attr_accessor :extension_paths, :ignored_extensions, :view_paths
+    attr_accessor :extension_paths, :ignored_extensions
 
     def initialize #:nodoc:
-      self.view_paths = []
       self.extension_paths = default_extension_paths
       self.ignored_extensions = []
       super
@@ -382,22 +381,19 @@ module Radiant
       admin.initialize_nav
     end
     
-    # Adds extension view paths and then hooks them into ActionMailer and ActionController
+    # This adds extension view paths to the standard Rails::Initializer method. 
+    # In environments that don't cache templates it reloads the path set on each request, 
+    # so that new extension paths are noticed without a restart.
     #
     def initialize_framework_views
-      view_paths = [].tap do |arr|
-        arr << configuration.view_path unless configuration.view_paths.include?(configuration.view_path)
-        arr.concat(configuration.view_paths)
-        arr.concat(extension_loader.paths(:view))
-        arr.reverse!
+      view_paths = extension_loader.paths(:view).push(configuration.view_path)
+      if ActionController::Base.view_paths.blank? || !ActionView::Base.cache_template_loading?
+        ActionController::Base.view_paths = ActionView::Base.process_view_paths(view_paths)
       end
-      if configuration.frameworks.include?(:action_mailer) || defined?(ActionMailer::Base)
-        ActionMailer::Base.view_paths = ActionView::Base.process_view_paths(view_paths)
+      if configuration.frameworks.include?(:action_mailer) && ActionMailer::Base.view_paths.blank? || !ActionView::Base.cache_template_loading?
+        ActionMailer::Base.view_paths = ActionView::Base.process_view_paths(view_paths) if configuration.frameworks.include?(:action_mailer)
       end
-      view_paths.each do |vp|
-        ActionController::Base.prepend_view_path(vp) unless ActionController::Base.view_paths.include?(vp)
-      end
-    end
+    end 
 
     # Extends the Rails initializer to make sure that extension controller paths are available when routes 
     # are initialized.

data/lib/radiant/resource_responses.rb

@@ -37,6 +37,12 @@ module Radiant
       def wrap(proc)
         # Makes sure our response blocks get evaluated in the right context
         lambda do
+          # Ruby 1.9.2 yields self in instance_eval... see https://gist.github.com/479572
+          # lambdas are as strict as methods in 1.9.x, making sure that the args match, Procs are not.
+          if RUBY_VERSION =~ /^1\.9/ and proc.lambda? and proc.arity != 1
+            raise "You can only pass a proc ('Proc.new') or a lambda that takes exactly one arg (for self) to the wrap method."
+          end
+          
           instance_eval(&proc)
         end
       end

data/lib/radiant/setup.rb

@@ -48,7 +48,7 @@ module Radiant
         step { Radiant::Config['admin.title'   ] = 'Radiant CMS' }
         step { Radiant::Config['admin.subtitle'] = 'Publishing for Small Teams' }
         step { Radiant::Config['defaults.page.parts' ] = 'body, extended' }
-        step { Radiant::Config['defaults.page.status' ] = 'draft' }
+        step { Radiant::Config['defaults.page.status' ] = 'Draft' }
         step { Radiant::Config['defaults.page.filter' ] = nil }
         step { Radiant::Config['defaults.page.fields'] = 'Keywords, Description' }
         step { Radiant::Config['session_timeout'] = 2.weeks }
@@ -131,7 +131,10 @@ module Radiant
             "#{Dir.pwd}/db/templates/#{filename}"
           ] +
           Dir.glob("#{RADIANT_ROOT}/vendor/extensions/**/db/templates/#{filename}") + 
-          Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}")
+          Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}") +
+          Radiant::Extension.descendants.inject([]) do |r, d|
+            r << "#{d.root}/db/templates/#{filename}"
+          end
         ).find { |name| File.file?(name) }
       end
       

data/lib/radiant/taggable.rb

@@ -31,7 +31,13 @@ module Radiant::Taggable
   end
   
   def render_tag(name, tag_binding)
-    send "tag:#{name}", tag_binding
+    tag_method_name = "tag:#{name}"
+    tag_method = method(tag_method_name)
+    if tag_method.arity == 0
+      tag_method.call
+    else
+      tag_method.call tag_binding
+    end
   end
   
   def tags

data/lib/tasks/cucumber.rake

@@ -26,6 +26,12 @@ begin
       t.profile = 'wip'
     end
 
+    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'rerun'
+    end
+
     desc 'Run all features'
     task :all => [:ok, :wip]
   end

data/lib/tasks/database.rake

@@ -30,11 +30,6 @@ namespace :db do
       ActiveRecord::Base.connection.tables.each do |table|
         ActiveRecord::Migration.drop_table table
       end
-      
-      # run migrations  in Radiant.root/db/migrate
-      Rake::Task["db:migrate:radiant"].invoke
-
-      # run migrations  in Rails.root/db/migrate
       Rake::Task["db:migrate"].invoke
     else
       say "Task cancelled."
@@ -64,6 +59,15 @@ To find radiant extensions, please visit http://ext.radiantcms.org.
 }
   end
   
+  desc "Migrate the database through all available migration scripts (looks for db/migrate/* in radiant, in extensions and in your site) and update db/schema.rb by invoking db:schema:dump. Turn off output with VERBOSE=false."
+  task :migrate => :environment do
+    Rake::Task['db:migrate:radiant'].invoke
+    Rake::Task['db:migrate:extensions'].invoke
+    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+  end
+
   namespace :migrate do
     desc "Migrates the database through steps defined in the core radiant distribution. Usual db:migrate options can apply."
     task :radiant => :environment do

data/lib/tasks/extensions.rake

@@ -75,26 +75,11 @@ namespace :spec do
 end
 
 namespace :radiant do
-  # TODO: load previously copied tasks just once.
-  # If update_all is run multiple times, previously copied tasks will be loaded twice,
-  # once from the local copy (RAILS_ROOT/lib/tasks) and once from the gem source.
-  task :extensions => :environment do
-    Radiant::ExtensionLoader.instance.extensions.each do |extension|
-      next if extension.root.starts_with? RAILS_ROOT
-      Dir[File.join extension.root, %w(lib tasks *.rake)].sort.each { |task| load task }
-    end
-  end
   namespace :extensions do
     desc "Runs update asset task for all extensions"
-    task :update_all => [:environment, 'radiant:extensions'] do
-      extension_names = Radiant::ExtensionLoader.instance.extensions.map { |f| f.to_s.underscore.sub(/_extension$/, '') }
-      extension_update_tasks = extension_names.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
+    task :update_all => [:environment] do
+      extension_update_tasks = Radiant.configuration.enabled_extensions.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
       extension_update_tasks.each {|t| Rake::Task[t].invoke }
     end
   end
 end
-
-# Load any custom rakefiles from extensions
-[RAILS_ROOT, RADIANT_ROOT].uniq.each do |root|
-  Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }
-end

data/lib/tasks/framework.rake

@@ -63,20 +63,10 @@ unless File.directory? "#{RAILS_ROOT}/app"
 
     desc "Update configs, scripts, html, images, sass, stylesheets and javascripts from Radiant."
     task :update do
-      tasks = %w{scripts javascripts configs static_html images sass stylesheets cached_assets}
+      tasks = %w{scripts javascripts configs static_html images sass stylesheets cached_assets bundle}
       tasks = tasks & ENV['ONLY'].split(',') if ENV['ONLY']
       tasks = tasks - ENV['EXCEPT'].split(',') if ENV['EXCEPT']
-      
-      instance_gemfile_path = RAILS_ROOT + '/Gemfile'
-      puts instance_gemfile_path
-      unless File.exists?(instance_gemfile_path)
-        File.open(instance_gemfile_path, 'w') do |f|
-          radiant_version = Radiant::Version.to_s
-          sqlite_version  = Gem.loaded_specs['sqlite3'].version.to_s
-          f.write ERB.new(File.read("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_gemfile")).result(binding)
-        end
-      end
-        
+
       tasks.each do |task| 
         puts "* Updating #{task}"
         Rake::Task["radiant:update:#{task}"].invoke
@@ -120,6 +110,45 @@ unless File.directory? "#{RAILS_ROOT}/app"
         TaskSupport.cache_admin_js
       end
 
+      desc "Update Gemfile from your current radiant install, backing up if required."
+      task :bundle do
+        require 'erb'
+        file = "#{RAILS_ROOT}/Gemfile"
+        tmpfile = "#{RAILS_ROOT}/Gemfile.tmp"
+        genfile = "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_gemfile"
+        backfile = "#{RAILS_ROOT}/Gemfile.bak"
+        
+        db_gems = {
+          'sqlite3' => 'sqlite3',
+          'mysql' => 'mysql',
+          'pg' => 'postgresql',
+          'db2' => 'db2',
+          'activerecord-sqlserver-adapter' => 'sqlserver'
+        }
+        active_db_gem = db_gems.keys.find { |g| Gem.loaded_specs[g] } || 'sqlite3'
+
+        File.open(tmpfile, 'w') do |f|
+          radiant_version = Radiant::Version.to_s
+          db = db_gems[active_db_gem]
+          f.write ERB.new(File.read(genfile)).result(binding)
+        end
+        
+        unless File.exist?(file) && FileUtils.compare_file(file, tmpfile)
+          warning = ""
+          if File.exist?(file)
+            FileUtils.cp(file, backfile)
+            warning << "** WARNING **
+Your old Gemfile has been saved as Gemfile.bak. If you had radiant extensions or other gems in that file, please copy those lines to the new file. After checking the Gemfile, please run `bundle install` to update your application."
+          else
+            warning << "** WARNING **
+A Gemfile has been created in your application directory. If you have config.gem entries in your old environment.rb (now .bak), please move them to the Gemfile. When you're happy with it, run `bundle install` to install the gems."
+          end
+          FileUtils.cp(tmpfile, file)
+        end
+        FileUtils.rm(tmpfile)
+        puts warning
+      end
+
       desc "Update configuration files from your current radiant install"
       task :configs do
         require 'erb'
@@ -128,54 +157,46 @@ unless File.directory? "#{RAILS_ROOT}/app"
           :development  => "#{RAILS_ROOT}/config/environments/development.rb",
           :test         => "#{RAILS_ROOT}/config/environments/test.rb",
           :cucumber     => "#{RAILS_ROOT}/config/environments/cucumber.rb",
-          :production   => "#{RAILS_ROOT}/config/environments/production.rb",
-          :gemfile      => "#{RAILS_ROOT}/Gemfile"
+          :production   => "#{RAILS_ROOT}/config/environments/production.rb"
         }
         tmps = {
           :env          => "#{RAILS_ROOT}/config/environment.tmp",
           :development  => "#{RAILS_ROOT}/config/environments/development.tmp",
           :test         => "#{RAILS_ROOT}/config/environments/test.tmp",
           :cucumber     => "#{RAILS_ROOT}/config/environments/cucumber.rb",
-          :production   => "#{RAILS_ROOT}/config/environments/production.tmp",
-          :gemfile      => "#{RAILS_ROOT}/Gemfile.tmp"
+          :production   => "#{RAILS_ROOT}/config/environments/production.tmp"
         }
         gens = {
           :env          => "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_environment.rb",
           :development  => "#{File.dirname(__FILE__)}/../../config/environments/development.rb",
           :test         => "#{File.dirname(__FILE__)}/../../config/environments/test.rb",
           :cucumber     => "#{File.dirname(__FILE__)}/../../config/environments/cucumber.rb",
-          :production   => "#{File.dirname(__FILE__)}/../../config/environments/production.rb",
-          :gemfile      => "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_gemfile"
+          :production   => "#{File.dirname(__FILE__)}/../../config/environments/production.rb"
         }
         backups = {
           :env          => "#{RAILS_ROOT}/config/environment.bak",
           :development  => "#{RAILS_ROOT}/config/environments/development.bak",
           :test         => "#{RAILS_ROOT}/config/environments/test.bak",
           :cucumber     => "#{RAILS_ROOT}/config/environments/cucumber.bak",
-          :production   => "#{RAILS_ROOT}/config/environments/production.bak",
-          :gemfile      => "#{RAILS_ROOT}/Gemfile.bak"
+          :production   => "#{RAILS_ROOT}/config/environments/production.bak"
         }
         
         FileUtils.cp("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_boot.rb", RAILS_ROOT + '/config/boot.rb')
         FileUtils.cp("#{File.dirname(__FILE__)}/../../config/preinitializer.rb", RAILS_ROOT + '/config/preinitializer.rb')
         warning = ""
-        [:env, :development, :test, :cucumber, :production, :gemfile].each do |env_file|
+        [:env, :development, :test, :cucumber, :production].each do |env_file|
           File.open(tmps[env_file], 'w') do |f|
             app_name        = File.basename(File.expand_path(RAILS_ROOT))
             radiant_version = Radiant::Version.to_s
-            sqlite_version = if Gem.loaded_specs['sqlite3']
-              Gem.loaded_specs['sqlite3'].version.to_s
-            else
-              '1.3.3'
-            end
             f.write ERB.new(File.read(gens[env_file])).result(binding)
           end
-          next if File.exist?(instances[env_file]) && FileUtils.compare_file(instances[env_file], tmps[env_file])
-          FileUtils.cp(instances[env_file], backups[env_file]) if File.exist?(instances[env_file])
-          FileUtils.cp(tmps[env_file], instances[env_file])
-          FileUtils.rm(tmps[env_file])
-          warning << "
+          unless File.exist?(instances[env_file]) && FileUtils.compare_file(instances[env_file], tmps[env_file])
+            FileUtils.cp(instances[env_file], backups[env_file]) if File.exist?(instances[env_file])
+            FileUtils.cp(tmps[env_file], instances[env_file])
+            warning << "
 - #{instances[env_file].sub(/^#{RAILS_ROOT}/, '')}"
+          end
+          FileUtils.rm(tmps[env_file])
         end
         unless warning.blank?
           puts "** WARNING **