use a more recent trocla version

5 files changed, 19 insertions, 26 deletions

diff --git a/Gemfile b/Gemfile
index acd4436..bb292ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,17 +3,17 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "moneta", ">= 0.6.1", :git => 'git://github.com/duritong/moneta.git'
+gem "moneta", "~> 0.7.2"
 gem "highline"
 gem "bcrypt-ruby"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", "~> 2.4.0"
   gem "rdoc", "~> 3.8"
   gem "mocha"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.1.5"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2464f5d..a933f8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,8 @@
-GIT
-  remote: git://github.com/duritong/moneta.git
-  revision: 38125d0d598891f27fa6836cbc57cb928831ac4f
-  specs:
-    moneta (0.6.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     bcrypt-ruby (2.1.4)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
     highline (1.6.2)
     jeweler (1.6.4)
@@ -16,28 +10,29 @@ GEM
       git (>= 1.2.5)
       rake
     mocha (0.9.12)
+    moneta (0.7.2)
     rake (0.9.2)
     rcov (0.9.9)
     rdoc (3.8)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bcrypt-ruby
-  bundler (~> 1.0.0)
+  bundler (~> 1.1.5)
   highline
   jeweler (~> 1.6.4)
   mocha
-  moneta (>= 0.6.1)!
+  moneta (~> 0.7.2)
   rcov
   rdoc (~> 3.8)
-  rspec (~> 2.3.0)
+  rspec (~> 2.4.0)
diff --git a/README.md b/README.md
index 17c514b..57bbd4b 100644
--- a/README.md
+++ b/README.md
@@ -113,9 +113,7 @@ to address.
 
 ## Installation
 
-Simply build and install the gem. BUT trocla is based on a not yet published
-version of [moneta](https://github.com/wycats/moneta). You can build a new
-moneta version based on the latest master as version 0.6.1 and instal that one.
+Simply build and install the gem. 
 
 ## Contributing to trocla
  
diff --git a/lib/trocla.rb b/lib/trocla.rb
index 96f14d1..5b5772a 100644
--- a/lib/trocla.rb
+++ b/lib/trocla.rb
@@ -67,7 +67,7 @@ class Trocla
     require 'moneta'
     require "moneta/adapters/#{config['adapter'].downcase}"
     lconfig = config
-    Moneta::Builder.new { run eval( "Moneta::Adapters::#{lconfig['adapter']}"), lconfig['adapter_options'] }
+    Moneta.new(lconfig['adapter'], lconfig['adapter_options'])
   end
   
   def config
diff --git a/lib/trocla/default_config.yaml b/lib/trocla/default_config.yaml
index 502e7f1..f46568f 100644
--- a/lib/trocla/default_config.yaml
+++ b/lib/trocla/default_config.yaml
@@ -2,6 +2,6 @@
 options:
     random: true
     length: 12
-adapter: YAML
+adapter: :YAML
 adapter_options:
-    :path: '/tmp/trocla.yaml'
+    :file: '/tmp/trocla.yaml'