hetzner-api 1.0.0.alpha.1 → 1.0.0.alpha.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hetzner-api (1.0.0)
+    hetzner-api (1.0.0.alpha.1)
       httparty
       thor
 

data/bin/hetzner

@@ -1,3 +1,13 @@
 #!/usr/bin/env ruby
-require 'hetzner-api'
+require "rubygems"
+require "bundler/setup"
+require "hetzner-api"
+
+if ENV['HETZNER_API_CUCUMBER_TEST']
+  puts 'testing mode'
+  require 'fakeweb'                                 
+  require File.expand_path File.dirname(__FILE__) + '/../spec/spec_constants'
+  require File.expand_path File.dirname(__FILE__) + '/../spec/api_stubs'
+end
+
 Hetzner::API::CLI.start

data/features/hetzner.feature

@@ -4,5 +4,5 @@ Feature: Hetzner
   I want to provider a decent, objective interface
   
   Scenario: Display boot options for one server
-    When I run "hetzner boot show 78.46.50.215 --username  --password "
-    Then the output should contain "178.46.50.215"
+    When I run "hetzner boot get 11.11.11.111 --username='myusername' --password='mycoolpassword'"
+    Then the output should contain "11.11.11.111"

data/features/support/env.rb

@@ -0,0 +1 @@
+ENV['HETZNER_API_CUCUMBER_TEST'] = "1"

