hcloud 0.1.0.pre.alpha4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4dbd2d5d61d5bbe1fce20502673f677a67faf33
-  data.tar.gz: 0ddfe0a2a9a06490c46e843b6ada4a38ab269ceb
+  metadata.gz: 42e5e0786794e6040e88021aeec5ea8d0c3da4d8
+  data.tar.gz: b2368e1557cecb9e16089cc9a850979b85faae7e
 SHA512:
-  metadata.gz: 3e60745c5f5d8692370d00bcab67ec354b2aa7bef9507417851713c58b687c61d274a039ae89635f1f0a4872fb5a376ab03f39fb3878d63f83b8d577f7faf4fe
-  data.tar.gz: 14ef3b03e95390258c8f1efc42586e97b6624b152cc61278b0f1b3c9cdffbd5fc79c8dd73228bd8df31df0ae3c4ceac1ffdb84ffbcb3364b13b64b8295b973e9
+  metadata.gz: 0e885d2e44be9a4bc6750b55c859de56d02059de3611c63c684f7bff51931f8d8ba677f430e7b74fa48b7f1adea837cefd0fb2607d209682b3ba81035b426b41
+  data.tar.gz: b582dc6e91e9dccb04cc5469d83a28795f55d3f7ce7d5da0826fe6c8035a58bbc89ef17cf2163b164a1577c6aba4fde4b0d03b6eb325b2a0cca87efd0a4b0f03

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /vendor
+config.ru
 /.yardoc
 /Gemfile.lock
 /_yardoc/

data/.rspec

@@ -0,0 +1,3 @@
+--format=documentation
+--color
+--tty

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+script: "bundle exec rspec"
+sudo: false
+rvm:
+  - 2.3
+  - 2.4
+  - 2.5

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 gem 'pry'
+gem 'codecov', :require => false, :group => :test
 
 # Specify your gem's dependencies in hcloud.gemspec
 gemspec

data/README.md

@@ -1,5 +1,8 @@
 # Hcloud
 
