lumberg 2.0.0.pre4 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8729386fae62f1240d8ca35e0b2440a5c13fd121
-  data.tar.gz: 0da476df19735bf334e8addb63f6507e1946a6be
+  metadata.gz: 852542026317752bc04944c381f01bd47bd7aac3
+  data.tar.gz: 54205352af91ff3517f4dcc4dafc731e5b896455
 SHA512:
-  metadata.gz: 48a7cf27c6d95dd99e2fe3553f8c91fe12a96a58996c38f0058997131798d55b5c317876a255d04059d586b36386a35cf3ba1749529766bfadf7f209681be0b7
-  data.tar.gz: ec675a24333fa0ba2b7e6070959c57eb7663a4df9b7a351818ecb5a165e50f7a20ce5e0a53a6818cddefaacc819e99d8f2eb0ce9b7d2f18656948d7becef927c
+  metadata.gz: 94ee04c10241649fabb4704b89088d874a85ce1292ccbb2cfff7e9d387e99782a56ae3626a279a0379cb031ebcec017e24ebce627785d1f3c6d7469a88462b1e
+  data.tar.gz: 6f4680fbf24f2a0fc8a7e6561c59da38c15bc3000c97e186acd18dfa7873a0f64d8ab449dce0f9b619389cf74fd568b5e9907263cb616073c324380f5b563240

data/README.md