data/hetzner-api.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/hetzner-api/version", __FILE__)
+require File.expand_path("../lib/hetzner/api/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "hetzner-api"
-  s.version     = Hetzner::Api::VERSION
+  s.version     = Hetzner::API::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Roland Moriz']
   s.email       = ['roland@moriz.de']

data/lib/hetzner/api/boot/plesk.rb

@@ -0,0 +1,8 @@
+module Hetzner
+  class API
+    module Boot
+      module Plesk
+      end
+    end
+  end
+end

data/lib/hetzner/api/boot/rescue.rb

@@ -0,0 +1,21 @@
+module Hetzner
+  class API
+    module Boot
+      module Rescue
+        # enables the rescue systm for given IP address/server using <em>os</em> (operating system) and <em>arch</em> (architecture)
+        #
+        # see <em>boot?</em> method to query the API for available options
+        #
+        # defaults to 64bit Linux
+        def enable_rescue!(ip, os = 'linux', arch = '64')
+          perform_post "/boot/#{ip}/rescue", :query => { :os => os, :arch => arch }
+        end
+        
+        # disables the rescue system for a given IP address/server
+        def disable_rescue!(ip)
+          perform_delete "/boot/#{ip}/rescue"
+        end
+      end
+    end
+  end
+end

data/lib/hetzner/api/boot/vnc.rb

@@ -0,0 +1,27 @@
+module Hetzner
+  class API
+    module Boot
+      module VNC
+        # queries the vnc boot status of one IP address/server
+        def boot_vnc?(ip)
+          path = "/boot/#{ip}/vnc"
+          perform_get path
+        end
+      
+        # enables vnc boot option for one IP address/server
+        #
+        # see <em>Boot</em> to query the API for available options
+        def boot_vnc!(ip, dist, arch, lang)
+          path = "/boot/#{ip}/vnc"
+          perform_post path, :query => { :dist => dist, :arch => arch, :lang => lang }
+        end
+      
+        # disables the vnc boot status of one IP address/server
+        def disable_boot_vnc!(ip)
+          path = "/boot/#{ip}/vnc"
+          perform_delete path
+        end
+      end
+    end
+  end
+end

data/lib/hetzner/api/boot/windows.rb

@@ -0,0 +1,22 @@
+module Hetzner
+  class API
+    module Boot
+      module Windows
+        def boot_windows?(ip)
+          path = "/boot/#{ip}/windows"
+          perform_get path
+        end
+
+        def boot_windows!(ip, lan)
+          path = "/boot/#{ip}/windows"
+          perform_post path, :query => { :lang => lang }
+        end
+
+        def disable_boot_windows!(ip)
+          path = "/boot/#{ip}/windows"
+          perform_delete path
+        end
+      end
+    end
+  end
+end

data/lib/{hetzner-api → hetzner}/api/boot.rb

@@ -1,6 +1,11 @@
 module Hetzner
   class API
     module Boot
+      include Plesk
+      include Rescue
+      include VNC
+      include Windows
+      
       # lists boot options for a given IP address/server or all servers of the account
       def boot?(ip = nil)
         path = "/boot"

data/lib/{hetzner-api → hetzner}/api/cli.rb

@@ -15,13 +15,12 @@ module Hetzner
       def boot(action, ip = '')
         generate_api_instance
         case action
-        when 'get'
-          require_ip ip
-          result = @api.boot?(ip)
-          pp result.parsed_response
-          #result.body.to_yaml
-        else
-          raise UnknownArgumentError, "'#{action}' is not a valid action!"
+          when 'get'
+            require_ip ip
+            result = @api.boot? ip
+            pp result.parsed_response
+          else
+            raise UnknownArgumentError, "'#{action}' is not a valid action!"
         end
       end
       

data/lib/{hetzner-api → hetzner}/api/failover.rb

@@ -4,7 +4,7 @@ module Hetzner
       # queries the failover status of one IP address or all failover IP addresses of the account
       def failover?(ip = nil)
         path = "/failover"
-        path << "/#{ip}" if @ip
+        path << "/#{ip}" if ip
         perform_get path
       end
       

data/lib/hetzner/api/ip.rb

@@ -0,0 +1,35 @@
+module Hetzner
+  class API
+    module IP
+      # shows all addresses that belong to the main server IP
+      def ips_for_server?(server_ip)
+        path = "/ip"
+        perform_get path, :query => { :server_ip => server_ip }
+      end
+      
+      # shows information of all IP addresses of the customer 
+      def ips?
+        get_ip_or_ips
+      end   
+      
+      # shows information of a given IP addresses of the customer
+      def ip?(ip)
+        get_ip_or_ips ip
+      end
+      
+      # sets or unsets traffic warning limits on a specific IP address
+      def ip!(ip, options = {})
+        path = "/ip/#{ip}"
+        perform_post path, :query => options
+      end
+      
+      private
+      
+      def get_ip_or_ips(ip = nil)
+        path = "/ip"
+        path << "/#{ip}" if ip
+        perform_get path
+      end
+    end
+  end
+end

data/lib/hetzner/api/server.rb

@@ -0,0 +1,6 @@
+module Hetzner
+  class API
+    module Server
+    end
+  end
+end

data/lib/hetzner/api/subnet.rb

@@ -0,0 +1,6 @@
+module Hetzner
+  class API
+    module Subnet
+    end
+  end
+end

data/lib/hetzner/api/traffic.rb

@@ -0,0 +1,6 @@
+module Hetzner
+  class API
+    module Traffic
+    end
+  end
+end

data/lib/hetzner/api/version.rb

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

data/lib/hetzner-api.rb

@@ -1,15 +1,21 @@
 require 'httparty'
-require 'forwardable'
+#require 'forwardable'
 
-require 'hetzner-api/api/cli'
-require 'hetzner-api/api/boot'
-require 'hetzner-api/api/failover'
-require 'hetzner-api/api/rdns'
-require 'hetzner-api/api/rescue'
-require 'hetzner-api/api/reset'
-require 'hetzner-api/api/vnc'
-require 'hetzner-api/api/windows'
-require 'hetzner-api/api/wol'
+require 'hetzner/api/cli'
+
+require 'hetzner/api/failover'
+require 'hetzner/api/rdns'
+require 'hetzner/api/reset'
+require 'hetzner/api/wol'
+require 'hetzner/api/server'
+require 'hetzner/api/ip'
+require 'hetzner/api/subnet'
+require 'hetzner/api/traffic'
+require 'hetzner/api/boot/rescue'
+require 'hetzner/api/boot/vnc'
+require 'hetzner/api/boot/windows'
+require 'hetzner/api/boot/plesk'
+require 'hetzner/api/boot'
 
 module Hetzner
   class API
@@ -20,11 +26,12 @@ module Hetzner
     include Boot
     include Failover
     include Rdns
-    include Rescue
     include Reset
-    include VNC
-    include Windows
     include WOL
+    include Server
+    include IP
+    include Subnet
+    include Traffic
     
     def initialize(username, password)
       @auth = {:username => username, :password => password}

data/spec/api_stubs.rb

@@ -3,47 +3,109 @@ require 'fakeweb'
 @base_dir = File.dirname(__FILE__)
 
 def fixture(path)
-  File.expand_path(@base_dir + '/fixtures/' + @resource + '/' + path)
+  file = File.expand_path(@base_dir + '/fixtures/' + @resource + '/' + path)
+  file
 end
 
-def uri(path = nil)
+def uri(path = nil, args = nil)
   url = "https://#{API_USERNAME}:#{API_PASSWORD}@#{API_SERVER}/#{@resource}"
   url << "/#{path}" if path
+  url << "#{args}"  if args
   url
 end
 
+
 FakeWeb.allow_net_connect = false
 
 
 @resource = 'reset'
 
-FakeWeb.register_uri :get,  uri,
+FakeWeb.register_uri :get,   uri,
                      :response => fixture('get.raw')
 
-FakeWeb.register_uri :get,  uri("#{WORKING_IP}"),
+FakeWeb.register_uri :get,   uri("#{WORKING_IP}"),
                      :response => fixture('get_with_ip.raw')
 
-FakeWeb.register_uri :get,  uri("#{UNKOWN_IP}"),              
+FakeWeb.register_uri :get,   uri("#{UNKOWN_IP}"),              
                      :response => fixture('get_with_ip_unknown.raw')
 
-FakeWeb.register_uri :get,  uri("#{RESET_IP_NOT_AVAILABLE}"), 
+FakeWeb.register_uri :get,   uri("#{RESET_IP_NOT_AVAILABLE}"), 
                      :response => fixture('get_with_ip_unavailable.raw')
 
-
-FakeWeb.register_uri :post, uri("#{WORKING_IP}?type=sw"),             
+FakeWeb.register_uri :post,  uri("#{WORKING_IP}?type=sw"),             
                      :response => fixture('post_with_ip.raw')
 
-FakeWeb.register_uri :post, uri("#{WORKING_IP}?type=foo"),            
+FakeWeb.register_uri :post,  uri("#{WORKING_IP}?type=foo"),            
                      :response => fixture('post_with_ip_invalid_input.raw')
 
-FakeWeb.register_uri :post, uri("#{RESET_IP_MANUAL_ACTIVE}?type=sw"), 
+FakeWeb.register_uri :post,  uri("#{RESET_IP_MANUAL_ACTIVE}?type=sw"), 
                      :response => fixture('post_with_ip_manual_active.raw')
 
-FakeWeb.register_uri :post, uri("#{RESET_IP_NOT_AVAILABLE}?type=sw"), 
+FakeWeb.register_uri :post,  uri("#{RESET_IP_NOT_AVAILABLE}?type=sw"), 
                      :response => fixture('post_with_ip_unavailable.raw')                     
 
-FakeWeb.register_uri :post, uri("#{UNKOWN_IP}?type=sw"), 
+FakeWeb.register_uri :post,  uri("#{UNKOWN_IP}?type=sw"), 
                      :response => fixture('post_with_ip_unknown.raw')                     
 
 
+@resource = 'boot'
+
+FakeWeb.register_uri :get,    uri("#{WORKING_IP}"),
+                     :response => fixture('get_with_ip.raw')
+
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}/rescue?arch=64&os=linux"),
+                     :response => fixture('rescue/post.raw')
+
+FakeWeb.register_uri :delete, uri("#{WORKING_IP}/rescue"),
+                     :response => fixture('rescue/delete.raw')
+
+FakeWeb.register_uri :get,    uri("#{WORKING_IP}/vnc"),
+                     :response => fixture('vnc/get.raw')
+
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}/vnc?arch=32&lang=en_US&dist=Fedora-13"),
+                     :response => fixture('vnc/post.raw')                     
+
+FakeWeb.register_uri :delete, uri("#{WORKING_IP}/vnc"),
+                     :response => fixture('vnc/delete.raw')  
+
+
+@resource = 'wol'
+
+FakeWeb.register_uri :get,    uri("#{WORKING_IP}"),
+                     :response => fixture('get.raw')  
+
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}"),
+                     :response => fixture('post.raw')  
+
+
+@resource = 'rdns'
+
+FakeWeb.register_uri :get,    uri("#{WORKING_IP}"),
+                     :response => fixture('get_with_ip.raw')
+
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}?ptr=testen.de"),
+                     :response => fixture('post_with_ip.raw')
+
+FakeWeb.register_uri :delete, uri("#{WORKING_IP}"),
+                     :response => fixture('delete_with_ip.raw')
+
+
+@resource = 'ip'
+
+FakeWeb.register_uri :get,    uri,
+                     :response => fixture('get.raw')
+
+FakeWeb.register_uri :get,    uri(nil, "?server_ip=#{WORKING_IP}"),
+                     :response => fixture('get_with_server_ip.raw')
+                                          
+FakeWeb.register_uri :get,    uri("#{WORKING_IP}"),
+                     :response => fixture('get_with_ip.raw')
+                                          
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}?traffic_warnings=true&traffic_monthly=2342"),
+                     :response => fixture('post_activate_with_data.raw')
+                     
+FakeWeb.register_uri :post,   uri("#{WORKING_IP}?traffic_warnings=false"),
+                     :response => fixture('post_deactivate_with_data.raw')
+
+
 #pp FakeWeb::Registry.instance.uri_map

