curator 0.9.0 → 0.10.0

data/lib/curator/configuration.rb

@@ -1,3 +1,3 @@
 module Curator::Configuration
-  attr_accessor :environment, :migrations_path
+  attr_accessor :environment, :migrations_path, :client
 end

data/lib/curator/mongo/data_store.rb

@@ -6,13 +6,28 @@ module Curator
     class DataStore
       def client
         return @client if @client
+
+        if Curator.config.client
+          @client        = Curator.config.client
+          @database_name = Curator.config.database
+          return @client
+        end
+
+        if ENV['MONGO_URI']
+          require 'uri'
+          uri = URI.parse(ENV['MONGO_URI'])
+          @database_name = uri.path.gsub(/^\//, '')
+          @client = ::Mongo::Connection.from_uri(uri.to_s)
+          return @client
+        end
+
         config = YAML.load(File.read(Curator.config.mongo_config_file))[Curator.config.environment]
         config = config.symbolize_keys
 
         host = config.delete(:host)
         port = config.delete(:port)
-        password = config.delete(:password)
-        username = config.delete(:username)
+        password = ENV['MONGO_PASSWORD'] || config.delete(:password)
+        username = ENV['MONGO_USERNAME'] || config.delete(:username)
         @database_name = config.delete(:database) || default_db_name
         @client = ::Mongo::Connection.new(host, port, config)
         @client.add_auth(@database_name, username, password) if username and password

data/lib/curator/riak/data_store.rb

@@ -6,6 +6,8 @@ module Curator
     class DataStore
       def client
         return @client if @client
+        return @client = Curator.config.client if Curator.config.client
+
         yml_config = YAML.load(File.read(Curator.config.riak_config_file))[Curator.config.environment]
         @client = ::Riak::Client.new(yml_config)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1871681440090585484
+      hash: 12316657956024539
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,10 +123,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1871681440090585484
+      hash: 12316657956024539
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Model and repository framework