hetzner-api 1.0.0.beta.2 → 1.0.0

data/Gemfile.lock

@@ -1,9 +1,11 @@
 PATH
   remote: .
   specs:
-    hetzner-api (1.0.0.beta.1)
+    hetzner-api (1.0.0.beta.2)
       httparty
+      json
       thor
+      xml-simple
 
 GEM
   remote: http://rubygems.org/
@@ -46,6 +48,7 @@ GEM
     sys-uname (0.8.4)
     term-ansicolor (1.0.5)
     thor (0.14.3)
+    xml-simple (1.0.12)
 
 PLATFORMS
   ruby
@@ -60,5 +63,7 @@ DEPENDENCIES
   fakeweb
   hetzner-api!
   httparty
+  json
   rspec (>= 2.0.0)
   thor
+  xml-simple

data/LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2010 Roland Moriz, http://moriz.de
+            
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-- 
+<a href="http://moriz.de/opensource">a Moriz GmbH OpenSource project.</a>

data/features/hetzner.feature

@@ -8,11 +8,15 @@ Feature: Hetzner
     When I run "hetzner boot 11.11.11.111 --username='myusername' --password='mycoolpassword'"
     Then the output should contain "11.11.11.111"
     
+  Scenario: Display the status of all failover IPs
+    When I run "hetzner failover --username='myusername' --password='mycoolpassword'"
+    Then the output should contain "active_server_ip"
+      
   Scenario: Display the status of a failover IP
     When I run "hetzner failover 11.11.11.111 --username='myusername' --password='mycoolpassword'"
     Then the output should contain "11.11.11.111"
   
   Scenario: Update the failover delegation of an ip
-    When I run "hetzner failover 11.11.11.111 --set --username='myusername' --password='mycoolpassword'"
-    Then the output should contain "11.11.11.111"
+    When I run "hetzner failover 22.22.22.222 --to 11.11.11.112 --username='myusername' --password='mycoolpassword'"
+    Then the output should contain "active_server_ip"
         

data/hetzner-api.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'httparty'
   s.add_dependency 'thor'
+  s.add_dependency 'json'
+  s.add_dependency 'xml-simple'
   
   s.add_development_dependency "bundler", ">= 1.0.2"
   s.add_development_dependency "autotest"

data/lib/hetzner/api/cli.rb

@@ -2,13 +2,14 @@ require 'thor'
 require 'ipaddr'
 require 'pp'
 require 'json'
+require 'xmlsimple'
 
 module Hetzner
   class API
     class CLI < Thor
       attr_accessor :api
       
-      desc "boot ACTION [SERVER_IP]", "'get' available boot options"
+      desc "boot ACTION [SERVER_IP]", "get available boot options"
       method_options :username => :string
       method_options :password => :string
       method_options :set      => 'get'
@@ -21,33 +22,47 @@ module Hetzner
           when 'get'
             require_ip ip
             result = @api.boot? ip
-            pp result.parsed_response
         end
+        
+        output(result)
       end
       
-      
-      desc "failover [SERVER_IP]", "get available boot options"
+      desc "failover [SERVER_IP] (--to [FAILOVER_IP])", "get/set failover of SERVER_IP (to FAILOVER_IP)"
       method_options :username => :string
       method_options :password => :string
-      method_options :set      => 'get'
-
-      def failover(ip)
-        require_ip ip
+      method_options :to       => :string
+      
+      def failover(ip = nil)
         generate_api_instance
-        
-        case options.set
-          when 'set'
-            result = @api.failover! ip
-            pp result.parsed_response
-          #  raise UnknownArgumentError, "'#{action}' is not a valid action!"
-          when 'get'
-            result = @api.failover? ip
-            pp result.parsed_response
+
+        if options.to
+          require_ip ip
+          require_ip options.to
+          result = @api.failover! ip, options.to
+        else
+          result = @api.failover? ip
         end
+       
+        output(result)
       end
       
       private
       
+      def output(result)
+        @render = 'xml'
+        case @render
+        when 'pp'
+          pp result.parsed_response
+        when 'yaml'
+          puts result.parsed_response.to_yaml
+        when 'xml'
+          puts XmlSimple.xml_out result.parsed_response, 'RootName' => 'result', 'AnonymousTag' => '' # dirty
+        when 'json'
+        else
+          jj JSON.parse result.response.body
+        end
+      end
+      
       def require_ip(ip)
         ip = IPAddr.new ip
       rescue ArgumentError

data/lib/hetzner/api/version.rb

@@ -1,5 +1,5 @@
 module Hetzner
   class API
-    VERSION = "1.0.0.beta.2"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hetzner-api
 version: !ruby/object:Gem::Version 
-  hash: 62196359
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  - 2
-  version: 1.0.0.beta.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Roland Moriz
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +47,37 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +89,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +103,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: autotest-fsevent
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,11 +117,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: autotest-growl
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,11 +131,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,11 +147,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,11 +161,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,11 +175,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,7 +189,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id012
 description: A wrapper for Hetzner.de's server management API
 email: 
 - roland@moriz.de
@@ -177,6 +203,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.rdoc
 - Rakefile
 - bin/hetzner