rails_new 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_new (0.0.4)
+    rails_new (0.0.5)
       rails (= 3.2.9)
 
 GEM
@@ -46,7 +46,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -70,10 +70,10 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.2.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/README.md

@@ -1,6 +1,6 @@
 ## About
 
-Customizable Rails template with Twitter Bootstrap, Devise and more!
+Bootstrap for Rails projects - Customizable Rails template with Twitter Bootstrap, Devise and more!
 
 ### Required Rails version
 

data/bin/rails_new

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # rails_new
 # https://github.com/lucascaton/rails_new
-# Created by Lucas Caton at 2012, november 23
+# Created by Lucas Caton at 2012, November 23
 
 app_name = ARGV.first
-system "rails new #{app_name} --skip-bundle --skip-test-unit -m https://raw.github.com/lucascaton/rails_new/master/lib/template.rb"
+system "rails new #{app_name} --skip-bundle --skip-test-unit -m #{File.expand_path('../../lib/template.rb', __FILE__)}"

data/lib/files/.gitignore.erb

@@ -0,0 +1,54 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+<%- if database_adapter == 'sqlite3' %>
+# Ignore the default SQLite database.
+/db/*.sqlite3
+<% end -%>
+
+# Ignore all logfiles and tempfiles
+/log/*.log
+/tmp
+
+# Ignore config files
+/config/database.yml
+
+# Ignore docs
+/doc/api
+/doc/app
+
+# Ignore public sub-directories
+/public/packages/*
+/public/system/*
+
+# Ignore files from text editors and IDEs
+Session.vim
+*.sw?
+
+# Ignore files from Operating System
+*~
+.DS_Store
+
+# Ignore files from Ctags
+/tags
+
+# Ignore files from RVM
+/.rvmrc
+
+# Ignore files from SASS
+/.sass-cache/
+
+# Ignore routes cache
+/.routes
+
+# Ignore simplecov files
+coverage/
+
+# Ignore other files
+rails_best_practices_output.html

data/lib/files/Gemfile.erb

@@ -0,0 +1,31 @@
+source 'https://rubygems.org'
+ruby '1.9.3'
+
+<%= @haml ? "gem 'haml-rails'" : '' %>
+gem 'jquery-rails'
+gem '<%= database_adapter %>'
+gem 'rails', '3.2.9'
+
+group :development do
+  gem 'thin'
+end
+
+group :development, :test do
+  gem 'pry'
+  gem 'awesome_print'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'factory_girl_rails'
+  gem 'forgery'
+  gem 'poltergeist'
+  gem 'rspec-rails'
+  gem 'simplecov', require: false
+end
+
+group :assets do
+  # gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
+end

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

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

data/lib/rails_new/version.rb

@@ -1,3 +1,3 @@
 module RailsNew
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/template.rb

@@ -1,12 +1,11 @@
 def yes?(question)
+  return true unless @customized
+
   answer = ask "     \e[1m\e[32mpromp".rjust(10) + "  \e[0m#{question} \e[33m(y/n)\e[0m"
   case answer.downcase
-  when 'yes', 'y'
-    true
-  when 'no', 'n'
-    false
-  else
-    yes?(question)
+  when 'yes', 'y' then true
+  when 'no',  'n' then false
+  else yes?(question)
   end
 end
 
@@ -15,9 +14,19 @@ def prompt(question, options)
   answer.present? ? answer : options[:default_answer]
 end
 
-def rewrite_file(file_name, content)
-  system "rm #{file_name} && > #{file_name}"
-  append_to_file(file_name, content)
+def apply_template(file)
+  # template "files/#{file}.erb", file, force: true
+  template "#{File.dirname(__FILE__)}/files/#{file}.erb", file, force: true
+  # first sed: remove duplicated empty lines
+  # second sed: remove lines with whitespaces
+  system "cat #{file} | sed '/^$/N;/^\\n$/D' | sed '/^ *$/d' > sed_output"
+  system "mv sed_output #{file}"
+end
+
+def commit(description)
+  system 'git add .'
+  system 'git add --update .'
+  system "git commit -am '#{description}'"
 end
 
 def database_adapter
@@ -25,120 +34,53 @@ 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
 
-
-@database = prompt 'What database you want to use?', default_answer: 'postgresql'
-@create_commits = true if yes?('Create first git commits?')
-
-remove_file 'public/index.html'
-remove_file 'app/assets/images/rails.png'
-
-rewrite_file 'Gemfile', %Q(
-source 'https://rubygems.org'
-ruby '1.9.3'
-
-gem 'haml-rails'
-gem 'jquery-rails'
-gem '#{database_adapter}'
-gem 'rails', '3.2.9'
-
-group :development do
-  gem 'thin'
-end
-
-group :development, :test do
-  gem 'pry'
-  gem 'awesome_print'
-end
-
-group :test do
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'factory_girl_rails'
-  gem 'forgery'
-  gem 'poltergeist'
-  gem 'rspec-rails'
-  gem 'simplecov', require: false
-end
-
-group :assets do
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'uglifier', '>= 1.0.3'
+def database_encoding
+  case database_adapter
+  when 'pg'     then 'unicode'
+  when 'mysql1' then 'utf8'
+  end
 end
-).strip
-
-rewrite_file '.gitignore', %Q(
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore all logfiles and tempfiles
-/log/*.log
-/tmp
-
-# Ignore config files
-/config/database.yml
-
-# Ignore docs
-/doc/api
-/doc/app
-
-# Ignore public sub-directories
-/public/packages/*
-/public/system/*
 
-# Ignore files from text editors and IDEs
-Session.vim
-*.sw?
 
-# Ignore files from Operating System
-*~
-.DS_Store
+@app_name   = `pwd`.gsub(/.*\/(.+)/, '\1').strip
+@customized = true
 
-# Ignore files from Ctags
-/tags
+@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?'
+@pt_br_locales       = yes? 'Use brazilian portuguese locale (I18n)?'
+# @twitter_bootstrap   = yes? 'Install and configure Twitter Bootstrap Rails gem?'
+# @devise              = yes? 'Install and configure Devise gem?'
 
-# Ignore files from RVM
-/.rvmrc
 
-# Ignore files from SASS
-/.sass-cache/
-
-# Ignore routes cache
-/.routes
-
-# Ignore simplecov files
-coverage/
+remove_file 'public/index.html'
+remove_file 'app/assets/images/rails.png'
 
-# Ignore other files
-rails_best_practices_output.html
-).strip
+apply_template 'Gemfile'
+apply_template '.gitignore'
+apply_template 'config/database.yml'
 
 system 'bundle install'
 
 if @create_commits
   system 'git init'
-  system 'git add .'
-  system "git commit -am 'Initial Rails directory structure'"
+  commit 'Initial Rails directory structure'
 end
 
-# if yes?('Install and configure Twitter Bootstrap Rails gem?')
-# end
-#
-# if yes?('Install and configure Devise gem?')
-# end
-
-if yes?('Use brazilian portuguese locale (I18n)?')
+if @pt_br_locales
   remove_file 'config/locales/en.yml'
   # Include config/locales*.pt-BR.yml files
   # Update config/application.rb
+  commit 'Including pt-br locales' if @create_commits
 end
+
+# route "map.root :controller => 'people'"
+# rake 'db:migrate'
+# rake 'twitter boostrap rake tasks...'

data/rails_new.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = RailsNew::VERSION
   gem.authors       = ['Lucas Caton']
   gem.email         = ['lucascaton@gmail.com']
-  gem.description   = %q{Customizable Rails template with Twitter Bootstrap, Devise and more!}
-  gem.summary       = %q{Customizable Rails template with Twitter Bootstrap, Devise and more!}
+  gem.description   = %q{Bootstrap for Rails projects - Customizable Rails template with Twitter Bootstrap, Devise and more!}
+  gem.summary       = %q{Bootstrap for Rails projects - Customizable Rails template with Twitter Bootstrap, Devise and more!}
   gem.homepage      = 'https://github.com/lucascaton/rails_new'
 
   gem.add_dependency 'rails', '3.2.9'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_new
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,7 +27,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.9
-description: Customizable Rails template with Twitter Bootstrap, Devise and more!
+description: Bootstrap for Rails projects - Customizable Rails template with Twitter
+  Bootstrap, Devise and more!
 email:
 - lucascaton@gmail.com
 executables:
@@ -48,6 +49,12 @@ files:
   UmFrZWZpbGU=
 - !binary |-
   YmluL3JhaWxzX25ldw==
+- !binary |-
+  bGliL2ZpbGVzLy5naXRpZ25vcmUuZXJi
+- !binary |-
+  bGliL2ZpbGVzL0dlbWZpbGUuZXJi
+- !binary |-
+  bGliL2ZpbGVzL2NvbmZpZy9kYXRhYmFzZS55bWwuZXJi
 - !binary |-
   bGliL3JhaWxzX25ldy92ZXJzaW9uLnJi
 - !binary |-
@@ -68,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4405151621816508930
+      hash: 4240153038540612432
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,11 +84,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4405151621816508930
+      hash: 4240153038540612432
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Customizable Rails template with Twitter Bootstrap, Devise and more!
+summary: Bootstrap for Rails projects - Customizable Rails template with Twitter Bootstrap,
+  Devise and more!
 test_files: []