sparkler 0.2.2 → 0.3.0

data/lib/sparkler/app_builder.rb

@@ -30,7 +30,7 @@ module Sparkler
     def add_custom_gems
       additions_path = find_in_source_paths 'Gemfile_additions'
       new_gems = File.open(additions_path).read
-      inject_into_file 'Gemfile', "\n#{new_gems}", after: /gem 'jquery-rails'/
+      inject_into_file 'Gemfile', "\n#{new_gems}", after: /gem 'rails'.*$/
 
       asset_gems = <<-END.gsub(/^  {6}/, '')
          gem 'compass-rails', '~> 1.0.3'
@@ -40,8 +40,12 @@ module Sparkler
       inject_into_file 'Gemfile', "\n#{asset_gems}", after: /gem 'uglifier'.*$/
     end
 
+    def use_sqlite_config_template
+      template 'database.sqlite.yml.erb', 'config/database.yml', force: true
+    end
+
     def use_postgres_config_template
-      template 'database.yml.erb', 'config/database.yml', force: true
+      template 'database.postgres.yml.erb', 'config/database.yml', force: true
     end
 
     def setup_local_postgres
@@ -52,12 +56,16 @@ module Sparkler
       append_file '.git/info/exclude', '/pg/'
     end
 
-    def create_database
+    def create_postgres_database
       pid = fork { exec 'postgres', '-D', 'pg' }
       bundle_command 'exec rake db:create'
       Process.kill "INT", pid
     end
 
+    def create_sqlite_database
+      bundle_command 'exec rake db:create'
+    end
+
     def setup_gitignore
       gitignore_file = find_in_source_paths('gitignore_additions')
       gitignore = File.open(gitignore_file).read
@@ -101,17 +109,19 @@ module Sparkler
       copy_file 'cucumber_javascript.rb', 'features/support/javascript.rb'
     end
 
-    def configure_rspec
-      generators_config = <<-RUBY.gsub(/^   {6}/, '')
+    def configure_generators
+      generators_config = <<-RUBY.gsub(/^   {2}/, '')
         config.generators do |generate|
-          generate.test_framework :rspec
-          generate.helper false
-          generate.stylesheets false
-          generate.javascript_engine false
-          generate.view_specs false
-        end
+          generate.helper              false
+          generate.assets              false
+          generate.view_specs          false
+        end\n
       RUBY
       inject_into_class 'config/application.rb', 'Application', generators_config
+    end
+
+    def configure_rspec
+      inject_into_file 'config/application.rb', "      generate.test_framework      :rspec\n", after: "config.generators do |generate|\n"
       generate 'rspec:install'
     end
   end

data/lib/sparkler/generators/app_generator.rb

@@ -4,7 +4,7 @@ require 'rails/generators/rails/app/app_generator'
 module Sparkler
   class AppGenerator < Rails::Generators::AppGenerator
     class_option :skip_test_unit, type: :boolean, aliases: '-T', default: true, desc: 'Skip Test::Unit files'
-    class_option :database, type: :string, aliases: '-d', default: 'postgresql', desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+    class_option :database, type: :string, aliases: '-d', default: 'sqlite3', desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
     class_option :local_database, type: :boolean, aliases: '--local-database', default: false, desc: "Create a pg folder in the application"
 
     def finish_template
@@ -13,6 +13,7 @@ module Sparkler
     end
 
     def sparkler_customization
+      invoke :configure_generators
       invoke :customize_gemfile
       invoke :setup_database
       invoke :remove_useless_files
@@ -33,10 +34,13 @@ module Sparkler
     end
 
     def setup_database
-      if 'postgresql' == options[:database]
+      if options[:database] == 'postgresql'
         build :use_postgres_config_template
         build :setup_local_postgres if options[:local_database]
-        build :create_database
+        build :create_postgres_database
+      elsif options[:database] == 'sqlite3'
+        build :use_sqlite_config_template
+        build :create_sqlite_database
       end
     end
 
@@ -68,6 +72,11 @@ module Sparkler
       bundle_command 'package'
     end
 
+    def configure_generators
+      say 'Configuring generators'
+      build :configure_generators
+    end
+
     def setup_git
       say 'Initalizing git repo'
       build :setup_gitignore

data/lib/sparkler/version.rb

@@ -1,3 +1,3 @@
 module Sparkler
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/templates/_flashes.html.haml

@@ -1,3 +1,3 @@
 - flash.each do |level, message|
-  = content_tag(:div, message, class: "flash #{message}")
+  = content_tag(:div, message, class: "flash #{level}")
 

data/templates/database.sqlite.yml.erb

@@ -0,0 +1,8 @@
+development: &default
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+
+test: &TEST
+  <<: *default
+  database: db/test.sqlite3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparkler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70106798067920 !ruby/object:Gem::Requirement
+  requirement: &70209236171920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70106798067920
+  version_requirements: *70209236171920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70106798067420 !ruby/object:Gem::Requirement
+  requirement: &70209236171420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70106798067420
+  version_requirements: *70209236171420
 description: Spin up a Rails app using all the tools and frameworks we like at Gaslight.
   Inspired heavily by thoughtbot's Suspenders.
 email:
@@ -60,7 +60,8 @@ files:
 - templates/application.css.sass
 - templates/application_layout.html.haml
 - templates/cucumber_javascript.rb
-- templates/database.yml.erb
+- templates/database.postgres.yml.erb
+- templates/database.sqlite.yml.erb
 - templates/env
 - templates/gitignore_additions
 - templates/home.html.haml