Rollback to 1.1.4

Author: jlong

.autotest

@@ -1,16 +1,8 @@
-.rvmrc
-.ruby-version
-.ruby-gemset
-.rspec-local
 config/database.yml
 db/*.db
-spec/dummy/db/*
 log/*.log
-spec/dummy/log/*
-spec/dummy/tmp/*
 pkg
 tmp/*
-spec/tmp/*
 .DS_Store
 .svn
 TAGS
@@ -23,5 +15,5 @@ spec/datasets/tmp
 rerun.txt
 *.swp
 radiant-*.gem
+.rvmrc
 .bundle
-*.lock

.gitignore

@@ -1,24 +1,28 @@
 rvm:
-  - 2.3.4
+  - 1.8.7
+  - 1.9.3
+
+branches:
+  only:
+    - master
+    - 1.x
 
 before_install:
-  - rm -f Gemfile
-  - gem install -v 1.17.3 bundler
+  - gem install rubygems-update --version 1.8.26
+  - update_rubygems --version=1.8.26
 
-before_script: bin/ci/before_script
+before_script: "./bin/ci/before_script"
 
-bundler_args: --without development
+bundler_args: ''
 
-script: bundle exec rake spec
+script: "bundle exec rake spec --trace"
 
 notifications:
   recipients:
     - [email protected]
+    - [email protected]
+    - [email protected]
   irc: "irc.freenode.org#radiantcms"
 
 env:
-  - DB=mysql
-  - DB=postgres
-
-gemfile:
-  - rails40.gemfile
+  - DB=sqlite

.rspec

@@ -1,15 +1,18 @@
 # Change Log
 
-# 2.x
+## 1.1.4
 
-* Remove r:navigation:url to be replaced with r:navigatin:path [Jim Gay]
-* Rename Radiant.config to Radiant.detail [Jim Gay]
-* Remove InheritableClassAttributes [Jim Gay]
-* Remove specific autotest support [Jim Gay]
-* Remove the notion of Radiant instances [Jim Gay]
+* Remove autotest support [Jim Gay]
+* Bump to Rails 2.3.18 [Jim Gay]
+* Update versions for several extensions in the generated Gemfile [Benny Degezelle]
+* Move snippet configuration into snippets extension [Benny Degezelle]
+* Get default gravatar image locally when fire walled [Andrew Vonderluft, Benny Degezelle]
+* Fix migration problems concerning allowed_children_cache [Andrew Vonderluft]
+* Prevent spec errors on generated extensions [Andrew Vonderluft]
 
 ## 1.1.3
 
+* Move to Rails 2.3.17 [Jim Gay]
 * Bump rack dependency to 1.1.6 [Jim Gay]
 * Fixed errors from using rake 10.0.3 and old gem package tasks [Jim Gay]
 

.travis.yml

@@ -1,18 +1,25 @@
-source "https://rubygems.org"
 
-gemspec
 
-if ENV['TRAVIS']
-  gemspec :development_group => :test
-  gem "mysql"
-  gem "pg"
-end
+source 'https://rubygems.org'
 
-group :development do
-  gem "autotest-rails"
-end
-gem 'pry-debugger', :group => [:development, :test] if RUBY_VERSION < "2.0.0"
-gem 'pry-byebug', :group => [:development, :test] if RUBY_VERSION >= "2.0.0"
+# This is the minimum of dependency required to run
+# the radiant instance generator, which is (normally)
+# the only time the radiant gem functions as an
+# application. The instance has its own Gemfile, which
+# requires radiant and therefore pulls in every
+# dependency mentioned in radiant.gemspec.
+
+gem "rails",   "2.3.18"
+gem "sqlite3", "1.3.5", :group => [:development, :test], :platform => :ruby
+
+# When radiant is installed as a gem you can run all of
+# its tests and specs from an instance. If you're working
+# on radiant itself and you want to run specs from the
+# radiant root directory, uncomment the lines below and
+# run `bundle install`.
+
+# gemspec
+# gem "compass-rails", "~> 1.0.3"
 
 # gem "radiant-archive-extension",             "~> 1.0.7"
 # gem "radiant-clipped-extension",             "~> 1.1.0"
@@ -24,3 +31,9 @@ gem 'pry-byebug', :group => [:development, :test] if RUBY_VERSION >= "2.0.0"
 # gem "radiant-site_templates-extension",      "~> 1.0.4"
 # gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
 # gem "radiant-textile_filter-extension",      "~> 1.0.4"
+
+if ENV['TRAVIS']
+  gemspec :development_group => :test
+  gem "mysql"
+  gem "pg"
+end

CHANGELOG.md

@@ -0,0 +1,31 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.1.0)
+    sqlite3 (1.3.5)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  rails (= 2.3.18)
+  sqlite3 (= 1.3.5)

Gemfile

@@ -0,0 +1,37 @@
+source :rubygems
+
+# This is the minimum of dependency required to run 
+# the radiant instance generator, which is (normally)
+# the only time the radiant gem functions as an 
+# application. The instance has its own Gemfile, which
+# requires radiant and therefore pulls in every 
+# dependency mentioned in radiant.gemspec.
+
+gem "rails", "3.2.8"
+gem "sqlite3", "1.3.5", :group => [:development, :test], :platform => :ruby
+
+# When radiant is installed as a gem you can run all of
+# its tests and specs from an instance. If you're working
+# on radiant itself and you want to run specs from the 
+# radiant root directory, uncomment the lines below and
+# run `bundle install`.
+
+gemspec
+# gem "compass-rails", "~> 1.0.3"
+
+# gem "radiant-archive-extension",             "~> 1.0.7"
+# gem "radiant-clipped-extension",             "~> 1.1.0"
+# gem "radiant-debug-extension",               "~> 1.0.2"
+# gem "radiant-exporter-extension",            "~> 1.1.0"
+# gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+# gem "radiant-sheets-extension",              "~> 1.1.0.alpha"
+# gem "radiant-snippets-extension",            "~> 1.1.0.alpha"
+# gem "radiant-site_templates-extension",      "~> 1.0.4"
+# gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+# gem "radiant-textile_filter-extension",      "~> 1.0.4"
+
+if ENV['TRAVIS']
+  gemspec :development_group => :test
+  gem "mysql"
+  gem "pg"
+end

Gemfile.lock

@@ -1,20 +1,17 @@
 ## Welcome to Radiant
 
-_Radiant is making major changes. The master branch may be broken._
-
 Radiant is a no-fluff, open source content management system designed for
 small teams. It is similar to Textpattern or MovableType, but is a general
 purpose content management system (not just a blogging engine).
 
-[![Build Status](https://secure.travis-ci.org/radiant/radiant.png?branch=master)](http://travis-ci.org/radiant/radiant)
-[![Dependency Status](https://gemnasium.com/radiant/radiant.png)](https://gemnasium.com/radiant/radiant)
+[![Build Status](https://secure.travis-ci.org/radiant/radiant.png?branch=1.x)](http://travis-ci.org/radiant/radiant)
 
 Radiant features:
 
 * An elegant user interface
 * The ability to arrange pages in a hierarchy
 * Flexible templating with layouts, snippets, page parts, and a custom tagging
-  language (Radius: https://github.com/jlong/radius)
+  language (Radius: http://radius.rubyforge.org)
 * A simple user management/permissions system
 * Support for Markdown and Textile as well as traditional HTML (it's easy to
   create other filters)
@@ -26,16 +23,16 @@ Radiant features:
 
 ## License
 
-Radiant is released under the MIT license and is copyright (c) 2006-2014
-John W. Long, Sean Cribbs, and Jim Gay. A copy of the MIT license can be
-found in the LICENSE file.
+Radiant is released under the MIT license and is copyright (c) 2006-2009
+John W. Long and Sean Cribbs. A copy of the MIT license can be found in the
+LICENSE file.
 
 ## Installation and Setup
 
 Radiant is a traditional Ruby on Rails application, meaning that you can
 configure and run it the way you would a normal Rails application.
 
-See the [INSTALL](INSTALL.md) file for more details.
+See the INSTALL file for more details.
 
 ### Installation of a Prerelease
 
@@ -45,7 +42,7 @@ Install the prerelease gem with the following command:
 
     $ gem install radiant --prerelease
 
-This will install the gem with the prerelease name, for example: ‘radiant-2.0.0.alpha’.
+This will install the gem with the prerelease name, for example: ‘radiant-0.9.0.rc2’.
 
 ### Upgrading an Existing Project to a newer version
 
@@ -59,6 +56,12 @@ This will install the gem with the prerelease name, for example: ‘radiant-2.0.
 
 3. Restart the web server
 
+## Development Requirements
+
+To run tests you will need to have the following gems installed:
+
+  gem install ZenTest rspec rspec-rails cucumber webrat nokogiri sqlite3-ruby
+
 ## Support
 
 The best place to get support is on the mailing list:
@@ -76,6 +79,6 @@ http://wiki.github.com/radiant/radiant/
 
 Enjoy!
 
---  
-The Radiant Dev Team  
+--
+The Radiant Dev Team
 http://radiantcms.org

GemfileRails3

@@ -1,15 +1,12 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'combustion'
+require File.join(File.dirname(__FILE__), 'config', 'boot')
 
-# Dir["#{RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |taskfile| load taskfile }
-# Radiant::ExtensionPath.rake_task_paths.each { |taskfile| load taskfile }
+require 'rake'
+require 'rake/testtask'
+require 'rdoc/task'
 
-# APP_RAKEFILE = File.expand_path("../spec/internal/Rakefile", __FILE__)
-# load 'rails/tasks/engine.rake'
+require 'tasks/rails'
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
-
-Bundler::GemHelper.install_tasks
+unless Rake::Task.task_defined? "radiant:release"
+  Dir["#{RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |taskfile| load taskfile }
+  Radiant::ExtensionPath.rake_task_paths.each { |taskfile| load taskfile }
+end