Skip to content

Commit

Permalink
Use trema develop branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
yasuhito committed May 29, 2015
1 parent 6051575 commit 435509d
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 36 deletions.
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'

gem 'trema', github: 'trema/trema', branch: 'feature/trema_ruby'
gem 'trema', github: 'trema/trema', branch: 'develop'

group :development, :test do
gem 'aruba', require: false
Expand Down
72 changes: 37 additions & 35 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
GIT
remote: git://github.com/trema/trema.git
revision: 021c9363f1d164692360616acd063ac13edf02cb
branch: feature/trema_ruby
revision: ccc3dc6de142c08e118d8271a80f961a6169f971
branch: develop
specs:
trema (0.1.0)
bundler (~> 1.9.1)
gli (~> 2.13.0)
phut (~> 0.4.0)
pio (~> 0.18.2)
bundler (~> 1.10.0)
gli (~> 2.13.1)
phut (~> 0.5.0)
pio (~> 0.20.0)
rake

GEM
Expand Down Expand Up @@ -36,10 +36,10 @@ GEM
concord (0.1.5)
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
coveralls (0.8.0)
multi_json (~> 1.10)
coveralls (0.8.1)
json (~> 1.8)
rest-client (>= 1.6.8, < 2)
simplecov (~> 0.9.1)
simplecov (~> 0.10.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
cucumber (2.0.0)
Expand All @@ -53,7 +53,7 @@ GEM
gherkin (~> 2.12.0)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.23)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
ffi (1.9.8)
Expand All @@ -68,7 +68,7 @@ GEM
multi_json (~> 1.3)
given_core (3.7.0)
sorcerer (>= 0.3.7)
gli (2.13.0)
gli (2.13.1)
guard (2.12.5)
formatador (>= 0.2.4)
listen (~> 2.7)
Expand All @@ -83,7 +83,7 @@ GEM
guard (~> 2.2)
guard-compat (~> 1.1)
guard-compat (1.2.1)
guard-rspec (4.5.0)
guard-rspec (4.5.1)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
Expand All @@ -94,11 +94,12 @@ GEM
http-cookie (1.0.2)
domain_name (~> 0.5)
ice_nine (0.11.1)
inch (0.5.10)
inch (0.6.2)
pry
sparkr (>= 0.2.0)
term-ansicolor
yard (~> 0.8.7.5)
json (1.8.2)
listen (2.10.0)
celluloid (~> 0.16.0)
rb-fsevent (>= 0.9.3)
Expand All @@ -107,39 +108,37 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.8.2)
mime-types (2.4.3)
mime-types (2.6.1)
multi_json (1.11.0)
multi_test (0.1.2)
nenv (0.2.0)
netrc (0.10.3)
notiffany (0.0.6)
nenv (~> 0.1)
shellany (~> 0.0)
parser (2.2.0.3)
parser (2.2.2.5)
ast (>= 1.1, < 3.0)
phut (0.4.0)
phut (0.5.0)
gli (~> 2.13.0)
pio (~> 0.18.2)
pio (~> 0.20.0)
pry (~> 0.10.1)
pio (0.18.2)
pio (0.20.0)
bindata (~> 2.1.0)
powerpack (0.1.0)
powerpack (0.1.1)
procto (0.0.2)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rainbow (2.0.0)
rake (10.4.2)
rb-fsevent (0.9.4)
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
reek (2.0.4)
reek (2.2.1)
parser (~> 2.2)
rainbow (~> 2.0)
require_all (~> 1.3)
unparser (~> 0.2.2)
require_all (1.3.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
Expand All @@ -160,22 +159,22 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rubocop (0.30.0)
rubocop (0.31.0)
astrolabe (~> 1.3)
parser (>= 2.2.0.1, < 3.0)
parser (>= 2.2.2.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.7.5)
ruby_parser (3.6.5)
ruby_parser (3.7.0)
sexp_processor (~> 4.1)
sexp_processor (4.5.0)
sexp_processor (4.6.0)
shellany (0.0.1)
simplecov (0.9.2)
simplecov (0.10.0)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
sorcerer (1.0.2)
sparkr (0.4.1)
Expand All @@ -185,17 +184,17 @@ GEM
thread_safe (0.3.5)
timers (4.0.1)
hitimes
tins (1.3.5)
tins (1.5.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.6)
unparser (0.2.2)
unf_ext (0.0.7.1)
unparser (0.2.3)
abstract_type (~> 0.0.7)
adamantium (~> 0.2.0)
concord (~> 0.1.5)
diff-lcs (~> 1.2.5)
equalizer (~> 0.0.9)
parser (~> 2.2.0.2)
parser (~> 2.2.2, >= 2.2.2.2)
procto (~> 0.0.2)
yard (0.8.7.6)

Expand All @@ -221,3 +220,6 @@ DEPENDENCIES
rubocop
trema!
yard

BUNDLED WITH
1.10.0

0 comments on commit 435509d

Please sign in to comment.