Skip to content

Commit 68763f9

Browse files
committed
Brushing things off
1 parent 4f80116 commit 68763f9

13 files changed

+179
-113
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ build/
3535

3636
# nope
3737
vendor/
38+
.ruby-version

.rspec

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
-r spec_helper
2-
-f documentation
3-
-c
1+
--color
2+
--format documentation
3+
--require pry
4+
--require support

.rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
inherit_from: .rubocop_todo.yml
2+
3+
Style/Documentation:
4+
Enabled: false

.rubocop_todo.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This configuration was generated by
2+
# `rubocop --auto-gen-config`
3+
# on 2015-10-02 15:15:46 -0400 using RuboCop version 0.34.2.
4+
# The point is for the user to remove these configuration records
5+
# one by one as the offenses are removed from the code base.
6+
# Note that changes in the inspected code, or installation of new
7+
# versions of RuboCop, may require this file to be generated again.
8+
9+
# Offense count: 1
10+
Metrics/AbcSize:
11+
Max: 32
12+
13+
# Offense count: 1
14+
# Configuration parameters: CountComments.
15+
Metrics/ClassLength:
16+
Max: 151
17+
18+
# Offense count: 1
19+
Metrics/CyclomaticComplexity:
20+
Max: 7
21+
22+
# Offense count: 1
23+
# Configuration parameters: CountComments.
24+
Metrics/MethodLength:
25+
Max: 29
26+
27+
# Offense count: 1
28+
Metrics/PerceivedComplexity:
29+
Max: 8

.simplecov

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SimpleCov.start { add_filter '/spec/' } if ENV['COVERAGE']

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: ruby
2-
rvm: 2.2.0
2+
3+
rvm: 2.2.3
4+
35
deploy:
46
provider: heroku
57
api_key:

Gemfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
source 'https://rubygems.org'
22

3-
ruby '2.2.0' if ENV.key?('DYNO')
3+
ruby '2.2.3' if ENV.key?('DYNO')
44

55
gem 'pry', group: [:test, :development]
66
gem 'puma'
77
gem 'rake', group: [:test, :development]
88
gem 'redis'
99
gem 'rerun', group: [:test, :development]
1010
gem 'rspec', group: [:test, :development]
11+
gem 'rubocop', group: [:test, :development]
12+
gem 'simplecov', group: [:test, :development]
1113
gem 'sinatra'
1214
gem 'sinatra-contrib'

Gemfile.lock

+55-29
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,84 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
backports (3.6.4)
4+
ast (2.1.0)
5+
astrolabe (1.3.1)
6+
parser (~> 2.2)
7+
backports (3.6.6)
58
celluloid (0.16.0)
69
timers (~> 4.0.0)
710
coderay (1.1.0)
811
diff-lcs (1.2.5)
9-
ffi (1.9.6)
10-
hitimes (1.2.2)
11-
listen (2.8.5)
12-
celluloid (>= 0.15.2)
12+
docile (1.1.5)
13+
ffi (1.9.10)
14+
hitimes (1.2.3)
15+
json (1.8.3)
16+
listen (2.10.1)
17+
celluloid (~> 0.16.0)
1318
rb-fsevent (>= 0.9.3)
1419
rb-inotify (>= 0.9)
1520
method_source (0.8.2)
16-
multi_json (1.10.1)
17-
pry (0.10.1)
21+
multi_json (1.11.2)
22+
parser (2.2.2.6)
23+
ast (>= 1.1, < 3.0)
24+
powerpack (0.1.1)
25+
pry (0.10.2)
1826
coderay (~> 1.1.0)
1927
method_source (~> 0.8.1)
2028
slop (~> 3.4)
21-
puma (2.10.2)
22-
rack (>= 1.1, < 2.0)
23-
rack (1.6.0)
29+
puma (2.14.0)
30+
rack (1.6.4)
2431
rack-protection (1.5.3)
2532
rack
2633
rack-test (0.6.3)
2734
rack (>= 1.0)
35+
rainbow (2.0.0)
2836
rake (10.4.2)
29-
rb-fsevent (0.9.4)
37+
rb-fsevent (0.9.6)
3038
rb-inotify (0.9.5)
3139
ffi (>= 0.5.0)
32-
redis (3.2.0)
40+
redis (3.2.1)
3341
rerun (0.10.0)
3442
listen (~> 2.7, >= 2.7.3)
35-
rspec (3.1.0)
36-
rspec-core (~> 3.1.0)
37-
rspec-expectations (~> 3.1.0)
38-
rspec-mocks (~> 3.1.0)
39-
rspec-core (3.1.4)
40-
rspec-support (~> 3.1.0)
41-
rspec-expectations (3.1.1)
43+
rspec (3.3.0)
44+
rspec-core (~> 3.3.0)
45+
rspec-expectations (~> 3.3.0)
46+
rspec-mocks (~> 3.3.0)
47+
rspec-core (3.3.2)
48+
rspec-support (~> 3.3.0)
49+
rspec-expectations (3.3.1)
4250
diff-lcs (>= 1.2.0, < 2.0)
43-
rspec-support (~> 3.1.0)
44-
rspec-mocks (3.1.1)
45-
rspec-support (~> 3.1.0)
46-
rspec-support (3.1.0)
47-
sinatra (1.4.5)
51+
rspec-support (~> 3.3.0)
52+
rspec-mocks (3.3.2)
53+
diff-lcs (>= 1.2.0, < 2.0)
54+
rspec-support (~> 3.3.0)
55+
rspec-support (3.3.0)
56+
rubocop (0.34.2)
57+
astrolabe (~> 1.3)
58+
parser (>= 2.2.2.5, < 3.0)
59+
powerpack (~> 0.1)
60+
rainbow (>= 1.99.1, < 3.0)
61+
ruby-progressbar (~> 1.4)
62+
ruby-progressbar (1.7.5)
63+
simplecov (0.10.0)
64+
docile (~> 1.1.0)
65+
json (~> 1.8)
66+
simplecov-html (~> 0.10.0)
67+
simplecov-html (0.10.0)
68+
sinatra (1.4.6)
4869
rack (~> 1.4)
4970
rack-protection (~> 1.4)
50-
tilt (~> 1.3, >= 1.3.4)
51-
sinatra-contrib (1.4.2)
71+
tilt (>= 1.3, < 3)
72+
sinatra-contrib (1.4.6)
5273
backports (>= 2.0)
5374
multi_json
5475
rack-protection
5576
rack-test
5677
sinatra (~> 1.4.0)
57-
tilt (~> 1.3)
78+
tilt (>= 1.3, < 3)
5879
slop (3.6.0)
59-
tilt (1.4.1)
60-
timers (4.0.1)
80+
tilt (2.0.1)
81+
timers (4.0.4)
6182
hitimes
6283

6384
PLATFORMS
@@ -70,5 +91,10 @@ DEPENDENCIES
7091
redis
7192
rerun
7293
rspec
94+
rubocop
95+
simplecov
7396
sinatra
7497
sinatra-contrib
98+
99+
BUNDLED WITH
100+
1.10.6

Rakefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
begin
22
require 'rspec/core/rake_task'
3+
require 'rubocop/rake_task'
34
rescue LoadError => e
45
warn e
56
end
67

78
RSpec::Core::RakeTask.new if defined?(RSpec)
8-
task default: :spec
9+
RuboCop::RakeTask.new if defined?(RuboCop)
10+
11+
task default: %i(rubocop spec)

app.rb

-50
This file was deleted.

0 commit comments

Comments
 (0)