data/spec/fixtures/boot/get_with_ip.raw

@@ -0,0 +1,29 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "boot": {
+    "rescue": {
+      "server_ip" : "11.11.11.111",
+      "os": ["linux","freebsd","opensolaris","vkvm"],
+      "arch": [64,32],
+      "active": false,
+      "password": null
+    },
+    "vnc": {
+      "server_ip": "11.11.11.111",
+      "dist": ["centOS-5.0","Fedora-6","openSUSE-10.2"],
+      "arch": [64,32],
+      "lang": ["de_DE","en_US"],
+      "active": false,
+      "password": null
+    },
+    "windows": {
+      "server_ip": "11.11.11.111",
+      "dist": null,
+      "lang": null,
+      "active": false,
+      "password": null
+    }
+  }
+}

data/spec/fixtures/boot/rescue/delete.raw

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "rescue": {
+    "server_ip": "123.123.123.123",
+    "os": ["linux","freebsd","opensolaris","vkvm"],
+    "arch": [64,32],
+    "active": false,
+    "password": null
+  }
+}

data/spec/fixtures/boot/rescue/post.raw

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "rescue": {
+    "server_ip": "11.11.11.111",
+    "os": ["linux","freebsd","opensolaris","vkvm"],
+    "arch": [64,32],
+    "active": false,
+    "password": null
+  }
+}

