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 66b7045 commit baed593
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 47 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: uncleclive
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=uncle-clive

gem 'sinatra'
Expand Down
88 changes: 43 additions & 45 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.6)
activesupport (= 4.1.6)
actionview (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
activesupport (4.1.6)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
archive-tar-minitar (0.5.2)
builder (3.2.2)
capybara (2.4.1)
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.3.0)
capybara-webkit (1.3.1)
capybara (>= 2.0.2, < 2.5.0)
json
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.1)
chunky_png (1.3.3)
coderay (1.1.0)
coveralls (0.7.1)
coveralls (0.7.2)
multi_json (~> 1.3)
rest-client
rest-client (= 1.6.7)
simplecov (>= 0.7)
term-ansicolor
thor
cucumber (1.3.16)
term-ansicolor (= 1.2.2)
thor (= 0.18.1)
cucumber (1.3.17)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
Expand All @@ -52,19 +52,19 @@ GEM
erubis (2.7.0)
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)
Expand All @@ -74,21 +74,20 @@ GEM
hitimes (1.2.2)
i18n (0.6.11)
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)
minitest (5.4.1)
mime-types (2.4.3)
mini_portile (0.6.1)
minitest (5.4.3)
multi_json (1.10.1)
multi_test (0.1.1)
netrc (0.7.7)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
nokogiri (1.6.4.1)
mini_portile (~> 0.6.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand All @@ -109,24 +108,23 @@ GEM
archive-tar-minitar (>= 0.5.2)
json (>= 1.4.6)
rest-client (>= 1.6.1)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
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.2)
rspec-core (3.1.7)
rspec-support (~> 3.1.0)
rspec-expectations (3.1.0)
rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.1.0)
rspec-mocks (3.1.0)
rspec-mocks (3.1.3)
rspec-support (~> 3.1.0)
rspec-support (3.1.0)
simplecov (0.9.0)
rspec-support (3.1.2)
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 @@ -138,19 +136,19 @@ 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)
thread_safe (0.3.4)
tilt (1.4.1)
timers (4.0.1)
hitimes
tins (1.3.2)
tins (0.13.2)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xpath (2.0.0)
Expand Down

0 comments on commit baed593

Please sign in to comment.