fog-profitbricks 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f366af928abd2f482a610a276cd7511d1be2af
-  data.tar.gz: af46d443b445216869a0ae92d8cffc6256652e4c
+  metadata.gz: 1f38f58b9bfa3c89cbd23e16fd8d781dc6431e5c
+  data.tar.gz: 2c6256c539c8c625de23af738e4982fc158305e5
 SHA512:
-  metadata.gz: a680334c5285ce54b790d242739a4a1b1a6cd7951fcd21953d975de3bc3a8156565c085ae742b1f799c638520f5e5502ce7818e732eccc4f4489353d94441c27
-  data.tar.gz: 86fe3c96f303573a3cd1f65de3b3aa5e8734ccd3f81bb9b7f7027445844e160ed11e839040d2fd7ddb6fbcaec7f4ab98ce5e2b6ef16ff52e6e6d523b4fcaeb48
+  metadata.gz: ebc75ce94e2206cfe4a5c092021439b76c0ed22b54b4e3705b5e1feeaa3ca59cc8da78e62c8832242d6b06616cdfb05ec0d91ca00bb17f2e7c8752644a4947d1
+  data.tar.gz: 6753697708c67ebf2a8cc85561971dd3da05e26634bba80c93c2f2e690504ac2b036db3eab406aadfd54a3baf5e8b877a55be75a92929128b52e036d879e3d8e

data/.travis.yml

@@ -7,7 +7,7 @@ matrix:
     - rvm: 1.8.7
       gemfile: gemfiles/Gemfile.1.8.7
     - rvm: 1.9.2
-      gemfile: gemfiles/Gemfile.1.9.2+
+      gemfile: gemfiles/Gemfile.1.9.2-
       env: COVERAGE=true
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.1.9.2+

data/README.md

@@ -1,6 +1,8 @@
 # Fog::profitbricks
 
