sant0sk1-dreamy 0.2.3 → 0.2.4

data/README.md

@@ -33,9 +33,9 @@ Fetch an array of Dreamy::Domain objects:
 Now that you have an array you can have your way with the data:
 
     account.domains.each do |d|
+      puts d.domain
+      puts d.type
       puts d.home
-      puts d.user
-      puts d.www_or_not
     end
     
 Same goes with Users, DNS records and announcement list subscribers
@@ -88,7 +88,8 @@ Run this from the command line to print the usage:
     === Commands
      help                           # show this usage
 
-     domains                        # list domains: details
+     domains:http                   # list HTTP domain details
+     domains:mysql                  # list MySQL domains
      domains:status                 # check availability of all domains (pingability)
 
      dns                            # list DNS records

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 2

data/lib/dreamy/commands/base.rb

@@ -84,7 +84,7 @@ module Dreamy::Command
       if @credentials[0].nil? || @credentials[1].nil?
         display "\nYou need to set your API credentials. You can do this 2 ways:\n"
         display "\n1) set environment variables 'DH_USER' and 'DH_KEY'"
-        display "2) create file ~/.Dreamyrc with user on first line and key on second\n\n"
+        display "2) create ~/.dreamyrc with user on first line and key on second\n\n"
         exit 1
       end
       @credentials

data/lib/dreamy/commands/domains.rb

@@ -4,9 +4,14 @@ module Dreamy::Command
   class Domains < Base
     
     def index
-      domains = @account.domains
+      http
+    end
+    
+    def http
+      domains = @account.domains.reject { |d| d.type != 'http'}
+      
       if domains.empty?
-        display "No domains on this account"
+        display "No HTTP domains on this account"
       else
         domain_table = table do |t|
           t.headings = 'Domain Name', 'Server', 'Type', 'User', 'WWW or Not'
@@ -16,6 +21,20 @@ module Dreamy::Command
       end
     end
     
+    def mysql
+      domains = @account.domains.reject { |d| d.type != 'mysqldns'}
+      
+      if domains.empty?
+        display "No MySQL domains on this account"
+      else
+        domain_table = table do |t|
+          t.headings = 'Domain Name', 'Server'
+          domains.each { |d| t << [d.domain,d.short_home]}
+        end
+        display domain_table
+      end
+    end
+    
     def status
       domains = @account.domains
       domains.each do |d|

data/lib/dreamy/commands/help.rb

@@ -10,13 +10,14 @@ module Dreamy::Command
 === Commands
  help                           # show this usage
 
- domains                        # list domains: details
+ domains:http                   # list HTTP domain details
+ domains:mysql                  # list MySQL domains
  domains:status                 # check availability of all domains (pingability)
  
  dns                            # list DNS records
  dns <name>                     # list DNS records for <name>
  
- announce:list <list>           # lists all subscribers to <name> list (eg - 'my_list@example.com')
+ announce:list <list>           # list all subscribers to <name> list (eg - 'my_list@example.com')
  announce:add <list> <email>    # add subscriber with <email> to <list>
  announce:remove <list> <email> # remove subscriber with <email> from <list>
  

data/lib/dreamy/domain.rb

@@ -7,22 +7,27 @@ module Dreamy
 
     def self.new_from_xml(xml)
       d = new
+      
       d.account_id    = (xml).at('account_id').innerHTML
       d.domain        = (xml).at('domain').innerHTML
-      d.fastcgi       = (xml).at('fastcgi').innerHTML
       d.home          = (xml).at('home').innerHTML
-      d.hosting_type  = (xml).at('hosting_type').innerHTML
-      d.outside_url   = (xml).at('outside_url').innerHTML
-      d.passenger     = (xml).at('passenger').innerHTML
-      d.path          = (xml).at('path').innerHTML
-      d.php           = (xml).at('php').innerHTML
-      d.php_fcgid     = (xml).at('php_fcgid').innerHTML
-      d.security      = (xml).at('security').innerHTML
       d.type          = (xml).at('type').innerHTML
       d.unique_ip     = (xml).at('unique_ip').innerHTML
-      d.user          = (xml).at('user').innerHTML
-      d.www_or_not    = (xml).at('www_or_not').innerHTML
-      d.xcache        = (xml).at('xcache').innerHTML
+      
+      if d.type == 'http'
+        d.fastcgi       = (xml).at('fastcgi').innerHTML
+        d.hosting_type  = (xml).at('hosting_type').innerHTML
+        d.outside_url   = (xml).at('outside_url').innerHTML
+        d.passenger     = (xml).at('passenger').innerHTML
+        d.path          = (xml).at('path').innerHTML
+        d.php           = (xml).at('php').innerHTML
+        d.php_fcgid     = (xml).at('php_fcgid').innerHTML
+        d.security      = (xml).at('security').innerHTML
+        d.user          = (xml).at('user').innerHTML
+        d.www_or_not    = (xml).at('www_or_not').innerHTML
+        d.xcache        = (xml).at('xcache').innerHTML
+      end
+      
       d
     end
     

data/test/domain_test.rb

@@ -4,7 +4,7 @@ class DreamyDomainTest < Test::Unit::TestCase
 
   context "Creation" do
     setup do
-      @xml = <<EOF
+      @domain_xml = <<EOF
 <data>
   <account_id>8675309</account_id>
   <domain>anessalee.net</domain>
@@ -24,10 +24,22 @@ class DreamyDomainTest < Test::Unit::TestCase
   <xcache>0</xcache>
 </data>
 EOF
-    @d = Dreamy::Domain.new_from_xml(Hpricot.XML(@xml))
+
+      @mysql_xml = <<EOF
+<data>
+  <account_id>8675309</account_id>
+  <domain>mysql.anessalee.net</domain>
+  <home>zechiel.swordfish.Dreamy.com</home>
+  <type>mysqldns</type>
+  <unique_ip></unique_ip>
+</data>
+EOF
+
+    @d = Dreamy::Domain.new_from_xml(Hpricot.XML(@domain_xml))
+    @m = Dreamy::Domain.new_from_xml(Hpricot.XML(@mysql_xml))
     end
 
-    should "assign valid domain from xml" do
+    should "assign valid http domain from xml" do
       assert_equal "8675309", @d.account_id
       assert_equal "anessalee.net", @d.domain
       assert_equal "0", @d.fastcgi
@@ -46,6 +58,14 @@ EOF
       assert_equal "0", @d.xcache
     end
     
+    should "assign valid mysql domain from xml" do
+      assert_equal "8675309", @m.account_id
+      assert_equal "mysql.anessalee.net", @m.domain
+      assert_equal "zechiel.swordfish.Dreamy.com", @m.home
+      assert_equal "mysqldns", @m.type
+      assert_equal "", @m.unique_ip
+    end
+    
     should "return shortened server name if requested" do
       assert_equal "juniormint", @d.short_home
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sant0sk1-dreamy
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jerod Santo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: dh
 dependencies: 
 - !ruby/object:Gem::Dependency