hcloud 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd378e8381d39a1fccf8cd2ce72ff3f024985fb5d5599978e928464e0018576
-  data.tar.gz: 885c2e766e37f274622be8a3519da323608576a765ba5dd7d104da1fd9c3237d
+  metadata.gz: d0476422e0663e6960e40d0198cfcc4544701def1670fbefae008cfcb4208a41
+  data.tar.gz: 192b15230064d1f5fea319268ce5ea897785e9bcc5c7f970ee50451490339fe7
 SHA512:
-  metadata.gz: 3e163d935512c077fbc7e3c94281d48aa1ba95eab1e5743190a66ab800e729ab1c8a905a974f86ca78c0e280bd77bc5763b9ec25e3b8b55db4725a8115cbabce
-  data.tar.gz: e26b48bb02882a3ec78b4412236466619a0e21759b9ba2f9f518fd17a591a0e1a0f9d3e344f63ef3502cbf3e293fc62577250247cc4f1b04908c2532bdbee7e2
+  metadata.gz: 9676ed391c7b0474fdb4c3b16d9ff2556ffe0909dfb2bc16a3d9fb9eed48d178b5d6d7ea7cc42eb93ebed99d38854846bbe0791e36a3967fd8c45ba5ca2fcd60
+  data.tar.gz: e9c4d5118d2e16ce1421cdc42c0413326bb58b17f986f91081d2db04004cb1a1e60edbcb4f84eec904adc6d6e71d5d7db4f052f4b1a07b2d0bede23184d87410

data/.github/workflows/ruby.yml

@@ -1,5 +1,12 @@
+---
 name: hcloud-ruby ci
-on: [push]
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
 jobs:
   lint:
     runs-on: ubuntu-latest

data/CHANGELOG.md

@@ -1,11 +1,31 @@
 # Changelog
 
