Permalink
Browse files

first few rails 3 tweaks

  • Loading branch information...
1 parent 10fd1b0 commit f5092cfb66e74df6250f0390408a9467f59a7ef2 @ethn ethn committed Oct 4, 2011
Showing with 194 additions and 84 deletions.
  1. +28 −26 Gemfile
  2. +91 −51 Gemfile.lock
  3. +11 −1 Rakefile
  4. +48 −0 config/application.rb
  5. +16 −6 config/boot.rb
View
54 Gemfile
@@ -7,17 +7,17 @@ source 'http://rubygems.org'
# must have all of these
-gem 'rails', '2.3.11'
-gem 'rack', '>=1.1.0'
-gem 'rake', '>=0.8.7'
-
-gem 'htmlentities', '~>4.2.1'
-gem 'macaddr', '~>1.0.0'
-gem 'uuid', '~>2.2.0'
-gem 'json', '~>1.4.6'
+gem 'rails', '>=3'
+#gem 'rack', '>=1.1.0'
+gem 'rake'#, '>=0.8.7'
+
+gem 'htmlentities'#, '~>4.2.1'
+gem 'macaddr'#, '~>1.0.0'
+gem 'uuid'#, '~>2.2.0'
+gem 'json'#, '~>1.4.6'
#gem 'userstamp', '~>2.0.1'
-gem 'ruby-openid', '~>2.1.8'
+gem 'ruby-openid'#, '~>2.1.8'
# ~~~~~~~~~ #
@@ -27,8 +27,10 @@ gem 'ruby-openid', '~>2.1.8'
# need at least one of the following
#gem 'sqlite3-ruby', :require => 'sqlite3', :group=>'sqlite'
-#gem 'postgres', '~>0.7.9.2008.01.28', :group=>'postgres'
-gem 'pg', '~>0.7', :group=>'postgres'
+group :postgres do
+ #gem 'postgres', '~>0.7.9.2008.01.28', :group=>'postgres'
+ gem 'pg', '~>0.7'
+end
gem 'mysql', '~>2.8.1', :group=>'mysql'
# ~~~~~~~~~~~~~~ #
@@ -49,7 +51,7 @@ end
# ~~~~~~~ #
group :hosting do
- gem 'hoptoad_notifier', '>=2.3.12'
+# gem 'hoptoad_notifier', '>=2.3.12'
gem 'aws-s3','>=0.6.2'
gem 'newrelic_rpm', '>=2.14.1'
end
@@ -67,20 +69,20 @@ group :test do
gem 'win32console', '1.3.0', :platforms => ['mingw', 'mswin']
gem 'win32-process', '0.6.5', :platforms => ['mingw', 'mswin']
- gem 'test-unit', '1.2.3'
- gem 'term-ansicolor', '1.0.5'
- gem 'nokogiri', '1.4.1'
- gem 'timecop', '>=0.2.1'
- gem 'spork', '>=0.5.7'
- gem 'assert2', '0.5.5'
- gem 'webrat', '>=0.7.0'
- gem 'rspec', '~>1.3', :require=>'spec'
- gem 'rspec-rails', '~>1.3'
- gem 'email_spec', '~>0.6.2'
- gem 'gherkin', '>=2.2.8'
- gem 'cucumber', '>=0.9.2'
- gem 'cucumber-rails', '0.3.2'
- gem 'database_cleaner', '0.5.0'
+ gem 'test-unit'#, '1.2.3'
+ gem 'term-ansicolor'#, '1.0.5'
+ gem 'nokogiri'#, '1.4.1'
+ gem 'timecop'#, '>=0.2.1'
+ gem 'spork'#, '>=0.5.7'
+ gem 'assert2'#, '0.5.5'
+# gem 'webrat'#, '>=0.7.0'
+ gem 'rspec'#, '~>1.3', :require=>'spec'
+# gem 'rspec-rails'#, '~>1.3'
+ gem 'email_spec'#, '~>0.6.2'
+ gem 'gherkin'#, '>=2.2.8'
+ gem 'cucumber'#, '>=0.9.2'
+ gem 'cucumber-rails'#, '0.3.2'
+ gem 'database_cleaner'#, '0.5.0'
# gem 'ZenTest', '4.4.0'
# gem 'autotest-rails', '<= 4.1.0'
View
@@ -1,22 +1,43 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (2.3.11)
- actionpack (= 2.3.11)
- actionpack (2.3.11)
- activesupport (= 2.3.11)
- rack (~> 1.1.0)
- activerecord (2.3.11)
- activesupport (= 2.3.11)
- activeresource (2.3.11)
- activesupport (= 2.3.11)
- activesupport (2.3.11)
+ actionmailer (3.1.0)
+ actionpack (= 3.1.0)
+ mail (~> 2.3.0)
+ actionpack (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.0.3)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.0)
+ activemodel (3.1.0)
+ activesupport (= 3.1.0)
+ bcrypt-ruby (~> 3.0.0)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ activesupport (3.1.0)
+ multi_json (~> 1.0)
archive-tar-minitar (0.5.2)
+ arel (2.2.1)
assert2 (0.5.5)
aws-s3 (0.6.2)
builder
mime-types
xml-simple
+ bcrypt-ruby (3.0.1)
builder (3.0.0)
columnize (0.3.4)
cucumber (1.0.2)
@@ -31,39 +52,56 @@ GEM
diff-lcs (1.1.3)
email_spec (0.6.6)
rspec
+ erubis (2.7.0)
gherkin (2.4.21)
json (>= 1.4.6)
+ hike (1.2.1)
hoe (2.12.3)
rake (~> 0.8)
- hoptoad_notifier (2.4.11)
- activesupport
- builder
htmlentities (4.2.4)
+ i18n (0.6.0)
json (1.4.6)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
macaddr (1.0.0)
+ mail (2.3.0)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
mime-types (1.16)
+ multi_json (1.0.3)
mysql (2.8.1)
newrelic_rpm (3.1.2)
nokogiri (1.4.1)
pg (0.11.0)
- rack (1.1.2)
+ polyglot (0.3.2)
+ rack (1.3.4)
+ rack-cache (1.0.3)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
+ rack (>= 1.0.0)
+ rack-ssl (1.3.2)
+ rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (2.3.11)
- actionmailer (= 2.3.11)
- actionpack (= 2.3.11)
- activerecord (= 2.3.11)
- activeresource (= 2.3.11)
- activesupport (= 2.3.11)
- rake (>= 0.8.3)
+ rails (3.1.0)
+ actionmailer (= 3.1.0)
+ actionpack (= 3.1.0)
+ activerecord (= 3.1.0)
+ activeresource (= 3.1.0)
+ activesupport (= 3.1.0)
+ bundler (~> 1.0)
+ railties (= 3.1.0)
+ railties (3.1.0)
+ actionpack (= 3.1.0)
+ activesupport (= 3.1.0)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
rake (0.9.2)
rdoc (3.9.4)
rspec (1.3.2)
- rspec-rails (1.3.4)
- rack (>= 1.0.0)
- rspec (~> 1.3.1)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -76,50 +114,52 @@ GEM
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
spork (0.8.5)
+ sprockets (2.0.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
term-ansicolor (1.0.5)
test-unit (1.2.3)
hoe (>= 1.5.1)
+ thor (0.14.6)
+ tilt (1.3.3)
timecop (0.3.5)
+ treetop (1.4.10)
+ polyglot
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.30)
uuid (2.2.0)
macaddr (~> 1.0)
- webrat (0.7.3)
- nokogiri (>= 1.2.0)
- rack (>= 1.0)
- rack-test (>= 0.5.3)
xml-simple (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
- assert2 (= 0.5.5)
+ assert2
aws-s3 (>= 0.6.2)
- cucumber (>= 0.9.2)
- cucumber-rails (= 0.3.2)
- database_cleaner (= 0.5.0)
- email_spec (~> 0.6.2)
- gherkin (>= 2.2.8)
- hoptoad_notifier (>= 2.3.12)
- htmlentities (~> 4.2.1)
- json (~> 1.4.6)
- macaddr (~> 1.0.0)
+ cucumber
+ cucumber-rails
+ database_cleaner
+ email_spec
+ gherkin
+ htmlentities
+ json
+ macaddr
mysql (~> 2.8.1)
newrelic_rpm (>= 2.14.1)
- nokogiri (= 1.4.1)
+ nokogiri
pg (~> 0.7)
- rack (>= 1.1.0)
- rails (= 2.3.11)
- rake (>= 0.8.7)
+ rails (>= 3)
+ rake
rdoc
- rspec (~> 1.3)
- rspec-rails (~> 1.3)
+ rspec
ruby-debug19
- ruby-openid (~> 2.1.8)
- spork (>= 0.5.7)
- term-ansicolor (= 1.0.5)
- test-unit (= 1.2.3)
- timecop (>= 0.2.1)
- uuid (~> 2.2.0)
- webrat (>= 0.7.0)
+ ruby-openid
+ spork
+ term-ansicolor
+ test-unit
+ timecop
+ uuid
win32-process (= 0.6.5)
win32console (= 1.3.0)
View
@@ -1,3 +1,13 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+SampleRails::Application.load_tasks
+
+=begin
+
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
@@ -19,4 +29,4 @@ task :setup do
end
task :environment => :setup
-
+=end
View
@@ -0,0 +1,48 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+if defined?(Bundler)
+ # If you precompile assets before deploying to production, use this line
+ Bundler.require *Rails.groups(:assets => %w(development test))
+ # If you want your assets lazily compiled in production, use this line
+ # Bundler.require(:default, :assets, Rails.env)
+end
+
+module SampleRails
+ class Application < Rails::Application
+ # Settings in config/environments/* take precedence over those specified here.
+ # Application configuration should go into files in config/initializers
+ # -- all .rb files in that directory are automatically loaded.
+
+ # Custom directories with classes and modules you want to be autoloadable.
+ # config.autoload_paths += %W(#{config.root}/extras)
+
+ # Only load the plugins named here, in the order given (default is alphabetical).
+ # :all can be used as a placeholder for all plugins not explicitly named.
+ # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+ # Activate observers that should always be running.
+ # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+ # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+ # config.time_zone = 'Central Time (US & Canada)'
+
+ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+ # config.i18n.default_locale = :de
+
+ # Configure the default encoding used in templates for Ruby 1.9.
+ config.encoding = "utf-8"
+
+ # Configure sensitive parameters which will be filtered from the log file.
+ config.filter_parameters += [:password]
+
+ # Enable the asset pipeline
+ config.assets.enabled = true
+
+ # Version of your assets, change this if you want to expire all your assets
+ config.assets.version = '1.0'
+ end
+end
Oops, something went wrong.

0 comments on commit f5092cf

Please sign in to comment.