tsrails 2.0.2 → 2.0.3

data/README.md

@@ -117,6 +117,7 @@ Initializers (in config/initializers)
 Version History
 ---------------
 
+- 2.0.3 - 2012 Nov 15 - Modified to remove RVM integration since we're using rbenv now
 - 2.0.2 - 2012 Feb 23 - Minor release fix
 - 2.0.1 - 2012 Feb 23 - Modified template file to more easily change Ruby versions
 - 2.0.0 - 2012 Jan 30 - Updated for Rails 3.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'date'
 
-TSRAILS_GEM_VERSION = '2.0.2'
+TSRAILS_GEM_VERSION = '2.0.3'
 
 #############################################################################
 # Helper functions

data/template/files/Gem.gemfile

@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
-gem 'rake', '0.9.2'
+gem 'rake'
 
-gem 'rails', '3.2.1'
+gem 'rails'
 gem 'sqlite3'
-gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'bcrypt-ruby', '>= 3.0.0'
 gem 'meta_search',    '>= 1.1.0.pre'
 gem 'clearance'
 gem 'therubyracer'
@@ -27,7 +27,7 @@ group :development, :test do
   gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
   gem 'rails3-generators'
   gem 'annotate'
-  gem 'spork', '>= 0.9.0.rc'
+  gem 'spork'
   gem 'guard'
   gem 'guard-bundler'
   gem 'guard-coffeescript'
@@ -46,11 +46,11 @@ group :test do
   gem 'factory_girl_rails'
   gem 'capybara'
   gem 'launchy'
-  gem 'shoulda', '>= 3.0.0.beta'
+  gem 'shoulda'
 end
 
 group :assets do
-  gem 'sass-rails', "  ~> 3.2.3"
-  gem 'coffee-rails', "~> 3.2.1"
-  gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
 end

data/template/files/_flashes.html.haml

@@ -1,3 +1,3 @@
 #flashes
   - flash.each do |key, value|
-    %div{:class => key}= h(value)
+    %div{:class => "flash_#{key}"}= h(value)

data/template/files/application.html.haml

@@ -7,7 +7,7 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
     = yield :head
-  %body.bp.two-col
+  %body
     #container
       #header
         Web Site
@@ -19,3 +19,4 @@
         = render :partial => 'shared/javascript'
       #footer
         = render :partial => 'shared/footer'
+  = yield :javascript

data/template/files/env.rb

@@ -47,6 +47,7 @@ ActionController::Base.allow_rescue = false
 # subsequent scenarios. If you do this, we recommend you create a Before
 # block that will explicitly put your database in a known state.
 Cucumber::Rails::World.use_transactional_fixtures = true
+
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
 if defined?(ActiveRecord::Base)

data/template/tsrails_3_2.rb

@@ -8,6 +8,8 @@ require 'colored'
 require 'net/http'
 require 'net/ssh'
 
+DO_RVM = nil
+
 template_root = File.expand_path(File.join(File.dirname(__FILE__)))
 source_paths << File.join(template_root, "files")
 ruby_version = "1.9.3"
@@ -55,11 +57,13 @@ printf "**********************************************************************\n
 # RVM
 #============================================================================
 
-section "Making an RVM gemset for #{@app_name}"
-run "rvm #{ruby_version}"
-run "rvm gemset create #{@app_name}"
-run "rvm gemset use #{@app_name}"
-run "echo \"rvm ruby-#{ruby_version}@#{@app_name}\" > .rvmrc"
+unless DO_RVM.nil?
+  section "Making an RVM gemset for #{@app_name}"
+  run "rvm #{ruby_version}"
+  run "rvm gemset create #{@app_name}"
+  run "rvm gemset use #{@app_name}"
+  run "echo \"rvm ruby-#{ruby_version}@#{@app_name}\" > .rvmrc"
+end
 
 #============================================================================
 # Remove unneeded files
@@ -159,7 +163,6 @@ copy_file "spec.opts", "spec/spec.opts", :force => true
 copy_file "mailer_macros.rb", "spec/support/mailer_macros.rb", force: true
 copy_file "Guardfile", "Guardfile", force: true
 
-
 #============================================================================
 # Install Formtastic stuff
 #============================================================================

data/tsrails.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'tsrails'
-  s.version           = '2.0.2'
-  s.date              = '2012-02-23'
+  s.version           = '2.0.3'
+  s.date              = '2012-11-15'
 
   s.summary     = "Generate a Rails app using Taylored Software's best practices."
   s.description = <<-HERE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tsrails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70300100980240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300100980240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70300100973660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +37,12 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70300100973660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: ! "TSWRails is a base Rails project that you can upgrade. It is used
   by\nTaylored Software to get a jump start on a working app. \n"
 email: rubygems@taylored-software.com
@@ -103,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Generate a Rails app using Taylored Software's best practices.