philosophies-suspenders 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a982c6590778438fcb8339dc511202137777de9
-  data.tar.gz: f75305597dee18f3b83fff5ec37f0e3966c9a279
+  metadata.gz: f4d6c7f9c63ca8ae28fdc7a6b1e28a33287b6de1
+  data.tar.gz: 4a0c56e3cfce4a914bd73769803beafcf1243174
 SHA512:
-  metadata.gz: a7fa4ade06a61496f4b40cecacade97db4a1d8eb3ecfda2da55f4fc9ee572dd7cea5409728ff4d276aba263adbce1d5873c7cb6a28f06dbdb471edb5a19a6b8e
-  data.tar.gz: 3c137ad784fc66e5f62e7d6a76a28353295d9f96df41f84b211202a79499ed492cf3302b1d1aff0167b48637b0433e381d328364832c1be4db7aedb64dd726a4
+  metadata.gz: 898984d912915fd1662a85593a03ef0afa38ffcfe26c39223269f2cd692edf43c3da7eda5062c51500e55fa1ef69cdc9303a65e6155c9b5995d696c80f0248c6
+  data.tar.gz: aa1e575faabc660d67541b2c4593a6ea5f1eedab69fc42520df73afac57ef286d61b4ea270257585984232b5d3db8a83b52a5f3906c5f280dc86140f19146c98

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    philosophies-suspenders (2.0.0)
+    philosophies-suspenders (2.0.2)
       bundler (~> 1.3)
       rails (= 4.2.3)
 
