Merge pull request #4 from mosinski/master

specify ruby version and change to use https rubygems source

Georgios Larkou 11 年之前
父节点
当前提交
1070577c6a
共有 2 个文件被更改,包括 24 次插入20 次删除
  1. 2 1
      Gemfile
  2. 22 19
      Gemfile.lock

+ 2 - 1
Gemfile

@@ -1,4 +1,5 @@
1
-source 'http://rubygems.org'
1
+source 'https://rubygems.org'
2 2
 
3
+ruby '2.1.1'
3 4
 gem 'thin'
4 5
 gem 'faye'

+ 22 - 19
Gemfile.lock

@@ -1,34 +1,37 @@
1 1
 GEM
2
-  remote: http://rubygems.org/
2
+  remote: https://rubygems.org/
3 3
   specs:
4
-    addressable (2.3.2)
5
-    cookiejar (0.3.0)
4
+    addressable (2.3.6)
5
+    cookiejar (0.3.2)
6 6
     daemons (1.1.9)
7
-    em-http-request (1.0.3)
8
-      addressable (>= 2.2.3)
7
+    em-http-request (1.1.2)
8
+      addressable (>= 2.3.4)
9 9
       cookiejar
10
-      em-socksify
10
+      em-socksify (>= 0.3)
11
+      eventmachine (>= 1.0.3)
12
+      http_parser.rb (>= 0.6.0)
13
+    em-socksify (0.3.0)
11 14
       eventmachine (>= 1.0.0.beta.4)
12
-      http_parser.rb (>= 0.5.3)
13
-    em-socksify (0.2.1)
14
-      eventmachine (>= 1.0.0.beta.4)
15
-    eventmachine (1.0.0)
16
-    faye (0.8.6)
15
+    eventmachine (1.0.3)
16
+    faye (1.0.1)
17 17
       cookiejar (>= 0.3.0)
18 18
       em-http-request (>= 0.3.0)
19 19
       eventmachine (>= 0.12.0)
20
-      faye-websocket (>= 0.4.0)
20
+      faye-websocket (>= 0.7.0)
21
+      multi_json (>= 1.0.0)
21 22
       rack (>= 1.0.0)
22
-      yajl-ruby (>= 1.0.0)
23
-    faye-websocket (0.4.6)
23
+      websocket-driver (>= 0.3.0)
24
+    faye-websocket (0.7.3)
24 25
       eventmachine (>= 0.12.0)
25
-    http_parser.rb (0.5.3)
26
-    rack (1.4.1)
27
-    thin (1.5.0)
26
+      websocket-driver (>= 0.3.1)
27
+    http_parser.rb (0.6.0)
28
+    multi_json (1.9.3)
29
+    rack (1.5.2)
30
+    thin (1.6.2)
28 31
       daemons (>= 1.0.9)
29
-      eventmachine (>= 0.12.6)
32
+      eventmachine (>= 1.0.0)
30 33
       rack (>= 1.0.0)
31
-    yajl-ruby (1.1.0)
34
+    websocket-driver (0.3.3)
32 35
 
33 36
 PLATFORMS
34 37
   ruby