data/spec/fixtures/boot/vnc/delete.raw

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "vnc": {
+    "server_ip": "11.11.11.111",
+    "dist": ["centOS-5.0","Fedora-6","openSUSE-10.2"],
+    "arch": [64,32],
+    "lang": ["de_DE","en_US"],
+    "active": false,
+    "password": null
+  }
+}

data/spec/fixtures/boot/vnc/get.raw

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "vnc": {
+    "server_ip": "11.11.11.111",
+    "dist": ["centOS-5.0","Fedora-6","openSUSE-10.2"],
+    "arch": [64,32],
+    "lang": ["de_DE","en_US"],
+    "active": false,
+    "password": null
+  }
+}

data/spec/fixtures/boot/vnc/post.raw

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "vnc": {
+    "server_ip": "11.11.11.111",
+    "dist": "Fedora-13",
+    "arch": 32,
+    "lang" : "en_US",
+    "active": true,
+    "password": "u7Ng5j43"
+  }
+}

data/spec/fixtures/ip/get.raw

@@ -0,0 +1,27 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+[
+  {
+    "ip": {
+      "ip":"11.11.11.111",
+      "server_ip": "11.11.11.111",
+      "locked": false,
+      "traffic_warnings": false,
+      "traffic_hourly": 50,
+      "traffic_daily": 50,
+      "traffic_monthly":8
+    }
+  },
+  {
+    "ip": {
+      "ip": "11.11.11.112",
+      "server_ip": "11.11.11.111",
+      "locked": false,
+      "traffic_warnings": false,
+      "traffic_hourly": 200,
+      "traffic_daily": 2000,
+      "traffic_monthly": 20
+    }
+  }
+]

