refinerycms 1.0.7 → 1.0.8

data/Gemfile

@@ -23,13 +23,13 @@ gemspec
 # REFINERY CMS ================================================================
 # Anything you put in here will be overridden when the app gets updated.
 
-# gem 'refinerycms', '~> 1.0.6'
+# gem 'refinerycms', '~> 1.0.8'
 
 group :development, :test do
   # To use refinerycms-testing, uncomment it (if it's commented out) and run 'bundle install'
   # Then, run 'rails generate refinerycms_testing' which will copy its support files.
   # Finally, run 'rake' to run the tests.
-  # gem 'refinerycms-testing',    '~> 1.0.6'
+  # gem 'refinerycms-testing',    '~> 1.0.8'
 end
 
 # END REFINERY CMS ============================================================

data/Gemfile.lock

@@ -1,60 +1,56 @@
 PATH
   remote: .
   specs:
-    refinerycms (1.0.7)
+    refinerycms (1.0.8)
       bundler (~> 1.0)
-      refinerycms-authentication (= 1.0.7)
-      refinerycms-base (= 1.0.7)
-      refinerycms-core (= 1.0.7)
-      refinerycms-dashboard (= 1.0.7)
-      refinerycms-images (= 1.0.7)
-      refinerycms-pages (= 1.0.7)
-      refinerycms-resources (= 1.0.7)
-      refinerycms-settings (= 1.0.7)
-    refinerycms-authentication (1.0.7)
+      refinerycms-authentication (= 1.0.8)
+      refinerycms-base (= 1.0.8)
+      refinerycms-core (= 1.0.8)
+      refinerycms-dashboard (= 1.0.8)
+      refinerycms-images (= 1.0.8)
+      refinerycms-pages (= 1.0.8)
+      refinerycms-resources (= 1.0.8)
+      refinerycms-settings (= 1.0.8)
+    refinerycms-authentication (1.0.8)
       activerecord (~> 3.0.10)
       devise (~> 1.4.3)
       friendly_id_globalize3 (~> 3.2.1)
-      refinerycms-core (= 1.0.7)
-    refinerycms-base (1.0.7)
-    refinerycms-core (1.0.7)
-      actionmailer (~> 3.0.10)
+      refinerycms-core (= 1.0.8)
+    refinerycms-base (1.0.8)
+    refinerycms-core (1.0.8)
       acts_as_indexed (~> 0.7)
       awesome_nested_set (~> 2.0)
       friendly_id_globalize3 (~> 3.2.1)
       globalize3 (~> 0.1)
-      railties (~> 3.0.10)
-      refinerycms-base (= 1.0.7)
+      rails (~> 3.0.10)
+      refinerycms-base (= 1.0.8)
       refinerycms-generators (~> 1.0)
-      refinerycms-settings (= 1.0.7)
+      refinerycms-settings (= 1.0.8)
       truncate_html (~> 0.5)
       will_paginate (~> 3.0.0)
-    refinerycms-dashboard (1.0.7)
-      refinerycms-core (= 1.0.7)
-    refinerycms-images (1.0.7)
+    refinerycms-dashboard (1.0.8)
+      refinerycms-core (= 1.0.8)
+    refinerycms-images (1.0.8)
       activerecord (~> 3.0.10)
       dragonfly (~> 0.9.0)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 1.0.7)
-    refinerycms-pages (1.0.7)
+      refinerycms-core (= 1.0.8)
+    refinerycms-pages (1.0.8)
       activerecord (~> 3.0.10)
       awesome_nested_set (~> 2.0)
       friendly_id_globalize3 (~> 3.2.1)
       globalize3 (~> 0.1)
-      refinerycms-core (= 1.0.7)
+      refinerycms-core (= 1.0.8)
       seo_meta (~> 1.1)
-    refinerycms-resources (1.0.7)
+    refinerycms-resources (1.0.8)
       activerecord (~> 3.0.10)
       dragonfly (~> 0.9.0)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 1.0.7)
-    refinerycms-settings (1.0.7)
+      refinerycms-core (= 1.0.8)
+    refinerycms-settings (1.0.8)
       activerecord (~> 3.0.10)
-      refinerycms-base (= 1.0.7)
-    refinerycms-testing (1.0.7)
-      autotest
-      autotest-notification
-      autotest-rails
+      refinerycms-base (= 1.0.8)
+    refinerycms-testing (1.0.8)
       capybara (~> 1.0.0)
       cucumber-rails (~> 1.0.0)
       database_cleaner
@@ -63,14 +59,13 @@ PATH
       json_pure
       launchy
       rack-test (>= 0.5.6)
-      refinerycms-core (= 1.0.7)
+      refinerycms-core (= 1.0.8)
       rspec-instafail
       rspec-rails (~> 2.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.6.2)
     abstract (1.0.0)
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
@@ -94,17 +89,13 @@ GEM
       activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
     activesupport (3.0.10)
     acts_as_indexed (0.7.3)
     addressable (2.2.6)
     arel (2.0.10)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    autotest-notification (2.3.3)
-      autotest-standalone (~> 4.5)
-    autotest-rails (4.1.0)
-      ZenTest
-    autotest-standalone (4.5.6)
     awesome_nested_set (2.0.1)
       activerecord (>= 3.0.0)
     babosa (0.3.5)
