broham 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/broham.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{broham}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip (flip) Kromer"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-04-09}
   s.description = %q{Bro! Broham always knows where his bros are, bro. Using broham, a newly-created cloud machine can annouce its availability for a certain role ("nfs_server" or "db_slave-2"), allowing any other interested nodes to discover its public_ip, private_ip, etc. See also: http://j.mp/amongbros}
   s.email = %q{flip@infochimps.org}
   s.executables = ["broham", "broham-diss", "broham-fuck_all_yall", "broham-host", "broham-register", "broham-register_as_next", "broham-sup", "broham-unregister", "broham-unregister-like", "broham-yo"]
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mrflip/broham}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Broham: A simple, global, highly-available, none-too-bright service registry. Broham always knows where his bros are, bro.}
   s.test_files = [
     "spec/broham_spec.rb",

data/lib/broham.rb

@@ -6,11 +6,13 @@ require 'sdb/active_sdb'
 require 'ohai'
 OHAI_INFO = Ohai::System.new unless defined?(OHAI_INFO)
 OHAI_INFO.all_plugins
-# Settings from Configliere
-require 'configliere'; Configliere.use :define
+# Settings from Configliere.
+require 'configliere'
 Settings.define :access_key,        :required => true, :description => "Amazon AWS access key ID     -- found in your AWS console (http://bit.ly/awsconsole)"
 Settings.define :secret_access_key, :required => true, :description => "Amazon AWS secret access key -- found in your AWS console (http://bit.ly/awsconsole)"
 
+::Log = Logger.new(STDERR) unless defined?(Log)
+
 #
 # Make sure you are using a recent (>= 1.11,0) version of right_aws, and set the
 # SDB_API_VERSION environment variable to '2009-04-15':
@@ -121,17 +123,20 @@ class Broham < RightAws::ActiveSdb::Base
   def self.my_availability_zone() OHAI_INFO[:ec2][:availability_zone]              ; end
   def self.timestamp()            Time.now.utc.strftime("%Y%m%d%H%M%S")            ; end
 
-  def private_ip()        self['private_ip'       ] || default_ip ; end
-  def public_ip()         self['public_ip'        ] || default_ip ; end
-  def default_ip()        self['default_ip'       ] ; end
-  def fqdn()              self['fqdn'             ] ; end
-  def availability_zone() self['availability_zone'] ; end
+  def private_ip()        self['private_ip'       ].first || default_ip ; end
+  def public_ip()         self['public_ip'        ].first || default_ip ; end
+  def default_ip()        self['default_ip'       ].first ; end
+  def fqdn()              self['fqdn'             ].first ; end
+  def availability_zone() self['availability_zone'].first ; end
   def idx()
-    self['idx']
+    self['idx'].first
   end
 
-  def self.establish_connection
-    @connection ||= RightAws::ActiveSdb.establish_connection(Settings[:access_key], Settings[:secret_access_key])
+  def self.establish_connection options={}
+    options = { :logger => Log }.merge options
+    access_key = options[:access_key] || Settings[:access_key]
+    secret_access_key = options[:access_key] || Settings[:secret_access_key]
+    @connection ||= RightAws::ActiveSdb.establish_connection(access_key, secret_access_key, options)
   end
 
   # Register an nfs server share
@@ -159,5 +164,3 @@ class Broham < RightAws::ActiveSdb::Base
   end
 
 end
-
-Broham.establish_connection

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: broham
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -05:00
+date: 2010-04-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: "Bro! Broham always knows where his bros are, bro. Using broham, a newly-created cloud machine can annouce its availability for a certain role (\"nfs_server\" or \"db_slave-2\"), allowing any other interested nodes to discover its public_ip, private_ip, etc. See also: http://j.mp/amongbros"
 email: flip@infochimps.org
 executables: 
@@ -86,18 +97,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Broham: A simple, global, highly-available, none-too-bright service registry. Broham always knows where his bros are, bro."