data/spec/fixtures/ip/get_with_ip.raw

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "ip": {
+    "ip":"11.11.11.111",
+    "server_ip": "11.11.11.111",
+    "locked": false,
+    "traffic_warnings": false,
+    "traffic_hourly": 50,
+    "traffic_daily": 50,
+    "traffic_monthly": 8
+  }
+}

data/spec/fixtures/ip/get_with_server_ip.raw

@@ -0,0 +1,27 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+[
+  {
+    "ip": {
+      "ip":"11.11.11.111",
+      "server_ip": "11.11.11.111",
+      "locked": false,
+      "traffic_warnings": false,
+      "traffic_hourly": 50,
+      "traffic_daily": 50,
+      "traffic_monthly":8
+    }
+  },
+  {
+    "ip": {
+      "ip": "11.11.11.112",
+      "server_ip": "11.11.11.111",
+      "locked": false,
+      "traffic_warnings": false,
+      "traffic_hourly": 200,
+      "traffic_daily": 2000,
+      "traffic_monthly": 20
+    }
+  }
+]

data/spec/fixtures/ip/post_activate_with_data.raw

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "ip": {
+    "ip":"11.11.11.111",
+    "server_ip": "11.11.11.111",
+    "locked": false,
+    "traffic_warnings": true,
+    "traffic_hourly": 50,
+    "traffic_daily": 50,
+    "traffic_monthly":8
+  }
+}

data/spec/fixtures/ip/post_deactivate_with_data.raw

@@ -0,0 +1,14 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "ip": {
+    "ip":"11.11.11.111",
+    "server_ip": "11.11.11.111",
+    "locked": false,
+    "traffic_warnings": false,
+    "traffic_hourly": 50,
+    "traffic_daily": 50,
+    "traffic_monthly":8
+  }
+}

data/spec/fixtures/rdns/delete_with_ip.raw

@@ -0,0 +1,3 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+

data/spec/fixtures/rdns/get_with_ip.raw

@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "rdns": {
+    "ip": "11.11.11.111",
+    "ptr": "testen.de"
+  }
+}

data/spec/fixtures/rdns/post_with_ip.raw

@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "rdns": {
+    "ip": "11.11.11.111",
+    "ptr": "testen.de"
+  }
+}

data/spec/fixtures/wol/get.raw

@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "wol":
+  {
+    "server_ip":"11.11.11.111"
+  }
+}

data/spec/fixtures/wol/post.raw

@@ -0,0 +1,9 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "wol":
+  {
+    "server_ip":"11.11.11.111"
+  }
+}

data/spec/{hetzner_spec.rb → hetzner_api_spec.rb}

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe "Reset" do
   describe "query" do
     before(:all) do
-      @h = Hetzner::API.new(API_USERNAME, API_PASSWORD)
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
     end
 
     it "should list available reset options for all servers" do
@@ -34,7 +34,7 @@ describe "Reset" do
 
   describe "execution" do
     before(:all) do
-      @h = Hetzner::API.new(API_USERNAME, API_PASSWORD)
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
     end
     
     it "should reset the specific IP" do
@@ -71,65 +71,71 @@ end
 describe "Boot" do
   describe "query boot configuration" do 
     before(:all) do
-      @h = Hetzner::API.new(USERNAME, PASSWORD)
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
     end
-    
+  
     it "should display the boot configuration" do
       result = @h.boot? WORKING_IP 
-      result.should == {"boot"=>{"vnc"=>{"arch"=>[64, 32], "server_ip"=>WORKING_IP, "lang"=>["de_DE", "en_US", "fr_FR"], "dist"=>["centOS-5.3", "centOS-5.4", "centOS-5.5", "Fedora-11", "Fedora-12", "Fedora-13", "Fedora-9", "openSUSE-11.0", "openSUSE-11.1", "openSUSE-11.3"], "password"=>nil, "active"=>false}, "rescue"=>{"arch"=>[64, 32], "os"=>["linux", "freebsd", "opensolaris", "vkvm"], "server_ip"=>WORKING_IP, "password"=>nil, "active"=>false}, "windows"=>{"server_ip"=>WORKING_IP, "lang"=>nil, "dist"=>nil, "password"=>nil, "active"=>false}}}
+      result.response.should be_an_instance_of Net::HTTPOK
     end
   end
