Skip to content

Commit

Permalink
Gem updates (#105)
Browse files Browse the repository at this point in the history
* Update various libs for easier usage
  • Loading branch information
Scott Weber authored and jessieay committed Feb 24, 2017
1 parent 800a453 commit 3c17809
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 69 deletions.
13 changes: 5 additions & 8 deletions Gemfile
Expand Up @@ -4,20 +4,19 @@ source 'https://rubygems.org'
gem 'rails', '~> 4.2.7.1'

gem 'autoprefixer-rails'
gem 'bootstrap-sass', '~> 3.2.0'
gem 'sass-rails', '~> 4.0.3'
gem 'sass-rails'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'dotenv-rails'
gem 'jquery-rails'

gem 'turbolinks'
gem 'jbuilder', '~> 2.0'
gem 'secure_headers'
gem 'slim-rails', require: ['slim-rails', 'slim/translator']
gem 'therubyracer'
gem 'thin'
gem 'secure_headers'
gem 'sidekiq'
gem 'sidekiq-cron'
gem 'uswds-rails', github: '18F/uswds-rails-gem'

group :development do
gem 'better_errors'
Expand All @@ -26,8 +25,6 @@ group :development do
gem 'guard-rspec'
gem 'quiet_assets'
gem 'rb-fsevent'
gem 'spring'
gem 'spring-commands-rspec'
gem 'unf'
gem 'sinatra'
end
Expand All @@ -54,7 +51,7 @@ end
group :test do
gem 'capybara', '~> 2.3.0'
gem 'capybara-screenshot'
gem 'capybara-webkit'
gem 'poltergeist'
gem 'database_cleaner'
gem 'faker'
gem 'launchy'
Expand Down
42 changes: 18 additions & 24 deletions Gemfile.lock
@@ -1,3 +1,10 @@
GIT
remote: git://github.com/18F/uswds-rails-gem.git
revision: aa12ddd314209ef9e75bb2f2bfcf1454336df049
specs:
uswds-rails (1.0.0)
sass

GIT
remote: git://github.com/matschaffer/knife-solo.git
revision: d51ebaa1391937e4613672d31da2a040d054d78d
Expand Down Expand Up @@ -78,8 +85,6 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
brakeman (3.1.5)
erubis (~> 2.6)
fastercsv (~> 1.5)
Expand Down Expand Up @@ -118,9 +123,6 @@ GEM
capybara-screenshot (1.0.11)
capybara (>= 1.0, < 3)
launchy
capybara-webkit (1.8.0)
capybara (>= 2.3.0, < 2.7.0)
json
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
Expand Down Expand Up @@ -152,6 +154,7 @@ GEM
rack
uuidtools (~> 2.1)
cleanroom (1.0.0)
cliver (0.3.2)
coderay (1.1.1)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -332,10 +335,6 @@ GEM
jbuilder (2.4.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
knife-ec2 (0.12.0)
fog (~> 1.29.0)
Expand All @@ -345,7 +344,6 @@ GEM
winrm (~> 1.7)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.15)
libyajl2 (1.2.0)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
Expand Down Expand Up @@ -410,6 +408,10 @@ GEM
pg (0.18.4)
pkg-config (1.1.7)
plist (3.1.0)
poltergeist (1.13.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand Down Expand Up @@ -462,7 +464,6 @@ GEM
redis (3.3.1)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
ref (2.0.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
Expand Down Expand Up @@ -576,9 +577,6 @@ GEM
molinillo (~> 0.2.3)
semverse (~> 1.1)
sparkr (0.4.1)
spring (1.6.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (2.12.4)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -594,9 +592,6 @@ GEM
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.5.2)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thin (1.6.4)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
Expand Down Expand Up @@ -627,6 +622,9 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
winrm (1.7.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
Expand All @@ -648,12 +646,10 @@ DEPENDENCIES
berkshelf
better_errors
binding_of_caller
bootstrap-sass (~> 3.2.0)
brakeman
capistrano-rails
capybara (~> 2.3.0)
capybara-screenshot
capybara-webkit
coffee-rails (~> 4.0.0)
coveralls
database_cleaner
Expand All @@ -664,12 +660,12 @@ DEPENDENCIES
guard-rspec
inch
jbuilder (~> 2.0)
jquery-rails
knife-ec2
knife-solo!
knife-solo_data_bag
launchy
pg
poltergeist
pry-nav
puma
quiet_assets
Expand All @@ -680,23 +676,21 @@ DEPENDENCIES
rspec-html-matchers
rspec-rails (~> 3.1.0)
rvm-capistrano
sass-rails (~> 4.0.3)
sass-rails
sdoc (~> 0.4.0)
secure_headers
shoulda
sidekiq
sidekiq-cron
sinatra
slim-rails
spring
spring-commands-rspec
sqlite3
therubyracer
thin
timecop
turbolinks
uglifier (>= 1.3.0)
unf
uswds-rails!
webmock

BUNDLED WITH
Expand Down
5 changes: 1 addition & 4 deletions app/assets/javascripts/application.js
Expand Up @@ -10,10 +10,7 @@
// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_ujs
//= require turbolinks
//= require bootstrap-sprockets
//= require autosize.min
//= require_tree .

Expand All @@ -26,4 +23,4 @@ ready = function() {


$(document).ready(ready);
$(document).on('page:load', ready);
$(document).on('page:load', ready);
3 changes: 0 additions & 3 deletions app/assets/stylesheets/application.css.scss
Expand Up @@ -13,6 +13,3 @@
*= require_self
*= require_tree .
*/

@import "bootstrap-sprockets";
@import "bootstrap";
4 changes: 0 additions & 4 deletions bin/rails
@@ -1,8 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
APP_PATH = File.expand_path('../../config/application', __FILE__)
require_relative '../config/boot'
require 'rails/commands'
4 changes: 0 additions & 4 deletions bin/rake
@@ -1,8 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
require_relative '../config/boot'
require 'rake'
Rake.application.run
4 changes: 0 additions & 4 deletions bin/rspec
@@ -1,8 +1,4 @@
#!/usr/bin/env ruby
begin
load File.expand_path("../spring", __FILE__)
rescue LoadError
end
#
# This file was generated by Bundler.
#
Expand Down
18 changes: 0 additions & 18 deletions bin/spring

This file was deleted.

0 comments on commit 3c17809

Please sign in to comment.