broham 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/broham-host

@@ -4,9 +4,9 @@ require 'broham'
 require 'broham/script'
 require 'json'
 
-cluster = Broham.get_cluster_settings
-cluster_name, role_name = [Settings[:cluster_name], Settings[:role_name]]
+Broham.get_cluster_settings
+role_name = Settings[:role_name]
 
-$stderr.puts %Q{Retrieving '#{role_name}' for cluster '#{cluster_name}'}
-resp = cluster.host role_name
+$stderr.puts %Q{Retrieving '#{role_name}'}
+resp = Broham.host role_name
 $stderr.puts resp.to_pretty_json

data/bin/broham-register

@@ -4,11 +4,10 @@ require 'broham'
 require 'broham/script'
 Settings.define :set, :description => %Q{Any arg prefixed with "--set" will become an extra arg to register: 'broham-register foo --set-path=/path/to/foo' sets :path => '/path/to/foo' as an additional attribute}, :type => Hash
 
-cluster = Broham.get_cluster_settings
-cluster_name, role_name, broham_args = [Settings[:cluster_name], Settings[:role_name], Settings[:set]||{}]
+Broham.get_cluster_settings
+role_name, broham_args = [Settings[:role_name], Settings[:set]||{}]
 
-$stderr.puts %Q{Registering as #{role_name} in #{cluster_name} cluster, with #{broham_args.inspect}}
-resp = cluster.register role_name, broham_args
-node = cluster.host role_name
+$stderr.puts %Q{Registering as #{role_name} with #{broham_args.inspect}}
+resp = Broham.register role_name, broham_args
+node = Broham.host role_name
 $stderr.puts resp.to_pretty_json
-

data/bin/broham-register_as_next

@@ -4,10 +4,10 @@ require 'broham'
 require 'broham/script'
 Settings.define :set, :description => %Q{Any arg prefixed with "--set" will become an extra arg to register: 'broham-register foo --set-path=/path/to/foo' sets :path => '/path/to/foo' as an additional attribute}, :type => Hash
 
-cluster = Broham.get_cluster_settings
-cluster_name, role_name, broham_args = [Settings[:cluster_name], Settings[:role_name], Settings[:set]||{}]
+Broham.get_cluster_settings
+role_name, broham_args = [Settings[:role_name], Settings[:set]||{}]
 
-$stderr.puts %Q{Registering as next #{role_name} in #{cluster_name} cluster, with #{broham_args.inspect}}
-resp = cluster.register_as_next role_name, broham_args
+$stderr.puts %Q{Registering as next #{role_name} with #{broham_args.inspect}}
+resp = Broham.register_as_next role_name, broham_args
 $stderr.puts resp.to_pretty_json
 

data/bin/broham-sup

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'broham'
+require 'broham/script'
+require 'json'
+
+Broham.get_cluster_settings
+role_name = Settings[:role_name]
+
+$stderr.puts %Q{Retrieving '#{role_name}'}
+resp = Broham.host role_name
+$stderr.puts resp.to_pretty_json

data/bin/broham-unregister-all

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

data/bin/broham-yo

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'broham'
+require 'broham/script'
+Settings.define :set, :description => %Q{Any arg prefixed with "--set" will become an extra arg to register: 'broham-register foo --set-path=/path/to/foo' sets :path => '/path/to/foo' as an additional attribute}, :type => Hash
+
+Broham.get_cluster_settings
+role_name, broham_args = [Settings[:role_name], Settings[:set]||{}]
+
+$stderr.puts %Q{Registering as #{role_name} with #{broham_args.inspect}}
+resp = Broham.register role_name, broham_args
+node = Broham.host role_name
+$stderr.puts resp.to_pretty_json

data/broham.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{broham}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   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.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-host", "broham-register", "broham-register_as_next", "broham-unregister-all"]
+  s.executables = ["broham-host", "broham-register", "broham-register_as_next", "broham-sup", "broham-unregister-all", "broham-yo"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.textile"
@@ -27,7 +27,9 @@ Gem::Specification.new do |s|
      "bin/broham-host",
      "bin/broham-register",
      "bin/broham-register_as_next",
+     "bin/broham-sup",
      "bin/broham-unregister-all",
+     "bin/broham-yo",
      "broham.gemspec",
      "lib/broham.rb",
      "lib/broham/script.rb",

data/lib/broham.rb

@@ -22,127 +22,125 @@ Settings.define :secret_access_key, :required => true, :description => "Amazon A
 # and +:access_key+. The configliere gem (http://github.com/mrflip/configliere)
 # can help with that.
 #
-module Broham
-  class Cluster < RightAws::ActiveSdb::Base
-    # Returns the last-registered host in the given role
-    def self.host role
-      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
+class Broham < RightAws::ActiveSdb::Base
+  # Returns the last-registered host in the given role
+  def self.host role
+    select_by_role(role, :order => 'timestamp DESC')
+  end
 
-    def self.host_attrs(role)
-      { :role => role, :timestamp => timestamp,
-        :private_ip => my_private_ip, :public_ip => my_public_ip, :default_ip => my_default_ip, :fqdn => my_fqdn  }
-    end
+  # Returns all hosts in the given role
+  def self.hosts role
+    select_all_by_role(role, :order => 'timestamp DESC')
+  end
 
-    def self.register role, attrs={}
-      ahost = host(role) || new
-      ahost.attributes = (host_attrs(role).merge(attrs))
-      success = ahost.save
-      success ? self.new(success) : false
-    end
+  def self.host_attrs(role)
+    { :role => role, :timestamp => timestamp,
+      :private_ip => my_private_ip, :public_ip => my_public_ip, :default_ip => my_default_ip, :fqdn => my_fqdn  }
+  end
 
-    #
-    # Enlists as the next among many machines filling the given role.
-    #
-    # This is just a simple counter: it doesn't check whether the machine is
-    # already enlisted under a different index, or whether there are missing
-    # indices.
-    #
-    # It uses conditional save to be sure that the count is consistent
-    #
-    def self.register_as_next role, attrs={}
-      my_idx = 0
-      100.times do
-        ahost = host(role) || new
-        current_max_idx = ahost[:idx] && ahost[:idx].first
-        my_idx          = (current_max_idx.to_i + 1)
-        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
-      end
-      register role+'-'+my_idx.to_s, { :idx => my_idx }.merge(attrs)
-    end
+  def self.register role, attrs={}
+    ahost = host(role) || new
+    ahost.attributes = (host_attrs(role).merge(attrs))
+    success = ahost.save
+    success ? self.new(success) : false
+  end
 
-    # alternative syntax for #register
-    def self.yo!(*args)       register *args ; end
-    # alternative syntax for #register_as_next
-    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)
+  #
+  # Enlists as the next among many machines filling the given role.
+  #
+  # This is just a simple counter: it doesn't check whether the machine is
+  # already enlisted under a different index, or whether there are missing
+  # indices.
+  #
+  # It uses conditional save to be sure that the count is consistent
+  #
+  def self.register_as_next role, attrs={}
+    my_idx = 0
+    100.times do
+      ahost = host(role) || new
+      current_max_idx = ahost[:idx] && ahost[:idx].first
+      my_idx          = (current_max_idx.to_i + 1)
+      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
     end
+    register role+'-'+my_idx.to_s, { :idx => my_idx }.merge(attrs)
+  end
 
-    #
-    # Registration attributes
-    #
-
-    def self.my_private_ip()        OHAI_INFO[:cloud][:private_ips].first rescue nil ; end
-    def self.my_public_ip()         OHAI_INFO[:cloud][:public_ips].first  rescue nil ; end
-    def self.my_default_ip()        OHAI_INFO[:ipaddress]                            ; end
-    def self.my_fqdn()              OHAI_INFO[:fqdn]                                 ; end
-    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 idx()
-      self['idx']
-    end
+  # alternative syntax for #register
+  def self.yo!(*args)       register *args ; end
+  # alternative syntax for #register_as_next
+  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
 
-    def self.establish_connection
-      @connection ||= RightAws::ActiveSdb.establish_connection(Settings[:access_key], Settings[:secret_access_key])
-    end
+  #
+  # Removes all registrations for the given role
+  #
+  def self.unregister_all role
+    select_all_by_role(role).each(&:delete)
+  end
 
-    # Register an nfs server share
-    def self.register_nfs_share server_path, client_path=nil, role='nfs_server'
-      client_path ||= server_path
-      register(role, :server_path => server_path, :client_path => client_path)
-    end
+  #
+  # Registration attributes
+  #
 
-    # NFS: device path, for stuffing into /etc/fstab
-    def self.nfs_device_path role='nfs_server'
-      nfs_server = host(role) or return
-      [nfs_server.private_ip, nfs_server[:server_path]].join(':')
-    end
+  def self.my_private_ip()        OHAI_INFO[:cloud][:private_ips].first rescue nil ; end
+  def self.my_public_ip()         OHAI_INFO[:cloud][:public_ips].first  rescue nil ; end
+  def self.my_default_ip()        OHAI_INFO[:ipaddress]                            ; end
+  def self.my_fqdn()              OHAI_INFO[:fqdn]                                 ; end
+  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 idx()
+    self['idx']
+  end
 
-    # Hadoop: master jobtracker node
-    def self.hadoop_jobtracker(role='hadoop_jobtracker') ; host(role) ; end
-    # Hadoop: master namenode
-    def self.hadoop_namenode(  role='hadoop_namenode')   ; host(role) ; end
-    # Hadoop: cloudera desktop node
-    def self.cloudera_desktop( role='cloudera_desktop')  ; host(role) ; end
+  def self.establish_connection
+    @connection ||= RightAws::ActiveSdb.establish_connection(Settings[:access_key], Settings[:secret_access_key])
+  end
 
-    def to_hash() attributes ; end
-    def to_pretty_json
-      to_hash.reject{|k,v| k.to_s == 'id'}.to_json
-    end
+  # Register an nfs server share
+  def self.register_nfs_share server_path, client_path=nil, role='nfs_server'
+    client_path ||= server_path
+    register(role, :server_path => server_path, :client_path => client_path)
+  end
 
+  # NFS: device path, for stuffing into /etc/fstab
+  def self.nfs_device_path role='nfs_server'
+    nfs_server = host(role) or return
+    [nfs_server.private_ip, nfs_server[:server_path]].join(':')
   end
 
+  # Hadoop: master jobtracker node
+  def self.hadoop_jobtracker(role='hadoop_jobtracker') ; host(role) ; end
+  # Hadoop: master namenode
+  def self.hadoop_namenode(  role='hadoop_namenode')   ; host(role) ; end
+  # Hadoop: cloudera desktop node
+  def self.cloudera_desktop( role='cloudera_desktop')  ; host(role) ; 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
+  def to_hash() attributes ; end
+  def to_pretty_json
+    to_hash.reject{|k,v| k.to_s == 'id'}.to_json
   end
+
 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
+

data/lib/broham/script.rb

@@ -1,21 +1,17 @@
-module Broham
+class Broham < RightAws::ActiveSdb::Base
 
   def self.get_cluster_settings
     Configliere.use :commandline, :config_file
     Settings.read('broham.yaml')
     Settings.resolve!
-    Settings[:cluster_name] = Settings.rest.shift
     Settings[:role_name]    = Settings.rest.shift
     check_args!
-    cluster = Broham.new(Settings[:cluster_name])
-    cluster.establish_connection
-    cluster.create_domain
-    cluster
+    self.establish_connection
   end
 
   def self.check_args!
-    if (Settings[:cluster_name].blank? || Settings[:role_name].blank?)
-      warn "Please supply a cluster name and a role as the first two arguments"
+    if Settings[:role_name].blank?
+      warn "Please supply a role as the first argument"
       exit(-1)
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -49,7 +49,9 @@ executables:
 - broham-host
 - broham-register
 - broham-register_as_next
+- broham-sup
 - broham-unregister-all
+- broham-yo
 extensions: []
 
 extra_rdoc_files: 
@@ -65,7 +67,9 @@ files:
 - bin/broham-host
 - bin/broham-register
 - bin/broham-register_as_next
+- bin/broham-sup
 - bin/broham-unregister-all
+- bin/broham-yo
 - broham.gemspec
 - lib/broham.rb
 - lib/broham/script.rb