From 1ca23431c3c0dd699e27b771dfc43a609507c402 Mon Sep 17 00:00:00 2001 From: joegatt Date: Tue, 11 Jun 2013 16:02:22 +0200 Subject: [PATCH] Adds livereload, sass and coffeescript guards. Also updates gems and tidies up Gemfile. --- Gemfile | 93 ++++++++++++++++++++++++---------------------------- Gemfile.lock | 33 +++++++++++++++---- Guardfile | 13 ++++++++ 3 files changed, 81 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 95ae9c03..af3bb0dc 100644 --- a/Gemfile +++ b/Gemfile @@ -2,97 +2,88 @@ source 'https://rubygems.org' gem 'rails', '3.2.13' -gem 'thin' -gem 'unicorn' - -gem 'devise' -gem 'rails_admin' - -gem 'attr_encrypted' -gem 'friendly_id' gem 'acts-as-taggable-on' -gem 'paper_trail' -gem 'settingslogic' -gem 'rmagick' - -gem 'wtf_lang' - -gem 'evernote-thrift' -gem 'oauth' -gem 'omniauth' -gem 'omniauth-evernote' - +gem 'attr_encrypted' +gem 'breadcrumbs_on_rails' +gem 'coveralls', require: false +gem 'devise' gem 'differ' -gem 'nokogiri' - +gem 'evernote-thrift' +gem 'friendly_id' +gem 'gmaps4rails' +gem 'god' gem 'haml' gem 'haml-rails' gem 'html5-rails' - -gem 'json' - +gem 'httparty' gem 'jquery-rails' -gem 'pjax_rails' +gem 'json' gem 'meta-tags', require: 'meta_tags' -gem 'breadcrumbs_on_rails' +gem 'nokogiri' +gem 'oauth' +gem 'omniauth' +gem 'omniauth-evernote' +gem 'paper_trail' +gem 'pjax_rails' gem 'rails-timeago' -gem 'gmaps4rails' +gem 'rails_admin' +gem 'rmagick' +gem 'settingslogic' +gem 'thin' +gem 'unicorn' gem 'wikipedia-client' -gem 'httparty' - -gem 'god' - -gem 'coveralls', require: false +gem 'wtf_lang' group :development do - gem 'sqlite3' + gem 'capistrano' + gem 'factory_girl_rails' gem 'flog' gem 'fuubar' - gem 'rspec-rails' - gem 'factory_girl_rails' - gem 'rails_best_practices' - gem 'capistrano' + gem 'guard-coffeescript' + gem 'guard-livereload' gem 'guard-rubocop' + gem 'guard-sass', require: false + gem 'rails_best_practices' + gem 'rspec-rails' + gem 'sqlite3' end group :assets do gem 'coffee-rails' - gem 'uglifier' - gem 'sass-rails' gem 'compass-rails' gem 'compass-h5bp' + gem 'sass-rails' gem 'turbo-sprockets-rails3' + gem 'uglifier' end -# Test set-up from http://ruby.railstutorial.org/chapters/static-pages#sec:guard -# And http://everydayrails.com/2012/03/12/testing-series-rspec-setup.html group :test do - gem 'sqlite3' + gem 'capybara' + gem 'database_cleaner' + gem 'factory_girl_rails' gem 'faker' gem 'fakeweb' gem 'fuubar' - gem 'rspec-rails' - gem 'shoulda-matchers' - gem 'factory_girl_rails' - gem 'capybara' gem 'guard' gem 'guard-bundler' gem 'guard-rspec' gem 'guard-spork' - gem 'spork-rails' gem 'launchy' - gem 'database_cleaner' + gem 'rspec-rails' + gem 'shoulda-matchers' gem 'simplecov', require: false + gem 'spork-rails' + gem 'sqlite3' gem 'vcr' # System-dependent gems # Linux - gem 'rb-inotify', '~> 0.9' gem 'libnotify' + gem 'rb-inotify', '~> 0.9' # Mac OSX - # gem 'rb-fsevent', '0.9.1' # gem 'growl', '1.0.3' + # gem 'rb-fsevent', '0.9.1' # Windows # gem 'rb-fchange', '0.0.5' @@ -102,6 +93,6 @@ end group :staging, :production do gem 'libv8', '~> 3.11.8.3', platform: :ruby - gem 'therubyracer', '~> 0.11.1' gem 'pg' + gem 'therubyracer', '~> 0.11.1' end diff --git a/Gemfile.lock b/Gemfile.lock index 3d23743a..d2e79e52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,6 +91,9 @@ GEM warden (~> 1.2.1) diff-lcs (1.2.4) differ (0.1.2) + em-websocket (0.5.0) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.5.3) encryptor (1.1.3) erubis (2.7.0) eventmachine (1.0.3) @@ -105,7 +108,7 @@ GEM faker (1.1.2) i18n (~> 0.5) fakeweb (1.3.0) - ffi (1.8.1) + ffi (1.9.0) flog (4.1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.0) @@ -129,6 +132,13 @@ GEM guard-bundler (1.0.0) bundler (~> 1.0) guard (~> 1.1) + guard-coffeescript (1.3.2) + coffee-script (>= 2.2.0) + guard (>= 1.1.0) + guard-livereload (1.4.0) + em-websocket (>= 0.5.0) + guard (>= 1.8.0) + multi_json (~> 1.7) guard-rspec (3.0.1) guard (>= 1.8) rspec (~> 2.13) @@ -136,6 +146,9 @@ GEM childprocess (~> 0.3) guard (~> 1.8) rubocop (>= 0.6.1, < 1.0.0) + guard-sass (1.3.0) + guard (>= 1.1.0) + sass (>= 3.1) guard-spork (1.5.0) childprocess (>= 0.2.3) guard (>= 1.1) @@ -154,12 +167,13 @@ GEM jquery-rails (>= 2.0) railties (>= 3.2) thor (~> 0.14) + http_parser.rb (0.5.3) httparty (0.11.0) multi_json (~> 1.0) multi_xml (>= 0.5.2) i18n (0.6.1) journey (1.0.4) - jquery-rails (3.0.0) + jquery-rails (3.0.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (3.0.1) @@ -175,7 +189,7 @@ GEM libnotify (0.8.0) ffi (>= 1.0.11) libv8 (3.11.8.17) - listen (1.1.6) + listen (1.2.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) @@ -187,6 +201,7 @@ GEM actionpack method_source (0.8.1) mime-types (1.23) + mini_portile (0.5.0) multi_json (1.7.6) multi_xml (0.5.4) nested_form (0.3.2) @@ -197,7 +212,8 @@ GEM net-ssh (2.6.7) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - nokogiri (1.5.9) + nokogiri (1.6.0) + mini_portile (~> 0.5.0) oauth (0.4.7) omniauth (1.1.4) hashie (>= 1.2, < 3) @@ -213,7 +229,7 @@ GEM paper_trail (2.7.2) activerecord (~> 3.0) railties (~> 3.0) - parser (2.0.0.beta4) + parser (2.0.0.beta5) ast (~> 1.0) slop (~> 3.4) pg (0.15.1) @@ -309,10 +325,10 @@ GEM rubocop (0.8.2) parser (>= 2.0.0.beta1, <= 2.0.0) rainbow (>= 1.1.4) - ruby-progressbar (1.1.0) + ruby-progressbar (1.1.1) ruby_parser (3.1.3) sexp_processor (~> 4.1) - safe_yaml (0.9.2) + safe_yaml (0.9.3) sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) @@ -396,8 +412,11 @@ DEPENDENCIES god guard guard-bundler + guard-coffeescript + guard-livereload guard-rspec guard-rubocop + guard-sass guard-spork haml haml-rails diff --git a/Guardfile b/Guardfile index 57846d69..3f766d99 100644 --- a/Guardfile +++ b/Guardfile @@ -44,3 +44,16 @@ guard 'rubocop', all_on_start: false, notification: true do watch(%r{.+\.rb$}) watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) } end + +guard 'livereload' do + watch(%r{app/views/.+\.(erb|haml|slim)$}) + watch(%r{app/helpers/.+\.rb}) + watch(%r{public/.+\.(css|js|html)}) + watch(%r{config/locales/.+\.yml}) + # Rails Assets Pipeline + watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html))).*}) { |m| "/assets/#{m[3]}" } +end + +guard 'sass', :input => 'sass', :output => 'css', :noop => true, :hide_success => true + +guard 'coffeescript', :input => 'app/assets/javascripts', :noop => true, :hide_success => true