sant0sk1-dreamy 0.4.1 → 0.5.0

data/README.md

@@ -38,7 +38,7 @@ Now that you have an array you can have your way with the data:
       puts d.home
     end
     
-Same goes with Users, DNS records and announcement list subscribers
+Same goes with Users, DNS records, announcement list subscribers, MySQL databases, MySQL hosts, and MySQL users
     
     # fetch an array of Dreamy::User objects
     account.users
@@ -52,6 +52,9 @@ Same goes with Users, DNS records and announcement list subscribers
     # fetch an array of Dreamy::Subscribers to an announcement list
     account.announce_list(listname,domain)
     
+    # fetch an array of Dreamy::MysqlUser objects
+    account.mysql_users
+    
 You can interact with announcement lists by adding and removing subscribers
     
     # add a new subscriber to an announcement list
@@ -124,6 +127,10 @@ Run this from the command line to print the usage:
      domains:http                       # list HTTP domain details
      domains:mysql                      # list MySQL domains
      domains:status                     # check availability of all domains (pingability)
+     
+     mysql:dbs                          # list MySQL database details
+     mysql:hosts                        # list MySQL database hostnames
+     mysql:users                        # list MySQL user details
 
      ps                                 # list private servers
      ps:add <web|mysql> <yes|no>        # adds a private server of type <web|mysql>. Yes = move data

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 0
 :major: 0
-:minor: 4
+:minor: 5

data/lib/dreamy.rb

@@ -16,6 +16,9 @@ require 'dreamy/announce_list'
 require 'dreamy/private_server'
 require 'dreamy/subscriber'
 require 'dreamy/user'
+require 'dreamy/mysql/db'
+require 'dreamy/mysql/host'
+require 'dreamy/mysql/user'
 
 module Dreamy
     class CantConnect < StandardError; end

data/lib/dreamy/base.rb

@@ -11,7 +11,7 @@ module Dreamy
     # returns an array of domain objects
     def domains
       doc = request("domain-list_domains")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |domains, domain| domains << Domain.new_from_xml(domain); domains }
     end
 
@@ -22,39 +22,39 @@ module Dreamy
       else
         doc = request("user-list_users_no_pw")
       end
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |users, user| users << User.new_from_xml(user); users }
     end
 
     # returns an array of dns objects
     def dns
       doc = request("dns-list_records")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |records, dns| records << Dns.new_from_xml(dns); records }
     end
     
     def dns_add(record,type,value)
       doc = request("dns-add_record", {"record" => record, "type" => type, "value" => value})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def dns_remove(record,type,value)
       doc = request("dns-remove_record", {"record" => record, "type" => type, "value" => value})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def announce_lists
       doc = request("announcement_list-list_lists")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |lists, list| lists << AnnounceList.new_from_xml(list); lists }
     end
     
     # returns an array of subscriber objects
     def announce_list(listname,domain)
       doc = request("announcement_list-list_subscribers",{ "listname" => listname, "domain" => domain})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |subs, sub| subs << Subscriber.new_from_xml(sub); subs }
     end
     
