Skip to content

Commit

Permalink
Bump version, dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
pikesley committed Nov 15, 2014
1 parent f4e2fc9 commit 8c1ba80
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.1.2
- 2.1.5
deploy:
provider: heroku
app: dead-cockroach
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '2.1.2'
ruby '2.1.5'
#ruby-gemset=dead-cockroach

gem 'sinatra'
Expand Down
104 changes: 52 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ GEM
specs:
addressable (2.3.6)
builder (3.2.2)
capybara (2.3.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.2.0)
capybara (>= 2.0.2, < 2.4.0)
capybara-webkit (1.3.1)
capybara (>= 2.0.2, < 2.5.0)
json
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid (0.16.0)
timers (~> 4.0.0)
coderay (1.1.0)
coveralls (0.7.0)
coveralls (0.7.2)
multi_json (~> 1.3)
rest-client
rest-client (= 1.6.7)
simplecov (>= 0.7)
term-ansicolor
thor
term-ansicolor (= 1.2.2)
thor (= 0.18.1)
crack (0.4.2)
safe_yaml (~> 1.0.0)
cucumber (1.3.16)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
Expand All @@ -37,41 +37,41 @@ GEM
docile (1.1.5)
eventmachine (1.0.3)
extlib (0.9.16)
ffi (1.9.3)
ffi (1.9.6)
formatador (0.2.5)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (2.6.1)
guard (2.8.2)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-cucumber (1.4.1)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
guard-cucumber (1.5.1)
cucumber (>= 1.3.0)
guard (>= 2.0.0)
guard-rspec (4.3.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
haml (4.0.5)
tilt
highline (1.6.21)
hitimes (1.2.2)
json (1.8.1)
kramdown (1.4.1)
listen (2.7.9)
kramdown (1.5.0)
listen (2.8.0)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
lumberjack (1.0.9)
method_source (0.8.2)
mime-types (2.3)
mini_portile (0.6.0)
mime-types (2.4.3)
mini_portile (0.6.1)
multi_json (1.10.1)
multi_test (0.1.1)
netrc (0.7.7)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
pry (0.10.0)
nokogiri (1.6.4.1)
mini_portile (~> 0.6.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
Expand All @@ -84,25 +84,24 @@ GEM
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec (3.0.0)
rspec-core (~> 3.0.0)
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-core (3.0.3)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.3)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
rspec-mocks (~> 3.1.0)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.3)
rspec-support (~> 3.0.0)
rspec-support (3.0.3)
safe_yaml (1.0.3)
simplecov (0.9.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-support (3.1.2)
safe_yaml (1.0.4)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sinatra (1.4.5)
Expand All @@ -114,19 +113,20 @@ GEM
diff-lcs (>= 1.1.2)
extlib (>= 0.9.5)
highline (>= 1.4.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
terminal-notifier-guard (1.5.3)
thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.19.1)
term-ansicolor (1.2.2)
tins (~> 0.8)
terminal-notifier-guard (1.6.4)
thin (1.6.3)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
thor (0.18.1)
tilt (1.4.1)
timers (1.1.0)
tins (1.3.0)
vcr (2.9.2)
webmock (1.18.0)
timers (4.0.1)
hitimes
tins (0.13.2)
vcr (2.9.3)
webmock (1.20.4)
addressable (>= 2.3.6)
crack (>= 0.3.2)
xpath (2.0.0)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8c1ba80

Please sign in to comment.