Skip to content

Commit fb22dd8

Browse files
committed
Merge pull request #13 from sue445/feature/upgrade
update gems
2 parents aae9741 + 5c4d01a commit fb22dd8

File tree

8 files changed

+85
-56
lines changed

8 files changed

+85
-56
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
language: ruby
22
rvm:
3-
- 2.0
43
- 2.1
54
- 2.2
5+
- 2.3.0
66
- ruby-head
77
script:
88
- bundle exec rspec
99
notifications:
1010
email: false
1111
matrix:
1212
allow_failures:
13-
- rvm: 2.2
1413
- rvm: ruby-head

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
22

33
group :development do
4-
gem 'rspec', '~> 3.1.0'
4+
gem 'rspec'
55
gem 'rspec-power_assert'
66

7-
gem 'guard-rspec', "~> 4.3.1"
7+
gem 'guard-rspec'
88

99
# Runs on Mac OS X
1010
gem 'growl'

Gemfile.lock

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,75 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
celluloid (0.16.0)
5-
timers (~> 4.0.0)
64
coderay (1.1.0)
75
diff-lcs (1.2.5)
8-
ffi (1.9.6)
6+
ffi (1.9.10)
97
formatador (0.2.5)
108
growl (1.0.3)
11-
guard (2.6.1)
9+
guard (2.13.0)
1210
formatador (>= 0.2.4)
13-
listen (~> 2.7)
11+
listen (>= 2.7, <= 4.0)
1412
lumberjack (~> 1.0)
13+
nenv (~> 0.1)
14+
notiffany (~> 0.0)
1515
pry (>= 0.9.12)
16+
shellany (~> 0.0)
1617
thor (>= 0.18.1)
17-
guard-rspec (4.3.1)
18+
guard-compat (1.2.1)
19+
guard-rspec (4.6.4)
1820
guard (~> 2.1)
19-
rspec (>= 2.14, < 4.0)
20-
hitimes (1.2.2)
21-
libnotify (0.8.4)
21+
guard-compat (~> 1.1)
22+
rspec (>= 2.99.0, < 4.0)
23+
libnotify (0.9.1)
2224
ffi (>= 1.0.11)
23-
listen (2.7.11)
24-
celluloid (>= 0.15.2)
25+
listen (3.0.5)
2526
rb-fsevent (>= 0.9.3)
2627
rb-inotify (>= 0.9)
27-
lumberjack (1.0.9)
28+
lumberjack (1.0.10)
2829
method_source (0.8.2)
29-
power_assert (0.2.1)
30-
pry (0.10.1)
30+
nenv (0.2.0)
31+
notiffany (0.0.8)
32+
nenv (~> 0.1)
33+
shellany (~> 0.0)
34+
power_assert (0.2.7)
35+
pry (0.10.3)
3136
coderay (~> 1.1.0)
3237
method_source (~> 0.8.1)
3338
slop (~> 3.4)
34-
rb-fsevent (0.9.4)
39+
rb-fsevent (0.9.7)
3540
rb-inotify (0.9.5)
3641
ffi (>= 0.5.0)
3742
rb-notifu (0.0.4)
38-
rspec (3.1.0)
39-
rspec-core (~> 3.1.0)
40-
rspec-expectations (~> 3.1.0)
41-
rspec-mocks (~> 3.1.0)
42-
rspec-core (3.1.7)
43-
rspec-support (~> 3.1.0)
44-
rspec-expectations (3.1.2)
43+
rspec (3.4.0)
44+
rspec-core (~> 3.4.0)
45+
rspec-expectations (~> 3.4.0)
46+
rspec-mocks (~> 3.4.0)
47+
rspec-core (3.4.2)
48+
rspec-support (~> 3.4.0)
49+
rspec-expectations (3.4.0)
4550
diff-lcs (>= 1.2.0, < 2.0)
46-
rspec-support (~> 3.1.0)
47-
rspec-mocks (3.1.3)
48-
rspec-support (~> 3.1.0)
49-
rspec-power_assert (0.2.0)
51+
rspec-support (~> 3.4.0)
52+
rspec-mocks (3.4.1)
53+
diff-lcs (>= 1.2.0, < 2.0)
54+
rspec-support (~> 3.4.0)
55+
rspec-power_assert (0.3.0)
5056
power_assert (~> 0.2.0)
5157
rspec (>= 2.14)
52-
rspec-support (3.1.2)
58+
rspec-support (3.4.1)
59+
shellany (0.0.1)
5360
slop (3.6.0)
5461
thor (0.19.1)
55-
timers (4.0.1)
56-
hitimes
5762

5863
PLATFORMS
5964
ruby
6065

