refinerycms 2.0.10 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6ad0f14924f923363e264fb39ff64eb67668417
-  data.tar.gz: 4f6b987f0d1c40f902ab8c508895881230718822
+  metadata.gz: 38cc70410f6bdd92b218d39a3546db122bd4c139
+  data.tar.gz: 9f4bd73cf266c9218f2e58ba58ce52e24d0c3944
 SHA512:
-  metadata.gz: 70982cce73ab6ba87ea397fe4e4cf2e44e2aca712680d7e98b6cf17d5aae298f182b1bdd5c7ae2e04348ffdd2f6eca46371ad3f18f5664e08dd5a29a511d332a
-  data.tar.gz: 5e064897d523e64ad90245084149fb73d9ed6ac00d9ce9e7299c5e423c678bd90aa9155805288ab09bf403c45b0ef07d737bc52306bbad1ef98bd9405031b56c
+  metadata.gz: 2110a488e988482cd189d447287e6f8c094e68dba4fce4e5e4f9d95573c7067e8aa055c7f93588dbc16f19c75f7c11feb2d3be5f5a79b8055ef165a353af833d
+  data.tar.gz: 6776cf2b05df7d047d130ea0f2204dad54ef49f168885455967c32be62c65162fa336de0b43628272d371c05a6a712470cfea8f033589753f48f03abb67f3ba8

data/bin/refinerycms

@@ -4,7 +4,7 @@ require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
 template_path = File.expand_path('../../templates/refinery/installer.rb', __FILE__)
 
-if ARGV.size == 0 || ARGV[0] == "--help"
+def show_help_message
   puts "Usage:"
   puts "  refinerycms APP_NAME [options]"
   puts ""
@@ -22,9 +22,22 @@ if ARGV.size == 0 || ARGV[0] == "--help"
     dasherized = [option.aliases, "[#{dasherized}]"].flatten.join(', ') if option.aliases.any?
     puts "  #{dasherized}".ljust(28) << "# #{option.description}"
   end
+end
+
+if ARGV.empty?
+  show_help_message
   exit 0
 end
 
+case ARGV.first
+  when "-h", "--help"
+    show_help_message
+    exit 0
+  when "-v", "--version"
+    puts "Refinery CMS #{Gem.loaded_specs['refinerycms'].version}"
+    exit 0
+end
+
 application_name = ARGV.shift
 
 result = Rails::Generators::AppGenerator.start [application_name, '-m', template_path, '--skip-test-unit'] | ARGV
@@ -38,7 +51,7 @@ if result && result.include?('Gemfile')
   note << "You can now see Refinery running in your browser at http://localhost:3000/refinery"
 
   if ARGV.include?('--heroku')
-    note << "\nIf you want files and images to work on Heroku, you will need setup S3:"
+    note << "\nIf you want files and images to work on Heroku, you will need to setup S3:"
     note << "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX S3_REGION=XXXXXXXXXX"
   end
 

data/templates/refinery/edge.rb

@@ -1,39 +1,43 @@
 require 'rbconfig'
 
-gsub_file 'Gemfile', "gem 'jquery-rails'", "gem 'jquery-rails', '~> 2.0.0'"
 # We want to ensure that you have an ExecJS runtime available!
 begin
-  run 'bundle install'
   require 'execjs'
-  ::ExecJS::Runtimes.autodetect
-rescue
-  gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
+rescue LoadError
+  abort "ExecJS is not installed. Please re-start the installer after running:\ngem install execjs"
+end
+
+if File.read("#{destination_root}/Gemfile") !~ /assets.+coffee-rails/m
+  gem "coffee-rails", :group => :assets
 end
 
 append_file 'Gemfile' do
 "
