Update bundles.

trema · Apr 10, 2015 · 08f33cc · 08f33cc
1 parent 978156e
commit 08f33cc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'trema', github: 'trema/trema_ruby', branch: 'develop'
+gem 'trema', github: 'trema/trema', branch: 'feature/trema_ruby'
 
 group :development, :test do
   gem 'aruba', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
-  remote: git://github.com/trema/trema_ruby.git
-  revision: 66d5c47c7e89488e48d6d71064f521d48a3dacd2
-  branch: develop
+  remote: git://github.com/trema/trema.git
+  revision: 021c9363f1d164692360616acd063ac13edf02cb
+  branch: feature/trema_ruby
   specs:
     trema (0.1.0)
-      bundler (~> 1.8.5)
+      bundler (~> 1.9.1)
       gli (~> 2.13.0)
-      phut (~> 0.3.1)
+      phut (~> 0.4.0)
       pio (~> 0.18.2)
       rake
 
@@ -28,29 +28,34 @@ GEM
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
-    coveralls (0.7.11)
+    coveralls (0.8.0)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    cucumber (1.3.19)
+    cucumber (2.0.0)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.1.3)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
+    cucumber-core (1.1.3)
+      gherkin (~> 2.12.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    equalizer (0.0.9)
+    domain_name (0.5.23)
+      unf (>= 0.0.5, < 1.0.0)
+    equalizer (0.0.11)
     ffi (1.9.8)
     flay (2.6.1)
       ruby_parser (~> 3.0)
@@ -86,14 +91,16 @@ GEM
       guard (~> 2.0)
       rubocop (~> 0.20)
     hitimes (1.2.2)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     ice_nine (0.11.1)
     inch (0.5.10)
       pry
       sparkr (>= 0.2.0)
       term-ansicolor
       yard (~> 0.8.7.5)
-    listen (2.9.0)
-      celluloid (>= 0.15.2)
+    listen (2.10.0)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
@@ -110,7 +117,7 @@ GEM
       shellany (~> 0.0)
     parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
-    phut (0.3.1)
+    phut (0.4.0)
       gli (~> 2.13.0)
       pio (~> 0.18.2)
       pry (~> 0.10.1)
@@ -127,22 +134,23 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    reek (2.0.2)
+    reek (2.0.4)
       parser (~> 2.2)
       rainbow (~> 2.0)
       require_all (~> 1.3)
       unparser (~> 0.2.2)
     require_all (1.3.2)
-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.3)
       rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-given (3.7.0)
@@ -152,13 +160,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    rubocop (0.29.1)
+    rubocop (0.30.0)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
+    ruby-progressbar (1.7.5)
     ruby_parser (3.6.5)
       sexp_processor (~> 4.1)
     sexp_processor (4.5.0)
@@ -178,6 +186,9 @@ GEM
     timers (4.0.1)
       hitimes
     tins (1.3.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.6)
     unparser (0.2.2)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)

diff --git a/Guardfile b/Guardfile
@@ -1,13 +1,13 @@
 guard :rspec, cmd: 'bundle exec rspec' do
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^lib\/(.+)\.rb$/) { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib\/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { 'spec' }
 end
 
 guard :rubocop do
   watch(/.+\.rb$/)
   watch(/.+\.rake$/)
-  watch(/(?:.+\/)?\.rubocop\.yml$/) { |m| File.dirname(m[0]) }
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end
 
 guard :bundler do