startblock 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60770b3aee9993bc321411044b1b2bc6d77cad21
-  data.tar.gz: 51dc9c7591cbd8fcb0efb910319f790408fee989
+  metadata.gz: b272176ada27acb05cdb1d0ac0d082d9c8f1a34e
+  data.tar.gz: 734c10128815708c11b9af83466b76f100332aa6
 SHA512:
-  metadata.gz: bdf0ecea21f68d2f25272f3684d1c08652a7cdb2bee310371c6fc22279e83137d0343bd9c490cda76ee15778c97fd397c9b1fa1a12197d6414e6687046912c56
-  data.tar.gz: e4c166fec18727d8f5383975fa22530bbee45d406f78fe931a426168be93b45ca4861856a89269fa8a3e85008fdbdd2799475fa509dd7fc40c8e47524cec01a9
+  metadata.gz: 2aec4368ea1f2a047625a1a92183d03001f3112a2b9fc13d1efb5f9276beb15bb0f26d25d3daf66553c6d6262f1c72ad9871f2626975996426ddc5fccea7d6a9
+  data.tar.gz: 26e8f71dbb6b979ba246e13846283d024a19bf5c23346bafa5879cef6b270cdc7d0a260729ee3328f9e121dd3e23704e7e358c20c4e5707b81c72fb3ec8c3098

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.3

data/.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.2.0
-before_install:
-  - "echo '--colour' > ~/.rspec"
-  - git config --global user.name 'Travis CI'
-  - git config --global user.email 'travis-ci@example.com'
-install:
-  - bundle install
+  - 2.2.3
 notifications:
-  email: false
-sudo: false
+  email: true

data/CHANGELOG

@@ -0,0 +1,21 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## V1.1 - Navy Silver (Released on 2015-08-21)
+
+### Added
+- Rubocop was added with a default config
+- Bootstrap is now our default templating 'framework'
+
+### Changed
+- Updated the ruby version to 2.2.3
+- Make rails version follow all patch versions (Added ~> to the version)
+
+### Removed
+- Bourbon, Bitters and Neat has been removed
+- Rollbar
+- Normalize-rails
+
+### Fixed
+- Nothing

data/Gemfile.lock

@@ -2,115 +2,100 @@ PATH
   remote: .
   specs:
     startblock (1.0)
-      bitters (~> 0.10)
       bundler (~> 1.3)
-      rails (= 4.2.0)
+      rails (~> 4.2)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    bitters (0.10.1)
-      bourbon (>= 3.2)
-      sass (>= 3.2)
-      thor
-    bourbon (4.2.0)
-      sass (~> 3.4)
-      thor
+    arel (6.0.3)
     builder (3.2.2)
     erubis (2.7.0)