-TODO: Write a gem description
+![Gem Version](https://badge.fury.io/rb/fog-profitbricks.svg) [![Build Status](https://travis-ci.org/fog/fog-profitbricks.svg?branch=master)](https://travis-ci.org/fog/fog-profitbricks) [![Dependency Status](https://gemnasium.com/fog/fog-profitbricks.svg)](https://gemnasium.com/fog/fog-profitbricks) [![Coverage Status](https://img.shields.io/coveralls/fog/fog-profitbricks.svg)](https://coveralls.io/r/fog/fog-profitbricks?branch=master) [![Code Climate](https://codeclimate.com/github/fog/fog-profitbricks.png)](https://codeclimate.com/github/fog/fog-profitbricks)
+
+Module for the 'fog' gem to support ProfitBricks
 
 ## Installation
 
@@ -22,7 +24,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/fog-profitbricks/fork )
+1. Fork it ( https://github.com/fog/fog-profitbricks/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/gemfiles/Gemfile.1.8.7

@@ -1,7 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'mime-types', '< 2.0'
 gem 'nokogiri', '< 1.6'
 gem 'rest-client', '~> 1.6.8'
 
-gemspec :path => '../'
+gemspec :path => '../'

data/gemfiles/Gemfile.1.9.2+

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'activesupport', '>= 3.0', '< 4'
 gem 'mime-types', '< 2.0'

data/gemfiles/Gemfile.1.9.2-

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'mime-types', '< 2.0'
+
+gemspec :path => '../'

data/lib/fog/profitbricks/models/base.rb

@@ -0,0 +1,11 @@
+module Fog
+  module Models
+    module ProfitBricks
+      class Base < Fog::Model
+        def wait_for(timeout=Fog.timeout, interval=5, &block)
+          super
+        end
+      end
+    end
+  end
+end

data/lib/fog/profitbricks/models/compute/datacenter.rb

@@ -1,59 +1,62 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Datacenter < Fog::Model
-                identity  :id,         :aliases => 'dataCenterId'
-                attribute :name,       :aliases => 'dataCenterName'
-                attribute :version,    :aliases => 'dataCenterVersion'
-                attribute :state,      :aliases => 'provisioningState'
-                attribute :request_id, :aliases => 'requestId'
-                attribute :region
-
-                attr_accessor :options
-
-                def initialize(attributes={})
-                    super
-                end
-
-                def save
-                    requires :name, :region
-
-                    data = service.create_data_center(name, region)
-                    merge_attributes(data.body['createDataCenterResponse'])
-                    true
-                end
-
-                def update
-                    requires :id
-                    data = service.update_data_center(id, options)
-                    merge_attributes(data.body['updateDataCenterResponse'])
-                    true
-                end
-
-                def destroy
-                    requires :id
-                    service.delete_data_center(id)
-                    true
-                end
-
-                def clear(confirm = false)
-                    requires :id
-                    if confirm == true
-                        service.clear_data_center(id)
-                        true
-                    else
-                        raise ArgumentError.new('Confirm with true boolean to clear datacenter')
-                    end
-                end
-
-                def ready?
-                    self.state == 'AVAILABLE'
-                end
-
-                def failed?
-                    self.state == 'ERROR'
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Datacenter < Fog::Models::ProfitBricks::Base
+        identity  :id,          :aliases => "dataCenterId"
+
+        attribute :name,       :aliases => "dataCenterName"
+        attribute :version,    :aliases => "dataCenterVersion"
+        attribute :state,      :aliases => "provisioningState"
+        attribute :request_id, :aliases => "requestId"
+        attribute :region
+
+        attr_accessor :options
+
+        def initialize(attributes = {})
+          super
+        end
+
+        def save
+          requires :name, :region
+
+          data = service.create_data_center(name, region)
+          merge_attributes(data.body["createDataCenterResponse"])
+          true
+        end
+
+        def update
+          requires :id
+          data = service.update_data_center(id, options)
+          merge_attributes(data.body["updateDataCenterResponse"])
+          true
+        end
+
+        def destroy
+          requires :id
+          service.delete_data_center(id)
+          true
+        end
+
+        def clear(confirm = false)
+          requires :id
+          if confirm == true
+            service.clear_data_center(id)
+            true
+          else
+            raise ArgumentError.new("Confirm with true boolean to clear datacenter")
+          end
+        end
+
+        def ready?
+          state == "AVAILABLE"
+        end
+
+        def failed?
+          state == "ERROR"
         end
+      end
     end
+  end
 end

data/lib/fog/profitbricks/models/compute/datacenters.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/datacenter'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/datacenter"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Datacenters < Fog::Collection
-                model Fog::Compute::ProfitBricks::Datacenter
+  module Compute
+    class ProfitBricks
+      class Datacenters < Fog::Collection
+        model Fog::Compute::ProfitBricks::Datacenter
 
-                def all
-                    load (service.get_all_data_centers.body['getAllDataCentersResponse'])
-                end
+        def all
+          load(service.get_all_data_centers.body["getAllDataCentersResponse"])
+        end
 
-                def get(id)
-                    datacenter = service.get_data_center(id).body['getDataCenterResponse']
-                    Excon::Errors
-                    new(datacenter)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          datacenter = service.get_data_center(id).body["getDataCenterResponse"]
+          Excon::Errors
+          new(datacenter)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/flavor.rb

@@ -1,27 +1,30 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Flavor < Fog::Model
-                identity  :id,   :aliases => 'flavorId'
-                attribute :name, :aliases => 'flavorName'
-                attribute :cores
-                attribute :ram
+  module Compute
+    class ProfitBricks
+      class Flavor < Fog::Models::ProfitBricks::Base
+        identity  :id,   :aliases => "flavorId"
+
+        attribute :name, :aliases => "flavorName"
+        attribute :cores
+        attribute :ram
 
-                def initialize(attributes={})
-                    super
-                end
+        def initialize(attributes = {})
+          super
+        end
 
-                def save
-                    requires :name, :ram, :cores
-                    data = service.create_flavor(name, cores, ram)
-                    merge_attributes(data.body['createFlavorResponse'])
-                    true
-                end
+        def save
+          requires :name, :ram, :cores
+          data = service.create_flavor(name, cores, ram)
+          merge_attributes(data.body["createFlavorResponse"])
+          true
+        end
 
-                def update
-                    Fog::Mock.not_implemented
-                end
-            end
+        def update
+          Fog::Mock.not_implemented
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/flavors.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/flavor'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/flavor"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Flavors < Fog::Collection
-                model Fog::Compute::ProfitBricks::Flavor
+  module Compute
+    class ProfitBricks
+      class Flavors < Fog::Collection
+        model Fog::Compute::ProfitBricks::Flavor
 
-                def all()
-                    load (service.get_all_flavors.body['getAllFlavorsResponse'])
-                end
+        def all()
+          load(service.get_all_flavors.body["getAllFlavorsResponse"])
+        end
 
-                def get(id)
-                    flavor = service.get_flavor(id).body['getFlavorResponse']
-                    Excon::Errors
-                    new(flavor)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          flavor = service.get_flavor(id).body["getFlavorResponse"]
+          Excon::Errors
+          new(flavor)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/image.rb

@@ -1,30 +1,33 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Image < Fog::Model
-                identity  :id,             :aliases => 'imageId'
-                attribute :name,           :aliases => 'imageName'
-                attribute :type,           :aliases => 'imageType'
-                attribute :size,           :aliases => 'imageSize'
-                attribute :cpu_hotplug,    :aliases => 'cpuHotPlug'
-                attribute :cpu_hotunplug,  :aliases => 'cpuHotUnplug'
-                attribute :ram_hotplug,    :aliases => 'memoryHotPlug'
-                attribute :ram_hotunplug,  :aliases => 'memoryHotUnPlug'
-                attribute :disc_hotplug,   :aliases => 'discVirtioHotPlug'
-                attribute :disc_hotunplug, :aliases => 'discVirtioUnHotPlug'
-                attribute :nic_hotplug,    :aliases => 'nicHotPlug'
-                attribute :nic_hotunplug,  :aliases => 'nicHotUnPlug'
-                attribute :server_ids,     :aliases => 'serverIds'
-                attribute :os_type,        :aliases => 'osType'
-                attribute :region,         :aliases => 'location'
-                attribute :bootable
-                attribute :writeable
-                attribute :public
+  module Compute
+    class ProfitBricks
+      class Image < Fog::Models::ProfitBricks::Base
+        identity  :id,             :aliases => "imageId"
+
+        attribute :name,           :aliases => "imageName"
+        attribute :type,           :aliases => "imageType"
+        attribute :size,           :aliases => "imageSize"
+        attribute :cpu_hotplug,    :aliases => "cpuHotPlug"
+        attribute :cpu_hotunplug,  :aliases => "cpuHotUnplug"
+        attribute :ram_hotplug,    :aliases => "memoryHotPlug"
+        attribute :ram_hotunplug,  :aliases => "memoryHotUnPlug"
+        attribute :disc_hotplug,   :aliases => "discVirtioHotPlug"
+        attribute :disc_hotunplug, :aliases => "discVirtioUnHotPlug"
+        attribute :nic_hotplug,    :aliases => "nicHotPlug"
+        attribute :nic_hotunplug,  :aliases => "nicHotUnPlug"
+        attribute :server_ids,     :aliases => "serverIds"
+        attribute :os_type,        :aliases => "osType"
+        attribute :region,         :aliases => "location"
+        attribute :bootable
+        attribute :writeable
+        attribute :public
 
-                def initialize(attributes={})
-                    super
-                end
-            end
+        def initialize(attributes = {})
+          super
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/images.rb

@@ -1,23 +1,23 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/image'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/image"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Images < Fog::Collection
-                model Fog::Compute::ProfitBricks::Image
+  module Compute
+    class ProfitBricks
+      class Images < Fog::Collection
+        model Fog::Compute::ProfitBricks::Image
 
-                def all
-                    load (service.get_all_images.body['getAllImagesResponse'])
-                end
+        def all
+          load(service.get_all_images.body["getAllImagesResponse"])
+        end
 
-                def get(id)
-                    image = service.get_image(id).body['getImageResponse']
-                    new(image)
-                rescue Fog::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          image = service.get_image(id).body["getImageResponse"]
+          new(image)
+        rescue Fog::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/interface.rb

@@ -1,64 +1,67 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Interface < Fog::Model
-                identity  :id,                  :aliases => 'nicId'
-                attribute :name,                :aliases => 'nicName'
-                attribute :mac_address,         :aliases => 'macAddress'
-                attribute :lan_id,              :aliases => 'lanId'
-                attribute :dhcp_active,         :aliases => 'dhcpActive'
-                attribute :ips,                 :aliases => 'ips'
-                attribute :server_id,           :aliases => 'serverId'
-                attribute :internet_access,     :aliases => 'internetAccess'
-                attribute :state,               :aliases => 'provisioningState'
-                attribute :firewall
-                attribute :data_center_id,      :aliases => 'dataCenterId'
-                attribute :data_center_version, :aliases => 'dataCenterVersion'
-                attribute :request_id,          :aliases => 'requestId'
+  module Compute
+    class ProfitBricks
+      class Interface < Fog::Models::ProfitBricks::Base
+        identity  :id,                  :aliases => "nicId"
+
+        attribute :name,                :aliases => "nicName"
+        attribute :mac_address,         :aliases => "macAddress"
+        attribute :lan_id,              :aliases => "lanId"
+        attribute :dhcp_active,         :aliases => "dhcpActive"
+        attribute :ips,                 :aliases => "ips"
+        attribute :server_id,           :aliases => "serverId"
+        attribute :internet_access,     :aliases => "internetAccess"
+        attribute :state,               :aliases => "provisioningState"
+        attribute :firewall
+        attribute :data_center_id,      :aliases => "dataCenterId"
+        attribute :data_center_version, :aliases => "dataCenterVersion"
+        attribute :request_id,          :aliases => "requestId"
 
-                attr_accessor :options
+        attr_accessor :options
 
-                def initialize(attributes={})
-                    super
-                end
+        def initialize(attributes = {})
+          super
+        end
 
-                def save
-                    requires :server_id, :lan_id
+        def save
+          requires :server_id, :lan_id
 
-                    data = service.create_nic(server_id, lan_id, options={})
-                    merge_attributes(data.body['createNicResponse'])
-                    true
-                end
+          data = service.create_nic(server_id, lan_id, options = {})
+          merge_attributes(data.body["createNicResponse"])
+          true
+        end
 
-                def update
-                    requires :id
+        def update
+          requires :id
 
-                    data = service.update_nic(id, options)
-                    merge_attributes(data.body['updateNicResponse'])
-                    true
-                end
+          data = service.update_nic(id, options)
+          merge_attributes(data.body["updateNicResponse"])
+          true
+        end
 
-                def destroy
-                    requires :id
-                    service.delete_nic(id)
-                    true
-                end
+        def destroy
+          requires :id
+          service.delete_nic(id)
+          true
+        end
 
-                def set_internet_access(options={})
-                    service.set_internet_access(
-                        options[:data_center_id], options[:lan_id], options[:internet_access]
-                    )
-                    true
-                end
+        def set_internet_access(options = {})
+          service.set_internet_access(
+            options[:data_center_id], options[:lan_id], options[:internet_access]
+          )
+          true
+        end
 
-                def ready?
-                    self.state == 'AVAILABLE'
-                end
+        def ready?
+          state == "AVAILABLE"
+        end
 
-                def failed?
-                    self.state == 'ERROR'
-                end
-            end
+        def failed?
+          state == "ERROR"
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/interfaces.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/interface'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/interface"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Interfaces < Fog::Collection
-                model Fog::Compute::ProfitBricks::Interface
+  module Compute
+    class ProfitBricks
+      class Interfaces < Fog::Collection
+        model Fog::Compute::ProfitBricks::Interface
 
-                def all
-                    load(service.get_all_nic.body['getAllNicResponse'])
-                end
+        def all
+          load(service.get_all_nic.body["getAllNicResponse"])
+        end
 
-                def get(id)
-                    interface = service.get_nic(id).body['getNicResponse']
-                    Excon::Errors
-                    new(interface)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          interface = service.get_nic(id).body["getNicResponse"]
+          Excon::Errors
+          new(interface)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/region.rb

@@ -1,15 +1,18 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Region < Fog::Model
-                identity  :id,      :aliases => 'locationId'
-                attribute :name,    :aliases => 'locationName'
-                attribute :country, :aliases => 'country'
+  module Compute
+    class ProfitBricks
+      class Region < Fog::Models::ProfitBricks::Base
+        identity  :id,      :aliases => "locationId"
+
+        attribute :name,    :aliases => "locationName"
+        attribute :country, :aliases => "country"
 
-                def initialize(attributes={})
-                    super
-                end
-            end
+        def initialize(attributes = {})
+          super
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/regions.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/region'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/region"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Regions < Fog::Collection
-                model Fog::Compute::ProfitBricks::Region
+  module Compute
+    class ProfitBricks
+      class Regions < Fog::Collection
+        model Fog::Compute::ProfitBricks::Region
 
-                def all()
-                    load (service.get_all_locations.body['getAllLocationsResponse'])
-                end
+        def all()
+          load(service.get_all_locations.body["getAllLocationsResponse"])
+        end
 
-                def get(id)
-                    region = service.get_location(id).body['getLocationResponse']
-                    Excon::Errors
-                    new(region)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          region = service.get_location(id).body["getLocationResponse"]
+          Excon::Errors
+          new(region)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/server.rb

@@ -1,107 +1,112 @@
-require 'fog/compute/models/server'
+require "fog/compute/models/server"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Server < Fog::Compute::Server
-                identity  :id,                  :aliases => 'serverId'
-                attribute :name,                :aliases => 'serverName'
-                attribute :cores
-                attribute :ram
-                attribute :attached_volumes,    :aliases => 'connectedStorages'
-                attribute :interfaces,          :aliases => 'nics'
-                attribute :internet_access,     :aliases => 'internetAccess'
-                attribute :zone,                :aliases => 'availabilityZone'
-                attribute :creation_time,       :aliases => 'creationTime'
-                attribute :modification_time,   :aliases => 'lastModificationTime'
-                attribute :machine_state,       :aliases => 'virtualMachineState'
-                attribute :state,               :aliases => 'provisioningState'
-                attribute :os_type,             :aliases => 'osType'
-                attribute :cpu_hotplug,         :aliases => 'cpuHotPlug'
-                attribute :ram_hotplug,         :aliases => 'ramHotPlug'
-                attribute :nic_hotplug,         :aliases => 'nicHotPlug'
-                attribute :nic_hotunplug,       :aliases => 'nicHotUnPlug'
-                attribute :disc_hotplug,        :aliases => 'discVirtioHotPlug'
-                attribute :disc_hotunplug,      :aliases => 'discVirtioHotUnPlug'
-                attribute :data_center_id,      :aliases => 'dataCenterId'
-                attribute :data_center_version, :aliases => 'dataCenterVersion'
-                attribute :request_id,          :aliases => 'requestId'
-
-                attr_accessor :options
-                attr_accessor :flavor_id
-
-                def initialize(attributes={})
-                    super
-                end
-
-                def save
-                    requires :data_center_id
-
-                    if (cores and ram)
-                        data = service.create_server(data_center_id, cores, ram, options || {})
-                    elsif flavor_id
-                        flavor = service.flavors.get(flavor_id)
-                        data = service.create_server(data_center_id, flavor.cores, flavor.ram, options || {})
-                    else
-                        raise ArgumentError, 'cores/ram or flavor_id is required for this operation'
-                    end
-
-                    merge_attributes(data.body['createServerResponse'])
-                    true
-                end
-
-                def update
-                    requires :id
-
-                    data = service.update_server(id, options)
-                    merge_attributes(data.body['updateServerResponse'])
-                    true
-                end
-
-                def reset
-                    requires :id
-                    service.reset_server(id)
-                    true
-                end
-
-                def start
-                    requires :id
-                    service.start_server(id)
-                    true
-                end
-
-                def stop
-                    requires :id
-                    service.stop_server(id)
-                    true
-                end
-
-                def destroy
-                    requires :id
-                    service.delete_server(id)
-                    true
-                end
-
-                def volumes
-                    service.volumes.find_all do |volume|
-                        volume.server_ids =~ /#{id}/
-                    end
-                end
-
-                def interfaces
-                    service.interfaces.find_all do |nic|
-                        nic.server_id == id
-                    end
-                end
-
-                def ready?
-                    self.state == 'AVAILABLE'
-                end
-
-                def failed?
-                    self.state == 'ERROR'
-                end
-            end
+  module Compute
+    class ProfitBricks
+      class Server < Fog::Compute::Server
+        identity  :id,                  :aliases => "serverId"
+
+        attribute :name,                :aliases => "serverName"
+        attribute :cores
+        attribute :ram
+        attribute :attached_volumes,    :aliases => "connectedStorages"
+        attribute :interfaces,          :aliases => "nics"
+        attribute :internet_access,     :aliases => "internetAccess"
+        attribute :zone,                :aliases => "availabilityZone"
+        attribute :creation_time,       :aliases => "creationTime"
+        attribute :modification_time,   :aliases => "lastModificationTime"
+        attribute :machine_state,       :aliases => "virtualMachineState"
+        attribute :state,               :aliases => "provisioningState"
+        attribute :os_type,             :aliases => "osType"
+        attribute :cpu_hotplug,         :aliases => "cpuHotPlug"
+        attribute :ram_hotplug,         :aliases => "ramHotPlug"
+        attribute :nic_hotplug,         :aliases => "nicHotPlug"
+        attribute :nic_hotunplug,       :aliases => "nicHotUnPlug"
+        attribute :disc_hotplug,        :aliases => "discVirtioHotPlug"
+        attribute :disc_hotunplug,      :aliases => "discVirtioHotUnPlug"
+        attribute :data_center_id,      :aliases => "dataCenterId"
+        attribute :data_center_version, :aliases => "dataCenterVersion"
+        attribute :request_id,          :aliases => "requestId"
+
+        attr_accessor :options
+        attr_accessor :flavor_id
+
+        def initialize(attributes = {})
+          super
         end
+
+        def wait_for(timeout=Fog.timeout, interval=5, &block)
+          super
+        end
+
+        def save
+          requires :data_center_id
+
+          if (cores and ram)
+            data = service.create_server(data_center_id, cores, ram, options || {})
+          elsif flavor_id
+            flavor = service.flavors.get(flavor_id)
+            data = service.create_server(data_center_id, flavor.cores, flavor.ram, options || {})
+          else
+            raise ArgumentError, "cores/ram or flavor_id is required for this operation"
+          end
+
+          merge_attributes(data.body["createServerResponse"])
+          true
+        end
+
+        def update
+          requires :id
+
+          data = service.update_server(id, options)
+          merge_attributes(data.body["updateServerResponse"])
+          true
+        end
+
+        def reset
+          requires :id
+          service.reset_server(id)
+          true
+        end
+
+        def start
+          requires :id
+          service.start_server(id)
+          true
+        end
+
+        def stop
+          requires :id
+          service.stop_server(id)
+          true
+        end
+
+        def destroy
+          requires :id
+          service.delete_server(id)
+          true
+        end
+
+        def volumes
+          service.volumes.find_all do |volume|
+            volume.server_ids =~ /#{id}/
+          end
+        end
+
+        def interfaces
+          service.interfaces.find_all do |nic|
+            nic.server_id == id
+          end
+        end
+
+        def ready?
+          state == "AVAILABLE"
+        end
+
+        def failed?
+          state == "ERROR"
+        end
+      end
     end
+  end
 end

data/lib/fog/profitbricks/models/compute/servers.rb

@@ -1,23 +1,23 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/server'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/server"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Servers < Fog::Collection
-                model Fog::Compute::ProfitBricks::Server
+  module Compute
+    class ProfitBricks
+      class Servers < Fog::Collection
+        model Fog::Compute::ProfitBricks::Server
 
-                def all
-                    load (service.get_all_servers.body['getAllServersResponse'])
-                end
+        def all
+          load(service.get_all_servers.body["getAllServersResponse"])
+        end
 
-                def get(id)
-                    server = service.get_server(id).body['getServerResponse']
-                    new(server)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          server = service.get_server(id).body["getServerResponse"]
+          new(server)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/volume.rb

@@ -1,74 +1,77 @@
+require "fog/profitbricks/models/base"
+
 module Fog
-    module Compute
-        class ProfitBricks
-            class Volume < Fog::Model
-                identity  :id,                  :aliases => 'storageId'
-                attribute :name,                :aliases => 'storageName'
-                attribute :size
-                attribute :creation_time,       :aliases => 'creationTime'
-                attribute :modification_time,   :aliases => 'lastModificationTime'
-                attribute :server_ids,          :aliases => 'serverIds'
-                attribute :mount_image,         :aliases => 'mountImage'
-                attribute :state,               :aliases => 'provisioningState'
-                attribute :data_center_id,      :aliases => 'dataCenterId'
-                attribute :data_center_version, :aliases => 'dataCenterVersion'
-                attribute :request_id,          :aliases => 'requestId'
+  module Compute
+    class ProfitBricks
+      class Volume < Fog::Models::ProfitBricks::Base
+        identity  :id,                  :aliases => "storageId"
 
-                attr_accessor :options
+        attribute :name,                :aliases => "storageName"
+        attribute :size
+        attribute :creation_time,       :aliases => "creationTime"
+        attribute :modification_time,   :aliases => "lastModificationTime"
+        attribute :server_ids,          :aliases => "serverIds"
+        attribute :mount_image,         :aliases => "mountImage"
+        attribute :state,               :aliases => "provisioningState"
+        attribute :data_center_id,      :aliases => "dataCenterId"
+        attribute :data_center_version, :aliases => "dataCenterVersion"
+        attribute :request_id,          :aliases => "requestId"
 
-                def initialize(attributes={})
-                    super
-                end
+        attr_accessor :options
 
-                def save
-                    requires :data_center_id, :size
+        def initialize(attributes = {})
+          super
+        end
 
-                    data = service.create_storage(data_center_id, size, options)
-                    merge_attributes(data.body['createStorageResponse'])
-                    true
-                end
+        def save
+          requires :data_center_id, :size
 
-                def update
-                    requires :id
+          data = service.create_storage(data_center_id, size, options)
+          merge_attributes(data.body["createStorageResponse"])
+          true
+        end
 
-                    data = service.update_storage(id, options)
-                    merge_attributes(data.body['updateStorageResponse'])
-                    true
-                end
+        def update
+          requires :id
 
-                def attach(server_id, options={})
-                    requires :id
-                    
-                    options = {
-                        'busType'      => options[:bus_type],
-                        'deviceNumber' => options[:device_number]
-                    }
+          data = service.update_storage(id, options)
+          merge_attributes(data.body["updateStorageResponse"])
+          true
+        end
 
-                    data = service.connect_storage_to_server(id, server_id, options)
-                    reload
-                end
+        def attach(server_id, options = {})
+          requires :id
+          
+          options = {
+            "busType"    => options[:bus_type],
+            "deviceNumber" => options[:device_number]
+          }
 
-                def detach(server_id)
-                    requires :id
+          data = service.connect_storage_to_server(id, server_id, options)
+          reload
+        end
 
-                    data = service.disconnect_storage_from_server(id, server_id)
-                    reload
-                end
+        def detach(server_id)
+          requires :id
 
-                def destroy
-                    requires :id
-                    service.delete_storage(id)
-                    true
-                end
+          data = service.disconnect_storage_from_server(id, server_id)
+          reload
+        end
+
+        def destroy
+          requires :id
+          service.delete_storage(id)
+          true
+        end
 
-                def ready?
-                    self.state == 'AVAILABLE'
-                end
+        def ready?
+          state == "AVAILABLE"
+        end
 
-                def failed?
-                    self.state == 'ERROR'
-                end
-            end
+        def failed?
+          state == "ERROR"
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/models/compute/volumes.rb

@@ -1,24 +1,24 @@
-require 'fog/core/collection'
-require 'fog/profitbricks/models/compute/volume'
+require "fog/core/collection"
+require "fog/profitbricks/models/compute/volume"
 
 module Fog
-    module Compute
-        class ProfitBricks
-            class Volumes < Fog::Collection
-                model Fog::Compute::ProfitBricks::Volume
+  module Compute
+    class ProfitBricks
+      class Volumes < Fog::Collection
+        model Fog::Compute::ProfitBricks::Volume
 
-                def all
-                    load(service.get_all_storages.body['getAllStoragesResponse'])
-                end
+        def all
+          load(service.get_all_storages.body["getAllStoragesResponse"])
+        end
 
-                def get(id)
-                    volume = service.get_storage(id).body['getStorageResponse']
-                    Excon::Errors
-                    new(volume)
-                rescue Excon::Errors::NotFound
-                    nil
-                end
-            end
+        def get(id)
+          volume = service.get_storage(id).body["getStorageResponse"]
+          Excon::Errors
+          new(volume)
+        rescue Excon::Errors::NotFound
+          nil
         end
+      end
     end
-end
+  end
+end

data/lib/fog/profitbricks/parsers/compute/get_all_servers.rb

@@ -37,6 +37,7 @@ module Fog
               @storage['size'] = value.to_i
             when 'connectedStorages'
               @server['connectedStorages'] << @storage
+              @storage = {}
             when 'nicId', 'nicName', 'macAddress', 'gatewayIp',
                'dhcpActive', 'ips'
               @nic[name] = value

data/lib/fog/profitbricks/parsers/compute/get_server.rb

@@ -39,6 +39,7 @@ module Fog
               @storage['size'] = value.to_i
             when 'connectedStorages'
               @response['getServerResponse']['connectedStorages'] << @storage
+              @storage = {}
             when 'nicId', 'nicName', 'macAddress', 'gatewayIp',
                'dhcpActive', 'ips'
               @nic[name] = value

data/lib/fog/profitbricks/requests/compute/start_server.rb

@@ -38,8 +38,8 @@ module Fog
           if server = self.data[:servers].find {
             |attrib| attrib["serverId"] == server_id
           }
-            server["machine_state"] = "RUNNING"
-            server["provisioning_state"] = "AVAILABLE"
+            server["virtualMachineState"] = "RUNNING"
+            server["provisioningState"] = "AVAILABLE"
           else
             raise Fog::Errors::NotFound.new("The requested server resource could not be found")
           end

data/lib/fog/profitbricks/requests/compute/stop_server.rb

@@ -38,8 +38,8 @@ module Fog
           if server = self.data[:servers].find {
             |attrib| attrib["serverId"] == server_id
           }
-            server["machine_state"] = "SHUTOFF"
-            server["provisioning_state"] = "INACTIVE"
+            server["virtualMachineState"] = "SHUTOFF"
+            server["provisioningState"] = "INACTIVE"
           else
             raise Fog::Errors::NotFound.new("The requested server resource could not be found")
           end

data/lib/fog/profitbricks/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module ProfitBricks
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/tests/profitbricks/requests/compute/server_tests.rb

@@ -166,16 +166,19 @@ Shindo.tests('Fog::Compute[:profitbricks] | server request', ['profitbricks', 'c
     tests('#stop_server').succeeds do
       # puts '#stop_server'
       service.stop_server(@server_id)
+      service.servers.get(@server_id).wait_for { state == "INACTIVE" }
     end
 
     tests('#start_server').succeeds do
       # puts '#start_server'
       service.start_server(@server_id)
+      service.servers.get(@server_id).wait_for { state == "AVAILABLE" }
     end
 
     tests('#reset_server').succeeds do
       # puts '#reset_server'
       service.reset_server(@server_id)
+      service.servers.get(@server_id).wait_for { state == "AVAILABLE" }
     end
 
     tests('#disconnect_storage_from_server').formats(@minimal_format) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-profitbricks
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ethan Devenport
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -172,10 +172,12 @@ files:
 - fog-profitbricks.gemspec
 - gemfiles/Gemfile.1.8.7
 - gemfiles/Gemfile.1.9.2+
+- gemfiles/Gemfile.1.9.2-
 - lib/fog/bin/profitbricks.rb
 - lib/fog/profitbricks.rb
 - lib/fog/profitbricks/compute.rb
 - lib/fog/profitbricks/core.rb
+- lib/fog/profitbricks/models/base.rb
 - lib/fog/profitbricks/models/compute/datacenter.rb
 - lib/fog/profitbricks/models/compute/datacenters.rb
 - lib/fog/profitbricks/models/compute/flavor.rb