Skip to content

Commit 8a32344

Browse files
committed
Updated README and ruby/npm dependencies
Now, both the Rails and Webpack Dev servers start with foreman start -f Procfile.dev
1 parent 17bcd21 commit 8a32344

File tree

6 files changed

+187
-153
lines changed

6 files changed

+187
-153
lines changed

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ ruby "2.1.5"
33

44

55
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
6-
gem 'rails', '4.2.0.beta1'
6+
gem 'rails', '~>4.2'
77
# Use sqlite3 as the database for Active Record
88
gem 'sqlite3', group: :development
99
gem 'pg', group: :production
1010

1111
gem 'rails_12factor'
1212

1313
# Use SCSS for stylesheets
14-
gem 'sass-rails', '~> 5.0.0.beta1'
14+
gem 'sass-rails'
1515
gem 'bootstrap-sass', '~> 3.3.1'
1616
# Use Uglifier as compressor for JavaScript assets
17-
gem 'uglifier', '>= 1.3.0'
17+
gem 'uglifier'
1818
# Use CoffeeScript for .js.coffee assets and views
19-
gem 'coffee-rails', '~> 4.0.0'
19+
gem 'coffee-rails'
2020
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
2121
# gem 'therubyracer', platforms: :ruby
2222

@@ -25,15 +25,15 @@ gem 'jquery-rails'
2525
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
2626
gem 'turbolinks'
2727
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
28-
gem 'jbuilder', '~> 2.0'
28+
gem 'jbuilder'
2929
# bundle exec rake doc:rails generates the API under doc/api.
30-
gem 'sdoc', '~> 0.4.0', group: :doc
30+
gem 'sdoc', group: :doc
3131

3232
# Use ActiveModel has_secure_password
3333
# gem 'bcrypt', '~> 3.1.7'
3434

3535
# Use Rails Html Sanitizer for HTML sanitization
36-
gem 'rails-html-sanitizer', '~> 1.0'
36+
gem 'rails-html-sanitizer'
3737

3838
# Use Unicorn as the app server
3939
gem 'unicorn'

Gemfile.lock

