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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hetzner-api (1.0.0.alpha.3)
+    hetzner-api (1.0.0.beta.1)
       httparty
       thor
 
@@ -12,6 +12,8 @@ GEM
       background_process
       cucumber (~> 0.9.0)
     autotest (4.2.10)
+    autotest-fsevent (0.2.3)
+      sys-uname
     autotest-growl (0.2.4)
       autotest (>= 4.2.4)
     background_process (1.2)
@@ -31,16 +33,17 @@ GEM
     httparty (0.6.1)
       crack (= 0.1.8)
     json (1.4.6)
-    rspec (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-      rspec-mocks (= 2.0.0.rc)
-    rspec-core (2.0.0.rc)
-    rspec-expectations (2.0.0.rc)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    sys-uname (0.8.4)
     term-ansicolor (1.0.5)
     thor (0.14.3)
 
@@ -50,11 +53,12 @@ PLATFORMS
 DEPENDENCIES
   aruba
   autotest
+  autotest-fsevent
   autotest-growl
   bundler (>= 1.0.2)
   cucumber
   fakeweb
   hetzner-api!
   httparty
-  rspec (~> 2.0.0.rc)
+  rspec (>= 2.0.0)
   thor

data/README.rdoc

@@ -40,28 +40,28 @@ see http://wiki.hetzner.de/index.php?title=Robot_Webservice_en for details.
       should fail for the specific IP if a manual reset is active
       should fail for the specific IP if reset is unavailable
       should fail for the specific IP if IP is unknown
-
+  
   Boot
     query boot configuration
       should display the boot configuration
     the rescue system
       should be able to activate
       should be able to deactivate
-
+  
   Rdns
     should query the current rdns status
     should be able to set a new ptr
     should be able to remove a new ptr
-
+  
   VNC
     should be able to query vnc boot status
     should be able to set vnc boot status
     should be able to disable vnc boot status
-
+  
   WOL
     should be able to query WOL status
     should be able to send a WOL notification
-
+  
   IP
     information
       should be able to display all IP addresses of the customer account
@@ -70,7 +70,7 @@ see http://wiki.hetzner.de/index.php?title=Robot_Webservice_en for details.
     manage traffic warnings
       should be able to activate and set traffic warning limits on a specific IP address
       should be able to deactivate traffic warnings for a specific IP address
-
+  
   Subnet
     information
       should be able to display all IP subnets of the customer account
@@ -79,22 +79,28 @@ see http://wiki.hetzner.de/index.php?title=Robot_Webservice_en for details.
     manage traffic warnings
       should be able to activate and set traffic warning limits on a specific IP address
       should be able to deactivate traffic warnings for a specific IP address
-
+  
   Server
     information
       should be able to display all servers of the customer account
       should be able to display a specific server by its IP address
-
+  
   Plesk
     should be able to query plesk boot option status
     should be able to activate plesk boot option
     should be able to disable plesk boot option
-
+  
+  Failover
+    should be able to query the status of all failover IPs
+    should be able to query the status of a single failover IP
+    should be able to set the status of a single failover IP
+  
   Traffic
     should display the traffic for a specific ip address and a subnet
     should display the traffic for serveral IP addresse and no subnet
     should display the traffic for subnets and no ip address
-
+  
+  
 
 == Readme (rdoc)
 

data/cucumber.yml

@@ -1 +1,2 @@
-default: --format html --out report.html --format pretty
+default: --format pretty
+autotest: features -r features --format pretty --color

data/features/hetzner.feature

@@ -3,6 +3,16 @@ Feature: Hetzner
   As a CLI
   I want to provider a decent, objective interface
   
-  Scenario: Display boot options for one server
-    When I run "hetzner boot get 11.11.11.111 --username='myusername' --password='mycoolpassword'"
-    Then the output should contain "11.11.11.111"
+  
+  Scenario: Display available boot options for a specific server
+    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 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"
+        

data/hetzner-api.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "bundler", ">= 1.0.2"
   s.add_development_dependency "autotest"
+  s.add_development_dependency "autotest-fsevent"
   s.add_development_dependency "autotest-growl"
-  s.add_development_dependency "rspec",   "~> 2.0.0.rc"
+  s.add_development_dependency "rspec",   ">= 2.0.0"
   s.add_development_dependency "fakeweb"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"

data/lib/hetzner/api/cli.rb

@@ -11,16 +11,38 @@ module Hetzner
       desc "boot ACTION [SERVER_IP]", "'get' available boot options"
       method_options :username => :string
       method_options :password => :string
+      method_options :set      => 'get'
       
-      def boot(action, ip = '')
+      def boot(ip = "")
+        require_ip ip
         generate_api_instance
-        case action
+        
+        case options.set
           when 'get'
             require_ip ip
             result = @api.boot? ip
             pp result.parsed_response
-          else
-            raise UnknownArgumentError, "'#{action}' is not a valid action!"
+        end
+      end
+      
+      
+      desc "failover [SERVER_IP]", "get available boot options"
+      method_options :username => :string
+      method_options :password => :string
+      method_options :set      => 'get'
+
+      def failover(ip)
+        require_ip ip
+        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
         end
       end
       

data/lib/hetzner/api/failover.rb

@@ -10,7 +10,7 @@ module Hetzner
       
       # redirects the failover_ip to another server ip
       def failover!(failover_ip, active_server_ip)
-        path = "/rdns/#{failover_ip}"
+        path = "/failover/#{failover_ip}"
         perform_post path, :query => { :active_server_ip => active_server_ip }
       end
     end

data/lib/hetzner/api/version.rb

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

data/spec/api_stubs.rb

@@ -154,5 +154,16 @@ FakeWeb.register_uri :post,   uri(nil, "?from=2010-09-01&type=month&ip[]=#{WORKI
 
 FakeWeb.register_uri :post,   uri(nil, "?from=2010-01&to=2010-10&type=year&subnet[]=#{WORKING_SUBNET_IP}&subnet[]=#{WORKING_SUBNET_IP_2}"),
                      :response => fixture('post_with_two_subnets_and_no_ip_year.raw')
+
+
+@resource = 'failover'
+
+FakeWeb.register_uri :get,    uri,
+                     :response => fixture('get.raw')
                      
+FakeWeb.register_uri :get,    uri("#{FAILOVER_IP}"),
+                     :response => fixture('get_with_failover_ip.raw')
+
+FakeWeb.register_uri :post,    uri("#{FAILOVER_IP}?active_server_ip=#{WORKING_IP_2}"),
+                     :response => fixture('post_with_active_server_ip.raw')                     
 #pp FakeWeb::Registry.instance.uri_map

data/spec/fixtures/failover/get.raw

@@ -0,0 +1,23 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+[
+  {
+    "failover":
+    {
+      "ip":"22.22.22.222",
+      "netmask":"255.255.255.255",
+      "server_ip": "22.22.22.222",
+      "active_server_ip": "22.22.22.222"
+    }
+  },
+  {
+    "failover":
+    {
+      "ip":"22.22.22.223",
+      "netmask":"255.255.255.255",
+      "server_ip": "22.22.22.223",
+      "active_server_ip": "22.22.22.222"
+    }
+  }
+]

data/spec/fixtures/failover/get_with_failover_ip.raw

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "failover":
+  {
+    "ip":"22.22.22.222",
+    "netmask":"255.255.255.255",
+    "server_ip": "22.22.22.222",
+    "active_server_ip": "11.11.11.111"
+  }
+}

data/spec/fixtures/failover/post_with_active_server_ip.raw

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+  "failover":
+  {
+    "ip":"22.22.22.222",
+    "netmask":"255.255.255.255",
+    "server_ip": "22.22.22.222",
+    "active_server_ip": "11.11.11.112"
+  }
+}