-
-gem 'refinerycms', :git => 'git://github.com/refinery/refinerycms.git'
-
-# USER DEFINED
-
-# Specify additional Refinery CMS Engines here (all optional):
-gem 'refinerycms-i18n', :git => 'git://github.com/parndt/refinerycms-i18n.git'
-#  gem 'refinerycms-blog', :git => 'git://github.com/refinery/refinerycms-blog.git'
-#  gem 'refinerycms-inquiries', :git => 'git://github.com/refinery/refinerycms-inquiries.git'
-#  gem 'refinerycms-search', :git => 'git://github.com/refinery/refinerycms-search.git'
-#  gem 'refinerycms-page-images', :git => 'git://github.com/refinery/refinerycms-page-images.git'
-
-# END USER DEFINED
+gem 'refinerycms', github: 'refinery/refinerycms', branch: 'master'
+
+# Optionally, specify additional Refinery CMS Extensions here:
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
+#  gem 'refinerycms-blog', github: 'refinery/refinerycms-blog', branch: 'master'
+#  gem 'refinerycms-inquiries', github: 'refinery/refinerycms-inquiries', branch: 'master'
+#  gem 'refinerycms-search', github: 'refinery/refinerycms-search', branch: 'master'
+#  gem 'refinerycms-page-images', github: 'refinery/refinerycms-page-images', branch: 'master'
 "
 end
 
+begin
+  require 'execjs'
+  ::ExecJS::Runtimes.autodetect
+rescue
+  gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
+end
+
 run 'bundle install'
+
 rake 'db:create'
 generate "refinery:cms --fresh-installation #{ARGV.join(' ')}"
 
-say <<-eos
+say <<-SAY
   ============================================================================
     Your new Refinery CMS application is now running on edge and mounted to /.
   ============================================================================
-eos
+SAY

data/templates/refinery/installer.rb

@@ -1,43 +1,39 @@
 require 'rbconfig'
-VERSION_BAND = '2.0.0'
+VERSION_BAND = '2.1.0'
 
-gsub_file 'Gemfile', "gem 'jquery-rails'", "gem 'jquery-rails', '~> 2.0.0'"
 # We want to ensure that you have an ExecJS runtime available!
 begin
-  run 'bundle install'
   require 'execjs'
-  ::ExecJS::Runtimes.autodetect
-rescue
-  require 'pathname'
-  if Pathname.new(destination_root.to_s).join('Gemfile').read =~ /therubyracer/
-    gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
-  else
-    append_file 'Gemfile', <<-GEMFILE
-
-group :assets do
-  # Added by Refinery. We want to ensure that you have an ExecJS runtime available!
-  gem 'therubyracer'
+rescue LoadError
+  abort "ExecJS is not installed. Please re-start the installer after running:\ngem install execjs"
 end
-GEMFILE
-  end
+
+if File.read("#{destination_root}/Gemfile") !~ /assets.+coffee-rails/m
+  gem "coffee-rails", :group => :assets
 end
 
 append_file 'Gemfile', <<-GEMFILE
 
 # Refinery CMS
-gem 'refinerycms', '~> #{VERSION_BAND}', :git => 'git://github.com/refinery/refinerycms.git', :branch => '2-0-stable'
+gem 'refinerycms', '~> #{VERSION_BAND}'
 
-# Specify additional Refinery CMS Extensions here (all optional):
-gem 'refinerycms-i18n', '~> #{VERSION_BAND}'
+# Optionally, specify additional Refinery CMS Extensions here:
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
 #  gem 'refinerycms-blog', '~> #{VERSION_BAND}'
 #  gem 'refinerycms-inquiries', '~> #{VERSION_BAND}'
 #  gem 'refinerycms-search', '~> #{VERSION_BAND}'
 #  gem 'refinerycms-page-images', '~> #{VERSION_BAND}'
 GEMFILE
 
-
+begin
+  require 'execjs'
+  ::ExecJS::Runtimes.autodetect
+rescue
+  gsub_file 'Gemfile', "# gem 'therubyracer'", "gem 'therubyracer'"
+end
 
 run 'bundle install'
+
 rake 'db:create'
 generate "refinery:cms --fresh-installation #{ARGV.join(' ')}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,106 +10,112 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: refinerycms-authentication
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-dashboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-images
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.1.0
 description: A Ruby on Rails CMS that supports Rails 3.2. It's easy to extend and
   sticks to 'the Rails way' where possible.
 email: info@refinerycms.com