sparkler 0.3.3 → 0.4.0

data/lib/sparkler/app_builder.rb

@@ -32,9 +32,9 @@ module Sparkler
       new_gems = File.open(additions_path).read
       inject_into_file 'Gemfile', "\n#{new_gems}", after: /gem 'sqlite3'/
 
-      asset_gems = <<-END.gsub(/^  {6}/, '')
-         gem 'compass-rails', '~> 1.0.3'
+      asset_gems = <<-END.gsub(/^  {4}/, '')
          gem 'zurb-foundation'
+         gem 'compass-rails', github: 'milgner/compass-rails', ref: '1749c06f15dc4b058427e7969810457213647fb8'
       END
 
       inject_into_file 'Gemfile', "\n#{asset_gems}", after: /gem 'uglifier'.*$/
@@ -42,10 +42,12 @@ module Sparkler
 
     def use_sqlite_config_template
       template 'database.sqlite.yml.erb', 'config/database.yml', force: true
+      template 'database.sqlite.yml.erb', 'config/database.example.yml', force: true
     end
 
     def use_postgres_config_template
       template 'database.postgres.yml.erb', 'config/database.yml', force: true
+      template 'database.postgres.yml.erb', 'config/database.example.yml', force: true
     end
 
     def setup_local_postgres
@@ -88,7 +90,7 @@ module Sparkler
     end
 
     def setup_foundation
-      generate 'foundation:install'
+      generate 'foundation:install --skip'
     end
 
     def add_foundation_to_application
@@ -100,13 +102,19 @@ module Sparkler
       copy_file 'env', '.env'
     end
 
-    def remove_routes_comment_lines
-      replace_in_file 'config/routes.rb', /Application\.routes\.draw do.*end/m, "Application.routes.draw do\nend"
+    def setup_sentry
+      copy_file 'raven.rb', 'config/initializers/raven.rb'
+    end
+
+    def setup_scripts
+      %w(bootstrap data).each do |file|
+        copy_file file, "script/#{file}"
+        chmod "script/#{file}", 0755
+      end
     end
 
-    def generate_cucumber
-      generate 'cucumber:install', '--rspec', '--capybara'
-      copy_file 'cucumber_javascript.rb', 'features/support/javascript.rb'
+    def remove_routes_comment_lines
+      replace_in_file 'config/routes.rb', /Application\.routes\.draw do.*end/m, "Application.routes.draw do\nend"
     end
 
     def configure_generators

data/lib/sparkler/generators/app_generator.rb

@@ -22,10 +22,11 @@ module Sparkler
       invoke :create_views_and_layouts
       invoke :copy_miscellaneous_files
       invoke :setup_foundation
+      invoke :setup_sentry
       invoke :setup_env
-      invoke :setup_cucumber
       invoke :setup_rspec
       invoke :setup_git
+      invoke :setup_scripts
     end
 
     def remove_useless_files
@@ -53,7 +54,6 @@ module Sparkler
       say 'Creating layouts and partials'
       build :create_partials_directory
       build :create_shared_flashes
-      build :create_application_layout
 
       say 'Setting up High Voltage and a home page'
       build :setup_high_voltage
@@ -63,12 +63,18 @@ module Sparkler
       say 'Generating Foundation'
       build :setup_foundation
       build :add_foundation_to_application
+      build :create_application_layout
+    end
+
+    def setup_sentry
+      say 'Configuring Sentry'
+      build :setup_sentry
     end
 
     def customize_gemfile
       say 'Setting up gems and bundling'
       build :add_custom_gems
-      bundle_command 'install --binstubs --path vendor'
+      bundle_command 'install --path vendor'
       bundle_command 'package'
     end
 
@@ -84,6 +90,11 @@ module Sparkler
       build :ignore_local_postgres if options[:local_database]
     end
 
+    def setup_scripts
+      say 'Adding convenience scripts'
+      build :setup_scripts
+    end
+
     def copy_miscellaneous_files
       say 'Copying miscellaneous support files'
       build :copy_miscellaneous_files
@@ -94,12 +105,6 @@ module Sparkler
       build :add_env_from_template
     end
 
-    def setup_cucumber
-      say 'Installing and configuring Cucumber'
-      build :generate_cucumber
-      say "Don't forget to install chromedriver if you haven't already."
-    end
-
     def setup_rspec
       say 'Configuring Rspec'
       build :configure_rspec

data/lib/sparkler/version.rb

@@ -1,3 +1,3 @@
 module Sparkler
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/sparkler.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/sparkler/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "sparkler"
   gem.version       = Sparkler::VERSION
-  gem.date          = Date.today.strftime('%Y-%m-%d')
+  gem.date          = Time.now.strftime('%Y-%m-%d')
   gem.authors       = ["Chris Moore"]
