refinerycms 0.9.7.5 → 0.9.7.6

data/Gemfile

@@ -17,7 +17,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3' #db_adapter=sqlite3
 # gem 'aws-s3'
 
 #===REFINERY REQUIRED GEMS===
-gem 'acts_as_indexed', '= 0.6.2', :require => 'acts_as_indexed', :git => 'git://github.com/parndt/acts_as_indexed.git', :branch => 'master'
+gem 'acts_as_indexed', '= 0.6.3', :require => 'acts_as_indexed'
 gem 'authlogic',       '= 2.1.5', :require => 'authlogic'
 gem 'friendly_id',     '= 3.0.6', :require => 'friendly_id'
 gem 'rails',           '= 2.3.8'
@@ -41,11 +41,11 @@ end
 
 #===REQUIRED FOR REFINERY GEM INSTALL===
 # Leave the gem below disabled (commented out) if you're not using the gem install method.
-# gem 'refinerycms',    '= 0.9.7.5'
+# gem 'refinerycms',    '= 0.9.7.6'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:
 
 # Specify your application's gem requirements here. See the examples below:
-# gem "refinerycms-news", "~> 0.9.7.3", :require => "news"
-# gem "refinerycms-portfolio", "~> 0.9.6", :require => "portfolio"
+# gem 'refinerycms-news', '~> 0.9.8', :require => 'news'
+# gem 'refinerycms-portfolio', '~> 0.9.7', :require => 'portfolio'

data/bin/refinery

@@ -1,142 +1,4 @@
 #!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