6166
DEPENDENCIES
6267
growl
63-
guard-rspec (~> 4.3.1)
68+
guard-rspec
6469
libnotify
6570
rb-notifu
66-
rspec (~> 3.1.0)
71+
rspec
6772
rspec-power_assert
73+
74+
BUNDLED WITH
75+
1.11.2

Guardfile

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1+
# A sample Guardfile
2+
# More info at https://github.com/guard/guard#readme
13

4+
## Uncomment and set this to only include directories you want to watch
5+
# directories %w(app lib config test spec features) \
6+
# .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
27

3-
guard 'rspec', cmd: 'bundle exec rspec' do
8+
## Note: if you are using the `directories` clause above and you are not
9+
## watching the project directory ('.'), then you will want to move
10+
## the Guardfile to a watched dir and symlink it back, e.g.
11+
#
12+
# $ mkdir config
13+
# $ mv Guardfile config/
14+
# $ ln -s config/Guardfile .
15+
#
16+
# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
17+
18+
# Note: The cmd option is now required due to the increasing number of ways
19+
# rspec may be run, below are examples of the most common uses.
20+
# * bundler: 'bundle exec rspec'
21+
# * bundler binstubs: 'bin/rspec'
22+
# * spring: 'bin/rsspec' (This will use spring if running and you have
23+
# installed the spring binstubs per the docs)
24+
# * zeus: 'zeus rspec' (requires the server to be started separetly)
25+
# * 'just' rspec: 'rspec'
26+
guard :rspec, cmd: 'bundle exec rspec' do
427
watch(%r{^spec/.+_spec\.rb$})
528
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
629
watch('spec/spec_helper.rb') { "spec" }
730
end
8-

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ TDDBC for Ruby with RSpec
66
[![Build Status](https://travis-ci.org/tddbc/ruby_rspec.svg?branch=master)](https://travis-ci.org/tddbc/ruby_rspec)
77

88
## 動作確認環境
9-
* ruby 2.1.x
10-
* ruby 2.0.x
11-
12-
ruby 1.9以前では動きません
9+
* ruby 2.1以降
1310

1411
## セットアップ
1512
```bash

lib/sample.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- encoding: utf-8 -*-
2-
31
class Sample
42
def say(greeting)
53
"#{greeting} TDD BootCamp!"

spec/lib/sample_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# -*- encoding: utf-8 -*-
2-
31
describe Sample do
42
let(:sample){ Sample.new }
53

spec/spec_helper.rb

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# This file was generated by the `rspec --init` command. Conventionally, all
22
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
3-
# The generated `.rspec` file contains `--require spec_helper` which will cause this
4-
# file to always be loaded, without a need to explicitly require it in any files.
3+
# The generated `.rspec` file contains `--require spec_helper` which will cause
4+
# this file to always be loaded, without a need to explicitly require it in any
5+
# files.
56
#
67
# Given that it is always loaded, you are encouraged to keep this file as
78
# light-weight as possible. Requiring heavyweight dependencies from this file
89
# will add to the boot time of your test suite on EVERY test run, even for an
910
# individual file that may not need all of that loaded. Instead, consider making
1011
# a separate helper file that requires the additional dependencies and performs
11-
# the additional setup, and require it from the spec files that actually need it.
12+
# the additional setup, and require it from the spec files that actually need
13+
# it.
1214
#
1315
# The `.rspec` file also contains a few flags that are not defaults but that
1416
# users commonly want.
@@ -30,10 +32,10 @@
3032
# This option will default to `true` in RSpec 4. It makes the `description`
3133
# and `failure_message` of custom matchers include text for helper methods
3234
# defined using `chain`, e.g.:
33-
# be_bigger_than(2).and_smaller_than(4).description
34-
# # => "be bigger than 2 and smaller than 4"
35+
# be_bigger_than(2).and_smaller_than(4).description
36+
# # => "be bigger than 2 and smaller than 4"
3537
# ...rather than:
36-
# # => "be bigger than 2"
38+
# # => "be bigger than 2"
3739
expectations.include_chain_clauses_in_custom_matcher_descriptions = true
3840
end
3941

@@ -56,11 +58,16 @@
5658
config.filter_run :focus
5759
config.run_all_when_everything_filtered = true
5860
59-
# Limits the available syntax to the non-monkey patched syntax that is recommended.
60-
# For more details, see:
61-
# - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
62-
# - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
63-
# - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
61+
# Allows RSpec to persist some state between runs in order to support
62+
# the `--only-failures` and `--next-failure` CLI options. We recommend
63+
# you configure your source control system to ignore this file.
64+
config.example_status_persistence_file_path = "spec/examples.txt"
65+
66+
# Limits the available syntax to the non-monkey patched syntax that is
67+
# recommended. For more details, see:
68+
# - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
69+
# - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
70+
# - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
6471
config.disable_monkey_patching!
6572
6673
# This setting enables warnings. It's recommended, but in some cases may

0 commit comments

Comments
 (0)