tdiary/tdiary-core [master] update dependency: ffi-1.2.0

[SHIBATA H. <nul...@cl...>]

SHIBATA Hiroshi	2012-11-23 04:15:40 +0900 (Fri, 23 Nov 2012)

  New Revision: 3ec9847906c12cbbb284b63e341cc5cb1ef10622
  https://github.com/tdiary/tdiary-core/commit/3ec9847906c12cbbb284b63e341cc5cb1ef10622

  Merged da9457e: Merge branch 'master' of github.com:tdiary/tdiary-core

  Log:
    update dependency: ffi-1.2.0

  Modified files:
    Gemfile.lock
    misc/gemfiles/ruby18.gemfile
    misc/gemfiles/ruby18.gemfile.lock

  Modified: Gemfile.lock (+6 -5)
===================================================================
--- Gemfile.lock    2012-11-19 05:37:14 +0900 (6399993)
+++ Gemfile.lock    2012-11-23 04:15:40 +0900 (a677a1d)
@@ -13,7 +13,7 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     capistrano_colors (0.5.5)
-    capybara (2.0.0)
+    capybara (2.0.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -36,7 +36,7 @@ GEM
       multi_json (~> 1.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    ffi (1.1.5)
+    ffi (1.2.0)
     hashie (1.2.0)
     highline (1.6.15)
     hike (1.2.1)
@@ -52,8 +52,8 @@ GEM
       multi_json (>= 1.0)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.5)
-      addressable
+    libwebsocket (0.1.6.1)
+      websocket
     method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.7)
@@ -103,7 +103,7 @@ GEM
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (10.0.1)
+    rake (10.0.2)
     rcov (1.0.0)
     redcarpet (2.2.2)
     rspec (2.12.0)
@@ -147,6 +147,7 @@ GEM
     tilt (1.3.3)
     twitter-text (1.5.0)
       activesupport
+    websocket (1.0.3)
     xpath (1.0.0)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)

  Modified: misc/gemfiles/ruby18.gemfile (+1 -0)
===================================================================
--- misc/gemfiles/ruby18.gemfile    2012-11-19 05:37:14 +0900 (9a63449)
+++ misc/gemfiles/ruby18.gemfile    2012-11-23 04:15:40 +0900 (c8683c7)
@@ -18,6 +18,7 @@ group :development, :test do
   gem 'tapp'
   gem 'test-unit', :require => 'test/unit'
   gem 'rspec'
+  gem 'ffi', '< 1.2'
   gem 'capybara', '< 2', :require => 'capybara/rspec'
   gem 'launchy'
   gem 'sequel', '3.40.0'

  Modified: misc/gemfiles/ruby18.gemfile.lock (+5 -3)
===================================================================
--- misc/gemfiles/ruby18.gemfile.lock    2012-11-19 05:37:14 +0900 (f1c1fe4)
+++ misc/gemfiles/ruby18.gemfile.lock    2012-11-23 04:15:40 +0900 (e549954)
@@ -42,8 +42,8 @@ GEM
       multi_json (>= 1.0)
     launchy (2.1.2)
       addressable (~> 2.3)
-    libwebsocket (0.1.5)
-      addressable
+    libwebsocket (0.1.6.1)
+      websocket
     method_source (0.8.1)
     mime-types (1.19)
     multi_json (1.3.7)
@@ -82,7 +82,7 @@ GEM
     rack (1.4.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.1)
+    rake (10.0.2)
     rcov (1.0.0)
     redcarpet (2.2.2)
     rspec (2.12.0)
@@ -114,6 +114,7 @@ GEM
     tilt (1.3.3)
     twitter-text (1.5.0)
       activesupport
+    websocket (1.0.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yajl-ruby (1.1.0)
@@ -125,6 +126,7 @@ DEPENDENCIES
   capybara (< 2)
   ci_reporter
   coffee-script
+  ffi (< 1.2)
   jasmine
   launchy
   omniauth