-  gem.email         = ["chrism@gaslightsoftware.com"]
+  gem.email         = ["chrism@gaslight.co"]
   gem.summary       = %q{Generate a Rails app using Gaslight's choices of gems and frameworks.}
   gem.description   = %q{Spin up a Rails app using all the tools and frameworks we like at Gaslight. Inspired heavily by thoughtbot's Suspenders.}
   gem.homepage      = "https://github.com/gaslight/sparkler"
@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'rails', '3.2.12'
+  gem.add_dependency 'rails', '4.0.0'
   gem.add_dependency 'bundler', '>= 1.1'
 end

data/templates/Gemfile_additions

@@ -1,25 +1,18 @@
-gem 'thin'
+gem 'puma'
 gem 'haml-rails'
 gem 'high_voltage', ">= 1.2.0"
 gem 'rdiscount'
-gem 'airbrake'
-
-group :development do
-  gem 'foreman'
-end
+gem 'sentry-raven'
 
 group :development, :test do
-  gem 'rspec-rails', '~> 2.9.0'
-  gem 'dotenv'
+  gem 'rspec-rails'
+  gem 'dotenv-rails'
 end
 
 group :test do
-  gem 'cucumber-rails', '1.3.0', :require => false
   gem 'factory_girl_rails'
   gem 'database_cleaner'
   gem 'timecop'
-  gem 'shoulda-matchers'
-  gem 'launchy'
 end
 
 group :staging, :production do

data/templates/Procfile

@@ -1,2 +1,2 @@
-web: bundle exec thin start -p $PORT
+web: bundle exec rails server -p $PORT
 <% if options[:local_database] %>db: postgres -D pg<% end %>

data/templates/application.css.sass

@@ -1,3 +1,4 @@
+@import compass/css3
 @import foundation_and_overrides
 
 body

data/templates/application_layout.html.haml

@@ -8,16 +8,15 @@
     = stylesheet_link_tag    "application"
     = csrf_meta_tags
   %body
-    #wrapper.container
-      %header.row
-        .columns.twelve
-          %h1 Header
-      #main.row
-        .columns.twelve
-          = render 'application/flashes'
-          = yield
-      %footer.row
-        .columns.twelve
-          %p © #{Date.today.year} Gaslight Software LLC. All Rights Reserved.
+    %header.row
+      .columns.large-12
+        %h1 Header
+    #main.row
+      .columns.large-12
+        = render 'application/flashes'
+        = yield
+    %footer.row
+      .columns.large-12
+        %p © #{Date.today.year} Gaslight LLC. All Rights Reserved.
     = javascript_include_tag "application"
     = content_for(:javascript)

data/templates/bootstrap

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+set -e
+
+echo ""
+echo " Setting up..."
+echo ""
+
+#
+# Check for Bundler
+#
+if test ! $(which bundle)
+then
+  echo "  x You need to install Bundler:"
+  echo "    gem install bundler"
+  exit
+else
+  echo "  + Bundler found."
+fi
+
+#
+# Install gems
+#
+echo "  + Bootstrapping your Rubies."
+bundle install --without production --local --path vendor --quiet
+
+#
+# Setting up database.yml
+#
+echo "  + Setup config/database.yml"
+cp config/database.example.yml config/database.yml
+
+#
+# Setting up database
+#
+echo "  + Setting up database..."
+rake db:setup
+
+echo ""
+echo "Ok, setup complete. Run"
+echo "  rails server"
+echo "to start the application."
+

data/templates/data

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+dropdb DB_NAME_dev
+createdb DB_NAME_dev
+
+heroku pgbackups:capture --expire --app HEROKU_APP_NAME
+curl -Lo latest.dump `heroku pgbackups:url --app HEROKU_APP_NAME`
+pg_restore --verbose --no-acl --no-owner -d DB_NAME_dev latest.dump
+

data/templates/en.yml

@@ -0,0 +1,31 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  date:
+    formats:
+      nice: "%B %e, %Y"
+      year: "%Y"
+      year_and_month: "%B of %Y"
+  time:
+    formats:
+      nice: "%B %e, %Y %l:%M%p"
+

data/templates/env

@@ -1,2 +1,3 @@
 PORT=3000
+SENTRY_DSN=12345
 

data/templates/gitignore_additions

@@ -1,4 +1,3 @@
 
 # Vendor Everything
-/bin/
 /vendor/ruby/

data/templates/raven.rb

@@ -0,0 +1,5 @@
+require 'raven'
+
+Raven.configure do |config|
+  config.dsn = ENV.fetch('SENTRY_DSN')
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparkler
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
 description: Spin up a Rails app using all the tools and frameworks we like at Gaslight.
   Inspired heavily by thoughtbot's Suspenders.
 email:
-- chrism@gaslightsoftware.com
+- chrism@gaslight.co
 executables:
 - sparkler
 extensions: []
@@ -69,12 +69,15 @@ files:
 - templates/_flashes.html.haml
 - templates/application.css.sass
 - templates/application_layout.html.haml
-- templates/cucumber_javascript.rb
+- templates/bootstrap
+- templates/data
 - templates/database.postgres.yml.erb
 - templates/database.sqlite.yml.erb
+- templates/en.yml
 - templates/env
 - templates/gitignore_additions
 - templates/home.html.haml
+- templates/raven.rb
 - templates/time_formats.rb
 - test/lib/sparkler/version_test.rb
 - test/test_helper.rb

data/templates/cucumber_javascript.rb

@@ -1,5 +0,0 @@
-Capybara.register_driver :chrome do |app|
-  Capybara::Selenium::Driver.new(app, :browser => :chrome)
-end
-
-Capybara.javascript_driver = :chrome