rails_new 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_new (0.0.7)
+    rails_new (0.0.8)
       rails (= 3.2.9)
 
 GEM
@@ -41,7 +41,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -49,7 +49,7 @@ GEM
     mime-types (1.19)
     multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)

data/lib/files/Gemfile.erb

@@ -1,12 +1,17 @@
 source 'https://rubygems.org'
 ruby '1.9.3'
 
+gem 'rails', '3.2.10'
+gem 'jquery-rails'
 <%- if @haml -%>
 gem 'haml-rails'
 <%- end -%>
-gem 'jquery-rails'
 gem '<%= database_adapter %>'
-gem 'rails', '3.2.9'
+<%- if @twitter_bootstrap -%>
+gem 'therubyracer'
+gem 'less-rails'
+gem 'twitter-bootstrap-rails'
+<%- end -%>
 
 group :development do
   gem 'better_errors'

data/lib/files/config/database.yml.erb

@@ -1,31 +1,31 @@
 defaults: &defaults
-  adapter: <%= database_adapter %>
+  adapter: <%= database_yaml_adapter %>
   <%- if database_encoding -%>
   encoding: <%= database_encoding %>
   <%- end -%>
-  <%- if database_adapter == 'mysql2' %>
+  <%- if database_yaml_adapter == 'mysql2' %>
   reconnect: false
   <%- end -%>
   pool: 5
-  <%- if database_adapter == 'sqlite3' -%>
+  <%- if database_yaml_adapter == 'sqlite3' -%>
   timeout: 5000
   <%- end -%>
-  <%- if database_adapter != 'sqlite3' -%>
+  <%- if database_yaml_adapter != 'sqlite3' -%>
   username:
   password:
   <%- end -%>
-  <%- if database_adapter == 'mysql2' -%>
+  <%- if database_yaml_adapter == 'mysql2' -%>
   socket: /tmp/mysql.sock
   <%- end -%>
 
 development:
   <<: *defaults
-  <%= database_adapter == 'sqlite3' ? 'database: db/development.sqlite3' : "database: #{@app_name}_development" %>
+  <%= database_yaml_adapter == 'sqlite3' ? 'database: db/development.sqlite3' : "database: #{@app_name}_development" %>
 
 test:
   <<: *defaults
-  <%= database_adapter == 'sqlite3' ? 'database: db/test.sqlite3' : "database: #{@app_name}_test" %>
+  <%= database_yaml_adapter == 'sqlite3' ? 'database: db/test.sqlite3' : "database: #{@app_name}_test" %>
 
 production:
   <<: *defaults
-  <%= database_adapter == 'sqlite3' ? 'database: db/production.sqlite3' : "database: #{@app_name}" %>
+  <%= database_yaml_adapter == 'sqlite3' ? 'database: db/production.sqlite3' : "database: #{@app_name}" %>

data/lib/rails_new/version.rb

@@ -1,3 +1,3 @@
 module RailsNew
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/template.rb

@@ -31,11 +31,17 @@ def database_adapter
   when 'postgresql', 'postgres', 'psql' then 'pg'
   when 'mysql'                          then 'mysql2'
   when 'sqlite'                         then 'sqlite3'
-  when 'mongo', 'mongodb'               then 'mongoid'
   else @database
   end
 end
 
+def database_yaml_adapter
+  case database_adapter
+  when 'pg' then 'postgresql'
+  else database_adapter
+  end
+end
+
 def database_encoding
   case database_adapter
   when 'pg'     then 'unicode'
@@ -50,10 +56,10 @@ end
 @database            = prompt 'What database you want to use?', default_answer: 'postgresql'
 @customized          = yes? 'Would you like to customize the template options?'
 @create_commits      = yes? 'Create first git commits?'
-# @static_pages        = yes? 'Create static pages?'
-# @haml                = yes? 'Use HAML?'
+@static_pages        = yes? 'Create static pages?'
+@haml                = yes? 'Use HAML?'
 @pt_br_locales       = yes? 'Use brazilian portuguese locale (I18n)?'
-# @twitter_bootstrap   = yes? 'Install and configure Twitter Bootstrap Rails gem?'
+@twitter_bootstrap   = yes? 'Install and configure Twitter Bootstrap Rails gem?'
 # @devise              = yes? 'Install and configure Devise gem?'
 
 
@@ -78,6 +84,14 @@ if @pt_br_locales
   commit 'Including pt-br locales' if @create_commits
 end
 
-# route "map.root :controller => 'people'"
-# rake 'db:migrate'
-# rake 'twitter boostrap rake tasks...'
+if @twitter_bootstrap
+  system 'rails generate bootstrap:install less'
+  system 'rails generate bootstrap:layout application'
+  commit 'Installing twitter bootstrap gem' if @create_commits
+end
+
+if @static_pages
+  if @twitter_bootstrap
+  else
+  end
+end