@@ -7,7 +7,7 @@ beta-ish. Please report any issues you find. :)
 
 [RDoc](http://rdoc.info/github/site5/lumberg/master/frames)
 
-Confirmed to work with ruby 1.8.7, 1.9.2, REE and JRuby 1.6.0 on
+Confirmed to work with ruby 1.9.3, 2.0.0 and JRuby 1.9 mode on
 cPanel 11.28+
 
 [Build Status]: http://travis-ci.org/site5/lumberg
@@ -26,8 +26,8 @@ Create a server object and connect to WHM using your host and hash:
 ```ruby
 require 'lumberg'
 server = Lumberg::Whm::Server.new(
-  :host => WHM_HOST,
-  :hash => WHM_HASH
+  host: WHM_HOST,
+  hash: WHM_HASH
 )
 ```
 
@@ -35,9 +35,9 @@ If you are using HTTP Basic Authentication with a username/password:
 
 ```ruby
 server = Lumberg::Whm::Server.new(
-  :host => WHM_HOST,
-  :user => USERNAME,
-  :hash => 'my_password'
+  host: WHM_HOST,
+  user: USERNAME,
+  hash: 'my_password'
 )
 ```
 
@@ -78,29 +78,29 @@ Here's an example of what the returned data looks like for a single account
 pp result[:params][:acct].first
 
 {
-  :startdate=>false,
-  :plan           => "default",
-  :suspended      => false,
-  :theme          => "x3",
-  :shell          => "/usr/local/cpanel/bin/jailshell",
-  :maxpop         => "unlimited",
-  :maxlst         => "unlimited",
-  :maxaddons      => "*unknown*",
-  :suspendtime    => nil,
-  :ip             => false,
-  :maxsub         => "unlimited",
-  :domain         => "bob.com",
-  :maxsql         => "unlimited",
-  :partition      => "home",
-  :maxftp         => "unlimited",
-  :user           => "bob",
-  :suspendreason  => "not suspended",
-  :unix_startdate => false,
-  :diskused       => false,
-  :maxparked      => "*unknown*",
-  :email          => "*unknown*",
-  :disklimit      => "unlimited",
-  :owner          => "root"
+  startdate:      false,
+  plan:           "default",
+  suspended:      false,
+  theme:          "x3",
+  shell:          "/usr/local/cpanel/bin/jailshell",
+  maxpop:         "unlimited",
+  maxlst:         "unlimited",
+  maxaddons:      "*unknown*",
+  suspendtime:    nil,
+  ip:             false,
+  maxsub:         "unlimited",
+  domain:         "bob.com",
+  maxsql:         "unlimited",
+  partition:      "home",
+  maxftp:         "unlimited",
+  user:           "bob",
+  suspendreason:  "not suspended",
+  unix_startdate: false,
+  diskused:       false,
+  maxparked:      "*unknown*",
+  email:          "*unknown*",
+  disklimit:      "unlimited",
+  owner:          "root"
 }
 ```
 
@@ -111,9 +111,9 @@ Creating a new account requires only a username, domain, and password.
 
 ```ruby
 result = server.account.create(
-  :username => 'newuser',
-  :domain   => 'newuser.com',
-  :password => 'password'
+  username: 'newuser',
+  domain:   'newuser.com',
+  password: 'password'
 )
 
 if result[:success]
@@ -126,7 +126,7 @@ Account Creation Ok
 You can list all accounts or search for a specific account.
 
 ```ruby
-result = server.account.list(:search => 'new', :searchtype => 'user')
+result = server.account.list(search: 'new', searchtype: 'user')
 acct   = result[:params][:acct].first
 p "Found user '#{acct[:user]}' with domain '#{acct[:domain]}'"
 
@@ -137,7 +137,7 @@ Found user 'newuser' with domain 'newuser.com'
 Suspending an account is simple and the reason for suspension is optional.
 
 ```ruby
-result = server.account.suspend(:username => 'newuser', :reason => 'bad user')
+result = server.account.suspend(username: 'newuser', reason: 'bad user')
 p "user was suspended successfully" if result[:success]
 
 user was suspended successfully
@@ -147,7 +147,7 @@ We can look at the account list again to see the reason for the user's
 suspension.
 
 ```ruby
-result = server.account.list(:search => 'new', :searchtype => 'user')
+result = server.account.list(search: 'new', searchtype: 'user')
 acct   = result[:params][:acct].first
 p "user '#{acct[:user]}' was suspended with reason '#{acct[:suspendreason]}'"
 
@@ -157,7 +157,7 @@ user 'newuser' was suspended with reason 'bad user'
 Finally, we remove the user and delete their account.
 
 ```ruby
-result = server.account.remove(:username => 'newuser')
+result = server.account.remove(username: 'newuser')
 p result[:message]
 
 newuser account removed
@@ -171,13 +171,13 @@ so first we create a user account and then we can create that user as a reseller
 
 ```ruby
 result = server.account.create(
-  :username => 'rtest',
-  :domain   => 'resellerexample.com',
-  :password => 'password'
+  username: 'rtest',
+  domain:   'resellerexample.com',
+  password: 'password'
 )
 
 if result[:success]
-  result = server.reseller.create(:username => 'rtest', :makeowner => true)
+  result = server.reseller.create(username: 'rtest', makeowner: true)
   p "created reseller rtest" if result[:success]
 end
 
@@ -197,7 +197,7 @@ Suspending a reseller is pretty straightforward. It's optional to provide a
 reason for the suspension.
 
 ```ruby
-result = server.reseller.suspend(:username => 'rtest', :reason => 'bad user')
+result = server.reseller.suspend(username: 'rtest', reason: 'bad user')
 p "reseller was suspended successfully" if result[:success]
 
 user was suspended successfully
@@ -207,7 +207,7 @@ Deleting the reseller removes the reseller status from the user account. To
 also delete the user account, set the `:terminatereseller` argument.
 
 ```ruby
-result = server.reseller.terminate(:reseller => 'rtest', :terminatereseller => true)
+result = server.reseller.terminate(reseller: 'rtest', terminatereseller: true)
 p result[:message]
 
 Account Terminations Complete
@@ -227,8 +227,8 @@ Lumberg::Cpanel](#extending-lumbergcpanel) for details on how you can help.
 ```ruby
 # Create an interface object for cPanel API Email module
 email = Lumberg::Cpanel::Email.new(
-  :server       => server,  # An instance of Lumberg::Server
-  :api_username => "jerry"  # User whose cPanel we'll be interacting with
+  server:       server,  # An instance of Lumberg::Server
+  api_username: "jerry"  # User whose cPanel we'll be interacting with
 )
 
 # Get a list of email accounts
@@ -237,10 +237,10 @@ email.accounts[:params][:data] #=> Array of info hashes for each email account
 # Add an email forwarder to forward mail for my-forwarder@domain.com to
 # dest@other-domain.com
 email.add_forwarder(
-  :domain   => "domain.com",
-  :email    => "my-forwarder",
-  :fwdopt   => "fwd",
-  :fwdemail => "dest@other-domain.com"
+  domain:   "domain.com",
+  email:    "my-forwarder",
+  fwdopt:   "fwd",
+  fwdemail: "dest@other-domain.com"
 )
 
 ```
@@ -309,7 +309,7 @@ email.add_forwarder(
          # Returns Hash API response.
          def list_sprites(options = {})
            perform_request({
-            :api_function => "spritelist"
+            api_function: "spritelist"
            }.merge(options))
          end
        end

data/lib/lumberg/cpanel.rb

@@ -14,6 +14,7 @@ module Lumberg
     require "lumberg/cpanel/dns_lookup"
     require "lumberg/cpanel/domain_lookup"
     require "lumberg/cpanel/password"
+    require "lumberg/cpanel/password_strength"
     require "lumberg/cpanel/file_manager"
     require "lumberg/cpanel/zone_edit"
     require "lumberg/cpanel/support"
@@ -25,5 +26,6 @@ module Lumberg
     require "lumberg/cpanel/locale"
     require "lumberg/cpanel/mysql"
     require "lumberg/cpanel/domain_keys"
+    require "lumberg/cpanel/ftp"
   end
 end

data/lib/lumberg/cpanel/addon_domain.rb

@@ -13,7 +13,7 @@ module Lumberg
       # Returns Hash API response.
       def remove(options = {})
         perform_request({
-          :api_function => "deladdondomain"
+          api_function: "deladdondomain"
         }.merge(options))
       end
 
@@ -28,7 +28,7 @@ module Lumberg
       # Returns Hash API response.
       def add(options = {})
         perform_request({
-          :api_function => "addaddondomain"
+          api_function: "addaddondomain"
         }.merge(options))
       end
 
@@ -41,7 +41,7 @@ module Lumberg
       # Returns Hash API response.
       def list(options={})
         perform_request({
-          :api_function => "listaddondomains"
+          api_function: "listaddondomains"
         }.merge(options))
       end
     end

data/lib/lumberg/cpanel/backups.rb

@@ -8,7 +8,7 @@ module Lumberg
       # Returns Hash API response.
       def list(options = {})
         perform_request({
-          :api_function => "listfullbackups"
+          api_function: "listfullbackups"
         }.merge(options))
       end
     end

data/lib/lumberg/cpanel/base.rb

@@ -42,11 +42,11 @@ module Lumberg
 
         api_module = options.delete(:api_module) || self.class.api_module
         params = {
-          :response_key              => options.delete(:response_key) || "cpanelresult",
-          :cpanel_jsonapi_user       => options.delete(:api_username),
-          :cpanel_jsonapi_module     => api_module,
-          :cpanel_jsonapi_func       => options.delete(:api_function),
-          :cpanel_jsonapi_apiversion => options.delete(:api_version) || 2,
+          response_key:              options.delete(:response_key) || "cpanelresult",
+          cpanel_jsonapi_user:       options.delete(:api_username),
+          cpanel_jsonapi_module:     api_module,
+          cpanel_jsonapi_func:       options.delete(:api_function),
+          cpanel_jsonapi_apiversion: options.delete(:api_version) || 2,
         }.merge(options)
 
         server.perform_request("cpanel", params)

data/lib/lumberg/cpanel/box_trapper.rb

@@ -10,7 +10,7 @@ module Lumberg
       # Returns Hash API response.
       def list(options = {})
         perform_request({
-          :api_function => "accountmanagelist"
+          api_function: "accountmanagelist"
         }.merge(options))
       end
     end

data/lib/lumberg/cpanel/branding.rb

@@ -16,7 +16,7 @@ module Lumberg
       # Returns Hash API response.
       def list_pkgs(options = {})
         perform_request({
-          :api_function => "showpkgs"
+          api_function: "showpkgs"
         }.merge(options))
       end
 
@@ -43,7 +43,7 @@ module Lumberg
       # Returns Hash API response.
       def list_sprites(options = {})
         perform_request({
-          :api_function => "spritelist"
+          api_function: "spritelist"
         }.merge(options))
       end
 
@@ -59,7 +59,7 @@ module Lumberg
       # Returns Hash API response.
       def list_icons(options = {})
         perform_request({
-          :api_function => "applist"
+          api_function: "applist"
         }.merge(options))
       end
 
@@ -70,7 +70,7 @@ module Lumberg
       # Returns Hash API response.
       def list_object_types(options = {})
         perform_request({
-          :api_function => "listobjecttypes"
+          api_function: "listobjecttypes"
         }.merge(options))
       end
 
@@ -81,7 +81,7 @@ module Lumberg
       # Returns Hash API response.
       def list_image_types(options = {})
         perform_request({
-          :api_function => "listimgtypes"
+          api_function: "listimgtypes"
         }.merge(options))
       end
     end

data/lib/lumberg/cpanel/contact.rb

@@ -8,7 +8,7 @@ module Lumberg
       #
       # Returns Hash API response
       def show
-        perform_request({ :api_function => 'displaycontactinfo' })
+        perform_request({ api_function: 'displaycontactinfo' })
       end
 
       # Public: Updates the user's contact info and settings for email
@@ -31,7 +31,7 @@ module Lumberg
         options[:notify_disk_limit] = options.delete(:disk_quota)
         options[:notify_bandwidth_limit] = options.delete(:bandwidth)
         options[:notify_email_quota_limit] = options.delete(:email_quota)
-        perform_request({ :api_function => 'savecontactinfo' }.merge(options))
+        perform_request({ api_function: 'savecontactinfo' }.merge(options))
       end
     end
   end

data/lib/lumberg/cpanel/cron.rb

@@ -9,7 +9,7 @@ module Lumberg
       # Returns Hash API response.
       def set_email(options = {})
         perform_request({
-          :api_function => "set_email"
+          api_function: "set_email"
         }.merge(options))
       end
 
@@ -20,7 +20,7 @@ module Lumberg
       # Returns Hash API response.
       def email(options = {})
         perform_request({
-          :api_function => "get_email"
+          api_function: "get_email"
         }.merge(options))
       end
 
@@ -31,7 +31,7 @@ module Lumberg
       # Returns Hash API response.
       def list(options = {})
         perform_request({
-          :api_function => "listcron"
+          api_function: "listcron"
         }.merge(options))
       end
 
@@ -48,7 +48,7 @@ module Lumberg
       # Returns Hash API response.
       def add(options = {})
         perform_request({
-          :api_function => "add_line"
+          api_function: "add_line"
         }.merge(options))
       end
 
@@ -60,7 +60,7 @@ module Lumberg
       # Returns Hash API response.
       def remove(options = {})
         perform_request({
-          :api_function => "remove_line"
+          api_function: "remove_line"
         }.merge(options))
       end
 
@@ -81,7 +81,7 @@ module Lumberg
       # Returns Hash API response.
       def edit(options = {})
         perform_request({
-          :api_function => "edit_line"
+          api_function: "edit_line"
         }.merge(options))
       end
     end

data/lib/lumberg/cpanel/dns_lookup.rb

@@ -16,7 +16,7 @@ module Lumberg
       #
       # Returns Hash API response.
       def name_to_ip(options = {})
-        perform_request({ :api_function => 'name2ip' }.merge(options))
+        perform_request({ api_function: 'name2ip' }.merge(options))
       end
     end
   end

data/lib/lumberg/cpanel/domain_keys.rb

@@ -8,28 +8,28 @@ module Lumberg
       #
       # Returns Hash API response
       def add
-        perform_request({ :api_function => "install" })
+        perform_request({ api_function: "install" })
       end
 
       # Public: Remove DomainKeys corresponding to your domain
       #
       # Returns Hash API response
       def remove
-        perform_request({ :api_function => "uninstall" })
+        perform_request({ api_function: "uninstall" })
       end
 
       # Public: Check to see if your domain has DomainKeys installed
       #
       # Returns Hash API response
       def installed
-        perform_request({ :api_function => "installed" })
+        perform_request({ api_function: "installed" })
       end
 
       # Public: Check to see if DomainKeys are available on the server
       #
       # Returns Hash API response
       def available
-        perform_request({ :api_function => "available" })
+        perform_request({ api_function: "available" })
       end
     end
   end