-## [v1.2.0](https://github.com/tonobo/hcloud-ruby/tree/v1.2.0) (2023-10-10)
+## [v1.3.0](https://github.com/tonobo/hcloud-ruby/tree/v1.3.0) (2024-02-20)
+
+[Full Changelog](https://github.com/tonobo/hcloud-ruby/compare/v1.2.0...v1.3.0)
+
+**Closed issues:**
+
+- \[Enhancement\] Add missing fields / endpoints to Images + Servers [\#30](https://github.com/tonobo/hcloud-ruby/issues/30)
+
+**Merged pull requests:**
+
+- fix activemodel in Gemfile.lock [\#87](https://github.com/tonobo/hcloud-ruby/pull/87) ([skoch-hc](https://github.com/skoch-hc))
+- Fix typo for pagination method [\#85](https://github.com/tonobo/hcloud-ruby/pull/85) ([coorasse](https://github.com/coorasse))
+- \(\#82\) fix undefined method `.blank?` [\#84](https://github.com/tonobo/hcloud-ruby/pull/84) ([bastelfreak](https://github.com/bastelfreak))
+- CI: Run on PRs and pushes to master [\#83](https://github.com/tonobo/hcloud-ruby/pull/83) ([bastelfreak](https://github.com/bastelfreak))
+- Dont list activemodel as dev- and runtime dep [\#80](https://github.com/tonobo/hcloud-ruby/pull/80) ([bastelfreak](https://github.com/bastelfreak))
+- version: bump to v1.2.0 [\#79](https://github.com/tonobo/hcloud-ruby/pull/79) ([aufziehvogel](https://github.com/aufziehvogel))
+- build\(deps\): bump rack from 3.0.1 to 3.0.6.1 [\#75](https://github.com/tonobo/hcloud-ruby/pull/75) ([dependabot[bot]](https://github.com/apps/dependabot))
+- add missing features to existing resources [\#60](https://github.com/tonobo/hcloud-ruby/pull/60) ([aufziehvogel](https://github.com/aufziehvogel))
+
+## [v1.2.0](https://github.com/tonobo/hcloud-ruby/tree/v1.2.0) (2023-10-11)
 
 [Full Changelog](https://github.com/tonobo/hcloud-ruby/compare/v1.1.0...v1.2.0)
 
 **Closed issues:**
 
+- question: could you point out the differences to other hcloud gem? [\#71](https://github.com/tonobo/hcloud-ruby/issues/71)
 - \[Feature\] Add Primary IPs [\#57](https://github.com/tonobo/hcloud-ruby/issues/57)
 - \[Feature\] Add Primary IPs [\#56](https://github.com/tonobo/hcloud-ruby/issues/56)
 - \[Bug\] Firewalls do not expose actions [\#54](https://github.com/tonobo/hcloud-ruby/issues/54)
@@ -17,6 +37,7 @@
 
 **Merged pull requests:**
 
+- version: bump to v1.2.0 [\#78](https://github.com/tonobo/hcloud-ruby/pull/78) ([aufziehvogel](https://github.com/aufziehvogel))
 - lib: import active\_support before cherry-picking imports [\#77](https://github.com/tonobo/hcloud-ruby/pull/77) ([aufziehvogel](https://github.com/aufziehvogel))
 - Dependencies: Drop rake, as it's unnecessary [\#74](https://github.com/tonobo/hcloud-ruby/pull/74) ([Kjarrigan](https://github.com/Kjarrigan))
 - server: return `next_actions` data on create [\#72](https://github.com/tonobo/hcloud-ruby/pull/72) ([aufziehvogel](https://github.com/aufziehvogel))

data/Gemfile.lock

@@ -1,33 +1,44 @@
 PATH
   remote: .
   specs:
-    hcloud (1.2.0)
+    hcloud (1.3.0)
       activemodel
+      activesupport
       oj
       typhoeus
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
+    activemodel (7.1.1)
+      activesupport (= 7.1.1)
+    activesupport (7.1.1)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.1.1)
+    bigdecimal (3.1.4)
     builder (3.2.4)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
+    connection_pool (2.4.1)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     docile (1.4.0)
+    drb (2.1.1)
+      ruby2_keywords
     dry-core (1.0.0)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
@@ -47,8 +58,8 @@ GEM
     faker (3.0.0)
       i18n (>= 1.8.11, < 2)
     ffi (1.16.3)
-    grape (1.6.2)
-      activesupport
+    grape (1.8.0)
+      activesupport (>= 5)
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
@@ -64,7 +75,9 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
-    oj (3.16.1)
+    mutex_m (0.1.2)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
@@ -72,7 +85,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.0)
-    rack (3.0.1)
+    rack (3.0.6.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (3.1.1)
@@ -111,7 +124,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
@@ -127,7 +140,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activemodel
   bundler
   codecov
   faker

data/hcloud.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'activemodel'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'grape'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'webmock'
   spec.add_runtime_dependency 'activemodel'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'oj'
   spec.add_runtime_dependency 'typhoeus'
 end

data/lib/hcloud/abstract_resource.rb

@@ -12,7 +12,7 @@ module Hcloud
       def bind_to(klass)
         resource = self
         %w[find find_by where all [] page limit per_page order
-           to_a count pagnation each].each do |method|
+           to_a count pagnation pagination each].each do |method|
           klass.define_singleton_method(method) do |*args, &block|
             resource.new(client: Client.connection).public_send(method, *args, &block)
           end

data/lib/hcloud/entry_loader.rb

@@ -223,49 +223,17 @@ module Hcloud
       instance_variable_set("@#{key}", value)
     end
 
-    # rubocop: disable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/AbcSize
     def _load(resource)
       return if resource.nil?
 
       @_attributes = {}.with_indifferent_access
 
-      resource.each do |key, value|
-        definition = self.class.schema[key]
-
-        if definition == :time
-          _update_attribute(key, value ? Time.parse(value) : nil)
-          next
-        end
-
-        if definition.is_a?(Class) && definition.include?(EntryLoader)
-          _update_attribute(key, value ? definition.new(client, value) : nil)
-          next
-        end
-
-        # if schema definition is [Class]
-        if definition.is_a?(Array) && definition.first.include?(EntryLoader)
-
-          # just set attribute to an empty array if value is no array or empty
-          if !value.is_a?(Array) || value.empty?
-            _update_attribute(key, [])
-            next
-          end
-
-          if value.first.is_a?(Integer)
-            # If value is an integer, this is the id of an object which's class can be
-            # retreived from definition. Load a future object that can on access retreive the
-            # data from the api and convert it to a proper object.
-            _update_attribute(key, value.map { |id| Future.new(client, definition.first, id) })
-          else
-            # Otherwise the value *is* the content of the object
-            _update_attribute(key, value.map { |item| definition.first.new(client, item) })
-          end
-          next
-        end
+      loader = Hcloud::ResourceLoader.new(self.class.schema, client: client)
+      loaded_data = loader.load(resource)
 
+      loaded_data.each do |key, value|
         _update_attribute(key, value.is_a?(Hash) ? value.with_indifferent_access : value)
       end
     end
-    # rubocop: enable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/AbcSize
   end
 end

data/lib/hcloud/floating_ip.rb

@@ -12,7 +12,7 @@ module Hcloud
     )
 
     protectable :delete
-    updatable :description
+    updatable :name, :description
     destructible
 
     has_actions

data/lib/hcloud/floating_ip_resource.rb

@@ -13,7 +13,7 @@ module Hcloud
       end
     end
 
-    def create(type:, server: nil, home_location: nil, description: nil, labels: {})
+    def create(type:, name: nil, server: nil, home_location: nil, description: nil, labels: {})
       raise Hcloud::Error::InvalidInput, 'no type given' if type.blank?
       if server.nil? && home_location.nil?
         raise Hcloud::Error::InvalidInput, 'either server or home_location must be given'

data/lib/hcloud/future.rb

@@ -4,10 +4,13 @@ require 'active_support/core_ext/string/inflections'
 
 module Hcloud
   class Future < Delegator
+    attr_reader :raw_data
+
     # rubocop: disable Lint/MissingSuper
-    def initialize(client, target_class, id)
+    def initialize(client, target_class, id, raw_data: nil)
       @target_class = target_class
       @id = id
+      @raw_data = raw_data
       @__client = client
     end
     # rubocop: enable Lint/MissingSuper

data/lib/hcloud/image.rb

@@ -15,6 +15,8 @@ module Hcloud
     updatable :description, :type
     destructible
 
+    has_actions
+
     def to_snapshot
       update(type: 'snapshot')
     end

data/lib/hcloud/image_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class ImageResource < AbstractResource
-    filter_attributes :type, :bound_to, :name, :label_selector
+    filter_attributes :type, :bound_to, :name, :label_selector, :status, :include_deprecated
 
     bind_to Image
 

data/lib/hcloud/network.rb

@@ -40,5 +40,11 @@ module Hcloud
 
       prepare_request('actions/delete_route', j: COLLECT_ARGS.call(__method__, binding))
     end
+
+    def change_ip_range(ip_range:)
+      raise Hcloud::Error::InvalidInput, 'no ip_range given' if ip_range.blank?
+
+      prepare_request('actions/change_ip_range', j: COLLECT_ARGS.call(__method__, binding))
+    end
   end
 end

data/lib/hcloud/placement_group_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class PlacementGroupResource < AbstractResource
-    filter_attributes :type, :name
+    filter_attributes :type, :name, :label_selector
 
     bind_to PlacementGroup
 

data/lib/hcloud/resource_loader.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'time'
+
+module Hcloud
+  class ResourceLoader
+    def initialize(schema, client:)
+      @schema = schema
+      @client = client
+    end
+
+    def load(data)
+      load_with_schema(@schema, data)
+    end
+
+    private
+
+    def load_with_schema(schema, data)
+      if schema.respond_to?(:call)
+        schema.call(data, @client)
+      elsif schema.is_a?(Array) && schema.count.positive? && data.is_a?(Array)
+        load_array(schema, data)
+      elsif schema.is_a?(Hash) && data.is_a?(Hash)
+        load_hash(schema, data)
+      else
+        load_single_item(schema, data)
+      end
+    end
+
+    def load_array(schema, data)
+      data.map do |item|
+        load_with_schema(schema[0], item)
+      end
+    end
+
+    def load_hash(schema, data)
+      data.map do |key, value|
+        [key, load_with_schema(schema[key], value)]
+      end.to_h
+    end
+
+    def load_single_item(definition, value)
+      if definition == :time
+        return value ? Time.parse(value) : nil
+      end
+
+      if definition.is_a?(Class) && definition.include?(EntryLoader)
+        return if value.nil?
+
+        # If value is an integer, this is the id of an object which's class can be
+        # retreived from definition. Load a future object that can on access retreive the
+        # data from the api and convert it to a proper object.
+        return Future.new(@client, definition, value) if value.is_a?(Integer)
+
+        # Otherwise the value *is* the content of the object
+        return definition.new(@client, value)
+      end
+
+      value
+    end
+  end
+end

data/lib/hcloud/server.rb

@@ -12,7 +12,24 @@ module Hcloud
       datacenter: Datacenter,
       image: Image,
       iso: Iso,
+      load_balancers: [LoadBalancer],
+      placement_group: PlacementGroup,
       private_net: [Network],
+      public_net: {
+        ipv4: lambda do |data, client|
+          Future.new(client, PrimaryIP, data[:id]) if data.to_h[:id].is_a?(Integer)
+        end,
+        ipv6: lambda do |data, client|
+          Future.new(client, PrimaryIP, data[:id]) if data.to_h[:id].is_a?(Integer)
+        end,
+        floating_ips: [FloatingIP],
+        firewalls: [
+          lambda do |data, client|
+            Future.new(client, Firewall, data[:id], raw_data: data) if data.to_h[:id].is_a?(Integer)
+          end
+        ]
+        # firewalls: [{ id: Firewall }]
+      },
       volumes: [Volume]
     )
 
@@ -21,6 +38,7 @@ module Hcloud
     destructible
 
     has_actions
+    has_metrics
 
     def enable_rescue(type: 'linux64', ssh_keys: [])
       query = COLLECT_ARGS.call(__method__, binding)
@@ -73,10 +91,30 @@ module Hcloud
       prepare_request('actions/detach_from_network', j: { network: network })
     end
 
+    def add_to_placement_group(placement_group:)
+      raise Hcloud::Error::InvalidInput, 'no placement_group given' if placement_group.nil?
+
+      prepare_request('actions/add_to_placement_group', j: COLLECT_ARGS.call(__method__, binding))
+    end
+
+    def change_alias_ips(alias_ips:, network:)
+      raise Hcloud::Error::InvalidInput, 'no alias_ips given' if alias_ips.to_a.count.zero?
+      raise Hcloud::Error::InvalidInput, 'no network given' if network.nil?
+
+      prepare_request('actions/change_alias_ips', j: COLLECT_ARGS.call(__method__, binding))
+    end
+
+    def change_dns_ptr(ip:, dns_ptr:)
+      raise Hcloud::Error::InvalidInput, 'no IP given' if ip.blank?
+      raise Hcloud::Error::InvalidInput, 'no dns_ptr given' if dns_ptr.blank?
+
+      prepare_request('actions/change_dns_ptr', j: COLLECT_ARGS.call(__method__, binding))
+    end
+
     %w[
       poweron poweroff shutdown reboot reset
       disable_rescue disable_backup detach_iso
-      request_console
+      request_console remove_from_placement_group
     ].each do |action|
       define_method(action) do
         prepare_request("actions/#{action}", method: :post)

data/lib/hcloud/server_resource.rb

@@ -12,8 +12,13 @@ module Hcloud
                location: nil,
                start_after_create: nil,
                ssh_keys: [],
+               public_net: nil,
+               firewalls: nil,
                networks: [],
+               placement_group: nil,
                user_data: nil,
+               volumes: nil,
+               automount: nil,
                labels: {})
       prepare_request('servers', j: COLLECT_ARGS.call(__method__, binding),
                                  expected_code: 201) do |response|

data/lib/hcloud/ssh_key_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class SSHKeyResource < AbstractResource
-    filter_attributes :name, :label_selector
+    filter_attributes :name, :label_selector, :fingerprint
 
     def [](arg)
       case arg

data/lib/hcloud/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hcloud
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/lib/hcloud/volume_resource.rb

@@ -2,7 +2,7 @@
 
 module Hcloud
   class VolumeResource < AbstractResource
-    filter_attributes :name, :label_selector
+    filter_attributes :name, :label_selector, :status
 
     def [](arg)
       case arg

data/lib/hcloud.rb

@@ -4,6 +4,7 @@ require 'hcloud/version'
 require 'active_support'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
 
 module Hcloud
   autoload :Error, 'hcloud/errors'
@@ -12,6 +13,7 @@ module Hcloud
   autoload :TyphoeusExt, 'hcloud/typhoeus_ext'
   autoload :AbstractResource, 'hcloud/abstract_resource'
   autoload :EntryLoader, 'hcloud/entry_loader'
+  autoload :ResourceLoader, 'hcloud/resource_loader'
 
   autoload :Server, 'hcloud/server'
   autoload :ServerResource, 'hcloud/server_resource'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hcloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tim Foerster
@@ -9,10 +9,10 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grape
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,13 +68,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,6 +177,7 @@ files:
 - lib/hcloud/placement_group_resource.rb
 - lib/hcloud/primary_ip.rb
 - lib/hcloud/primary_ip_resource.rb
+- lib/hcloud/resource_loader.rb
 - lib/hcloud/server.rb
 - lib/hcloud/server_resource.rb
 - lib/hcloud/server_type.rb
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: HetznerCloud native Ruby client