broham 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/bin/broham

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-diss

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-fuck_all_yall

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-get

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-hosts

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-register

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-register_as_next

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-sup

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-unregister

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-unregister_like

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-word

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-yo

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/bin/broham-yo_yo_yo

@@ -34,7 +34,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register(role_name)
+    new_bro = Broham.register(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -43,7 +43,7 @@ class BrohamScript
     broham_args = Settings[:set]||{}
     BrohamScript.get_commandline_predicates :role_name
     $stderr.puts %Q{Registering #{role_name} -- #{broham_args}}
-    new_bro = Broham.register_as_next(role_name)
+    new_bro = Broham.register_as_next(role_name, broham_args)
     dump_table [new_bro]
   end
 
@@ -78,6 +78,8 @@ class BrohamScript
       unregister_cmd
     when 'unregister_like', 'fuck_all_yall'
       unregister_like_cmd
+    when 'register_as_next'
+      register_as_next_cmd
     when 'get', 'word'
       get_cmd
     when ''

data/broham.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{broham}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip (flip) Kromer"]
-  s.date = %q{2010-05-16}
+  s.date = %q{2010-06-08}
   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-get", "broham-hosts", "broham-register", "broham-register_as_next", "broham-sup", "broham-unregister", "broham-unregister_like", "broham-word", "broham-yo", "broham-yo_yo_yo"]
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "bin/broham-yo_yo_yo",
      "broham.gemspec",
      "lib/broham.rb",
+     "lib/broham/cluster.rb",
      "lib/broham/script.rb",
      "lib/broham/sdb.rb",
      "lib/broham/sdb/active_sdb.rb",
@@ -50,7 +51,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.6}
+  s.rubygems_version = %q{1.3.7}
   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",
@@ -61,7 +62,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else

data/lib/broham.rb

@@ -2,6 +2,7 @@
 require 'right_aws'
 require 'sdb/active_sdb'
 require 'broham/sdb'
+require 'broham/cluster'
 
 # Machine information
 require 'ohai'
@@ -129,10 +130,11 @@ class Broham < RightAws::ActiveSdb::Base
   end
 
   def self.establish_connection options={}
+    return @connection if @connection
     options = { :logger => Log }.merge options
     access_key        = options[:access_key]        || Settings[:access_key]
     secret_access_key = options[:secret_access_key] || Settings[:secret_access_key]
-    @connection ||= RightAws::ActiveSdb.establish_connection(access_key, secret_access_key, options)
+    @connection = RightAws::ActiveSdb.establish_connection(access_key, secret_access_key, options)
   end
 
   # Register an nfs server share

data/lib/broham/cluster.rb

@@ -0,0 +1,51 @@
+#
+#
+# This actually reaches into the settings hash and supplies
+#
+# (it's written like this so that chef
+#
+class BrohamNode < RightAws::ActiveSdb::Base
+  attr_accessor :settings
+
+  def self.set_cluster_info! settings
+    node = new(settings)
+    node.set_cluster_info!
+    node.settings
+  end
+
+  #
+  # Settings hash must contain
+  # * 'aws'::          a hash with keys 'access_key' and 'secret_access_key' holding your AWS credentsials
+  # * 'cluster_name':: name of the cluster
+  # * 'cluster_role':: role within that cluster
+  #
+  # Method will set values for
+  # * 'cluster_role_index'
+  # * 'node_name'
+  #
+  def initialize settings
+    self.settings = settings
+  end
+
+  def set_cluster_info!
+    settings['cluster_role_index'] ||= broham_attr('idx')
+  end
+
+  # retrieve a simple scalar value from the broham info
+  def broham_attr attr
+    [ broham_info[attr] ].flatten.first
+  end
+
+  # Return cached copy of the broham registration, if any
+  #
+  def broham_info
+    return @broham_info if @broham_info
+    establish_connection
+    @broham_info ||= Broham.register_as_next("#{settings["cluster_name"]}-#{settings["cluster_role"]}")
+  end
+
+  def establish_connection
+    raise "Need to supply an AWS credentials hash with keys 'access_key' and 'secret_access_key'" if settings["aws"].blank?
+    Broham.establish_connection(:access_key => settings["aws"]["access_key"], :secret_access_key => settings["aws"]["secret_access_key"])
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: broham
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -86,6 +91,7 @@ files:
 - bin/broham-yo_yo_yo
 - broham.gemspec
 - lib/broham.rb
+- lib/broham/cluster.rb
 - lib/broham/script.rb
 - lib/broham/sdb.rb
 - lib/broham/sdb/active_sdb.rb
@@ -103,23 +109,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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."