Now you need to write 'yes' when updating to accept that you were told to backup. Sorted out what happens when (update or fresh install)

Author: parndt

Gemfile

@@ -27,6 +27,7 @@ end
 # gem 'aws-s3', :require => 'aws/s3'
 
 # REFINERY CMS ================================================================
+# Anything you put in here will be overridden when the app gets updated.
 
 # gem 'refinerycms', '~> 0.9.9.1'
 

authentication/refinerycms-authentication.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Authentication engine for Refinery CMS}
   s.description       = %q{The default authentication engine for Refinery CMS}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

base/refinerycms-base.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Base engine for Refinery CMS}
   s.description       = %q{The basic base for Refinery CMS Refinery CMS}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

bin/refinerycms

@@ -213,6 +213,15 @@ module Refinery
           exit(1)
         end
       end
+
+      if @options[:update]
+        puts "Please ensure you have a backup of your project and its database."
+        puts "Type 'yes' to continue (anything other than 'yes' will cancel)"
+        unless $stdin.gets.strip == 'yes'
+          puts "Cancelling..."
+          exit
+        end
+      end
     end
 
     def update!
@@ -236,34 +245,32 @@ module Refinery
         exit(1)
       elsif defined? JRUBY_VERSION
         find_and_replace(@app_path.join('Gemfile'), /['|"]sqlite3['|"]/, "'activerecord-jdbcsqlite3-adapter'")
+
+        # Override username and password
+        find_and_replace('config/database.yml', %r{username:.*}, "username: #{@options[:database][:username]}")
+        find_and_replace('config/database.yml', %r{password:.*}, "password: #{@options[:database][:password]}")
+
+        puts "\n---------"
+        puts "Refinery successfully installed in '#{@app_path}'!\n\n"
       end
     end
 
     def bundle!
-      # Add refinery gems to the Gemfile
-      gemfile_contents = Refinery.root.join('Gemfile').read
-      refinery_gems = gemfile_contents.match(/# REFINERY CMS =+.*# END REFINERY CMS =+/m)[0]
+      # Insert the current REFINERY CMS section (you shouldn't put anything in here).
+      refinery_gems = Refinery.root.join('Gemfile').read.match(/# REFINERY CMS =+.*# END REFINERY CMS =+/m)[0]
       refinery_gems.gsub!("# gem 'refinerycms'", "gem 'refinerycms'") # Enable refinerycms
       refinery_gems.gsub!("gem 'refinerycms-testing'", "# gem 'refinerycms-testing'") # Disable testing
-      refinery_user_defined_gems = gemfile_contents.match(/# USER DEFINED(.*)# END USER DEFINED/m)
-      refinery_user_defined_gems = refinery_user_defined_gems[1] unless refinery_user_defined_gems.nil?
-      app_gemfile = @app_path.join('Gemfile')
-      FileUtils::cp app_gemfile, "#{app_gemfile}.backup"
       unless @options[:update]
+        app_gemfile = @app_path.join('Gemfile')
+        FileUtils::cp app_gemfile, "#{app_gemfile}.backup"
         app_gemfile.open('a') do |f|
           f.write "\n#{refinery_gems}\n"
-          @options[:gems] = ([refinery_user_defined_gems] | [@options[:gems]]).flatten.compact
-
           f.write "\n# USER DEFINED\n#{@options[:gems].join("\n")}\n# END USER DEFINED" if @options[:gems].any?
         end
+      else
+        find_and_replace(@app_path.join('Gemfile'), /# REFINERY CMS =+.*# END REFINERY CMS =+/m, refinery_gems)
       end
 
-      # Override database username and password
-      unless @options[:update]
-        # Override username and password
-        find_and_replace('config/database.yml', %r{username:.*}, "username: #{@options[:database][:username]}")
-        find_and_replace('config/database.yml', %r{password:.*}, "password: #{@options[:database][:password]}")
-      end
 
       # Specify the correct version of the Refinery CMS gem (may be git source).
       src = Refinery.version !~ /\.pre$/ ? "'= #{Refinery.version}'" : ":git => 'git://github.com/resolve/refinerycms'"
@@ -273,15 +280,14 @@ module Refinery
       find_and_replace('Gemfile', "# gem 'aws-s3', :require => 'aws/s3'",
                         "gem 'aws-s3', :require => 'aws/s3'") if @options[:heroku]
 
-      puts "\n---------"
-      puts "Refinery successfully installed in '#{@app_path}'!\n\n"
-
       # Automate
       # TODO: Check exit codes to see whether or not these worked
       puts "Installing gem requirements using bundler..\n"
 
       # Ensure RefineryCMS is up to date if we're updating
-      run_command("bundle update refinerycms refinerycms-generators", {:fail => "Unable to update core gems"}) if @options[:update]
+      if @options[:update]
+        run_command("bundle update refinerycms refinerycms-generators", {:fail => "Unable to update core gems"})
+      end
 
       # Install!
       run_command("bundle install", {:fail => "Unable to install necessary gems"})
@@ -328,6 +334,15 @@ module Refinery
         puts "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX"
       end
 
+      puts "\n--- Refinery CMS 0.9.9.1 note ---"
+      puts "New 'core' engine called 'refinerycms-testing' which handles RSpec and Cucumber support."
+      puts "You will see this disabled in your Gemfile in the '# REFINERY CMS' section."
+      puts "To enable it, uncomment the gem line in your Gemfile and run:"
+      puts "\nbundle install"
+      puts "rails generate refinerycms_testing"
+      puts "\nIf it prompts you about whether you want to overwrite any files that conflict, choose yes."
+      puts "--- End upgrade note ---\n"
+
       puts "\nThanks for installing Refinery, enjoy creating your new application!"
       puts "---------\n\n"
     end

core/lib/generators/refinerycms_generator.rb

@@ -86,6 +86,9 @@ def generate
       self.class.source_root.join('db', 'seeds.rb').read
     end
 
+    force_options = self.options.dup
+    force_options[:force] = self.options[:force] || self.options[:update]
+    self.options = force_options
     # Seeds and migrations now need to be copied from their various engines.
     existing_source_root = self.class.source_root
     ::Refinery::Plugins.registered.pathnames.reject{|p| !p.join('db').directory?}.sort.each do |pathname|

core/refinerycms-core.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

dashboard/refinerycms-dashboard.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Dashboard engine for Refinery CMS}
   s.description       = %q{The dashboard is usually the first engine the user sees in the backend of Refinery CMS. It displays useful information and contains links to common functionality.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

images/refinerycms-images.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Images engine for Refinery CMS}
   s.description       = %q{Handles all image upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

lib/gemspec.rb

@@ -44,7 +44,7 @@
   s.executables       = %w(#{Dir['bin/*'].join(' ').gsub('bin/', '')})
 
   # Bundler
-  s.add_dependency    'bundler',                    '~> 1.0.5'
+  s.add_dependency    'bundler',                    '~> 1.0.10'
 
   # Refinery CMS
   s.add_dependency    'refinerycms-authentication', '~> #{::Refinery::Version}'

pages/refinerycms-pages.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Pages engine for Refinery CMS}
   s.description       = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

refinerycms.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
   s.version           = %q{0.9.9.1}
   s.description       = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.summary           = %q{A Ruby on Rails CMS that supports Rails 3}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables       = %w(refinerycms)
 
   # Bundler
-  s.add_dependency    'bundler',                    '~> 1.0.5'
+  s.add_dependency    'bundler',                    '~> 1.0.10'
 
   # Refinery CMS
   s.add_dependency    'refinerycms-authentication', '~> 0.9.9.1'

resources/refinerycms-resources.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Resources engine for Refinery CMS}
   s.description       = %q{Handles all file upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

settings/refinerycms-settings.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Settings engine for Refinery CMS}
   s.description       = %q{The default settings engine that is required by Refinery CMS core. Adds programmer creatable, user editable settings for each engine.}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

testing/refinerycms-testing.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version           = %q{0.9.9.1}
   s.summary           = %q{Testing plugin for Refinery CMS}
   s.description       = %q{This plugin adds the ability to run cucumber and rspec against the RefineryCMS gem while inside a RefineryCMS project}
-  s.date              = %q{2011-02-14}
+  s.date              = %q{2011-02-15}
   s.email             = %q{[email protected]}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}