+
   
-  describe "Rescue" do
+  describe "the rescue system" do
     before(:all) do
-      @h = Hetzner::API.new(USERNAME, PASSWORD)
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
     end
+    
     it "should be able to activate" do
       result = @h.enable_rescue! WORKING_IP
-      
+      result.response.should be_an_instance_of Net::HTTPOK
+
       # {"rescue"=>{"arch"=>64, "os"=>"linux", "server_ip"=>WORKING_IP, "password"=>"h9JbXPz8", "active"=>true}} 
-      result['rescue']['arch'].should == 64
-      result['rescue']['os'].should == 'linux'
-      result['rescue']['active'].should be_true
+      #result['rescue']['arch'].should == 64
+      #result['rescue']['os'].should == 'linux'
+      #result['rescue']['active'].should be_true
     end
-    
+       
     it "should be able to deactivate" do
       result = @h.disable_rescue! WORKING_IP
-      result.should == {"rescue"=>{"arch"=>[64, 32], "os"=>["linux", "freebsd", "opensolaris", "vkvm"], "server_ip"=>WORKING_IP, "password"=>nil, "active"=>false}}
+      result.response.should be_an_instance_of Net::HTTPOK
     end
   end
 end
 
 describe "Rdns" do
   before(:all) do
-    @h = Hetzner::API.new(USERNAME, PASSWORD)
+    @h = Hetzner::API.new API_USERNAME, API_PASSWORD
   end
   
   it "should query the current rdns status" do
     result = @h.rdns? WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
     result['rdns']['ip'].should == WORKING_IP
     result['rdns']['ptr'].should == TEST_PTR
   end
   
   it "should be able to set a new ptr" do
-    result = @h.rdns! RDNS_WORKING_IP, 'testen.de'
-    result['rdns']['ip'].should == RDNS_WORKING_IP
-    result['rdns']['ptr'].should == 'testen.de'
+    result = @h.rdns! WORKING_IP, TEST_PTR
+    result.response.should be_an_instance_of Net::HTTPOK    
+    result['rdns']['ip'].should  == WORKING_IP
+    result['rdns']['ptr'].should == TEST_PTR
   end
   
   it "should be able to remove a new ptr" do
-    result = @h.delete_rdns! RDNS_WORKING_IP
-    puts result
+    result = @h.delete_rdns! WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
   end
 end
 
 describe "VNC" do
   before(:all) do
-    @h = Hetzner::API.new(USERNAME, PASSWORD)
+    @h = Hetzner::API.new API_USERNAME, API_PASSWORD
   end
   
   it "should be able to query vnc boot status" do
     result = @h.boot_vnc? WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
     result['vnc']['server_ip'].should == WORKING_IP
     result['vnc']['active'].should be_false
     result['vnc']['password'].should be_nil
@@ -137,6 +143,7 @@ describe "VNC" do
   
   it "should be able to set vnc boot status" do
     result = @h.boot_vnc! WORKING_IP, 'Fedora-13', '32', 'en_US'
+    result.response.should be_an_instance_of Net::HTTPOK
     result['vnc']['server_ip'].should == WORKING_IP
     result['vnc']['active'].should be_true
     result['vnc']['password'].should_not be_nil
@@ -144,6 +151,7 @@ describe "VNC" do
   
   it "should be able to disable vnc boot status" do
     result = @h.disable_boot_vnc! WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
     result['vnc']['server_ip'].should == WORKING_IP
     result['vnc']['active'].should be_false
     result['vnc']['password'].should be_nil
@@ -152,16 +160,62 @@ end
 
 describe "WOL" do
   before(:all) do