+[![Build Status](https://travis-ci.org/tonobo/hcloud-ruby.svg?branch=master)](https://travis-ci.org/tonobo/hcloud-ruby)
+[![codecov](https://codecov.io/gh/tonobo/hcloud-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/tonobo/hcloud-ruby)
+
 This is an unoffical ruby client for HetznerCloud Api service.
 
 **Its currently in development and lacking a lot of feature. 
@@ -43,11 +46,29 @@ end
 
 * Create a server
 
+Nonblocking:
+
 ```ruby
 c.servers.create(name: "moo5", server_type: "cx11", image: "ubuntu-16.04")
 #=> [#<Hcloud::Action>, <#Hcloud::Server>, "root_password"]
 ```
 
+Wating for finish:
+
+```ruby
+action,server = c.servers.create(name: "moo5", server_type: "cx11", image: "ubuntu-16.04")
+
+while action.status == "running"
+  puts "Waiting for Action #{action.id} to complete ..."
+  action = c.actions.find(action.id)
+  server = c.servers.find(server.id)
+  puts "Action Status: #{action.status}"
+  puts "Server Status: #{server.status}"
+  puts "Server IP Config: #{server.public_net["ipv4"]}"
+  sleep 5
+end
+```
+
 * Update servers' name
 
 ```ruby

data/hcloud.gemspec

@@ -21,6 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "grape"
+  spec.add_development_dependency "activesupport"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
   spec.add_runtime_dependency "typhoeus"
   spec.add_runtime_dependency "oj"
   spec.add_runtime_dependency "activesupport"

data/lib/hcloud.rb

@@ -5,6 +5,7 @@ module Hcloud
   autoload :Error, 'hcloud/errors'
   autoload :Client, 'hcloud/client'
   autoload :AbstractResource, 'hcloud/abstract_resource'
+  autoload :MultiReply, 'hcloud/multi_reply'
   autoload :ServerResource, 'hcloud/server_resource'
   autoload :EntryLoader, 'hcloud/entry_loader'
   autoload :FloatingIP, 'hcloud/floating_ip'
@@ -24,4 +25,5 @@ module Hcloud
   autoload :ActionResource, 'hcloud/action_resource'
   autoload :Iso, 'hcloud/iso'
   autoload :IsoResource, 'hcloud/iso_resource'
+  autoload :Pagination, 'hcloud/pagination'
 end

data/lib/hcloud/abstract_resource.rb

@@ -1,12 +1,66 @@
 module Hcloud
   class AbstractResource
+    include Enumerable
+
     attr_reader :client, :parent, :base_path
 
     def initialize(client:, parent: nil, base_path: "")
       @client = client
       @parent = parent
+      @page = 1
+      @per_page = 25
+      @order = []
       @base_path = base_path
     end
+
+    def page(page)
+      @page = page
+      self
+    end
+
+    def per_page(per_page)
+      @per_page = per_page
+      self
+    end
+
+    def limit(limit)
+      @limit = limit
+      self
+    end
+
+    def order(*sort)
+      @order = sort.flat_map do |s|
+        case s
+        when Symbol, String then s.to_s
+        when Hash then s.map { |k, v| "#{k}:#{v}" }
+        else
+          raise ArgumentError, 
+            "Unable to resolve type for given #{s.inspect} from #{sort}"
+        end
+      end
+      self
+    end
+    
+    def mj(path, **o, &block)
+      if !client.nil? and client.auto_pagination
+        requests = __entries__(path, **o)
+        if requests.all?{|x| x.is_a? Hash }
+          m = MultiReply.new(j: requests, pagination: :auto)
+          m.cb = block
+          return m
+        end
+        client.hydra.run
+        j = requests.map do |x|
+          Oj.load(x.response.body)
+        end
+        m = MultiReply.new(j: j, pagination: :auto)
+        m.cb = block
+        return m
+      end
+      m = MultiReply.new(j: [Oj.load(request(path, o.merge(ep: ep)).run.body)])
+      m.cb = block
+      m
+    end
     
     def each(&block)
       all.each do |member|
@@ -16,8 +70,44 @@ module Hcloud
 
     protected
 
+    def page_params(per_page: nil, page: nil)
+      { per_page: per_page || @per_page, page: page || @page }.to_param
+    end
+
+    def sort_params
+      @order.to_a.map{|x| "sort=#{x}" }.join("&")
+    end
+
+    def ep(per_page: nil, page: nil)
+      r = []
+      (x = page_params(per_page: per_page, page: page)).empty? ? nil : r << x 
+      (x = sort_params).empty? ? nil : r << x
+      r.compact.join("&")
+    end
+
     def request(*args)
       client.request(*args)
     end
+
+    def __entries__(path, **o)
+      ret = Oj.load(request(path, o.merge(ep: ep(per_page: 1, page: 1))).run.body)
+      a = ret.dig("meta", "pagination", "total_entries").to_i
+      if a <= 1
+        return [ret]
+      end
+      unless @limit.nil?
+        a = @limit if a > @limit
+      end
+      r = a / Client::MAX_ENTRIES_PER_PAGE + (a % Client::MAX_ENTRIES_PER_PAGE)
+      requests = r.times.map do |i|
+        per_page = Client::MAX_ENTRIES_PER_PAGE
+        if !@limit.nil? and r == (i+1) and a % per_page != 0
+          per_page = a % per_page
+        end
+        req = request(path, o.merge(ep: ep(per_page: per_page, page: i+1)))
+        client.hydra.queue req
+        req
+      end
+    end
   end
 end

data/lib/hcloud/action_resource.rb

@@ -1,14 +1,12 @@
 
 module Hcloud
   class ActionResource < AbstractResource
-    include Enumerable
-
-    def all(sort: nil)
-      Oj.load(request(base_path("actions"), q: {sort: sort}).run.body)["actions"].map do |x|
-        Action.new(x, self, client)
+    def all
+      mj(base_path("actions")) do |j|
+        j.flat_map{|x| x["actions"].map{ |x| Action.new(x, self, client) } }
       end
     end
-    
+
     def find(id)
       Action.new(
         Oj.load(request(base_path("actions/#{id.to_i}")).run.body)["action"], 
@@ -22,12 +20,9 @@ module Hcloud
     rescue Error::NotFound
     end
 
-    def where(status: nil, sort: nil)
-      Oj.load(
-        request(base_path("actions"), 
-                q: {status: status, sort: sort}).run.body
-      )["actions"].map do |x|
-        Action.new(x, self, client)
+    def where(status: nil)
+      mj(base_path("actions"), q: {status: status}) do |j|
+        j.flat_map{|x| x["actions"].map{ |x| Action.new(x, self, client) }}
       end
     end
 

data/lib/hcloud/client.rb

@@ -3,9 +3,14 @@ autoload :Oj, "oj"
 
 module Hcloud
   class Client
-    attr_reader :token
-    def initialize(token:)
+    MAX_ENTRIES_PER_PAGE = 50
+
+    attr_reader :token, :auto_pagination, :hydra
+    def initialize(token:, auto_pagination: false, concurrency: 20)
       @token = token
+      @auto_pagination = auto_pagination
+      @concurrency = concurrency
+      @hydra = Typhoeus::Hydra.new(max_concurrency: concurrency)
     end
 
     def authorized?
@@ -57,9 +62,13 @@ module Hcloud
         options[:body] = Oj.dump(x, mode: :compat)
         options[:method] ||= :post
       end
+      q = []
+      q << options.delete(:ep).to_s
       if x = options.delete(:q)
-        path << "?"+x.to_param
+        q << x.to_param
       end
+      path = path.dup
+      path << "?"+q.join("&")
       r = Typhoeus::Request.new(
         "https://api.hetzner.cloud/v1/#{path}",
         {

data/lib/hcloud/image.rb

@@ -34,7 +34,7 @@ module Hcloud
       )
     end
 
-    def destory
+    def destroy
       request("images/#{id.to_i}", method: :delete).run
       true
     end

data/lib/hcloud/image_resource.rb

@@ -1,10 +1,8 @@
 module Hcloud
   class ImageResource < AbstractResource
-    include Enumerable
-
     def all
-      Oj.load(request("images").run.body)["images"].map do |x|
-        Image.new(x, self, client)
+      mj("images") do |j|
+        j.flat_map{|x| x["images"].map{ |x| Image.new(x, self, client) } }
       end
     end
     
@@ -33,10 +31,8 @@ module Hcloud
       method(:where).parameters.inject(query) do |r,x| 
         (var = eval(x.last.to_s)).nil? ? r : r.merge!(x.last => var)
       end
-      Oj.load(
-        request("images", q: query).run.body
-      )["images"].map do |x|
-        Image.new(x, self, client)
+      mj("images", q: query) do |j|
+        j.flat_map{|x| x["images"].map{ |x| Image.new(x, self, client) } }
       end
     end
 

data/lib/hcloud/iso_resource.rb

@@ -1,10 +1,8 @@
 module Hcloud
   class IsoResource < AbstractResource
-    include Enumerable
-
     def all
-      Oj.load(request("isos").run.body)["isos"].map do |x|
-        Iso.new(x, self, client)
+      mj("isos") do |j|
+        j.flat_map{|x| x["isos"].map{ |x| Iso.new(x, self, client) } }
       end
     end
 

data/lib/hcloud/location_resource.rb

@@ -1,10 +1,9 @@
 module Hcloud
   class LocationResource < AbstractResource
-    include Enumerable
-
     def all
-      j = Oj.load(request("locations").run.body)
-      j["locations"].map{|x| Location.new(x, self, client) }
+      mj("locations") do |j|
+        j.flat_map{|x| x["locations"].map{ |x| Location.new(x, self, client) } }
+      end
     end
 
     def find(id)

data/lib/hcloud/multi_reply.rb

@@ -0,0 +1,22 @@
+module Hcloud
+  class MultiReply
+    include Enumerable
+    attr_accessor :cb
+
+    def initialize(j:, pagination: nil)
+       @j = j
+       @pagination = pagination
+    end
+
+    def pagination
+      @pagination || Pagination.new(@j.first.to_h["meta"].to_h["pagination"], nil, nil)
+    end
+
+    def each(&block)
+      @cb.call(@j).each do |member|
+        block.call(member)
+      end
+    end
+
+  end
+end

data/lib/hcloud/pagination.rb

@@ -0,0 +1,14 @@
+module Hcloud
+  class Pagination
+    Attributes = {
+      page: nil,
+      per_page: nil,
+      previous_page: nil,
+      next_page: nil,
+      last_page: nil,
+      total_entries: nil,
+    }
+    
+    include EntryLoader
+  end
+end

data/lib/hcloud/server_resource.rb

@@ -1,7 +1,5 @@
 module Hcloud
   class ServerResource < AbstractResource
-    include Enumerable
-
     def create(name:,
                server_type:,
                datacenter: nil,
@@ -23,8 +21,8 @@ module Hcloud
     end
 
     def all
-      Oj.load(request("servers").run.body)["servers"].map do |x|
-        Server.new(x, self, client)
+      mj("servers") do |j|
+        j.flat_map{|x| x["servers"].map{ |x| Server.new(x, self, client) } }
       end
     end
 

data/lib/hcloud/ssh_key_resource.rb

@@ -1,15 +1,14 @@
 module Hcloud
   class SSHKeyResource < AbstractResource
-    include Enumerable
-
     def all
-      j = Oj.load(request("ssh_keys").run.body)
-      j["ssh_keys"].map{|x| SSHKey.new(x, self, client) }
+      mj("ssh_keys") do |j|
+        j.flat_map{|x| x["ssh_keys"].map{ |x| SSHKey.new(x, self, client) } }
+      end
     end
 
     def create(name:, public_key:)
       j = Oj.load(request("ssh_keys", j: {name: name, public_key: public_key}).run.body)
-      SSHKey.new(j, self, client)
+      SSHKey.new(j["ssh_key"], self, client)
     end
 
     def find(id)

data/lib/hcloud/version.rb

@@ -1,3 +1,3 @@
 module Hcloud
-  VERSION = "0.1.0-alpha4"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tim Foerster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: grape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +144,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -111,6 +169,8 @@ files:
 - lib/hcloud/iso_resource.rb
 - lib/hcloud/location.rb
 - lib/hcloud/location_resource.rb
+- lib/hcloud/multi_reply.rb
+- lib/hcloud/pagination.rb
 - lib/hcloud/server.rb
 - lib/hcloud/server_resource.rb
 - lib/hcloud/server_type.rb
@@ -132,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2.2