Merge 1080011 into 2d1d8a4

core/lib/generators/refinery/cms/cms_generator.rb

@@ -75,20 +75,32 @@ def append_gitignore!
     end
 
     def append_heroku_gems!
-      append_file 'Gemfile', %q{
+      append_file 'Gemfile', %Q{
+# The Ruby version is specified here so that Heroku uses the right version.
+ruby #{ENV['RUBY_VERSION'].inspect}
+
 # The Heroku gem allows you to interface with Heroku's API
 gem 'heroku'
 
-# Fog allows you to use S3 assets (added for Heroku)
-gem 'fog'
+group :production do
+  # Fog allows you to use S3 assets (added for Heroku)
+  gem 'dragonfly-s3_data_store'
+
+  # Gems that Heroku recommend using:
+  gem 'rails_12factor'
+
 }
       # If postgres is not the database in use, Heroku still needs it.
       if destination_path.join('Gemfile').file? && destination_path.join('Gemfile').read !~ %r{gem ['"]pg['"]}
         append_file 'Gemfile', %q{
-# Postgres support (added for Heroku)
-gem 'pg'
+  # Postgres support (added for Heroku)
+  gem 'pg'
 }
       end
+require 'pry';binding.pry
+      append_file 'Gemfile', %q{
+end
+} # close the production group that was opened for dragonfly, and pg.
     end
 
     def bundle!
@@ -144,6 +156,9 @@ def deploy_to_hosting_heroku!(message = nil)
       say_status "Setting up the Heroku database..", nil
       run "heroku#{' run' if options[:stack] == 'cedar'} rake db:migrate"
 
+      say_status "Seeding the Heroku database..", nil
+      run "heroku#{' run' if options[:stack] == 'cedar'} rake db:seed"
+
       say_status "Restarting servers...", nil
       run "heroku restart"
     end

images/refinerycms-images.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   s.add_dependency 'dragonfly',               '~> 1.0.0'
-  s.add_dependency 'dragonfly-s3_data_store', '~> 1.0.0'
   s.add_dependency 'refinerycms-core',        version
 
   s.required_ruby_version = Refinery::Version.required_ruby_version

resources/refinerycms-resources.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'acts_as_indexed',         '~> 0.8.0'
   s.add_dependency 'dragonfly',               '~> 1.0.0'
-  s.add_dependency 'dragonfly-s3_data_store', '~> 1.0.0'
   s.add_dependency 'refinerycms-core',        version
 
   s.required_ruby_version = Refinery::Version.required_ruby_version

templates/refinery/edge.rb

@@ -1,8 +1,11 @@
-require 'rbconfig'
-
 # We want to ensure that you have an ExecJS runtime available!
 begin
   require 'execjs'
+  begin
+    ::ExecJS::Runtimes.autodetect
+  rescue
+    gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
+  end
 rescue LoadError
   abort "ExecJS is not installed. Please re-start the installer after running:\ngem install execjs"
 end
@@ -13,29 +16,18 @@
 
 append_file 'Gemfile' do
 "
-gem 'refinerycms', git: 'https://github.com/refinery/refinerycms', branch: 'master'
+gem 'refinerycms', git: 'https://github.com/refinery/refinerycms', branch: 'template_test'
 
 gem 'quiet_assets', :group => :development
 
-# Add support for refinerycms-acts-as-indexed
+# Add support for searching inside Refinery's admin interface.
 gem 'refinerycms-acts-as-indexed', ['~> 2.0', '>= 2.0.0']
 
-# Add support for refinerycms-wymeditor
+# Add support for Refinery's custom fork of the visual editor WYMeditor.
 gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']
-
-gem 'seo_meta', git: 'https://github.com/parndt/seo_meta', branch: 'master'
-
-gem 'paper_trail', git: 'https://github.com/airblade/paper_trail', branch: 'master'
 "
 end
 
-begin
-  require 'execjs'
-  ::ExecJS::Runtimes.autodetect
-rescue
-  gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
-end
-
 run 'bundle install'
 
 rake 'db:create'