-    @h = Hetzner::API.new(USERNAME, PASSWORD)
+    @h = Hetzner::API.new API_USERNAME, API_PASSWORD
   end
   
   it "should be able to query WOL status" do
     result = @h.wol? WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
     result['wol']['server_ip'].should == WORKING_IP
   end
   
   it "should be able to send a WOL notification" do
     result = @h.wol! WORKING_IP
+    result.response.should be_an_instance_of Net::HTTPOK
     result['wol']['server_ip'].should == WORKING_IP
   end
 end
+
+describe 'IP' do
+  describe "information" do
+    before(:all) do
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
+    end
+    it "should be able to display all IP addresses of the customer account" do
+      result = @h.ips?
+      result.response.should be_an_instance_of Net::HTTPOK
+      result.parsed_response.should have_at_least(2).entries
+    end  
+  
+    it "should be able to display a IP address of the customer account" do
+      result = @h.ip? WORKING_IP
+      result.response.should be_an_instance_of Net::HTTPOK
+      result.parsed_response.should have(1).entry
+    end
+    
+    it "should be able to display all IP addresses for a given server IP address" do
+      result = @h.ips_for_server? WORKING_IP
+      result.response.should be_an_instance_of Net::HTTPOK
+      result.parsed_response.should have(2).entry
+    end
+  end
+  
+  describe "manage traffic warnings" do
+    before(:all) do
+      @h = Hetzner::API.new API_USERNAME, API_PASSWORD
+    end
+    
+    it "should be able to activate and set traffic warning limits on a specific IP address" do
+      result = @h.ip! WORKING_IP, :traffic_warnings => 'true', :traffic_monthly => TRAFFIC_LIMIT_IN_GIGABYTE
+      result.response.should be_an_instance_of Net::HTTPOK
+      result.parsed_response.should have(1).entry
+    end
+    
+    it "should be able to deactivate traffic warnings for a specific IP address" do
+      result = @h.ip! WORKING_IP, :traffic_warnings => 'false'
+      result.response.should be_an_instance_of Net::HTTPOK
+      result.parsed_response.should have(1).entry
+    end
+  end
+end
+

data/spec/spec_constants.rb

@@ -5,9 +5,11 @@ RESET_IP_NOT_AVAILABLE = '11.11.11.223'
 RESET_IP_MANUAL_ACTIVE = '11.11.11.224'
 RESET_IP_FAILED        = '11.11.11.225'
 
-TEST_PTR     = ''
+TEST_PTR     = 'testen.de'
 RDNS_TEST_IP = ''
 
+TRAFFIC_LIMIT_IN_GIGABYTE = 2342
+
 API_SERVER   = 'robot-ws.your-server.de'
 API_USERNAME = 'myusername'
 API_PASSWORD = 'mycoolpassword'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hetzner-api
 version: !ruby/object:Gem::Version 
-  hash: -3702664322
+  hash: -3702664328
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - alpha
-  - 1
-  version: 1.0.0.alpha.1
+  - 2
+  version: 1.0.0.alpha.2
 platform: ruby
 authors: 
 - Roland Moriz
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,20 +169,40 @@ files:
 - bin/hetzner
 - cucumber.yml
 - features/hetzner.feature
+- features/support/env.rb
 - features/support/setup.rb
 - hetzner-api.gemspec
 - lib/hetzner-api.rb
-- lib/hetzner-api/api/boot.rb
-- lib/hetzner-api/api/cli.rb
-- lib/hetzner-api/api/failover.rb
-- lib/hetzner-api/api/rdns.rb
-- lib/hetzner-api/api/rescue.rb
-- lib/hetzner-api/api/reset.rb
-- lib/hetzner-api/api/vnc.rb
-- lib/hetzner-api/api/windows.rb
-- lib/hetzner-api/api/wol.rb
-- lib/hetzner-api/version.rb
+- lib/hetzner/api/boot.rb
+- lib/hetzner/api/boot/plesk.rb
+- lib/hetzner/api/boot/rescue.rb
+- lib/hetzner/api/boot/vnc.rb
+- lib/hetzner/api/boot/windows.rb
+- lib/hetzner/api/cli.rb
+- lib/hetzner/api/failover.rb
+- lib/hetzner/api/ip.rb
+- lib/hetzner/api/rdns.rb
+- lib/hetzner/api/reset.rb
+- lib/hetzner/api/server.rb
+- lib/hetzner/api/subnet.rb
+- lib/hetzner/api/traffic.rb
+- lib/hetzner/api/version.rb
+- lib/hetzner/api/wol.rb
 - spec/api_stubs.rb
