Permalink
Browse files

gems deps updated

  • Loading branch information...
1 parent bcd892d commit 4e6602c3b5b5ca8b4f7eb81185c87d5f703dd7ae @kristianmandrup committed Mar 21, 2013
Showing with 89 additions and 72 deletions.
  1. +1 −1 .rspec
  2. +1 −0 .rvmrc
  3. +10 −6 Gemfile
  4. +75 −64 Gemfile.lock
  5. +1 −1 VERSION
  6. +1 −0 lib/controll.rb
View
2 .rspec
@@ -1 +1 @@
---color
+--color --format nested
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm use 1.9.3
View
16 Gemfile
@@ -1,18 +1,22 @@
-source :rubygems
+source 'https://rubygems.org'
-gem 'hashie', '~> 1.2'
+gem 'hashie', '>= 1.2'
gem 'liquid'
-gem 'imperator-ext', '~> 0.2.0' #, path: '/Users/kmandrup/private/repos/imperator-ext' #, :git => 'git://github.com/kristianmandrup/imperator-ext.git'
+gem 'imperator-ext', '>= 0.2.0' #, path: '/Users/kmandrup/private/repos/imperator-ext' #, :git => 'git://github.com/kristianmandrup/imperator-ext.git'
gem 'focused_controller', :git => 'git://github.com/kristianmandrup/focused_controller.git'
gem 'i18n', '>= 0.6'
-gem 'rails', '~> 3'
+gem 'rails', '>= 3.1'
+
+group :test do
+ gem 'mongoid', '>= 3.1'
+end
group :development do
- gem "rspec", ">= 2.8.0"
+ gem "rspec", ">= 2.11"
gem "rdoc", ">= 3.12"
- gem "bundler", ">= 1.0.0"
+ gem "bundler", ">= 1.1.0"
gem "jeweler", ">= 1.8.4"
gem "simplecov",">= 0.5"
end
View
139 Gemfile.lock
@@ -6,49 +6,50 @@ GIT
actionpack (~> 3.0)
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- actionmailer (3.2.7)
- actionpack (= 3.2.7)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
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.1.3)
- activemodel (3.2.7)
- activesupport (= 3.2.7)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.7)
- activemodel (= 3.2.7)
- activesupport (= 3.2.7)
- activesupport (3.2.7)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- backports (2.6.3)
- builder (3.0.0)
- diff-lcs (1.1.3)
+ backports (2.6.7)
+ builder (3.0.4)
+ descendants_tracker (0.0.1)
+ diff-lcs (1.2.1)
erubis (2.7.0)
git (1.2.5)
- hashie (1.2.0)
+ hashie (2.0.3)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.4)
imperator (0.2.0)
activemodel
uuidtools
virtus
- imperator-ext (0.2.1)
+ imperator-ext (0.2.3)
imperator
virtus
jeweler (1.8.4)
@@ -57,78 +58,88 @@ GEM
rake
rdoc
journey (1.0.4)
- json (1.7.4)
- liquid (2.3.0)
+ json (1.7.7)
+ liquid (2.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.3.6)
+ mime-types (1.21)
+ mongoid (3.1.2)
+ activemodel (~> 3.2)
+ moped (~> 1.4.2)
+ origin (~> 1.0)
+ tzinfo (~> 0.3.22)
+ moped (1.4.3)
+ multi_json (1.7.1)
+ origin (1.0.11)
polyglot (0.3.3)
- rack (1.4.1)
+ 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.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.7)
- actionmailer (= 3.2.7)
- actionpack (= 3.2.7)
- activerecord (= 3.2.7)
- activeresource (= 3.2.7)
- activesupport (= 3.2.7)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.7)
- railties (3.2.7)
- actionpack (= 3.2.7)
- activesupport (= 3.2.7)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
- rdoc (3.12)
+ rake (10.0.3)
+ rdoc (3.12.2)
json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.2)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
- simplecov (0.6.4)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.1)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
+ simplecov (0.7.1)
multi_json (~> 1.0)
- simplecov-html (~> 0.5.3)
- simplecov-html (0.5.3)
- sprockets (2.1.3)
+ simplecov-html (~> 0.7.1)
+ simplecov-html (0.7.1)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thor (0.15.4)
- tilt (1.3.3)
- treetop (1.4.10)
+ thor (0.17.0)
+ tilt (1.3.6)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.37)
uuidtools (2.1.3)
- virtus (0.5.1)
+ virtus (0.5.4)
backports (~> 2.6.1)
+ descendants_tracker (~> 0.0.1)
PLATFORMS
ruby
DEPENDENCIES
- bundler (>= 1.0.0)
+ bundler (>= 1.1.0)
focused_controller!
- hashie (~> 1.2)
+ hashie (>= 1.2)
i18n (>= 0.6)
- imperator-ext (~> 0.2.0)
+ imperator-ext (>= 0.2.0)
jeweler (>= 1.8.4)
liquid
- rails (~> 3)
+ mongoid (>= 3.1)
+ rails (>= 3.1)
rdoc (>= 3.12)
- rspec (>= 2.8.0)
+ rspec (>= 2.11)
simplecov (>= 0.5)
View
2 VERSION
@@ -1 +1 @@
-0.3.1
+0.3.2
View
1 lib/controll.rb
@@ -2,6 +2,7 @@ module Controll
end
require 'hashie'
+require 'singleton'
require 'imperator-ext'
require 'controll/errors'
require 'controll/event'

0 comments on commit 4e6602c

Please sign in to comment.