broham 0.0.9 → 0.0.10

data/lib/broham.rb

@@ -1,15 +1,16 @@
 # SimpleDB interface
 require 'right_aws'
-RightAws::SdbInterface::API_VERSION = '2009-04-15'
 require 'sdb/active_sdb'
+require 'broham/sdb'
+
 # Machine information
 require 'ohai'
 OHAI_INFO = Ohai::System.new unless defined?(OHAI_INFO)
 OHAI_INFO.all_plugins
 # 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)"
+Settings.define :access_key,        :required => true, :description => "Amazon AWS access key ID     -- found in your AWS console (http://bit.ly/awsconsole)", :broham => true
+Settings.define :secret_access_key, :required => true, :description => "Amazon AWS secret access key -- found in your AWS console (http://bit.ly/awsconsole)", :broham => true
 
 ::Log = Logger.new(STDERR) unless defined?(Log)
 
@@ -30,11 +31,6 @@ 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_like role
     select(:all, :order => 'timestamp DESC').select{|bro| bro[:role].to_s =~ /^#{role}/ }
@@ -110,7 +106,7 @@ class Broham < RightAws::ActiveSdb::Base
   # 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
+  def self.fuck_all_yall(*args) unregister_like *args ; end
 
   #
   # Registration attributes

data/lib/broham/script.rb

@@ -1,24 +1,5 @@
 require 'json'
+Configliere.use :config_file, :commandline, :git_style_binaries
 
 class Broham < RightAws::ActiveSdb::Base
-  def self.get_cluster_settings
-    Configliere.use :commandline, :config_file
-    Settings.read('broham.yaml')
-    Settings.resolve!
-    self.establish_connection
-  end
-
-  def self.get_command_line_args *arg_names
-    arg_names.each do |arg_name|
-      Settings[arg_name] = Settings.rest.shift
-    end
-    check_args! *arg_names
-  end
-
-  def self.check_args! *arg_names
-    if Settings[:role_name].blank?
-      warn "Please supply a role as the first argument"
-      exit(-1)
-    end
-  end
 end

data/lib/broham/sdb.rb

@@ -0,0 +1,3 @@
+RightAws::SdbInterface::API_VERSION = '2009-04-15'
+require 'broham/sdb/active_sdb'
+require 'broham/sdb/right_sdb_interface.rb'

data/lib/broham/sdb/active_sdb.rb

@@ -0,0 +1,55 @@
+class RightAws::ActiveSdb::Base
+
+  # Store in-memory attributes to SDB.
+  # Replaces the attributes values already stored at SDB by in-memory data.
+  # Returns a hash of stored attributes.
+  #
+  #  sandy = Client.new(:name => 'Sandy')  #=> #<Client:0xb775a7a8 @attributes={"name"=>["Sandy"]}, @new_record=true>
+  #  sandy['toys'] = 'boys'
+  #  sandy.put
+  #  sandy['toys'] = 'patchwork'
+  #  sandy.put
+  #  sandy['toys'] = 'kids'
+  #  sandy.put
+  #  puts sandy.attributes.inspect         #=> {"name"=>["Sandy"], "id"=>"b2832ce2-e461-11dc-b13c-001bfc466dd7", "toys"=>["kids"]}
+  #  sandy.reload                          #=> {"name"=>["Sandy"], "id"=>"b2832ce2-e461-11dc-b13c-001bfc466dd7", "toys"=>["kids"]}
+  #
+  # compare to +put+ method
+  def save expected_attributes={ }
+    @attributes = uniq_values(@attributes)
+    prepare_for_update
+    connection.put_attributes(domain, id, @attributes, :replace, expected_attributes)
+    mark_as_old
+    @attributes
+  end
+
+  def save_if expected_attributes={ }
+    begin
+      save expected_attributes
+    rescue RightAws::AwsError => e
+      false
+    end
+  end
+
+  # Replaces the attributes at SDB by the given values.
+  # +Attrs+ is a hash: { attribute1 => values1, ..., attributeN => valuesN }.
+  # The other in-memory attributes are not being saved.
+  # Returns a hash of stored attributes.
+  #
+  # see +save+ method
+  def save_attributes(attrs, expected_attributes={})
+    prepare_for_update
+    attrs = uniq_values(attrs)
+    # if 'id' is present in attrs hash then replace internal 'id' attribute
+    unless attrs['id'].blank?
+      @attributes['id'] = attrs['id']
+    else
+      attrs['id'] = id
+    end
+    connection.put_attributes(domain, id, attrs, :replace, expected_attributes) unless attrs.blank?
+    attrs.each { |attribute, values| attrs[attribute] = values }
+    mark_as_old
+    attrs
+  end
+
+end

data/lib/broham/sdb/right_sdb_interface.rb

@@ -0,0 +1,141 @@
+class RightAws::SdbInterface < RightAws::RightAwsBase
+
+  # Prepare attributes for putting.
+  # (used by put_attributes)
+  def pack_attributes(items_or_attributes, replace = false, batch = false, expected_attributes = {}) #:nodoc:
+    if batch
+      index = 0
+      items_or_attributes.inject({}){|result, (item_name, attributes)|
+        item_prefix = "Item.#{index}."
+        result["#{item_prefix}ItemName"] = item_name.to_s
+        result.merge!(
+          pack_single_item_attributes(attributes, replace, item_prefix, expected_attributes))
+        index += 1
+        result
+      }
+    else
+      pack_single_item_attributes(items_or_attributes, replace)
+    end
+  end
+
+  def pack_single_item_attributes(attributes, replace, prefix = "", expected_attributes={})
+    result = {}
+    if attributes
+      idx = 0
+      skip_values = attributes.is_a?(Array)
+      attributes.each do |attribute, values|
+        # set replacement attribute
+        result["#{prefix}Attribute.#{idx}.Replace"] = 'true' if replace
+
+        # set expected attribute
+        expected_attributes = expected_attributes.to_mash
+        if expected_attributes.include?(attribute)
+          result["Expected.#{idx}.Name"] = attribute
+          if expected_attributes[attribute].nil?
+            result["Expected.#{idx}.Exists"] = 'false'
+          else
+            result["Expected.#{idx}.Value"] = expected_attributes[attribute]
+          end
+        end
+
+        # pack Name/Value
+        unless values.nil?
+          # Array(values) does not work here:
+          #  - Array('') => [] but we wanna get here ['']
+          [values].flatten.each do |value|
+            result["#{prefix}Attribute.#{idx}.Name"]  = attribute
+            result["#{prefix}Attribute.#{idx}.Value"] = ruby_to_sdb(value) unless skip_values
+            idx += 1
+          end
+        else
+          result["#{prefix}Attribute.#{idx}.Name"] = attribute
+          result["#{prefix}Attribute.#{idx}.Value"] = ruby_to_sdb(nil) unless skip_values
+          idx += 1
+        end
+      end
+    end
+    result
+  end
+
+  # Add/Replace item attributes.
+  #
+  # Params:
+  #  domain_name = DomainName
+  #  item_name   = ItemName
+  #  attributes  = {
+  #    'nameA' => [valueA1,..., valueAN],
+  #    ...
+  #    'nameZ' => [valueZ1,..., valueZN]
+  #  }
+  #  replace = :replace | any other value to skip replacement
+  #
+  # Returns a hash: { :box_usage, :request_id } on success or an exception on error.
+  # (Amazon raises no errors if the attribute was not overridden, as when the :replace param is unset).
+  #
+  # Example:
+  #
+  #  sdb = RightAws::SdbInterface.new
+  #  sdb.create_domain 'family'
+  #
+  #  attributes = {}
+  #  # create attributes for Jon and Silvia
+  #  attributes['Jon']    = %w{ car beer }
+  #  attributes['Silvia'] = %w{ beetle rolling_pin kids }
+  #  sdb.put_attributes 'family', 'toys', attributes   #=> ok
+  #  # now: Jon=>[car, beer], Silvia=>[beetle, rolling_pin, kids]
+  #
+  #  # add attributes to Jon
+  #  attributes.delete('Silvia')
+  #  attributes['Jon'] = %w{ girls pub }
+  #  sdb.put_attributes 'family', 'toys', attributes   #=> ok
+  #  # now: Jon=>[car, beer, girls, pub], Silvia=>[beetle, rolling_pin, kids]
+  #
+  #  # replace attributes for Jon and add to a cat (the cat had no attributes before)
+  #  attributes['Jon'] = %w{ vacuum_cleaner hammer spade }
+  #  attributes['cat'] = %w{ mouse clew Jons_socks }
+  #  sdb.put_attributes 'family', 'toys', attributes, :replace #=> ok
+  #  # now: Jon=>[vacuum_cleaner, hammer, spade], Silvia=>[beetle, rolling_pin, kids], cat=>[mouse, clew, Jons_socks]
+  #
+  # see: http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/SDB_API_PutAttributes.html
+  #
+  def put_attributes(domain_name, item_name, attributes, replace = false, expected_attributes = {})
+    begin
+      params = { 'DomainName' => domain_name,
+        'ItemName'   => item_name }.merge(pack_attributes(attributes, replace, false, expected_attributes))
+      link = generate_request("PutAttributes", params)
+      request_info( link, QSdbSimpleParser.new )
+    rescue RightAws::AwsError => e
+      # Don't sever the connection on a conditional put failure.
+      (e.to_s =~ /ConditionalCheckFailed:/) ? raise : on_exception()
+    rescue Exception
+      on_exception
+    end
+  end
+
+  # Delete value, attribute or item.
+  #
+  # Example:
+  #  # delete 'vodka' and 'girls' from 'Jon' and 'mice' from 'cat'.
+  #  sdb.delete_attributes 'family', 'toys', { 'Jon' => ['vodka', 'girls'], 'cat' => ['mice'] }
+  #
+  #  # delete the all the values from attributes (i.e. delete the attributes)
+  #  sdb.delete_attributes 'family', 'toys', { 'Jon' => [], 'cat' => [] }
+  #  # or
+  #  sdb.delete_attributes 'family', 'toys', [ 'Jon', 'cat' ]
+  #
+  #  # delete all the attributes from item 'toys' (i.e. delete the item)
+  #  sdb.delete_attributes 'family', 'toys'
+  #
+  # see http://docs.amazonwebservices.com/AmazonSimpleDB/2007-11-07/DeveloperGuide/SDB_API_DeleteAttributes.html
+  #
+  def delete_attributes(domain_name, item_name, attributes = nil, expected_attributes = {})
+    params = { 'DomainName' => domain_name,
+      'ItemName'   => item_name }.merge(pack_attributes(attributes, false, false, expected_attributes))
+    link = generate_request("DeleteAttributes", params)
+    request_info( link, QSdbSimpleParser.new )
+  rescue Exception
+    on_exception
+  end
+end
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Philip (flip) Kromer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -07:00
+date: 2010-05-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,14 +49,13 @@ executables:
 - broham
 - broham-diss
 - broham-fuck_all_yall
-- broham-host
-- broham-hosts_like
+- broham-get
+- broham-hosts
 - broham-register
-- broham-register_as_next
 - broham-sup
-- broham-sup_yall
 - broham-unregister
-- broham-unregister-like
+- broham-unregister_like
+- broham-word
 - broham-yo
 extensions: []
 
@@ -73,18 +72,20 @@ files:
 - bin/broham
 - bin/broham-diss
 - bin/broham-fuck_all_yall
-- bin/broham-host
-- bin/broham-hosts_like
+- bin/broham-get
+- bin/broham-hosts
 - bin/broham-register
-- bin/broham-register_as_next
 - bin/broham-sup
-- bin/broham-sup_yall
 - bin/broham-unregister
-- bin/broham-unregister-like
+- bin/broham-unregister_like
+- bin/broham-word
 - bin/broham-yo
 - broham.gemspec
 - lib/broham.rb
 - lib/broham/script.rb
+- lib/broham/sdb.rb
+- lib/broham/sdb/active_sdb.rb
+- lib/broham/sdb/right_sdb_interface.rb
 - spec/broham_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/bin/broham-host

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'broham'
-require 'broham/script'
-require 'json'
-
-Broham.get_cluster_settings
-Broham.get_command_line_args :role_name
-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-hosts_like

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'broham'
-require 'broham/script'
-
-Broham.get_cluster_settings
-Broham.get_command_line_args :role_name
-role_name = Settings[:role_name]
-
-$stderr.puts %Q{Retrieving all hosts like '#{role_name}'}
-resp = Broham.hosts_like role_name
-$stderr.puts resp.map(&:to_pretty_json)

data/bin/broham-register_as_next

@@ -1,13 +0,0 @@
-#!/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 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_yall

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'broham'
-require 'broham/script'
-
-Broham.get_cluster_settings
-Broham.get_command_line_args :role_name
-role_name = Settings[:role_name]
-
-$stderr.puts %Q{Retrieving all hosts like '#{role_name}'}
-resp = Broham.hosts_like role_name
-$stderr.puts resp.map(&:to_pretty_json)

data/bin/broham-unregister-like

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'broham'
-require 'broham/script'
-
-Broham.get_cluster_settings
-Broham.get_command_line_args :role_name
-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 }
-