+- spec/fixtures/boot/get_with_ip.raw
+- spec/fixtures/boot/rescue/delete.raw
+- spec/fixtures/boot/rescue/post.raw
+- spec/fixtures/boot/vnc/delete.raw
+- spec/fixtures/boot/vnc/get.raw
+- spec/fixtures/boot/vnc/post.raw
+- spec/fixtures/ip/get.raw
+- spec/fixtures/ip/get_with_ip.raw
+- spec/fixtures/ip/get_with_server_ip.raw
+- spec/fixtures/ip/post_activate_with_data.raw
+- spec/fixtures/ip/post_deactivate_with_data.raw
+- spec/fixtures/rdns/delete_with_ip.raw
+- spec/fixtures/rdns/get_with_ip.raw
+- spec/fixtures/rdns/post_with_ip.raw
 - spec/fixtures/reset/get.raw
 - spec/fixtures/reset/get_with_ip.raw
 - spec/fixtures/reset/get_with_ip_unavailable.raw
@@ -192,7 +212,9 @@ files:
 - spec/fixtures/reset/post_with_ip_manual_active.raw
 - spec/fixtures/reset/post_with_ip_unavailable.raw
 - spec/fixtures/reset/post_with_ip_unknown.raw
-- spec/hetzner_spec.rb
+- spec/fixtures/wol/get.raw
+- spec/fixtures/wol/post.raw
+- spec/hetzner_api_spec.rb
 - spec/spec_constants.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/hetzner-api/api/rescue.rb

@@ -1,19 +0,0 @@
-module Hetzner
-  class API
-    module Rescue
-      # enables the rescue systm for given IP address/server using <em>os</em> (operating system) and <em>arch</em> (architecture)
-      #
-      # see <em>boot?</em> method to query the API for available options
-      #
-      # defaults to 64bit Linux
-      def enable_rescue!(ip, os = 'linux', arch = '64')
-        perform_post "/boot/#{ip}/rescue", :query => { :os => os, :arch => arch }
-      end
-      
-      # disables the rescue system for a given IP address/server
-      def disable_rescue!(ip)
-        perform_delete "/boot/#{ip}/rescue"
-      end
-    end
-  end
-end

data/lib/hetzner-api/api/vnc.rb

@@ -1,25 +0,0 @@
-module Hetzner
-  class API
-    module VNC
-      # queries the vnc boot status of one IP address/server
-      def boot_vnc?(ip)
-        path = "/boot/#{ip}/vnc"
-        perform_get path
-      end
-      
-      # enables vnc boot option for one IP address/server
-      #
-      # see <em>Boot</em> to query the API for available options
-      def boot_vnc!(ip, dist, arch, lang)
-        path = "/boot/#{ip}/vnc"
-        perform_post path, :query => { :dist => dist, :arch => arch, :lang => lang }
-      end
-      
-      # disables the vnc boot status of one IP address/server
-      def disable_boot_vnc!(ip)
-        path = "/boot/#{ip}/vnc"
-        perform_delete path
-      end
-    end
-  end
-end

data/lib/hetzner-api/api/windows.rb

@@ -1,20 +0,0 @@
-module Hetzner
-  class API
-    module Windows
-      def boot_windows?(ip)
-        path = "/boot/#{ip}/windows"
-        perform_get path
-      end
-
-      def boot_windows!(ip, lan)
-        path = "/boot/#{ip}/windows"
-        perform_post path, :query => { :lang => lang }
-      end
-
-      def disable_boot_windows!(ip)
-        path = "/boot/#{ip}/windows"
-        perform_delete path
-      end
-    end
-  end
-end

data/lib/hetzner-api/version.rb

@@ -1,5 +0,0 @@
-module Hetzner
-  class Api
-    VERSION = "1.0.0.alpha.1"
-  end
-end