welaika-suspenders 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f634aab82dfbf90992167f4c6ff2fa402bbcb13
-  data.tar.gz: f478032d2a5b4d4b31bd11053a26f1d6e0292474
+  metadata.gz: cf7022f2b37a0700fadecdc3fee3ae499e5014c8
+  data.tar.gz: bf41da9706fa43631bfc42a814e22e345bc6dd44
 SHA512:
-  metadata.gz: d77fd242ddd18f160e66c5a218d982507a0887c1bfab8c74a3c77154fb1e45c92ed8685615c585323513c8ea9f6e8d182f09e75f0ef2f7813caaf3b30764b4b2
-  data.tar.gz: df8263f179dcc15f88d603fff876f221d4929571c80c9292f4720112a43a4529880c6cda419fc265aeee2e7e6aa81264a7916cfe687cdfe8b596c3931558321a
+  metadata.gz: a27f6edc2500ee53cbd62ce0f13704e1b48c1497aff5a49f775102a6e52eb4f914e4f147f2a6e53e16fc632461f61f2e724b922dcba5f59bdb5609382670abfe
+  data.tar.gz: 319ce8f5816f0928a7c690ee71c69bdb8ea6f8d7cdfe8737ce079f5886dbac7bf5ec7fb8a102b6614951fb9081a7ee462afa190fb0bbde1b589153b8a5a57c66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (2.2.1)
+    welaika-suspenders (2.3.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.1.8)
@@ -74,7 +74,7 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    minitest (5.4.3)
+    minitest (5.5.0)
     multi_json (1.10.1)
     multi_test (0.1.1)
     nokogiri (1.6.2.1)

data/README.md

@@ -4,13 +4,17 @@ This is a [suspenders](https://github.com/thoughtbot/suspenders) fork in use at
 Big thanks to [thoughtbot](http://thoughtbot.com/community) for providing such a great starting point.
 
 
-Installation
-------------
+## Installation
 
 First install the suspenders gem:
 
     gem install welaika-suspenders
 
+If you are using RVM, please create a new gemset named like `projectname`:
+
+    rvm gemset create projectname
+    rvm gemset use projectname
+
 Then run:
 
     welaika-suspenders projectname
@@ -18,22 +22,19 @@ Then run:
 This will create a rails app in `projectname`. This script creates a
 new git repository. It is not meant to be used against an existing repo.
 
-If you want to add an existing repo, run
-
-    git remote add origin git@github.com:welaika/projectname.git
-
 Then run:
 
     cd projectname && bin/setup
 
-Version number
---------------
+If you want to add an empty bare repository as origin, run
 
-`welaika-suspenders` version number isn't related to thoughbot's [suspenders](https://github.com/thoughtbot/suspenders).
+    git remote add origin git@github.com:welaika/projectname.git
 
+## Version number
 
-Changelog
----------
+`welaika-suspenders` version number isn't related to thoughbot's [suspenders](https://github.com/thoughtbot/suspenders).
+
+## Changelog
 
 We merge commits from thoughbot's [suspenders](https://github.com/thoughtbot/suspenders) periodically.
 
@@ -48,4 +49,6 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - add [slim-rails](https://github.com/slim-template/slim-rails) gem
 - add some html meta tags
 - use EU region as default for Heroku
-
+- use pry-byebug instead of byebug
+- use CDATA wrapper for javascript
+- create a .ruby-gemset file with app name

data/lib/suspenders/app_builder.rb

@@ -168,6 +168,10 @@ end
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
 
+    def create_ruby_gemset_file
+      create_file '.ruby-gemset', "#{app_name}\n"
+    end
+
     def setup_heroku_specific_gems
       inject_into_file 'Gemfile', "\n\s\sgem 'rails_12factor'",
         after: /group :staging, :production do/
@@ -233,6 +237,10 @@ end
       copy_file 'rack_timeout.rb', 'config/initializers/rack_timeout.rb'
     end
 
+    def configure_slim
+      copy_file 'slim.rb', 'config/initializers/slim.rb'
+    end
+
     def configure_action_mailer
       action_mailer_host 'development', "localhost:#{port_number}"
       action_mailer_host 'test', 'www.example.com'

data/lib/suspenders/generators/app_generator.rb

@@ -45,6 +45,7 @@ module Suspenders
 
     def customize_gemfile
       build :replace_gemfile
+      build :create_ruby_gemset_file
       build :set_ruby_to_version_being_used
 
       if options[:heroku]
@@ -126,6 +127,7 @@ module Suspenders
       build :configure_time_zone
       build :configure_time_formats
       build :configure_rack_timeout
+      build :configure_slim
       build :disable_xml_params
       build :configure_available_locales
       build :fix_i18n_deprecation_warning

data/lib/suspenders/version.rb

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

data/spec/features/new_project_spec.rb

@@ -29,6 +29,14 @@ feature 'Suspend a new project with default configuration' do
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
 
+  scenario 'generated .ruby-gemset is pulled from app name' do
+    run_suspenders
+
+    ruby_gemset_file = IO.read("#{project_path}/.ruby-gemset")
+
+    expect(ruby_gemset_file).to eq "#{SuspendersTestHelpers::APP_NAME}\n"
+  end
+
   scenario 'secrets.yml reads secret from env' do
     run_suspenders
 

data/templates/Gemfile.erb

@@ -35,12 +35,12 @@ end
 
 group :development, :test do
   gem "awesome_print"
-  gem "byebug"
   gem "dotenv-rails"
   gem "faker"
   gem "factory_girl_rails"
   gem "priscilla"
   gem "pry-bloodline"
+  gem "pry-byebug"
   gem "pry-rails"
   gem "rspec-rails", "~> 3.0.0"
 end

data/templates/README.md.erb

@@ -1,8 +1,6 @@
-<%= app_name.humanize %>
-<%= '=' * app_name.humanize.length %>
+# <%= app_name.humanize %>
 
-Getting Started
----------------
+## Getting Started
 
 After you have cloned this repo, run this setup script to set up your machine
 with the necessary dependencies to run and test this app:
@@ -24,8 +22,7 @@ is [purposefully excluded from the project's `Gemfile`][exclude].
 [foreman]: https://github.com/ddollar/foreman
 [exclude]: https://github.com/ddollar/foreman/pull/437#issuecomment-41110407
 
-Guidelines
-----------
+## Guidelines
 
 Use the following guides for getting things done, programming well, and
 programming in style.

data/templates/slim.rb

@@ -0,0 +1 @@
+Slim::Engine.set_options({ js_wrapper: :cdata })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -180,6 +180,7 @@ files:
 - templates/rails_helper.rb
 - templates/sample.env
 - templates/secrets.yml
+- templates/slim.rb
 - templates/smtp.rb
 - templates/spec_helper.rb
 - templates/staging.rb