Lines changed: 103 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,170 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.0.beta1)
5-
actionpack (= 4.2.0.beta1)
6-
actionview (= 4.2.0.beta1)
4+
actionmailer (4.2.0)
5+
actionpack (= 4.2.0)
6+
actionview (= 4.2.0)
7+
activejob (= 4.2.0)
78
mail (~> 2.5, >= 2.5.4)
8-
rails-dom-testing (~> 1.0, >= 1.0.2)
9-
actionpack (4.2.0.beta1)
10-
actionview (= 4.2.0.beta1)
11-
activesupport (= 4.2.0.beta1)
12-
rack (~> 1.6.0.beta)
9+
rails-dom-testing (~> 1.0, >= 1.0.5)
10+
actionpack (4.2.0)
11+
actionview (= 4.2.0)
12+
activesupport (= 4.2.0)
13+
rack (~> 1.6.0)
1314
rack-test (~> 0.6.2)
14-
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
15-
rails-dom-testing (~> 1.0, >= 1.0.2)
16-
actionview (4.2.0.beta1)
17-
activesupport (= 4.2.0.beta1)
15+
rails-dom-testing (~> 1.0, >= 1.0.5)
16+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
17+
actionview (4.2.0)
18+
activesupport (= 4.2.0)
1819
builder (~> 3.1)
1920
erubis (~> 2.7.0)
20-
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
21-
rails-dom-testing (~> 1.0, >= 1.0.2)
22-
activejob (4.2.0.beta1)
23-
globalid (>= 0.2.3)
24-
activemodel (4.2.0.beta1)
25-
activesupport (= 4.2.0.beta1)
21+
rails-dom-testing (~> 1.0, >= 1.0.5)
22+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
23+
activejob (4.2.0)
24+
activesupport (= 4.2.0)
25+
globalid (>= 0.3.0)
26+
activemodel (4.2.0)
27+
activesupport (= 4.2.0)
2628
builder (~> 3.1)
27-
activerecord (4.2.0.beta1)
28-
activemodel (= 4.2.0.beta1)
29-
activesupport (= 4.2.0.beta1)
30-
arel (>= 6.0.0.beta1, < 6.1)
31-
activesupport (4.2.0.beta1)
32-
i18n (>= 0.7.0.beta1, < 0.8)
29+
activerecord (4.2.0)
30+
activemodel (= 4.2.0)
31+
activesupport (= 4.2.0)
32+
arel (~> 6.0)
33+
activesupport (4.2.0)
34+
i18n (~> 0.7)
3335
json (~> 1.7, >= 1.7.7)
3436
minitest (~> 5.1)
35-
thread_safe (~> 0.1)
37+
thread_safe (~> 0.3, >= 0.3.4)
3638
tzinfo (~> 1.1)
37-
arel (6.0.0.beta1)
38-
autoprefixer-rails (3.0.0.20140821)
39+
arel (6.0.0)
40+
autoprefixer-rails (5.1.3)
3941
execjs
40-
binding_of_caller (0.7.3.pre1)
42+
json
43+
binding_of_caller (0.7.2)
4144
debug_inspector (>= 0.0.1)
42-
bootstrap-sass (3.3.1.0)
43-
sass (~> 3.2)
45+
bootstrap-sass (3.3.3)
46+
autoprefixer-rails (>= 5.0.0.1)
47+
sass (>= 3.2.19)
4448
builder (3.2.2)
45-
byebug (3.2.0)
49+
byebug (3.5.1)
4650
columnize (~> 0.8)
4751
debugger-linecache (~> 1.2)
48-
coffee-rails (4.0.1)
52+
slop (~> 3.6)
53+
coffee-rails (4.1.0)
4954
coffee-script (>= 2.2.0)
5055
railties (>= 4.0.0, < 5.0)
5156
coffee-script (2.3.0)
5257
coffee-script-source
5358
execjs
54-
coffee-script-source (1.7.1)
55-
columnize (0.8.9)
59+
coffee-script-source (1.9.0)
60+
columnize (0.9.0)
5661
debug_inspector (0.0.2)
5762
debugger-linecache (1.2.0)
5863
dotenv (1.0.2)
5964
erubis (2.7.0)
60-
execjs (2.2.1)
61-
foreman (0.76.0)
65+
execjs (2.3.0)
66+
foreman (0.77.0)
6267
dotenv (~> 1.0.2)
6368
thor (~> 0.19.1)
64-
globalid (0.2.3)
69+
globalid (0.3.0)
6570
activesupport (>= 4.1.0)
6671
hike (1.2.3)
67-
i18n (0.7.0.beta1)
68-
jbuilder (2.1.3)
72+
i18n (0.7.0)
73+
jbuilder (2.2.6)
6974
activesupport (>= 3.0.0, < 5)
7075
multi_json (~> 1.2)
71-
jquery-rails (3.1.1)
72-
railties (>= 3.0, < 5.0)
76+
jquery-rails (4.0.3)
77+
rails-dom-testing (~> 1.0)
78+
railties (>= 4.2.0)
7379
thor (>= 0.14, < 2.0)
74-
json (1.8.1)
75-
kgio (2.9.2)
80+
json (1.8.2)
81+
kgio (2.9.3)
7682
loofah (2.0.1)
7783
nokogiri (>= 1.5.9)
78-
mail (2.6.1)
84+
mail (2.6.3)
7985
mime-types (>= 1.16, < 3)
80-
mime-types (2.3)
81-
mini_portile (0.6.0)
82-
minitest (5.4.0)
86+
mime-types (2.4.3)
87+
mini_portile (0.6.2)
88+
minitest (5.5.1)
8389
multi_json (1.10.1)
84-
nokogiri (1.6.3.1)
85-
mini_portile (= 0.6.0)
86-
pg (0.17.1)
87-
rack (1.6.0.beta)
88-
rack-test (0.6.2)
90+
nokogiri (1.6.6.2)
91+
mini_portile (~> 0.6.0)
92+
pg (0.18.1)
93+
rack (1.6.0)
94+
rack-test (0.6.3)
8995
rack (>= 1.0)
90-
rails (4.2.0.beta1)
91-
actionmailer (= 4.2.0.beta1)
92-
actionpack (= 4.2.0.beta1)
93-
actionview (= 4.2.0.beta1)
94-
activejob (= 4.2.0.beta1)
95-
activemodel (= 4.2.0.beta1)
96-
activerecord (= 4.2.0.beta1)
97-
activesupport (= 4.2.0.beta1)
96+
rails (4.2.0)
97+
actionmailer (= 4.2.0)
98+
actionpack (= 4.2.0)
99+
actionview (= 4.2.0)
100+
activejob (= 4.2.0)
101+
activemodel (= 4.2.0)
102+
activerecord (= 4.2.0)
103+
activesupport (= 4.2.0)
98104
bundler (>= 1.3.0, < 2.0)
99-
railties (= 4.2.0.beta1)
100-
sprockets-rails (~> 3.0.0.beta1)
101-
rails-deprecated_sanitizer (1.0.2)
105+
railties (= 4.2.0)
106+
sprockets-rails
107+
rails-deprecated_sanitizer (1.0.3)
102108
activesupport (>= 4.2.0.alpha)
103-
rails-dom-testing (1.0.2)
104-
activesupport
109+
rails-dom-testing (1.0.5)
110+
activesupport (>= 4.2.0.beta, < 5.0)
105111
nokogiri (~> 1.6.0)
106112
rails-deprecated_sanitizer (>= 1.0.1)
107-
rails-html-sanitizer (1.0.0)
113+
rails-html-sanitizer (1.0.1)
108114
loofah (~> 2.0)
109-
rails_12factor (0.0.2)
115+
rails_12factor (0.0.3)
110116
rails_serve_static_assets
111117
rails_stdout_logging
112-
rails_serve_static_assets (0.0.2)
118+
rails_serve_static_assets (0.0.4)
113119
rails_stdout_logging (0.0.3)
114-
railties (4.2.0.beta1)
115-
actionpack (= 4.2.0.beta1)
116-
activesupport (= 4.2.0.beta1)
120+
railties (4.2.0)
121+
actionpack (= 4.2.0)
122+
activesupport (= 4.2.0)
117123
rake (>= 0.8.7)
118124
thor (>= 0.18.1, < 2.0)
119125
raindrops (0.13.0)
120-
rake (10.3.2)
121-
rdoc (4.1.1)
126+
rake (10.4.2)
127+
rdoc (4.2.0)
122128
json (~> 1.4)
123-
sass (3.4.1)
124-
sass-rails (5.0.0.beta1)
129+
sass (3.4.11)
130+
sass-rails (5.0.1)
125131
railties (>= 4.0.0, < 5.0)
126-
sass (~> 3.2)
127-
sprockets (~> 2.12)
132+
sass (~> 3.1)
133+
sprockets (>= 2.8, < 4.0)
128134
sprockets-rails (>= 2.0, < 4.0)
135+
tilt (~> 1.1)
129136
sdoc (0.4.1)
130137
json (~> 1.7, >= 1.7.7)
131138
rdoc (~> 4.0)
132-
spring (1.1.3)
133-
sprockets (2.12.1)
139+
slop (3.6.0)
140+
spring (1.2.0)
141+
sprockets (2.12.3)
134142
hike (~> 1.2)
135143
multi_json (~> 1.0)
136144
rack (~> 1.0)
137145
tilt (~> 1.1, != 1.3.0)
138-
sprockets-rails (3.0.0.beta1)
139-
actionpack (>= 4.0)
140-
activesupport (>= 4.0)
141-
sprockets (~> 2.8)
142-
sqlite3 (1.3.9)
146+
sprockets-rails (2.2.4)
147+
actionpack (>= 3.0)
148+
activesupport (>= 3.0)
149+
sprockets (>= 2.8, < 4.0)
150+
sqlite3 (1.3.10)
143151
thor (0.19.1)
144152
thread_safe (0.3.4)
145153
tilt (1.4.1)
146-
turbolinks (2.3.0)
154+
turbolinks (2.5.3)
147155
coffee-rails
148156
tzinfo (1.2.2)
149157
thread_safe (~> 0.1)
150-
uglifier (2.5.3)
158+
uglifier (2.7.0)
151159
execjs (>= 0.3.0)
152160
json (>= 1.8.0)
153161
unicorn (4.8.3)
154162
kgio (~> 2.6)
155163
rack
156164
raindrops (~> 0.7)
157-
web-console (2.0.0.beta3)
165+
web-console (2.0.0)
158166
activemodel (~> 4.0)
159-
binding_of_caller (= 0.7.3.pre1)
167+
binding_of_caller (>= 0.7.2)
160168
railties (~> 4.0)
161169
sprockets-rails (>= 2.0, < 4.0)
162170

@@ -167,19 +175,19 @@ DEPENDENCIES
167175
autoprefixer-rails
168176
bootstrap-sass (~> 3.3.1)
169177
byebug
170-
coffee-rails (~> 4.0.0)
178+
coffee-rails
171179
foreman
172-
jbuilder (~> 2.0)
180+
jbuilder
173181
jquery-rails
174182
pg
175-
rails (= 4.2.0.beta1)
176-
rails-html-sanitizer (~> 1.0)
183+
rails (~> 4.2)
184+
rails-html-sanitizer
177185
rails_12factor
178-
sass-rails (~> 5.0.0.beta1)
179-
sdoc (~> 0.4.0)
186+
sass-rails
187+
sdoc
180188
spring
181189
sqlite3
182190
turbolinks
183-
uglifier (>= 1.3.0)
191+
uglifier
184192
unicorn
185193
web-console (~> 2.0.0.beta2)

Procfile.dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
web: rails s -p 4000
22
webpack: cd webpack && $(npm bin)/webpack -w --config webpack.rails.config.js
3+
hot: cd webpack && node server.js

0 commit comments

Comments
 (0)