@@ -43,23 +43,35 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -76,7 +88,7 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
@@ -88,20 +100,21 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sprockets (3.2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    slop (3.6.0)
+    sprockets (3.3.2)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
       actionpack (>= 3.0)
@@ -117,7 +130,9 @@ PLATFORMS
 
 DEPENDENCIES
   philosophies-suspenders!
+  pry
+  pry-byebug
   rspec (~> 3.2)
 
 BUNDLED WITH
-   1.10.1
+   1.10.5

data/README.md

@@ -1,5 +1,7 @@
 # Suspenders
 
+[![Stories in Backlog](https://badge.waffle.io/philosophie/suspenders.svg?label=ready&title=Backlog)](http://waffle.io/philosophie/suspenders)
+
 This is Philosophie's fork of Suspenders, a Rails application template
 originally created by thoughtbot. This repo has strayed significantly from
 thoughtbot's and is not intended to go back upstream.
@@ -10,6 +12,10 @@ First install the gem:
 
     gem install philosophies-suspenders
 
+Or update if you already have the gem installed:
+
+    gem update philosophies-suspenders
+
 Then run:
 
     philosophies-suspenders projectname
@@ -32,7 +38,6 @@ It includes application gems like:
 * [Sidekiq](https://github.com/mperham/sidekiq) for background processing
 * [Flutie](https://github.com/thoughtbot/flutie) for `page_title` and `body_class` view
   helpers
-* [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 * [Rails Assets](https://rails-assets.org/) for managing frontend dependencies,
   including by default:
   * jquery
@@ -100,6 +105,13 @@ Suspenders also comes with:
 [i18n]: https://github.com/thoughtbot/suspenders/pull/304
 [segment]: https://segment.com
 
+## CSS Frameworks
+
+You can optionally install a CSS Framework
+options: bourbon_n_friends, bootstrap, foundation
+
+    philosophies-suspenders my_new_app --css-framework=CSS_FRAMEWORK
+
 ## Heroku
 
 By default, suspenders will:
@@ -117,7 +129,7 @@ By default, suspenders will:
 
 You can optionally specify alternate Heroku flags:
 
-    suspenders app \
+    philosophies-suspenders app \
       --heroku-flags "--region eu --addons newrelic,pgbackups,ssl"
 
 See all possible Heroku flags:
@@ -143,7 +155,7 @@ will push all branches to that remote.
 
 You can bypass all git functionality with the `--skip-git` option:
 
-    suspenders app --skip-git true
+    philosophies-suspenders app --skip-git true
 
 ## GitHub
 
@@ -151,7 +163,7 @@ You can optionally create a GitHub repository for the suspended Rails app. It
 requires that you have [Hub](https://github.com/github/hub) on your system:
 
     curl http://hub.github.com/standalone -sLo ~/bin/hub && chmod +x ~/bin/hub
-    suspenders app --github organization/project
+    philosophies-suspenders app --github organization/project
 
 This has the same effect as running:
 

data/lib/suspenders/app_builder.rb

@@ -305,11 +305,96 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       create_empty_directory('app/assets/javascripts/application')
     end
 
+    def install_bourbon_n_friends
+      inject_into_file(
+        'Gemfile',
+        %{\ngem 'bourbon'\ngem 'neat'},
+        after: Regexp.new("gem 'rails', '#{Suspenders::RAILS_VERSION}'")
+      )
+      bundle_command 'install'
+
+      inject_into_file(
+        'app/assets/stylesheets/application.scss',
+%{
+@import "bourbon";
+@import "neat";
+@import "base/grid-settings";
+@import "base/base";
+},
+        after: /@charset "utf-8";/
+      )
+    end
+
+    def install_bootstrap
+      inject_into_file(
+        'Gemfile',
+        %{\ngem 'bootstrap-sass'},
+        after: /gem 'sass-rails',.*$/
+      )
+      bundle_command 'install'
+
+      inject_into_file(
+        'app/assets/stylesheets/application.scss',
+        %{\n@import "bootstrap-sprockets";\n@import "bootstrap";},
+        after: /@charset "utf-8";/
+      )
+
+      inject_into_file(
+        'app/assets/javascripts/application.js',
+        %{\n\/\/= require bootstrap-sprockets},
+        after: /\/\/= require jquery-ujs/
+      )
+    end
+
+    def install_foundation
+      inject_into_file(
+        'Gemfile',
+        %{\ngem 'foundation-rails'},
+        after: /gem 'sass-rails',.*$/
+      )
+
+      inject_into_file(
+        'app/assets/stylesheets/application.scss',
+        %{\n@import "foundation_and_overrides";},
+        after: /@charset "utf-8";/
+      )
+
+      inject_into_file(
+        'app/assets/javascripts/application.js',
+        %{\n\/\/= require foundation},
+        after: /\/\/= require jquery-ujs/
+      )
+
+      inject_into_file(
+        'app/assets/javascripts/application.js',
+        %{\n$(document).foundation();},
+        after: /\/\/= require_tree ./
+      )
+
+      inject_into_file(
+        'app/views/layouts/application.html.erb',
+        %{<%= javascript_include_tag "vendor/modernizr" %>\n},
+        before: /<title>.*$/
+      )
+
+      bundle_command 'install'
+
+      result = run('bundle show foundation-rails', capture: true ).gsub("\n",'')
+      settings_file = File.join(
+        result,
+        'vendor', 'assets', 'stylesheets', 'foundation', '_settings.scss'
+      )
+
+      create_file(
+        "app/assets/stylesheets/foundation_and_overrides.scss",
+        File.read(settings_file)
+      )
+    end
+
     def gitignore_files
       remove_file '.gitignore'
       copy_file 'suspenders_gitignore', '.gitignore'
       [
-        'app/views/pages',
         'app/workers',
         'spec/lib',
         'spec/controllers',

data/lib/suspenders/generators/app_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators'
 require 'rails/generators/rails/app/app_generator'
+require 'pry-byebug'
 
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
@@ -18,6 +19,18 @@ module Suspenders
     class_option :origin, type: :string, default: nil,
       desc: "Add and push to git remote for origin"
 
+    class_option(
+      :css_framework,
+      type: :string,
+      aliases: "-C",
+      default: nil,
+      desc: "Install a css framework "\
+            "(options: bourbon_n_friends/bootstrap/foundation)"
+    )
+
+    class_option :skip_test_unit, type: :boolean, aliases: "-T", default: true,
+      desc: "Skip Test::Unit files"
+
     class_option :skip_git, type: :boolean, default: false,
       desc: "Don't create and commit to git repository"
 
@@ -50,6 +63,7 @@ module Suspenders
       invoke :run_stairs
       invoke :initial_commit_and_branching
       invoke :push_to_origin
+      invoke :setup_css_framework
       invoke :outro
     end
 
@@ -151,6 +165,18 @@ module Suspenders
       build :setup_javascripts
     end
 
+    def setup_css_framework
+      if options[:css_framework]
+        say "Installing #{options[:css_framework]}"
+        case options[:css_framework]
+        when 'bourbon_n_friends' then build :install_bourbon_n_friends
+        when 'bootstrap' then build :install_bootstrap
+        when 'foundation' then build :install_foundation
+        else say "Unrecognized Css Framework"
+        end
+      end
+    end
+
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
   RAILS_VERSION = "4.2.3"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/suspenders.gemspec

@@ -30,5 +30,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rspec', '~> 3.2'
 end

data/templates/Gemfile.erb

@@ -1,19 +1,20 @@
 source "https://rubygems.org"
 
 ruby "<%= Suspenders::RUBY_VERSION %>"
+gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 
 gem "airbrake"
 gem "autoprefixer-rails"
 gem "bundler", ">= 1.8.4"
 gem "coffee-rails", "~> 4.1.0"
 gem "flutie"
-gem "high_voltage"
 gem "i18n-tasks"
 gem "newrelic_rpm", ">= 3.9.8"
 gem "pg"
 gem "quiet_assets"
 gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
+gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "sidekiq"
 gem "simple_form"
@@ -41,7 +42,6 @@ group :development, :test do
   gem "pry-byebug"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.1.0"
-  gem "rspec-sidekiq"
   gem "rubocop"
 end
 
@@ -49,6 +49,7 @@ group :test do
   gem "capybara-webkit", ">= 1.2.0"
   gem "database_cleaner"
   gem "launchy"
+  gem "rspec-sidekiq"
   gem "shoulda-matchers", require: false
   gem "timecop"
 end

data/templates/suspenders_layout.html.erb.erb

@@ -3,7 +3,8 @@
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
-  <meta name="viewport" content="initial-scale=1" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
   <%%#
     Configure default and controller-, and view-specific titles in
     config/locales/en.yml. For more see:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philosophies-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Philosophie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.3
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement