Permalink
Browse files

Fix dependencies

  • Loading branch information...
Max Gorin
Max Gorin committed May 26, 2013
1 parent 9e08b92 commit 9e071726d327d6133938c1359a3aafce27ddc4e5
Showing with 104 additions and 104 deletions.
  1. +47 −50 Gemfile.lock
  2. +1 −1 netzke-communitypack.gemspec
  3. +2 −2 test/communitypack_test_app/Gemfile
  4. +54 −51 test/communitypack_test_app/Gemfile.lock
View
@@ -1,111 +1,108 @@
GIT
remote: git://github.com/netzke/netzke-basepack.git
- revision: 2eafbad8747fa6f81d6925cfda5c9fbdc1eb212d
+ revision: 9373e251d1a067ada91c1461b13580576af79d88
specs:
- netzke-basepack (0.8.2)
- netzke-core (~> 0.8.0)
+ netzke-basepack (0.8.4)
+ netzke-core (~> 0.8.2)
GIT
remote: git://github.com/netzke/netzke-core.git
- revision: b75d0dced90f6b2579334e275f0dd820456404a5
+ revision: c7adc71a80e84515b80df63c253fc6ae54fbc97e
specs:
- netzke-core (0.8.2)
- activesupport (>= 3.1.0)
+ netzke-core (0.8.4)
execjs
- rails (~> 3.2.9)
uglifier
PATH
remote: .
specs:
netzke-communitypack (0.8.0)
- netzke-basepack (~> 0.8.0)
+ netzke-basepack (>= 0.8.0)
rails (>= 3.0.0)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
- mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.4)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- hike (1.2.1)
+ hike (1.2.2)
i18n (0.6.1)
journey (1.0.4)
- json (1.7.6)
- mail (2.4.4)
- i18n (>= 0.4.0)
+ json (1.8.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.5.0)
+ mime-types (1.23)
+ multi_json (1.7.3)
polyglot (0.3.3)
- rack (1.4.3)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- thor (0.16.0)
- tilt (1.3.3)
+ sqlite3 (1.3.7)
+ thor (0.18.1)
+ tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
- uglifier (1.3.0)
+ tzinfo (0.3.37)
+ uglifier (2.1.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] + ["LICENSE", "Rakefile", "README.md"]
s.test_files = Dir["test/**/*"]
- s.add_dependency "netzke-basepack", "~> 0.8.0"
+ s.add_dependency "netzke-basepack", ">= 0.8.0"
s.add_dependency "rails", ">= 3.0.0"
s.add_development_dependency "sqlite3"
@@ -19,8 +19,8 @@ when 'sq'
end
# Get the latest sources from github
-gem 'netzke-core', :github => 'nomadcoder/netzke-core'
-gem 'netzke-basepack', :github => 'nomadcoder/netzke-basepack'
+gem 'netzke-core', :github => 'netzke/netzke-core'
+gem 'netzke-basepack', :github => 'netzke/netzke-basepack'
# gem 'netzke-core', path: "~/code/netzke/netzke-core"
# gem 'netzke-basepack', path: "~/code/netzke/netzke-basepack"
@@ -1,16 +1,17 @@
GIT
- remote: git://github.com/nomadcoder/netzke-basepack.git
- revision: 215168110ac4125d06be9d9f703d9883742a6532
+ remote: git://github.com/netzke/netzke-basepack.git
+ revision: 9373e251d1a067ada91c1461b13580576af79d88
specs:
- netzke-basepack (0.8.0)
- netzke-core (~> 0.8.0)
+ netzke-basepack (0.8.4)
+ netzke-core (~> 0.8.2)
GIT
- remote: git://github.com/nomadcoder/netzke-core.git
- revision: c5d884a25181f2b23bd0fcedc2cfd2ff4e37f5f3
+ remote: git://github.com/netzke/netzke-core.git
+ revision: c7adc71a80e84515b80df63c253fc6ae54fbc97e
specs:
- netzke-core (0.8.0)
- activesupport (>= 3.0.0)
+ netzke-core (0.8.4)
+ execjs
+ uglifier
GEM
remote: https://rubygems.org/
@@ -42,7 +43,7 @@ GEM
activesupport (3.2.8)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.3.2)
+ addressable (2.3.4)
arel (3.0.2)
builder (3.0.4)
capybara (1.1.4)
@@ -52,49 +53,48 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- capybara-screenshot (0.3.2)
+ capybara-screenshot (0.3.6)
capybara (>= 1.0, < 3)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
- coderay (1.0.8)
+ childprocess (0.3.9)
+ ffi (~> 1.0, >= 1.0.11)
+ coderay (1.0.9)
daemons (1.1.9)
database_cleaner (0.9.1)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.4)
erubis (2.7.0)
- eventmachine (1.0.0)
- factory_girl (4.1.0)
+ eventmachine (1.0.3)
+ execjs (1.4.0)
+ multi_json (~> 1.0)
+ factory_girl (4.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.1.0)
- factory_girl (~> 4.1.0)
+ factory_girl_rails (4.2.1)
+ factory_girl (~> 4.2.0)
railties (>= 3.0.0)
- ffi (1.2.0)
- hike (1.2.1)
- i18n (0.6.1)
+ ffi (1.8.1)
+ hike (1.2.2)
+ i18n (0.6.4)
journey (1.0.4)
- json (1.7.5)
- launchy (2.1.2)
+ json (1.7.7)
+ launchy (2.3.0)
addressable (~> 2.3)
- libwebsocket (0.1.7.1)
- addressable
- websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
- mime-types (1.19)
- multi_json (1.5.0)
+ mime-types (1.23)
+ multi_json (1.7.3)
mysql2 (0.3.11)
- nokogiri (1.5.6)
+ nokogiri (1.5.9)
polyglot (0.3.3)
- pry (0.9.10)
+ pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
- slop (~> 3.3.1)
- rack (1.4.1)
+ slop (~> 3.4)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
@@ -113,27 +113,27 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
- rdoc (3.12)
+ rake (10.0.4)
+ rdoc (3.12.2)
json (~> 1.4)
- rspec-core (2.12.2)
- rspec-expectations (2.12.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
- rspec-rails (2.12.0)
+ rspec-core (2.13.1)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.1)
+ rspec-rails (2.13.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
rubyzip (0.9.9)
- selenium-webdriver (2.27.2)
+ selenium-webdriver (2.32.1)
childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- slop (3.3.3)
+ websocket (~> 1.0.4)
+ slop (3.4.4)
spork (1.0.0rc3)
spork-rails (3.2.1)
rails (>= 3.0.0, < 3.3.0)
@@ -142,17 +142,20 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thin (1.5.0)
+ thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.16.0)
- tilt (1.3.3)
+ thor (0.18.1)
+ tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
- websocket (1.0.6)
+ tzinfo (0.3.37)
+ uglifier (2.1.0)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.0, >= 1.0.2)
+ websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

0 comments on commit 9e07172

Please sign in to comment.