Skip to content

Commit

Permalink
Ignore Gemfile.lock and use new bundler syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
halorgium committed Apr 21, 2013
1 parent 42c710c commit 125e813
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 29 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@
*.swo
bundle
.bundle
Gemfile.lock
14 changes: 5 additions & 9 deletions Gemfile
@@ -1,16 +1,12 @@
source "http://rubygems.org"

gem 'celluloid', :git => 'git://github.com/celluloid/celluloid'
gem 'celluloid-io', :git => 'git://github.com/celluloid/celluloid-io'
#gem 'celluloid-zmq', :git => 'git://github.com/celluloid/celluloid-zmq'
#gem 'dcell', :git => 'git://github.com/celluloid/dcell'
gem 'reel', :git => 'git://github.com/celluloid/reel'

gem 'ffi-rzmq', :git => 'git://github.com/chuckremes/ffi-rzmq.git'
gem 'celluloid', :github => 'celluloid/celluloid'
gem 'celluloid-io', :github => 'celluloid/celluloid-io'
gem 'reel', :github => 'celluloid/reel'

gem 'jruby-openssl', :platform => :jruby

gem 'websocket-protocol', :git => 'git://github.com/faye/websocket-protocol-ruby'
gem 'websocket-protocol', :github => 'faye/websocket-protocol-ruby'

# Specify your gem's dependencies in ami-agents.gemspec
# Specify your gem's dependencies in websocket-client-ruby.gemspec
gemspec
31 changes: 11 additions & 20 deletions Gemfile.lock
@@ -1,20 +1,20 @@
GIT
remote: git://github.com/celluloid/celluloid
revision: 1b536e9a3c33e953677f495cc0a213fb170a857d
specs:
celluloid (0.14.0.pre)
timers (>= 1.0.0)

GIT
remote: git://github.com/celluloid/celluloid-io
remote: git://github.com/celluloid/celluloid-io.git
revision: c014887d33c74a426fd0440aa3b99e6c31744709
specs:
celluloid-io (0.14.0.pre)
celluloid (>= 0.13.0)
nio4r (>= 0.4.0)

GIT
remote: git://github.com/celluloid/reel
remote: git://github.com/celluloid/celluloid.git
revision: 1b536e9a3c33e953677f495cc0a213fb170a857d
specs:
celluloid (0.14.0.pre)
timers (>= 1.0.0)

GIT
remote: git://github.com/celluloid/reel.git
revision: a2739675710312942a12a3f42d623fa85f7932f1
specs:
reel (0.3.0)
Expand All @@ -25,14 +25,7 @@ GIT
websocket_parser (>= 0.1.2)

GIT
remote: git://github.com/chuckremes/ffi-rzmq.git
revision: 6e01b87354099f03e59b8257714ced771224b42c
specs:
ffi-rzmq (1.0.1)
ffi

GIT
remote: git://github.com/faye/websocket-protocol-ruby
remote: git://github.com/faye/websocket-protocol-ruby.git
revision: 10da09afbd175ced358eaba2e5bcd468ba4733df
specs:
websocket-protocol (0.1.0)
Expand All @@ -48,14 +41,13 @@ GEM
specs:
certified (0.1.1)
coderay (1.0.9)
ffi (1.7.0)
http (0.4.0)
certified
http_parser.rb
http_parser.rb (0.5.3)
method_source (0.8.1)
nio4r (0.4.3)
pry (0.9.12.1)
pry (0.9.12)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
Expand All @@ -71,7 +63,6 @@ PLATFORMS
DEPENDENCIES
celluloid!
celluloid-io!
ffi-rzmq!
jruby-openssl
reel!
websocket-client-ruby!
Expand Down

0 comments on commit 125e813

Please sign in to comment.