@@ -175,6 +166,14 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
     railties (3.0.10)
       actionpack (= 3.0.10)
       activesupport (= 3.0.10)
@@ -239,6 +238,6 @@ DEPENDENCIES
   rcov
   refinerycms!
   refinerycms-i18n (~> 1.0.0)
-  refinerycms-testing (~> 1.0.6)
+  refinerycms-testing (~> 1.0.8)
   simplecov
   sqlite3

data/bin/refinerycms

@@ -166,19 +166,21 @@ module Refinery
         exit(1)
       end
 
+      # Get the name and path of the new application
+      @app_path = Pathname.new(File.expand_path(@input.first))
+      @app_name = @app_path.to_s.split(File::SEPARATOR).last
+
       rails_version_in_path = run_command('rails --version', {:cd => false, :bundler => false, :puts => false}).to_s.gsub(/(Rails |\n)/, '')
       @rails_version_to_use = @options[:rails][:version] || rails_version_in_path
       if @rails_version_to_use !~ %r{\b#{RAILS_MINOR_VERSION}}
         puts "\nRails #{@rails_version_to_use} is not supported by Refinery #{::Refinery.version}, " \
              "please use Rails #{RAILS_MINOR_VERSION}.x instead."
+        puts "\nYou can tell Refinery CMS an installed and compatible rails version to use like so:\n"
+        puts "\nrefinerycms #{@app_name} --rails-version #{RAILS_MINOR_VERSION}"
         puts "\n"
         exit(1)
       end
 
-      # Get the name and path of the new application
-      @app_path = Pathname.new(File.expand_path(@input.first))
-      @app_name = @app_path.to_s.split(File::SEPARATOR).last
-
       # Get the refinery path based on this file
       @refinery_path = Pathname.new(File.expand_path('../../', __FILE__))
 
@@ -236,6 +238,9 @@ module Refinery
       # Detect non-success or a blank rails output or starting with "Can't initialize" or "Error"
       if !$?.success? or rails_output.to_s.length == 0 or rails_output =~ /^(Can't\ initialize|Error)/
         puts "\nGenerating Rails application failed. Exiting..."
+        if run_command('gem list rails', {:cd => false, :puts => false, :ruby => false}) !~ %r{[( ]#{@rails_version_to_use}(.0)*[,\)]}
+          puts "\nDo you have Rails #{@rails_version_to_use} installed?"
+        end
         puts "\n"
         exit(1)
       else

data/changelog.md

@@ -1,3 +1,10 @@
+## 1.0.8 [1 September 2011]
+
+* `refinerycms-core` now depends on rails so that users of 1.0.x can be confident of the entire stack being present as before. [Philip Arndt](https://github.com/parndt)
+* No longer requiring autotest as a dependency of `refinerycms-testing`. [Philip Arndt](https://github.com/parndt)
+* Improved 'wrong rails version' error message on install with a more helpful guide on how to specify a rails version. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/1.0.7...1.0.8)
+
 ## 1.0.7 [31 August 2011]
 
 * No change, just fixing corruption in the 1.0.6 gem caused by Syck. [Philip Arndt](https://github.com/parndt)

data/refinerycms.gemspec

@@ -3,9 +3,9 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
-  s.version           = %q{1.0.7}
+  s.version           = %q{1.0.8}
   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-08-31}
+  s.date              = %q{2011-09-01}
   s.summary           = %q{A Ruby on Rails CMS that supports Rails 3}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
   s.add_dependency    'bundler',                    '~> 1.0'
 
   # Refinery CMS
-  s.add_dependency    'refinerycms-authentication', '= 1.0.7'
-  s.add_dependency    'refinerycms-base',           '= 1.0.7'
-  s.add_dependency    'refinerycms-core',           '= 1.0.7'
-  s.add_dependency    'refinerycms-dashboard',      '= 1.0.7'
-  s.add_dependency    'refinerycms-images',         '= 1.0.7'
-  s.add_dependency    'refinerycms-pages',          '= 1.0.7'
-  s.add_dependency    'refinerycms-resources',      '= 1.0.7'
-  s.add_dependency    'refinerycms-settings',       '= 1.0.7'
+  s.add_dependency    'refinerycms-authentication', '= 1.0.8'
+  s.add_dependency    'refinerycms-base',           '= 1.0.8'
+  s.add_dependency    'refinerycms-core',           '= 1.0.8'
+  s.add_dependency    'refinerycms-dashboard',      '= 1.0.8'
+  s.add_dependency    'refinerycms-images',         '= 1.0.8'
+  s.add_dependency    'refinerycms-pages',          '= 1.0.8'
+  s.add_dependency    'refinerycms-resources',      '= 1.0.8'
+  s.add_dependency    'refinerycms-settings',       '= 1.0.8'
 
   s.files             = [
     '.gitignore',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -44,12 +44,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,12 +76,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -92,12 +92,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -108,12 +108,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -124,12 +124,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -140,12 +140,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -156,12 +156,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 7
         segments: 
         - 1
         - 0
-        - 7
-        version: 1.0.7
+        - 8
+        version: 1.0.8
   type: :runtime
   version_requirements: *id009
 description: A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.