broham 0.0.5 → 0.0.6

data/README.textile

@@ -66,6 +66,18 @@ h4. Commandline Interface
   {"timestamp":["20100405093238"],"fqdn":["nfs.infochimps.org"],"client_path":["/home"],"server_path":["/home"],"role":["nfs_server"],"private_ip":["10.123.156.231"],"default_ip":["10.123.156.231"],"public_ip":["104.136.251.50"]}
 </code></pre>
 
+h4. IRB Usage
+
+<pre><code>
+    require 'configliere'
+    Settings.read('broham.yaml')
+    require 'broham'
+    require 'broham/script'
+    Broham.establish_connection
+
+    Broham.unregister_like 'gibbon-slave'
+</code></pre>
+
 h4. Setup
 
 For setup, we recommend configliere

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/bin/broham-diss

@@ -3,11 +3,10 @@ require 'rubygems'
 require 'broham'
 require 'broham/script'
 
-
 Broham.get_cluster_settings
 role_name = Settings[:role_name]
 
-$stderr.puts %Q{Removing all #{role_name}}
-resps = Broham.unregister_all role_name
+$stderr.puts %Q{Removing #{role_name}}
+resps = Broham.unregister role_name
 $stderr.puts resps.map{|resp| resp.to_pretty_json }
 

data/bin/broham-fuck_all_yall

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'broham'
+require 'broham/script'
+
+
+Broham.get_cluster_settings
+role_name = Settings[:role_name]
+
+$stderr.puts %Q{Removing all like #{role_name}}
+resps = Broham.unregister_like role_name
+$stderr.puts resps.map{|resp| resp.to_pretty_json }
+

data/bin/{broham-unregister-all → broham-unregister}

@@ -3,11 +3,10 @@ require 'rubygems'
 require 'broham'
 require 'broham/script'
 
-
 Broham.get_cluster_settings
 role_name = Settings[:role_name]
 
-$stderr.puts %Q{Removing all #{role_name}}
-resps = Broham.unregister_all role_name
+$stderr.puts %Q{Removing #{role_name}}
+resps = Broham.unregister role_name
 $stderr.puts resps.map{|resp| resp.to_pretty_json }
 

data/bin/broham-unregister-like

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'broham'
+require 'broham/script'
+
+
+Broham.get_cluster_settings
+role_name = Settings[:role_name]
+
+$stderr.puts %Q{Removing all like #{role_name}}
+resps = Broham.unregister_like role_name
+$stderr.puts resps.map{|resp| resp.to_pretty_json }
+

data/broham.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{broham}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   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-05}
+  s.date = %q{2010-04-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-diss", "broham-host", "broham-register", "broham-register_as_next", "broham-sup", "broham-unregister-all", "broham-yo"]
+  s.executables = ["broham-diss", "broham-fuck_all_yall", "broham-host", "broham-register", "broham-register_as_next", "broham-sup", "broham-unregister", "broham-unregister-like", "broham-yo"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.textile"
@@ -25,11 +25,13 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/broham-diss",
+     "bin/broham-fuck_all_yall",
      "bin/broham-host",
      "bin/broham-register",
      "bin/broham-register_as_next",
      "bin/broham-sup",
-     "bin/broham-unregister-all",
+     "bin/broham-unregister",
+     "bin/broham-unregister-like",
      "bin/broham-yo",
      "broham.gemspec",
      "lib/broham.rb",

data/lib/broham.rb

@@ -28,9 +28,14 @@ class Broham < RightAws::ActiveSdb::Base
     select_by_role(role, :order => 'timestamp DESC')
   end
 
+  # # Returns all hosts in the given role
+  # def self.hosts role
+  #   select_all_by_role(role, :order => 'timestamp DESC')
+  # end
+
   # Returns all hosts in the given role
-  def self.hosts role
-    select_all_by_role(role, :order => 'timestamp DESC')
+  def self.hosts_like role
+    select(:all, :order => 'timestamp DESC').select{|bro| bro[:role].to_s =~ /^#{role}/ }
   end
 
   def self.host_attrs(role)
@@ -45,6 +50,15 @@ class Broham < RightAws::ActiveSdb::Base
     success ? self.new(success) : false
   end
 
+  def self.roles ip=nil
+    ip ||= my_default_ip
+    select_all_by_default_ip(ip).map{|entry| entry['role'] }
+  end
+  def self.entry_for_role role, ip=nil
+    ip ||= my_default_ip
+    select_by_role_and_default_ip(role, ip)
+  end
+
   #
   # Enlists as the next among many machines filling the given role.
   #
@@ -56,16 +70,31 @@ class Broham < RightAws::ActiveSdb::Base
   #
   def self.register_as_next role, attrs={}
     my_idx = 0
+    if (registered_entry = entry_for_role(role)) then return registered_entry end
     100.times do
       ahost = host(role) || new
-      current_max_idx = ahost[:idx] && ahost[:idx].first
-      my_idx          = (current_max_idx.to_i + 1)
+      current_max_idx  = ahost[:idx] && ahost[:idx].first
+      my_idx           = current_max_idx ? current_max_idx.to_i + 1 : 0
       ahost.attributes = host_attrs(role).merge({ :idx => my_idx.to_s }.merge(attrs))
-      expected = current_max_idx ? {:idx => (current_max_idx.to_i + rand(5)).to_s} : {}
-      success = ahost.save_if(expected)
-      break if success
+      expected         = current_max_idx ? {:idx => (current_max_idx.to_i).to_s} : {}
+      registered_entry = ahost.save_if(expected)
+      break if registered_entry
     end
     register role+'-'+my_idx.to_s, { :idx => my_idx }.merge(attrs)
+    new registered_entry
+  end
+
+  #
+  # Removes all registrations for the given role wildcard
+  #
+  def self.unregister_like role
+    hosts_like(role).each(&:unregister)
+  end
+  def self.unregister role
+    host(role).each(&:unregister)
+  end
+  def unregister
+    delete
   end
 
   # alternative syntax for #register
@@ -74,15 +103,12 @@ class Broham < RightAws::ActiveSdb::Base
   def self.yo_yo_yo!(*args) register_as_next *args ; end
   # alternative syntax for #host
   def self.sup?(*args)      host *args    ; end
-  # alternative syntax for #hosts
-  def self.sup_bros?(*args) hosts *args   ; end
-
-  #
-  # Removes all registrations for the given role
-  #
-  def self.unregister_all role
-    select_all_by_role(role).each(&:delete)
-  end
+  # alternative syntax for #hosts_like
+  def self.sup_yall?(*args) hosts_like *args   ; end
+  # alternative syntax for #unregister
+  def self.diss(*args)      unregister *args   ; end
+  # alternative syntax for #unregister_like
+  def self.fuck_all_yall(*arg) unregister_like *args ; end
 
   #
   # Registration attributes
@@ -134,13 +160,4 @@ class Broham < RightAws::ActiveSdb::Base
 
 end
 
-
-# #
-# # Metaprogramming
-# #
-# def self.new cluster
-#   cluster_klass = '::'+Extlib::Inflection.classify(cluster.to_s)
-#   module_eval(%Q{ class #{cluster_klass} < Broham::Cluster ; end })
-#   cluster_klass.constantize rescue nil
-# end
-
+Broham.establish_connection

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -05:00
+date: 2010-04-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,11 +47,13 @@ description: "Bro! Broham always knows where his bros are, bro. Using broham, a
 email: flip@infochimps.org
 executables: 
 - broham-diss
+- broham-fuck_all_yall
 - broham-host
 - broham-register
 - broham-register_as_next
 - broham-sup
-- broham-unregister-all
+- broham-unregister
+- broham-unregister-like
 - broham-yo
 extensions: []
 
@@ -66,11 +68,13 @@ files:
 - Rakefile
 - VERSION
 - bin/broham-diss
+- bin/broham-fuck_all_yall
 - bin/broham-host
 - bin/broham-register
 - bin/broham-register_as_next
 - bin/broham-sup
-- bin/broham-unregister-all
+- bin/broham-unregister
+- bin/broham-unregister-like
 - bin/broham-yo
 - broham.gemspec
 - lib/broham.rb