rails_new 0.0.5 → 0.0.7

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_new (0.0.5)
+    rails_new (0.0.7)
       rails (= 3.2.9)
 
 GEM
@@ -36,6 +36,7 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.1)
@@ -73,6 +74,14 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.1)
+    rspec-expectations (2.12.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -90,3 +99,4 @@ PLATFORMS
 
 DEPENDENCIES
   rails_new!
+  rspec

data/lib/files/.gitignore.erb

@@ -7,10 +7,10 @@
 # Ignore bundler config
 /.bundle
 
-<%- if database_adapter == 'sqlite3' %>
+<%- if database_adapter == 'sqlite3' -%>
 # Ignore the default SQLite database.
 /db/*.sqlite3
-<% end -%>
+<%- end -%>
 
 # Ignore all logfiles and tempfiles
 /log/*.log

data/lib/files/Gemfile.erb

@@ -1,12 +1,15 @@
 source 'https://rubygems.org'
 ruby '1.9.3'
 
-<%= @haml ? "gem 'haml-rails'" : '' %>
+<%- if @haml -%>
+gem 'haml-rails'
+<%- end -%>
 gem 'jquery-rails'
 gem '<%= database_adapter %>'
 gem 'rails', '3.2.9'
 
 group :development do
+  gem 'better_errors'
   gem 'thin'
 end
 

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

@@ -1,12 +1,22 @@
 defaults: &defaults
   adapter: <%= database_adapter %>
-  <%= database_encoding ? "encoding: #{database_encoding}" : '' %>
-  <%= database_adapter == 'mysql2' ? 'reconnect: false' : '' %>
+  <%- if database_encoding -%>
+  encoding: <%= database_encoding %>
+  <%- end -%>
+  <%- if database_adapter == 'mysql2' %>
+  reconnect: false
+  <%- end -%>
   pool: 5
-  <%= database_adapter == 'sqlite3' ? 'timeout: 5000' : '' %>
+  <%- if database_adapter == 'sqlite3' -%>
+  timeout: 5000
+  <%- end -%>
+  <%- if database_adapter != 'sqlite3' -%>
   username:
   password:
-  <%= database_adapter == 'mysql2' ? 'socket: /tmp/mysql.sock' : '' %>
+  <%- end -%>
+  <%- if database_adapter == 'mysql2' -%>
+  socket: /tmp/mysql.sock
+  <%- end -%>
 
 development:
   <<: *defaults

data/lib/rails_new/version.rb

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

data/lib/template.rb

@@ -15,11 +15,8 @@ def prompt(question, options)
 end
 
 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 "sed '/^$/N;/^\\n$/D' #{file} > sed_output" # remove duplicated empty lines
   system "mv sed_output #{file}"
 end
 
@@ -42,7 +39,7 @@ end
 def database_encoding
   case database_adapter
   when 'pg'     then 'unicode'
-  when 'mysql1' then 'utf8'
+  when 'mysql2' then 'utf8'
   end
 end
 

data/rails_new.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/lucascaton/rails_new'
 
   gem.add_dependency 'rails', '3.2.9'
-  # gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+# Requires supporting ruby files with custom matchers
+Dir[File.expand_path('../support/*.rb', __FILE__)].each { |f| require f }

data/spec/support/macros.rb

@@ -0,0 +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)
+end

data/spec/templates/files_spec.rb

@@ -0,0 +1,145 @@
+require 'spec_helper'
+require 'erb'
+
+describe 'files' do
+  describe 'Gemfile' do
+    before do
+      stub!(:database_adapter).and_return('pg')
+    end
+
+    it 'has the correct source' do
+      expect(read_template).to match(%r{source 'https://rubygems.org'})
+    end
+
+    it 'has the correct Ruby version' do
+      expect(read_template).to match(%r{ruby '1.9.3'})
+    end
+
+    it 'includes haml-rails gem' do
+      @haml = true
+      expect(read_template).to match(%r{gem 'haml-rails'})
+    end
+
+    it 'does not include haml-rails gem' do
+      @haml = false
+      expect(read_template).to_not match(%r{gem 'haml-rails'})
+    end
+
+    it 'includes database adapter gem' do
+      expect(read_template).to match(%r{gem 'pg'})
+    end
+  end
+
+  describe '.gitignore' do
+    before do
+      stub!(:database_adapter)
+    end
+
+    it 'has the correct information' do
+      expect(read_template).to match(%r{# See http://help.github.com/ignore-files/ for more about ignoring files.})
+    end
+
+    it 'includes sqlite3 files' do
+      stub!(:database_adapter).and_return('sqlite3')
+      expect(read_template).to match(%r{/db/\*.sqlite3})
+    end
+
+    it 'does not include sqlite3 files' do
+      stub!(:database_adapter).and_return('pg')
+      expect(read_template).to_not match(%r{/db/\*.sqlite3})
+    end
+  end
+
+  describe 'config/database.yml' do
+    before do
+      stub!(:database_adapter)
+      stub!(:database_encoding)
+    end
+
+    it 'has the correct YAML groups' do
+      [%r{defaults: &defaults}, %r{development:}, %r{test:}, %r{production:}].each do |group|
+        expect(read_template).to match(group)
+      end
+    end
+
+    it 'has the default keys' do
+      [%r{pool: 5}].each do |key|
+        expect(read_template).to match(key)
+      end
+    end
+
+    it 'includes the database adapter key' do
+      stub!(:database_adapter).and_return('pg')
+      expect(read_template).to match(%r{adapter: pg})
+    end
+
+    it 'includes the database encoding key' do
+      stub!(:database_encoding).and_return('utf8')
+      expect(read_template).to match(%r{encoding: utf8})
+    end
+
+    it 'does not include the database encoding key' do
+      stub!(:database_encoding).and_return(nil)
+      expect(read_template).to_not match(%r{encoding:})
+    end
+
+    it 'includes the reconnect key' do
+      stub!(:database_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')
+      expect(read_template).to_not match(%r{reconnect:})
+    end
+
+    it 'includes the timeout key' do
+      stub!(:database_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')
+      expect(read_template).to_not match(%r{timeout:})
+    end
+
+    it 'has the username and password keys' do
+      stub!(:database_adapter).and_return('pg')
+      [%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')
+      [%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')
+      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')
+      expect(read_template).to_not match(%r{socket:})
+    end
+
+    it 'includes the sqlite databases' do
+      stub!(:database_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')
+      @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)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_new
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,6 +27,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.9
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bootstrap for Rails projects - Customizable Rails template with Twitter
   Bootstrap, Devise and more!
 email:
@@ -39,6 +55,8 @@ extra_rdoc_files: []
 files:
 - !binary |-
   LmdpdGlnbm9yZQ==
+- !binary |-
+  LnJzcGVj
 - !binary |-
   R2VtZmlsZQ==
 - !binary |-
@@ -61,6 +79,12 @@ files:
   bGliL3RlbXBsYXRlLnJi
 - !binary |-
   cmFpbHNfbmV3LmdlbXNwZWM=
+- !binary |-
+  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- !binary |-
+  c3BlYy9zdXBwb3J0L21hY3Jvcy5yYg==
+- !binary |-
+  c3BlYy90ZW1wbGF0ZXMvZmlsZXNfc3BlYy5yYg==
 homepage: https://github.com/lucascaton/rails_new
 licenses: []
 post_install_message: 
@@ -75,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4240153038540612432
+      hash: 295243804331268507
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4240153038540612432
+      hash: 295243804331268507
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -92,4 +116,10 @@ signing_key:
 specification_version: 3
 summary: Bootstrap for Rails projects - Customizable Rails template with Twitter Bootstrap,
   Devise and more!
-test_files: []
+test_files:
+- !binary |-
+  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- !binary |-
+  c3BlYy9zdXBwb3J0L21hY3Jvcy5yYg==
+- !binary |-
+  c3BlYy90ZW1wbGF0ZXMvZmlsZXNfc3BlYy5yYg==