-    globalid (0.3.3)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.10.1)
+    minitest (5.8.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    sass (3.4.11)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.3.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -118,4 +103,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  minitest (~> 5.8)
   startblock!
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -1,5 +1,7 @@
 # Startblock
 
+[![Build Status](https://travis-ci.org/firmhouse/Startblock.svg)](https://travis-ci.org/firmhouse/Startblock)
+
 Startblock is the base Rails application used at
 [Firmhouse](http://firmhouse.com).
 
@@ -54,7 +56,7 @@ This gem is cloned from the [Suspenders][suspenders] project and formatted to
 the wishes we have at Firmhouse. The main idea of this gem goes out to the amazing people at
 [Thoughtbot][thoughtbot].
 
-[thoughbot]: http://thoughtbot.com
+[thoughtbot]: http://thoughtbot.com
 [suspenders]: http://github.com/thoughtbot/suspenders
 
 

data/Rakefile

@@ -0,0 +1,8 @@
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end
+
+task :default => :test

data/VERSION

@@ -0,0 +1 @@
+V1.1

data/lib/startblock/app_builder.rb

@@ -105,12 +105,9 @@ end
         'app/assets/stylesheets/application.css.scss'
     end
 
-    def install_bitters
-      run "bitters install --path app/assets/stylesheets"
-    end
-
-    def install_refills
-      run "rails generate refills:import flashes"
+    def setup_javascripts
+      remove_file "app/assets/javascript/application.js"
+      copy_file "application.js", "app/assets/javascript/application.js"
     end
 
     def remove_routes_comment_lines
@@ -133,6 +130,10 @@ end
         'app/views/application/_mixpanel.html.erb'
     end
 
+    def setup_rubocop
+      copy_file "rubocop.yml", ".rubocop.yml"
+    end
+
     private
 
     def raise_on_missing_translations_in(environment)

data/lib/startblock/generators/app_generator.rb

@@ -26,12 +26,12 @@ module Startblock
       invoke :create_startblock_views
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :install_bitters
-      invoke :install_refills
+      invoke :setup_javascripts
       invoke :remove_routes_comment_lines
       invoke :setup_git
       invoke :setup_database
       invoke :setup_mixpanel
+      invoke :setup_rubocop
       invoke :outro
     end
 
@@ -84,14 +84,9 @@ module Startblock
       build :setup_stylesheets
     end
 
-    def install_bitters
-      say 'Install Bitters'
-      build :install_bitters
-    end
-
-    def install_refills
-      say "Install Refills"
-      build :install_refills
+    def setup_javascripts
+      say "Set up javascripts"
+      build :setup_javascripts
     end
 
     def remove_routes_comment_lines
@@ -119,6 +114,11 @@ module Startblock
       build :setup_mixpanel
     end
 
+    def setup_rubocop
+      say "Setting up Rubocop"
+      build :setup_rubocop
+    end
+
     def outro
       say 'Congratulations! You just entered our startblock.'
     end

data/lib/startblock/version.rb

@@ -1,5 +1,5 @@
 module Startblock
-  RAILS_VERSION = "4.2.0"
+  RAILS_VERSION = "~> 4.2"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/startblock.gemspec

@@ -26,8 +26,8 @@ start on a working app.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Startblock::VERSION
 
-  s.add_dependency 'bitters', '~> 0.10'
-  s.add_dependency 'bundler', '~> 1.3'
-  s.add_dependency 'rails', Startblock::RAILS_VERSION
-  s.add_dependency 'thor', '~> 0.19'
+  s.add_development_dependency "minitest", "~> 5.8"
+  s.add_runtime_dependency 'bundler', '~> 1.3'
+  s.add_runtime_dependency 'rails', Startblock::RAILS_VERSION
+  s.add_runtime_dependency 'thor', '~> 0.19'
 end

data/templates/Gemfile.erb

@@ -2,43 +2,45 @@ source "https://rubygems.org"
 
 gem "rails", "<%= Startblock::RAILS_VERSION %>"
 gem "pg"
-gem 'turbolinks'
-gem "bourbon", "~> 4.1.0"
-gem "refills"
-gem "neat", "~> 1.7.0"
-gem "normalize-rails", "~> 3.0.0"
+gem "turbolinks"
 gem "coffee-rails", "~> 4.1.0"
 gem "jquery-rails"
-gem 'jquery-turbolinks'
+gem "jquery-turbolinks"
+gem "bootstrap-sass", "~> 3.3.5"
 gem "sass-rails", "~> 5.0"
 gem "uglifier"
-gem 'rollbar', '~> 1.0.0'
-gem 'sidekiq', '~> 3.2.5'
-gem "redis", '~> 3.1.0'
+gem "sidekiq", "~> 3.2.5"
+gem "redis", "~> 3.1.0"
 gem "redis-namespace", "~> 1.5.1"
-gem "passenger"
 
 group :development do
   gem "spring"
   gem "web-console"
   gem "capistrano"
-  gem 'capistrano-rails'
-  gem 'capistrano-rails-console'
+  gem "capistrano-rails"
+  gem "capistrano-rails-console"
   gem "daemon_controller"
+  gem "passenger"
+  gem "quiet_assets"
 end
 
 group :development, :test do
   gem "awesome_print"
   gem "dotenv-rails"
+  gem "rubocop"
 end
 
 group :test do
   gem "minitest-rails-capybara"
   gem "minitest-reporters"
-  gem 'timecop'
-  gem 'shoulda'
-  gem 'mocha'
+  gem "timecop"
+  gem "shoulda"
+  gem "mocha"
 end
 
 group :staging, :production do
 end
+
+source "https://rails-assets.org" do
+  gem "rails-assets-fastclick"
+end

data/templates/application.css.scss

@@ -1,8 +1,4 @@
 @charset "utf-8";
 
-@import "normalize-rails";
-@import "bourbon";
-@import "base/grid-settings";
-@import "neat";
-@import "base/base";
-@import "refills/flashes";
+@import "bootstrap-sprockets";
+@import "bootstrap";

data/templates/application.js

@@ -0,0 +1,10 @@
+//= require jquery
+//= require jquery.turbolinks
+//= require jquery_ujs
+//= require bootstrap-sprockets
+//= require fastclick
+//= require turbolinks
+
+$(function() {
+  FastClick.attach(document.body);
+});

data/templates/rubocop.yml

@@ -0,0 +1,71 @@
+AllCops:
+  Include:
+    - "Gemfile"
+  Exclude:
+    - "db/**/*"
+    - "config/**/*"
+    - "script/**/*"
+    - "test/**/*"
+    - "vendor/**/*"
+    - "bin/**/*"
+    - "**/Rakefile"
+    - "**/config.ru"
+  RunRailsCops: true
+  DisplayCopNames: true
+  StyleGuideCopsOnly: false
+Style/AndOr:
+  EnforcedStyle: always
+  Enabled: true
+Style/CommentAnnotation:
+  Keywords:
+    - TODO
+    - FIXME
+    - OPTIMIZE
+    - HACK
+    - REVIEW
+Style/DotPosition:
+  EnforcedStyle: trailing
+Style/For:
+  EnforcedStyle: each
+  SupportedStyles:
+    - for
+    - each
+  Enabled: true
+Style/IndentationWidth:
+  Width: 2
+Style/NonNilCheck:
+  IncludeSemanticChanges: true
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+Style/TrailingBlankLines:
+  EnforcedStyle: final_newline
+  SupportedStyles:
+    - final_newline
+    - final_blank_line
+Metrics/LineLength:
+  Max: 110
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 40
+Metrics/AbcSize:
+  Max: 25
+Style/Next:
+  Enabled: false
+Lint/AssignmentInCondition:
+  Enabled: false
+Style/Documentation:
+  Description: Document classes and non-namespace modules.
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Rails/TimeZone:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: true

data/test/features/new_project_test.rb

@@ -0,0 +1,41 @@
+require "test_helper"
+
+class NewProjectTest < Minitest::Test
+  def test_ensure_tests_pass
+    Dir.chdir(project_path) do
+      Bundler.with_clean_env do
+        ENV["TEST"] = nil
+        assert `rake test` == "", "rake should not produce an error"
+      end
+    end
+  end
+
+  def test_ruby_version_file
+    ruby_version_file = IO.read("#{project_path}/.ruby-version")
+    assert_equal ruby_version_file, "#{RUBY_VERSION}\n"
+  end
+
+  def test_rubocop_should_pass
+    Dir.chdir(project_path) do
+      Bundler.with_clean_env do
+        assert `rubocop`.match(/no offenses detected/), "Rubocop should not be offended"
+      end
+    end
+  end
+
+  def test_gemfile_should_contain_certain_gems
+    gemfile = IO.read("#{project_path}/Gemfile")
+
+    assert gemfile.match(/bootstrap-sass/), "Gemfile should contain bootstrap-sass gem"
+    assert gemfile.match(/quiet_assets/), "Gemfile should contain quiet assets gem"
+  end
+
+  def test_application_js_should_be_created
+    app_js_file = IO.read("#{project_path}/app/assets/javascript/application.js")
+
+    assert app_js_file.match(/= require jquery.turbolinks/), "Jquery.turbolinks should be present"
+    assert app_js_file.match(/= require bootstrap-sprockets/), "Bootstrap should be present"
+    assert app_js_file.match(/FastClick.attach/), "Fastclick should be initialized"
+  end
+end
+

data/test/support/startblock.rb

@@ -0,0 +1,47 @@
+module StartblockTestHelpers
+  APP_NAME = "dummy_app"
+
+  def create_tmp_directory
+    FileUtils.mkdir_p(tmp_path)
+  end
+
+  def remove_project_directory
+    FileUtils.rm_rf(project_path)
+  end
+
+  def run_startblock(arguments = nil)
+    Dir.chdir(tmp_path) do
+      Bundler.with_clean_env do
+        %x(#{startblock_bin} #{APP_NAME} #{arguments})
+      end
+    end
+  end
+
+  def drop_dummy_database
+    if File.exist?(project_path)
+      Dir.chdir(project_path) do
+        Bundler.with_clean_env do
+          `rake db:drop`
+        end
+      end
+    end
+  end
+
+  def project_path
+    @project_path ||= Pathname.new("#{tmp_path}/#{APP_NAME}")
+  end
+
+  private
+
+  def tmp_path
+    @tmp_path ||= Pathname.new("#{root_path}/tmp")
+  end
+
+  def root_path
+    File.expand_path('../../../', __FILE__)
+  end
+
+  def startblock_bin
+    File.join(root_path, 'bin', 'startblock')
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+require 'bundler/setup'
+require "minitest/autorun"
+
+Bundler.require(:default, :test)
+
+require (Pathname.new(__FILE__).dirname + '../lib/startblock').expand_path
+
+Dir["./test/support/**/*.rb"].each { |file| require file }
+
+include StartblockTestHelpers
+
+create_tmp_directory
+drop_dummy_database
+remove_project_directory
+run_startblock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: startblock
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Jeroen van Baarsen
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bitters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
+        version: '5.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -81,11 +81,13 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- NEWS.md
 - README.md
+- Rakefile
+- VERSION
 - bin/rake
 - bin/setup
 - bin/startblock
@@ -102,14 +104,19 @@ files:
 - templates/_javascript.html.erb
 - templates/_mixpanel.html.erb
 - templates/application.css.scss
+- templates/application.js
 - templates/bin_setup.erb
 - templates/postgresql_database.yml.erb
+- templates/rubocop.yml
 - templates/sample.env
 - templates/secrets.yml
 - templates/staging.rb
 - templates/startblock_gitignore
 - templates/startblock_layout.html.erb.erb
 - templates/test_helper.erb
+- test/features/new_project_test.rb
+- test/support/startblock.rb
+- test/test_helper.rb
 homepage: http://github.com/firmhouse/startblock
 licenses:
 - MIT
@@ -123,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.5
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -131,8 +138,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using Firmhouse's best practices.
-test_files: []
+test_files:
+- test/features/new_project_test.rb
+- test/support/startblock.rb
+- test/test_helper.rb

data/NEWS.md

@@ -1,2 +0,0 @@
-1.0.0 (TBA)
-* First release