data/spec/support/macros.rb

@@ -1,4 +1,4 @@
 def read_template
   file = File.expand_path("../../../lib/files/#{example.metadata[:example_group][:description]}.erb", __FILE__)
-  ERB.new(File.new(file).read, nil, '%').result(binding)
+  ERB.new(File.new(file).read, nil, '-', '@output_buffer').result(binding)
 end

data/spec/templates/files_spec.rb

@@ -25,6 +25,20 @@ describe 'files' do
       expect(read_template).to_not match(%r{gem 'haml-rails'})
     end
 
+    it 'includes twitter-bootstrap-rails gems' do
+      @twitter_bootstrap = true
+      [%r{therubyracer}, %r{less-rails}, %r{twitter-bootstrap-rails}].each do |group|
+        expect(read_template).to match(group)
+      end
+    end
+
+    it 'does not include twitter-bootstrap-rails gems' do
+      @twitter_bootstrap = false
+      [%r{therubyracer}, %r{less-rails}, %r{twitter-bootstrap-rails}].each do |group|
+        expect(read_template).to_not match(group)
+      end
+    end
+
     it 'includes database adapter gem' do
       expect(read_template).to match(%r{gem 'pg'})
     end
@@ -52,7 +66,7 @@ describe 'files' do
 
   describe 'config/database.yml' do
     before do
-      stub!(:database_adapter)
+      stub!(:database_yaml_adapter)
       stub!(:database_encoding)
     end
 
@@ -69,8 +83,8 @@ describe 'files' do
     end
 
     it 'includes the database adapter key' do
-      stub!(:database_adapter).and_return('pg')
-      expect(read_template).to match(%r{adapter: pg})
+      stub!(:database_yaml_adapter).and_return('postgresql')
+      expect(read_template).to match(%r{adapter: postgresql})
     end
 
     it 'includes the database encoding key' do
@@ -84,58 +98,58 @@ describe 'files' do
     end
 
     it 'includes the reconnect key' do
-      stub!(:database_adapter).and_return('mysql2')
+      stub!(:database_yaml_adapter).and_return('mysql2')
       expect(read_template).to match(%r{reconnect: false})
     end
 
     it 'does not include the reconnect key' do
-      stub!(:database_adapter).and_return('pg')
+      stub!(:database_yaml_adapter).and_return('postgresql')
       expect(read_template).to_not match(%r{reconnect:})
     end
 
     it 'includes the timeout key' do
-      stub!(:database_adapter).and_return('sqlite3')
+      stub!(:database_yaml_adapter).and_return('sqlite3')
       expect(read_template).to match(%r{timeout: 5000})
     end
 
     it 'does not include the timeout key' do
-      stub!(:database_adapter).and_return('pg')
+      stub!(:database_yaml_adapter).and_return('postgresql')
       expect(read_template).to_not match(%r{timeout:})
     end
 
     it 'has the username and password keys' do
-      stub!(:database_adapter).and_return('pg')
+      stub!(:database_yaml_adapter).and_return('postgresql')
       [%r{username:}, %r{password:}].each do |key|
         expect(read_template).to match(key)
       end
     end
 
     it 'has no the username and password keys' do
-      stub!(:database_adapter).and_return('sqlite3')
+      stub!(:database_yaml_adapter).and_return('sqlite3')
       [%r{username:}, %r{password:}].each do |key|
         expect(read_template).to_not match(key)
       end
     end
 
     it 'includes the socket key' do
-      stub!(:database_adapter).and_return('mysql2')
+      stub!(:database_yaml_adapter).and_return('mysql2')
       expect(read_template).to match(%r{socket: /tmp/mysql.sock})
     end
 
     it 'does not include the socket key' do
-      stub!(:database_adapter).and_return('pg')
+      stub!(:database_yaml_adapter).and_return('postgresql')
       expect(read_template).to_not match(%r{socket:})
     end
 
     it 'includes the sqlite databases' do
-      stub!(:database_adapter).and_return('sqlite3')
+      stub!(:database_yaml_adapter).and_return('sqlite3')
       [%r{database: db/development.sqlite3}, %r{database: db/test.sqlite3}, %r{database: db/production.sqlite3}].each do |database_name|
         expect(read_template).to match(database_name)
       end
     end
 
     it 'includes the databases keys' do
-      stub!(:database_adapter).and_return('pg')
+      stub!(:database_yaml_adapter).and_return('postgresql')
       @app_name = 'application_name'
       [%r{database: application_name_development}, %r{database: application_name_test}, %r{database: application_name}].each do |database_name|
         expect(read_template).to match(database_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_new
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 295243804331268507
+      hash: 2811988831036325912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 295243804331268507
+      hash: 2811988831036325912
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24