-
-refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
-unless (app_path = ARGV.shift).nil? or app_path.length == 0
-  # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
-  if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
-    rails_root = Dir.getwd
-  else
-    rails_root = app_path =~ /^\// ? app_path : File.expand_path(File.join(Dir.getwd, app_path.gsub(/^\.\//, '')))
-  end
-  
-  if File.directory?(rails_root)
-    if ARGV.include?("--force")
-      # remove the contents of the current directory
-      Dir[File.join(rails_root, "*")].each {|dir| FileUtils::rm_rf(dir, :secure => true) }
-    else
-      puts "The path you specified already exists. If you want to override this directory (i.e. delete all the current contents) run this again with --force"
-    end
-  end
-
-  unless File.directory?(rails_root) and !ARGV.include?("--force")
-    # make the application path directory
-    FileUtils::makedirs rails_root
-
-    # copy in all of the relevant directories and root files.
-    to_copy = %w(app config db lib public themes script *.md Rakefile .gitignore config.ru asdas).map do |dir|
-      (new_file_path = refinery_root.join(dir)).exist? ? new_file_path.to_s : nil
-    end
-    FileUtils::cp_r to_copy.compact, rails_root, :verbose => false
-
-    # ensure lib/refinery_initializer.rb and lib/gemspec.rb don't make it in.
-    FileUtils::rm File.join(%W(#{rails_root} lib refinery_initializer.rb)) if File.exists?(File.join(%W(#{rails_root} lib refinery_initializer.rb)))
-    FileUtils::rm File.join(%W(#{rails_root} lib gemspec.rb)) if File.exists?(File.join(%W(#{rails_root} lib gemspec.rb)))
-
-    # copy the appropriate database adapter as specified (or not)
-    db_adapter = 'sqlite3'
-    if ARGV.collect{|a| a.split('=').first}.include?('--database')
-      ARGV.each do |arg|
-        arg_parts = arg.split('=')
-        db_adapter = arg_parts.last if arg_parts.first == '--database'
-      end
-    end
-    FileUtils::cp File.join(%W(#{rails_root} config database.yml.#{db_adapter})), File.join(%W(#{rails_root} config database.yml.example))
-    
-    # add in the config files
-    %w(database amazon_s3 rackspace_cloudfiles).each do |config|
-      FileUtils::move File.join(%W(#{rails_root} config #{config}.yml.example)), File.join(%W(#{rails_root} config #{config}.yml))
-
-      # figure out the app name from the install path and swap out your_local_xxx with this name.
-      unless rails_root == "/" or RUBY_PLATFORM =~ /mswin/
-        app_name = rails_root.split(File::SEPARATOR).last
-        # read in the file and split up the lines
-        lines = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "r").read.split("\n")
-        lines.each do |line|
-          line.gsub!("your_local_#{config}", "#{app_name}_development")
-          line.gsub!("your_test_#{config}", "#{app_name}_test")
-          line.gsub!("your_cucumber_#{config}", "#{app_name}_cucumber")
-          line.gsub!("your_production_#{config}", "#{app_name}_production")
-        end
-        # write the new content into the file.
-        config_file = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w")
-        config_file.puts(lines.join("\n"))
-        config_file.close
-      end
-    end
-
-    # update the environment file with a new secret key.
-    require 'digest/sha1'
-    new_digest = ""
-    3.times { new_digest << Digest::SHA1.hexdigest("--refinery--#{Time.now.to_s}--#{rand(10000000)}--") }
-
-    # read in the file and split up the lines
-    app_config_file = File.exist?(File.join(%W(#{rails_root} config application.rb))) ? "application.rb" : "environment.rb"
-    lines = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read.split("\n")
-    lines.each do |line|
-      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
-      line.gsub!(match, new_digest) unless match.nil?
-    end
-    
-    # write the new content into the config file.
-    app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w")
-    app_config.puts(lines.join("\n"))
-    app_config.close
-
-    # read in the Gemfile and write it back out with the refinerycms gem enabled.
-    (lines = refinery_root.join('Gemfile').open('r').read.split("\n")).each do |line|
-      line.gsub!(/\#*\s?gem 'refinerycms'/, "gem 'refinerycms'")
-      
-      # Ensure that the correct database gem libraries are included for the database adapter
-      # that the user has specified in the refinery install command.
-      if line =~ /\#db\_adapter\=/
-        if line =~ %r{#db_adapter=#{db_adapter}}
-          line.gsub!(/^(\#*\s?gem)/, 'gem')
-        else
-          line.gsub!(/^(\s?gem)/, '# gem')
-        end
-      end
-    end
-
-    # write the new content into the file.
-    app_gemfile = File.open(File.join(%W(#{rails_root} Gemfile)), "w")
-    app_gemfile.puts(lines.join("\n"))
-    app_gemfile.close
-
-    puts "\n---------"
-    puts "Refinery successfully installed in '#{rails_root}'!\n\n"
-    
-    # automate..
-    Dir.chdir(rails_root) do
-      puts "Installing gem requirements using bundler..\n"
-      puts (cmd="bundle install --without test")
-      puts `#{cmd}`
-      
-      puts "\n\nSetting up your development database..\n"
-      puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:setup")
-      puts `#{cmd}`
-      
-      puts "\n\nUpdating some core refinery files..\n"
-      puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
-      puts `#{cmd}`
-    end
-    
-    # output helpful messages.
-    puts "\n=== ACTION REQUIRED ==="
-    puts "Now you can launch your webserver using:"
-    puts "\ncd #{rails_root}"
-    puts "script/server"
-    puts "\nThis will launch the built-in webserver at port 3000."
-    puts "You can now see your site running in your browser at http://localhost:3000"
-    puts "\nThanks for installing Refinery, enjoy creating your new application!"
-    puts "---------\n\n"
-  end
-else
-  puts "\nPlease specify the path where you want to install Refinery. i.e. refinery /path/to/project [options]"
-  puts "\n"
-  puts "Options:"
-  puts "--force             Forces the directory to be overriden if the directory already exists"
-  puts "--database=name     Preconfigure for selected database (options: mysql/postgresql/sqlite3 - default: sqlite3)."
-  puts "\n"
-end
+# Running 'refinery' is the old way of generating an application and we want users to change.
+# We could call it here for them, but it would mean that the entire task ran without printing anything to the user.
+puts "We have renamed the 'refinery' task to 'refinerycms' so please use 'refinerycms' instead."

data/bin/refinery-upgrade-096-to-097

@@ -5,7 +5,6 @@ require 'yaml'
 
 refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
 unless (app_path = ARGV.shift).nil? or app_path.length == 0
-  puts "--------Updating--------\n\n"
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
   if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
     rails_root = Dir.getwd
@@ -13,7 +12,13 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     rails_root = app_path =~ /^\// ? app_path : File.expand_path(File.join(Dir.getwd, app_path.gsub(/^\.\//, '')))
   end
   rails_root = Pathname.new(rails_root.to_s)
-  
+
+  if rails_root.join('Gemfile').exist?
+    puts "Your application appears to already be running Refinery CMS >= 0.9.7"
+    exit
+  end
+  puts "--------Updating--------\n\n"
+
   FileUtils::cp refinery_root.join('Gemfile').to_s, rails_root.join('Gemfile').to_s, :verbose => true
   FileUtils::cp refinery_root.join('config', 'preinitializer.rb').to_s, rails_root.join('config', 'preinitializer.rb').to_s, :verbose => true
 
@@ -25,13 +30,13 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
      db_adapter = db_config["development"]["adapter"]
     end
   end
-    
+
   db_adapter = 'sqlite3' unless %w(sqlite3 mysql postgresql).include?(db_adapter)
 
   # read in the Gemfile and write it back out with the refinerycms gem enabled.
   (lines = refinery_root.join('Gemfile').open('r').read.split("\n")).each do |line|
     line.gsub!(/\#*\s?gem 'refinerycms'/, "gem 'refinerycms'")
-    
+
     # Ensure that the correct database gem libraries are included for the database adapter
     # that the user has specified in the refinery install command.
     if line =~ /\#db\_adapter\=/
@@ -51,18 +56,18 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
   # backup the config file.
   app_config_file = 'application.rb'
   FileUtils.cp rails_root.join('config', app_config_file).cleanpath.to_s, rails_root.join('config', "#{app_config_file.gsub('.rb', '')}.autobackupbyrefineryupgrade.rb").cleanpath.to_s, :verbose => true
-  
+
   # copy the new config file.
   FileUtils.cp refinery_root.join('config', app_config_file).cleanpath.to_s, rails_root.join('config', app_config_file).cleanpath.to_s, :verbose => true
 
   unless File.exist?(rails_root.join('config', 'settings.rb'))
     FileUtils.cp refinery_root.join('config', 'settings.rb').cleanpath.to_s, rails_root.join('config', 'settings.rb').cleanpath.to_s, :verbose => true
   end
-  
+
   unless (aai_config_file = rails_root.join('config', 'acts_as_indexed_config.rb')).exist?
     FileUtils::cp refinery_root.join('config', 'acts_as_indexed_config.rb').to_s, aai_config_file.to_s, :verbose => true
   end
-  
+
   # update routes files
   puts "\nNow I'm verifying and updating your routing in your files and your plugins...\n"
   Dir[rails_root.join('**', 'config', 'routes.rb')].map{|f| Pathname.new(f)}.each do |routes_file|
@@ -71,11 +76,14 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     original_lines = lines.dup
     open_routes_file.close
     lines.each do |line|
+      if routes_file.to_s == rails_root.join('config', 'routes.rb').to_s
+        line.gsub!("ActionController::Routing::Routes.draw do |map|", "ActionController::Routing::Routes.draw do |map|\n  map.filter(:locale)")
+        line.gsub!("map.connect 'admin/*path', :controller => 'admin/base', :action => 'error_404'",
+                   "map.redirect 'admin/*path', :controller => 'admin/base'")
+        line.gsub!("map.connect '*path', :controller => 'application', :action => 'error_404'",
+                   "map.connect 'refinery/*path', :controller => 'admin/base', :action => 'error_404'\n\n  # Marketable URLs\n  map.connect '*path', :controller => 'pages', :action => 'show'")
+      end
       line.gsub!("map.namespace(:admin) do |admin|", "map.namespace(:admin, :path_prefix => 'refinery') do |admin|")
-      line.gsub!("map.connect 'admin/*path', :controller => 'admin/base', :action => 'error_404'",
-                 "map.redirect 'admin/*path', :controller => 'admin/base'")
-      line.gsub!("map.connect '*path', :controller => 'application', :action => 'error_404'",
-                 "map.connect 'refinery/*path', :controller => 'admin/base', :action => 'error_404'\n\n  # Marketable URLs\n  map.connect '*path', :controller => 'pages', :action => 'show'")
     end
     lines = lines.join("\n").split("\n")
     open_routes_file = routes_file.open("w")
@@ -83,32 +91,31 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     open_routes_file.close
     puts "Made modifications to routes in #{routes_file} please ensure they are still valid." if original_lines != lines
   end
-  
+
   puts "\nCopied files required to support the new RefineryCMS version 0.9.7"
   puts "I backed up your config/application.rb file to #{rails_root.join('config', "#{app_config_file.gsub('.rb', '')}.autobackupbyrefineryupgrade.rb").cleanpath.to_s}"
   puts "\nI think your database adapter is #{db_adapter} so that is what will be installed by bundler.\n\n"
-  
+
   # automate..
-  Dir.chdir(rails_root) do
-    puts "Installing gem requirements using bundler..\n"
-    puts (cmd="bundle install --without test")
-    puts `#{cmd}`
-    
-    if rails_root.join('config', 'database.yml').exist?
-      puts "\n\nUpdating some core refinery files..\n"
-      puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
-      puts `#{cmd}`
-      
-      puts "\n\nMigrating your database..\n"
-      puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:migrate")
-      puts `#{cmd}`
-    else
-      puts "\nYour config/database.yml file is missing so I can't run a task that is required."
-      puts "Once you have your database file in place or are confident it will work without it please run:"
-      puts "\nrake refinery:update"
-    end
+  puts "Installing gem requirements using bundler..\n"
+  puts (cmd="bundle install --without test")
+  puts `cd '#{rails_root}' && #{cmd}`
+
+  if rails_root.join('config', 'database.yml').exist?
+    puts "\n\nUpdating some core refinery files..\n"
+    puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
+    puts `cd '#{rails_root}' && #{cmd}`
+
+    puts "\n\nMigrating your database..\n"
+    puts (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:migrate")
+    puts `cd '#{rails_root}' && #{cmd}`
+  else
+    puts "\nYour config/database.yml file is missing so I can't run a task that is required."
+    puts "Once you have your database file in place or are confident it will work without it please run:"
+    puts "\nrake refinery:update"
   end
-  
+  # end automation..
+
   puts "\n--------Update complete--------\n\n"
 
 else

data/bin/refinerycms

@@ -0,0 +1,150 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+begin
+  require 'rubygems'
+  require 'bundler'
+rescue LoadError
+  puts "\n==ACTION REQUIRED=="
+  puts "Could not load the bundler gem. This is a required dependency of Refinery CMS.\n\n"
+  puts "Please install it with `gem install bundler`.\n\n"
+  exit
+end
+
+refinery_root = (defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname) ? REFINERY_ROOT : Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")))
+unless (app_path = ARGV.shift).nil? or app_path.length == 0
+  # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
+  if (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2))
+    rails_root = Dir.getwd
+  else
+    rails_root = app_path =~ /^\// ? app_path : File.expand_path(File.join(Dir.getwd, app_path.gsub(/^\.\//, '')))
+  end
+
+  if File.directory?(rails_root)
+    if ARGV.include?("--force")
+      # remove the contents of the current directory
+      Dir[File.join(rails_root, "*")].each {|dir| FileUtils::rm_rf(dir, :secure => true) }
+    else
+      puts "The path you specified already exists. If you want to override this directory (i.e. delete all the current contents) run this again with --force"
+    end
+  end
+
+  unless File.directory?(rails_root) and !ARGV.include?("--force")
+    # make the application path directory
+    FileUtils::makedirs rails_root
+
+    # copy in all of the relevant directories and root files.
+    to_copy = %w(app config db lib public themes script *.md Rakefile .gitignore config.ru asdas).map do |dir|
+      (new_file_path = refinery_root.join(dir)).exist? ? new_file_path.to_s : nil
+    end
+    FileUtils::cp_r to_copy.compact, rails_root, :verbose => false
+
+    # ensure lib/refinery_initializer.rb and lib/gemspec.rb don't make it in.
+    FileUtils::rm File.join(%W(#{rails_root} lib refinery_initializer.rb)) if File.exists?(File.join(%W(#{rails_root} lib refinery_initializer.rb)))
+    FileUtils::rm File.join(%W(#{rails_root} lib gemspec.rb)) if File.exists?(File.join(%W(#{rails_root} lib gemspec.rb)))
+
+    # copy the appropriate database adapter as specified (or not)
+    db_adapter = 'sqlite3'
+    if ARGV.collect{|a| a.split('=').first}.include?('--database')
+      ARGV.each do |arg|
+        arg_parts = arg.split('=')
+        db_adapter = arg_parts.last if arg_parts.first == '--database'
+      end
+    end
+    FileUtils::cp File.join(%W(#{rails_root} config database.yml.#{db_adapter})), File.join(%W(#{rails_root} config database.yml.example))
+
+    # add in the config files
+    %w(database amazon_s3 rackspace_cloudfiles).each do |config|
+      FileUtils::move File.join(%W(#{rails_root} config #{config}.yml.example)), File.join(%W(#{rails_root} config #{config}.yml))
+
+      # figure out the app name from the install path and swap out your_local_xxx with this name.
+      unless rails_root == "/" or RUBY_PLATFORM =~ /mswin/
+        app_name = rails_root.split(File::SEPARATOR).last
+        # read in the file and split up the lines
+        lines = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "r").read.split("\n")
+        lines.each do |line|
+          line.gsub!("your_local_#{config}", "#{app_name}_development")
+          line.gsub!("your_test_#{config}", "#{app_name}_test")
+          line.gsub!("your_cucumber_#{config}", "#{app_name}_cucumber")
+          line.gsub!("your_production_#{config}", "#{app_name}_production")
+        end
+        # write the new content into the file.
+        config_file = File.open(File.join(%W(#{rails_root} config #{config}.yml)), "w")
+        config_file.puts(lines.join("\n"))
+        config_file.close
+      end
+    end
+
+    # update the environment file with a new secret key.
+    require 'digest/sha1'
+    new_digest = ""
+    3.times { new_digest << Digest::SHA1.hexdigest("--refinery--#{Time.now.to_s}--#{rand(10000000)}--") }
+
+    # read in the file and split up the lines
+    app_config_file = File.exist?(File.join(%W(#{rails_root} config application.rb))) ? "application.rb" : "environment.rb"
+    lines = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "r").read.split("\n")
+    lines.each do |line|
+      match = line.scan(/(:secret)([^']*)([\'])([^\']*)/).flatten.last
+      line.gsub!(match, new_digest) unless match.nil?
+    end
+
+    # write the new content into the config file.
+    app_config = File.open(File.join(%W(#{rails_root} config #{app_config_file})), "w")
+    app_config.puts(lines.join("\n"))
+    app_config.close
+
+    # read in the Gemfile and write it back out with the refinerycms gem enabled.
+    (lines = refinery_root.join('Gemfile').open('r').read.split("\n")).each do |line|
+      line.gsub!(/\#*\s?gem 'refinerycms'/, "gem 'refinerycms'")
+
+      # Ensure that the correct database gem libraries are included for the database adapter
+      # that the user has specified in the refinery install command.
+      if line =~ /\#db\_adapter\=/
+        if line =~ %r{#db_adapter=#{db_adapter}}
+          line.gsub!(/^(\#*\s?gem)/, 'gem')
+        else
+          line.gsub!(/^(\s?gem)/, '# gem')
+        end
+      end
+    end
+
+    # write the new content into the file.
+    app_gemfile = File.open(File.join(%W(#{rails_root} Gemfile)), "w")
+    app_gemfile.puts(lines.join("\n"))
+    app_gemfile.close
+
+    puts "\n---------"
+    puts "Refinery successfully installed in '#{rails_root}'!\n\n"
+
+    # automate..
+    puts "Installing gem requirements using bundler..\n"
+    puts "Running: " + (cmd="bundle install --without test")
+    puts `cd '#{rails_root}' && #{cmd}`
+
+    puts "\n\nSetting up your development database..\n"
+    puts "Running: " + (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' db:setup")
+    puts `cd '#{rails_root}' && #{cmd}`
+
+    puts "\n\nUpdating some core refinery files..\n"
+    puts "Running: " + (cmd="rake -f '#{File.join(rails_root, 'Rakefile')}' refinery:update from_installer=true")
+    puts `cd '#{rails_root}' && #{cmd}`
+    # end automation..
+
+    # output helpful messages.
+    puts "\n=== ACTION REQUIRED ==="
+    puts "Now you can launch your webserver using:"
+    puts "\ncd #{rails_root}"
+    puts "script/server"
+    puts "\nThis will launch the built-in webserver at port 3000."
+    puts "You can now see your site running in your browser at http://localhost:3000"
+    puts "\nThanks for installing Refinery, enjoy creating your new application!"
+    puts "---------\n\n"
+  end
+else
+  puts "\nPlease specify the path where you want to install Refinery. i.e. refinery /path/to/project [options]"
+  puts "\n"
+  puts "Options:"
+  puts "--force             Forces the directory to be overriden if the directory already exists"
+  puts "--database=name     Preconfigure for selected database (options: mysql/postgresql/sqlite3 - default: sqlite3)."
+  puts "\n"
+end