raygun 0.0.33 → 0.0.34.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a963ff0bec70e834b463f5160d23005df560a863
-  data.tar.gz: 7ea0876404e14ece6b23e51e6a69b0c2b9ee52c4
+  metadata.gz: b4d9434122e177fd57963fcfefd3c1fd1cbce8f6
+  data.tar.gz: 9d5ad928a6d2332dcd136e040c136fbe05965bfb
 SHA512:
-  metadata.gz: c460a51f57ee62a80988b9d1443c588964d3bb310ec80d03806f3817408e921a505395c7418fc830f1c574fd4062c6e5b54b6a7f12da89e947062cda2b127bb5
-  data.tar.gz: b81c2c9d15fda971de9dc9c0b607c27cbc5bb0f6377c820291b76e731f253dd0f031e66e82c182daaa8206994ae3bbb30ed341114fe5e7a4dee4e1a2c431161d
+  metadata.gz: 03f3de95813102ae73262d44d21ff6581bb717fa1462a0e918d86076773898e6943dd3f9addf03a1aee4f77e66caa24cce2048525113a6c5735a55b1771c0659
+  data.tar.gz: 66f5d3b3e1ba79e5c45e55273b533e81eb91b4e8fa058ac65161bafe0d3885fc8ef6bf236764cf70d712a1c892a9b2071d08a0262408732aec25b1facc1bcb38

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.0.34 [2013-]
+
+* Upgrade to bootstrapo 3.0 (#114, thanks @drtoast!).
+* RSpec's rake task patterns use globs, and don't work with regular expressions as one might expect (#107, thanks @wless1!).
+* Include a deployment script for heroku and configuration for circleci for easy continuous deployment (#109, thanks @jonah-carbonfive!).
+
 ## 0.0.33 [2013-07-08]
 
 * Raygun defaults to generating Rails 4 apps now (use -r 32 for Rails 3.2).
@@ -31,7 +37,7 @@
 
 * Use unicorn by default instead of thin, as per heroku's recommendation.
 * Suppress schema dumping unless run in development mode to eliminate pg_dump errors on heroku during db:migrate.
-* Tweak mailcacher configuration so that it only sets smtp_settings when mailchacher is running.
+* Tweak mailcatcher configuration so that it only sets smtp_settings when mailcatcher is running.
 
 ## 0.0.27 [2013-02-27]
 

data/README.md

@@ -7,9 +7,11 @@
 Rails application generator that builds a new project skeleton configured with Carbon Five preferences and
 best practices baked right in. Spend less time configuring and more building cool features.
 
+Raygun generates Rails 4 projects by default. Use ```-r 32``` to generate a Rails 3.2 project.
+
 Major tools/libraries:
 
-* Rails (3.2.x or 4.0.x)
+* Rails (4.0 or 3.2)
 * PostgreSQL
 * Slim
 * Less
@@ -58,8 +60,7 @@ another ruby, just change the ```Gemfile``` and ```.ruby-version``` as necessary
 
     $ raygun your-project
 
-Try ```raygun -r 40 your-project``` to generate a Rails 4 project (pssst! does not include authentication
-or authorization yet).
+Try ```raygun -r 32 your-project``` to generate a Rails 3.2 project.
 
 Once your project is baked out, you can easily kick the wheels. Be sure that you have the prerequities
 covered (see above).

data/bin/raygun

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
+File.expand_path('../../lib', __FILE__).tap do |lib|
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+end
+
 require 'optparse'
 require 'ostruct'
 require 'fileutils'

data/lib/raygun/version.rb

@@ -1,3 +1,3 @@
 module Raygun
-  VERSION = "0.0.33"
+  VERSION = "0.0.34.pre2"
 end

data/rails_40/Gemfile

@@ -10,11 +10,11 @@ gem 'pg'
 
 gem 'slim-rails'
 gem 'less-rails'
-gem 'less-rails-bootstrap'
+gem 'less-rails-bootstrap', '~> 3.0.3'
 gem 'jquery-rails'
 gem 'coffee-rails'
 gem 'turbolinks'
-gem 'simple_form', '~> 3.0.0.rc'
+gem 'simple_form', '~> 3.0'
 gem 'uglifier'
 
 gem 'awesome_print'
@@ -44,7 +44,7 @@ group :development do
   gem 'launchy'
   gem 'better_errors'
   gem 'binding_of_caller'
-  gem 'guard'
+  gem 'guard', '~> 2'
   gem 'guard-rspec'
   gem 'guard-jasmine'
   gem 'guard-livereload'

data/rails_40/README.md

@@ -22,7 +22,8 @@ After cloning, run these commands to install missing gems and prepare the databa
     $ bundle update
     $ rake db:setup db:sample_data
 
-Note, ```rake db:sample_data``` loads a small set of data for development. Check out ```db/sample_data.rb``` for details.
+Note, ```rake db:sample_data``` loads a small set of data for development. Check out [db/sample_data.rb](db/sample_data.rb)
+for details.
 
 ### Running the Specs
 
@@ -48,14 +49,26 @@ Guard is configured to run ruby and jasmine specs, and also listen for livereloa
 ### Using Mailcatcher
 
     $ gem install mailcatcher
-    $ mailcacher
+    $ mailcatcher
     $ open http://localhost:1080/
 
 Learn more at [mailcatcher.me](http://mailcatcher.me/). And please don't add mailcatcher to the Gemfile.
 
-### Deploying to Heroku
+### Continuous Integration and Deployment with CircleCI
 
-Install the heroku toolbelt if you don't already have it (https://toolbelt.heroku.com/).
+This project is configured for continuous integration and deployment with CircleCI and Heroku. Follow
+these steps for first time configuration:
+
+1. Push the project to Github, if you haven't already.
+1. Authenticate at circleci.com and follow this project.
+1. Be sure to enable Heroku deploys from the project settings on CircleCI.
+1. The project should automatically be deployed on every successful build.
+
+Check out [circle.yml](circle.yml) and [bin/deploy.sh](bin/deploy.sh) for details.
+
+### Manual Deploy to Heroku
+
+Install the Heroku toolbelt if you don't already have it (https://toolbelt.heroku.com/).
 
     $ heroku apps:create app-prototype
     $ git push heroku master

data/rails_40/app/assets/stylesheets/_footer.less

@@ -1,4 +1,4 @@
-@footerHeight: 30px;
+@footer-height: 30px;
 
 html, body {
   height: 100%;
@@ -8,23 +8,23 @@ html, body {
   min-height: 100%;
   height: auto !important;
   height: 100%;
-  margin: 0 auto -(@footerHeight + 1);
+  margin: 0 auto -(@footer-height + 1);
 }
 
 .push {
-  height: @footerHeight + 20px; // The extra prevents content from bumping right into our footer.
+  height: @footer-height + 20px; // The extra prevents content from bumping right into our footer.
 }
 
 footer {
-  height: @footerHeight;
-  line-height: @footerHeight;
+  height: @footer-height;
+  line-height: @footer-height;
 
   .container {
-    border-top: 1px solid @grayLighter;
+    border-top: 1px solid @gray-lighter;
   }
 
   p {
     margin: 0;
-    color: @grayLight;
+    color: @gray-light;
   }
 }

data/rails_40/app/assets/stylesheets/_navbar.less

@@ -1,5 +1,3 @@
 // Navbar
 
-.wrapper > .container {
-  padding-top: 60px; // Push the content down so that it's below our pinned navbar.
-}
+body { padding-top: 70px; }

data/rails_40/app/views/layouts/application.html.slim

@@ -5,32 +5,35 @@ html
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tag
+    meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
 
   body id=(controller.controller_name) class=(controller.action_name)
     .wrapper
-      .container
-        header.navbar.navbar-fixed-top
-          nav.navbar-inner
-            .container
-              .brand App Prototype
-              /ul.nav.pull-right
-              /  - if current_user
-              /    li.dropdown
-              /      a.dropdown-toggle href='#' data-toggle='dropdown'
-              /        = current_user.email
-              /        b.caret
-              /      ul.dropdown-menu
-              /        li= link_to 'Sign Out', sign_out_path
-              /  - else
-              /    li= link_to 'Sign In', sign_in_path
+      nav.navbar.navbar-default.navbar-fixed-top role='navigation'
+        .navbar-header
+          button.button.navbar-toggle data-toggle='collapse' data-target='.navbar-collapse'
+            span.icon-bar
+            span.icon-bar
+            span.icon-bar
+          a.navbar-brand href='/' App Prototype
+        .collapse.navbar-collapse
+          ul.nav.navbar-nav.pull-right
+            / - if current_user
+            /  li.dropdown
+            /    a.dropdown-toggle href='#' data-toggle='dropdown'
+            /      = current_user.email
+            /      b.caret
+            /    ul.dropdown-menu
+            /      li= link_to 'Sign Out', sign_out_path
+            / - else
+            /  li= link_to 'Sign In', sign_in_path
 
+      .container
         - flash.each do |name, msg|
           = content_tag :div, raw(msg), class: "alert #{alert_class(name)}"
-
         = yield
+        .push
 
-      .push
-
-    footer
-      .container
-        p © 2013 All rights reserved.
+      footer
+        .container
+          p © 2013 All rights reserved.

data/rails_40/app/views/pages/root.html.slim

@@ -1,12 +1,13 @@
 javascript:
+  /* This little bit of silliness is here to ensure our js feature specs are working. Remove at will. */
   $(document).ready(function() {
-    $('.hero-unit p:last').after("<p>Enjoy!</p>")
+    $('.jumbotron p:last').after("<p>Enjoy!</p>")
   });
 
-.hero-unit
+.jumbotron
   h1 Hello, world!
   br
   p Welcome to your newly generated rails application...
   p Meander around the code to see what's been done for you. Many small, and a few not-so-small, customizations have been made.
   p Custom generator templates create views that are bootstrap compatible and specs that are factory-aware and follow best practices.
-  p Your applicated is ready for easy deployment to heroku.
+  p Your application is ready for easy deployment to heroku.

data/rails_40/bin/deploy.sh

@@ -0,0 +1,47 @@
+#!/bin/sh -e
+
+if [ $# -ne 1 ]; then
+  echo 1>&2 "Usage: $0 <application name>"
+  exit 1
+fi
+
+APP_NAME=$1
+
+if [ -n "$CIRCLE_SHA1" ]; then
+  SHA_TO_DEPLOY=$CIRCLE_SHA1
+else
+  echo "CIRCLE_SHA1 isn't set, deploying the latest revision."
+  SHA_TO_DEPLOY=`git rev-parse HEAD`
+fi
+
+REMOTE_MISSING=$(git remote | grep heroku | wc -l)
+
+if [ $REMOTE_MISSING -eq 0 ] ; then
+  git remote add heroku git@heroku.com:$APP_NAME.git
+fi
+
+git fetch heroku
+
+PREV_WORKERS=$(heroku ps --app $APP_NAME | grep "^worker." | wc -l | xargs)
+
+PENDING_MIGRATIONS=$(git diff HEAD heroku/master --name-only -- db | wc -l | xargs)
+
+echo "There are $PENDING_MIGRATIONS pending migrations."
+
+# Migrations require downtime so enter maintenance mode
+if [ $PENDING_MIGRATIONS -gt 0 ]; then
+  heroku maintenance:on --app $APP_NAME
+
+  # Make sure workers are not running during a migration
+  heroku scale worker=0 --app $APP_NAME
+fi
+
+# Deploy code changes (and implicitly restart the app and any running workers)
+git push -f heroku $SHA_TO_DEPLOY:refs/heads/master
+
+# Run database migrations if needed and restart background workers once finished
+if [ $PENDING_MIGRATIONS -gt 0 ]; then
+  heroku run rake db:migrate db:seed --app $APP_NAME
+  heroku scale worker=$PREV_WORKERS --app $APP_NAME
+  heroku maintenance:off --app $APP_NAME
+fi

data/rails_40/circle.yml

@@ -0,0 +1,16 @@
+test:
+  override:
+    - rake spec:without_features spec:features
+  post:
+    - bundle exec guard-jasmine
+
+deployment:
+  acceptance:
+    branch: master
+    commands:
+      - ./bin/deploy.sh app-prototype-acceptance
+
+  production:
+    branch: production 
+    commands:
+      - ./bin/deploy.sh app-prototype

data/rails_40/lib/tasks/spec.rake

@@ -5,7 +5,9 @@ begin
   namespace :spec do
     desc "Run the code examples in spec/ except those in spec/features"
     RSpec::Core::RakeTask.new('without_features' => 'db:test:prepare') do |t|
-      t.pattern = "./spec/[^features]**/**/*_spec.rb"
+      file_list = FileList['spec/**/*_spec.rb'].exclude("spec/features/**/*_spec.rb")
+
+      t.pattern = file_list
     end
   end
 

data/raygun.gemspec

@@ -1,7 +1,9 @@
 # -*- encoding: utf-8 -*-
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+File.expand_path('../lib', __FILE__).tap do |lib|
+  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+end
+
 require 'raygun/version'
 
 Gem::Specification.new do |gem|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34.pre2
 platform: ruby
 authors:
 - Christian Nelson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Carbon Five Rails application generator
 email:
@@ -91,7 +91,7 @@ files:
 - rails_32/config/environments/test.rb
 - rails_32/config/initializers/backtrace_silencers.rb
 - rails_32/config/initializers/inflections.rb
-- rails_32/config/initializers/mailcacher.rb
+- rails_32/config/initializers/mailcatcher.rb
 - rails_32/config/initializers/mime_types.rb
 - rails_32/config/initializers/secret_token.rb
 - rails_32/config/initializers/session_store.rb
@@ -188,8 +188,10 @@ files:
 - rails_40/app/views/layouts/application.html.slim
 - rails_40/app/views/pages/root.html.slim
 - rails_40/bin/bundle
+- rails_40/bin/deploy.sh
 - rails_40/bin/rails
 - rails_40/bin/rake
+- rails_40/circle.yml
 - rails_40/config.ru
 - rails_40/config/application.rb
 - rails_40/config/boot.rb
@@ -202,7 +204,7 @@ files:
 - rails_40/config/initializers/backtrace_silencers.rb
 - rails_40/config/initializers/filter_parameter_logging.rb
 - rails_40/config/initializers/inflections.rb
-- rails_40/config/initializers/mailcacher.rb
+- rails_40/config/initializers/mailcatcher.rb
 - rails_40/config/initializers/mime_types.rb
 - rails_40/config/initializers/secret_token.rb
 - rails_40/config/initializers/session_store.rb
@@ -264,12 +266,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Generates and customizes Rails applications with Carbon Five best practices