@@ -62,84 +62,106 @@ module Dreamy
     def announce_add(listname,domain,email,name="")
       doc = request("announcement_list-add_subscriber",
                       {"listname" => listname, "domain" => domain, "email" => email, "name" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def announce_remove(listname,domain,email)
       doc = request("announcement_list-remove_subscriber",
                       {"listname" => listname, "domain" => domain, "email" => email})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
+    def mysql_dbs
+      doc = request("mysql-list_dbs")
+      api_error?(doc)
+      (doc/:data).inject([]) { |dbs, db| dbs << MysqlDb.new_from_xml(db); dbs }
+    end
+    
+    def mysql_hosts
+      doc = request("mysql-list_hostnames")
+      api_error?(doc)
+      (doc/:data).inject([]) { |hosts, host| hosts << MysqlHost.new_from_xml(host); hosts }
+    end
+    
+    def mysql_users
+      doc = request("mysql-list_users")
+      api_error?(doc)
+      (doc/:data).inject([]) { |users, user| users << MysqlUser.new_from_xml(user); users }
+    end
+    
     def ps
       doc = request("dreamhost_ps-list_ps")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |servers, server| servers << PrivateServer.new_from_xml(server); servers }
     end
     
     def ps_settings(name)
       doc = request("dreamhost_ps-list_settings", {"ps" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       PrivateServer.settings_from_xml(doc)
     end
     
     def ps_set(name,setting,value)
       doc = request("dreamhost_ps-set_settings", {"ps" => name, setting => value})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def ps_size_history(name)
       doc = request("dreamhost_ps-list_size_history", {"ps" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |sizes, size| sizes << PrivateServer.size_from_xml(size); sizes }
     end
     
     def ps_size_set(name,size)
       doc = request("dreamhost_ps-set_size", {"ps" => name, "size" => size})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def ps_reboot_history(name)
       doc = request("dreamhost_ps-list_reboot_history", {"ps" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |reboots,reboot| reboots << reboot.at('stamp').innerHTML; reboots }
     end
     
     def ps_reboot!(name)
       doc = request("dreamhost_ps-reboot", {"ps" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def ps_usage(name)
       doc = request("dreamhost_ps-list_usage", {"ps" => name})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |usages, usage| usages << PrivateServer.usage_from_xml(usage); usages }
     end
     
     def ps_add(type,movedata="no")
       doc = request("dreamhost_ps-add_ps", {"type" => type, "movedata" => movedata})
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def ps_remove
       doc = request("dreamhost_ps-remove_pending_ps")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       true
     end
     
     def ps_pending
       doc = request("dreamhost_ps-list_pending_ps")
-      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+      api_error?(doc)
       (doc/:data).inject([]) { |pends, pend| pends << PrivateServer.pending_from_xml(pend); pends }
     end
 
     private
+    
+    def api_error?(doc)
+      raise ApiError, (doc/:data).innerHTML if (doc/:result).innerHTML == "error"
+    end
 
     def request(cmd,values={})
       handle_response!(response(cmd,values))

data/lib/dreamy/commands/help.rb

@@ -23,6 +23,10 @@ module Dreamy::Command
  domains:mysql                      # list MySQL domains
  domains:status                     # check availability of all domains (pingability)
  
+ mysql:dbs                          # list MySQL database details
+ mysql:hosts                        # list MySQL database hostnames
+ mysql:users                        # list MySQL user details
+ 
  ps                                 # list private servers
  ps:add <web|mysql> <yes|no>        # adds a private server of type <web|mysql>. Yes = move data
  ps:pending                         # list private servers scheduled to be created

data/lib/dreamy/commands/mysql.rb

@@ -0,0 +1,45 @@
+module Dreamy::Command
+  class Mysql < Base
+    
+    def dbs
+      dbs = @account.mysql_dbs
+      if dbs.empty?
+        display "No MySQL databases on this account"
+      else
+        db_table = table do |t|
+          t.headings = 'Name', 'Home', 'Description', 'Disk used (MB)'
+          dbs.each { |db| t << [db.name,db.home,db.description,db.disk_usage_mb]  }
+        end
+        display db_table
+      end
+    end
+    alias :index :dbs
+    
+    def hosts
+      hosts = @account.mysql_hosts
+      if hosts.empty?
+        display "No MySQL hosts on this account"
+      else
+        host_table = table do |t|
+          t.headings = 'Domain Name','Home'
+          hosts.each { |host| t << [host.domain,host.home]  }
+        end
+        display host_table
+      end
+    end
+    
+    def users
+      users = @account.mysql_users
+      if users.empty?
+        display "No MySQL users on this account"
+      else
+        user_table = table do |t|
+          t.headings = 'Username', 'Database', 'Sel', 'Ins', 'Upd', 'Del', 'Cre', 'Drop', 'Ind', 'Alt'
+          users.each { |u| t << [u.username,u.db,u.select,u.insert,u.update,u.delete,u.create,u.drop,u.index,u.alter]  }
+        end
+        display user_table
+      end
+    end
+    
+  end
+end

data/lib/dreamy/mysql/db.rb

@@ -0,0 +1,17 @@
+module Dreamy
+  class MysqlDb
+    include EasyClassMaker
+
+    attributes  :account_id, :name, :description, :home, :disk_usage_mb
+
+    def self.new_from_xml(xml)
+      db = new
+      db.account_id     = (xml).at('account_id').innerHTML.to_i
+      db.name           = (xml).at('db').innerHTML
+      db.description    = (xml).at('description').innerHTML
+      db.home           = (xml).at('home').innerHTML
+      db.disk_usage_mb  = (xml).at('disk_usage_mb').innerHTML.to_f
+      db
+    end
+  end
+end

data/lib/dreamy/mysql/host.rb

@@ -0,0 +1,15 @@
+module Dreamy
+  class MysqlHost
+    include EasyClassMaker
+
+    attributes  :account_id, :domain, :home
+
+    def self.new_from_xml(xml)
+      host = new
+      host.account_id = (xml).at('account_id').innerHTML.to_i
+      host.domain     = (xml).at('domain').innerHTML
+      host.home       = (xml).at('home').innerHTML
+      host
+    end
+  end
+end

data/lib/dreamy/mysql/user.rb

@@ -0,0 +1,26 @@
+module Dreamy
+  class MysqlUser
+    include EasyClassMaker
+
+    attributes  :account_id, :db, :home, :username, :host, :select, :insert,
+                :update, :delete, :create, :drop, :index, :alter
+
+    def self.new_from_xml(xml)
+      u = new
+      u.account_id = (xml).at('account_id').innerHTML.to_i
+      u.db         = (xml).at('db').innerHTML
+      u.home       = (xml).at('home').innerHTML
+      u.username   = (xml).at('username').innerHTML
+      u.host       = (xml).at('host').innerHTML
+      u.select     = (xml).at('select_priv').innerHTML
+      u.insert     = (xml).at('insert_priv').innerHTML
+      u.update     = (xml).at('update_priv').innerHTML
+      u.delete     = (xml).at('delete_priv').innerHTML
+      u.create     = (xml).at('create_priv').innerHTML
+      u.drop       = (xml).at('drop_priv').innerHTML
+      u.index      = (xml).at('index_priv').innerHTML
+      u.alter      = (xml).at('alter_priv').innerHTML
+      u
+    end
+  end
+end

data/test/base_test.rb

@@ -136,6 +136,28 @@ class DreamyBaseTest < Test::Unit::TestCase
     
   end # announcement lists
   
+  context "MySQL" do
+    
+    should "return array of MysqlDb records" do
+      dbs = @@base.mysql_dbs
+      assert_kind_of Array, dbs
+      assert_kind_of Dreamy::MysqlDb, dbs.first unless dbs.empty?
+    end
+
+    should "return array of MysqlHost records" do
+      hosts = @@base.mysql_hosts
+      assert_kind_of Array, hosts
+      assert_kind_of Dreamy::MysqlDb, hosts.first unless hosts.empty?
+    end
+    
+    should "return array of MysqlUser records" do
+      users = @@base.mysql_users
+      assert_kind_of Array, users
+      assert_kind_of Dreamy::MysqlUser, users.first unless users.empty?
+    end
+    
+  end
+  
   context "Private Servers" do
     setup { @ps = CREDS["ps"] }
     

data/test/mysql_db_test.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + "/test_helper.rb"
+
+class DreamyMysqlDbTest < Test::Unit::TestCase
+
+  context "Creation" do
+    setup do
+      @xml = <<EOF
+<data>
+  <account_id>8675309</account_id>
+  <db>betterdb2435</db>
+  <description>This one's better</description>
+  <home>haass.tuna.dreamhost.com</home>
+  <disk_usage_mb>0.0078125</disk_usage_mb>
+</data>
+EOF
+    end
+
+    should "create a new user from xml" do
+      db = Dreamy::MysqlDb.new_from_xml(Hpricot.XML(@xml))
+      assert_equal 8675309, db.account_id
+      assert_equal "betterdb2435", db.name
+      assert_equal "This one's better", db.description
+      assert_equal "haass.tuna.dreamhost.com", db.home
+      assert_equal 0.0078125, db.disk_usage_mb
+    end
+  end
+  
+end

data/test/mysql_host_test.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + "/test_helper.rb"
+
+class DreamyMysqlHostTest < Test::Unit::TestCase
+
+  context "Creation" do
+    setup do
+      @xml = <<EOF
+<data>
+  <account_id>8675309</account_id>
+  <domain>mysql.site.dreamhosters.com</domain>
+  <home>haass.tuna.dreamhost.com</home>
+</data>
+EOF
+    end
+
+    should "create a new user from xml" do
+      host = Dreamy::MysqlHost.new_from_xml(Hpricot.XML(@xml))
+      assert_equal 8675309, host.account_id
+      assert_equal "mysql.site.dreamhosters.com", host.domain
+      assert_equal "haass.tuna.dreamhost.com", host.home
+    end
+  end
+  
+end

data/test/mysql_user_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + "/test_helper.rb"
+
+class DreamyMysqlUserTest < Test::Unit::TestCase
+
+  context "Creation" do
+    setup do
+      @xml = <<EOF
+<data>
+  <account_id>8675309</account_id>
+  <db>betterdb2435</db>
+  <home>haass.tuna.dreamhost.com</home>
+  <username>user_fu</username>
+  <host>haass.tuna.dreamhost.com</host>
+  <select_priv>Y</select_priv>
+  <insert_priv>Y</insert_priv>
+  <update_priv>N</update_priv>
+  <delete_priv>Y</delete_priv>
+  <create_priv>N</create_priv>
+  <drop_priv>Y</drop_priv>
+  <index_priv>Y</index_priv>
+  <alter_priv>N</alter_priv>
+</data>
+EOF
+    end
+
+    should "create a new user from xml" do
+      u = Dreamy::MysqlUser.new_from_xml(Hpricot.XML(@xml))
+      assert_equal 8675309, u.account_id
+      assert_equal "betterdb2435", u.db
+      assert_equal "haass.tuna.dreamhost.com", u.home
+      assert_equal "user_fu", u.username
+      assert_equal "haass.tuna.dreamhost.com", u.host
+      assert_equal "Y", u.select
+      assert_equal "Y", u.insert
+      assert_equal "N", u.update
+      assert_equal "Y", u.delete
+      assert_equal "N", u.create
+      assert_equal "Y", u.drop
+      assert_equal "Y", u.index
+      assert_equal "N", u.alter
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sant0sk1-dreamy
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jerod Santo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-02 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: dh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,12 +64,16 @@ files:
 - lib/dreamy/commands/dns.rb
 - lib/dreamy/commands/domains.rb
 - lib/dreamy/commands/help.rb
+- lib/dreamy/commands/mysql.rb
 - lib/dreamy/commands/ps.rb
 - lib/dreamy/commands/users.rb
 - lib/dreamy/core_extensions.rb
 - lib/dreamy/dns.rb
 - lib/dreamy/domain.rb
 - lib/dreamy/easy_class_maker.rb
+- lib/dreamy/mysql/db.rb
+- lib/dreamy/mysql/host.rb
+- lib/dreamy/mysql/user.rb
 - lib/dreamy/private_server.rb
 - lib/dreamy/subscriber.rb
 - lib/dreamy/user.rb
@@ -77,6 +81,9 @@ files:
 - test/base_test.rb
 - test/dns_test.rb
 - test/domain_test.rb
+- test/mysql_db_test.rb
+- test/mysql_host_test.rb
+- test/mysql_user_test.rb
 - test/private_server_test.rb
 - test/subscriber_test.rb
 - test/test_helper.rb
@@ -112,6 +119,9 @@ test_files:
 - test/base_test.rb
 - test/dns_test.rb
 - test/domain_test.rb
+- test/mysql_db_test.rb
+- test/mysql_host_test.rb
+- test/mysql_user_test.rb
 - test/private_server_test.rb
 - test/subscriber_test.rb
 - test/test_helper.rb