data/spec/hetzner_api_spec.rb

@@ -313,6 +313,45 @@ describe "Plesk" do
   end
 end
 
+describe "Failover" do
+  before(:all) do
+    @h = Hetzner::API.new API_USERNAME, API_PASSWORD
+  end
+  
+  it "should be able to query the status of all failover IPs" do
+    result = @h.failover?
+    result.response.should be_an_instance_of Net::HTTPOK
+    result.parsed_response.should have(2).entries
+    
+    # default in mode
+    result[0]['failover']['ip'].should               == FAILOVER_IP
+    result[0]['failover']['active_server_ip'].should == FAILOVER_IP
+    
+    # currently re-routed
+    result[1]['failover']['ip'].should == FAILOVER_IP_2
+    result[1]['failover']['active_server_ip'].should == FAILOVER_IP
+  end
+  
+  it "should be able to query the status of a single failover IP" do
+    result = @h.failover? FAILOVER_IP
+    result.response.should be_an_instance_of Net::HTTPOK
+    result['failover']['ip'].should               == FAILOVER_IP
+    result['failover']['netmask'].should          == '255.255.255.255' 
+    result['failover']['server_ip'].should        == FAILOVER_IP
+    result['failover']['active_server_ip'].should == WORKING_IP
+  end
+  
+  it "should be able to set the status of a single failover IP" do
+    result = @h.failover! FAILOVER_IP, WORKING_IP_2
+    result.response.should be_an_instance_of Net::HTTPOK
+    result['failover']['ip'].should               == FAILOVER_IP
+    result['failover']['netmask'].should          == '255.255.255.255' 
+    result['failover']['server_ip'].should        == FAILOVER_IP
+    result['failover']['active_server_ip'].should == WORKING_IP_2
+  end
+end
+
+
 describe "Traffic" do
    before(:all) do
     @h = Hetzner::API.new API_USERNAME, API_PASSWORD

data/spec/spec_constants.rb

@@ -8,6 +8,9 @@ RESET_IP_NOT_AVAILABLE = '11.11.11.223'
 RESET_IP_MANUAL_ACTIVE = '11.11.11.224'
 RESET_IP_FAILED        = '11.11.11.225'
 
+FAILOVER_IP            = '22.22.22.222'
+FAILOVER_IP_2          = '22.22.22.223'
+
 TEST_PTR     = 'testen.de'
 RDNS_TEST_IP = ''
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hetzner-api
 version: !ruby/object:Gem::Version 
-  hash: 62196353
+  hash: 62196359
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - beta
-  - 1
-  version: 1.0.0.beta.1
+  - 2
+  version: 1.0.0.beta.2
 platform: ruby
 authors: 
 - Roland Moriz
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: autotest-growl
+  name: autotest-fsevent
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,38 +93,37 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: autotest-growl
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712058
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        - rc
-        version: 2.0.0.rc
+        version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: fakeweb
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -138,7 +137,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: cucumber
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -151,6 +150,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: A wrapper for Hetzner.de's server management API
 email: 
 - roland@moriz.de
@@ -198,6 +211,9 @@ files:
 - spec/fixtures/boot/vnc/delete.raw
 - spec/fixtures/boot/vnc/get.raw
 - spec/fixtures/boot/vnc/post.raw
+- spec/fixtures/failover/get.raw
+- spec/fixtures/failover/get_with_failover_ip.raw
+- spec/fixtures/failover/post_with_active_server_ip.raw
 - spec/fixtures/ip/get.raw
 - spec/fixtures/ip/get_with_ip.raw
 - spec/fixtures/ip/get_with_server_ip.raw