hyperb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30372b492d04628c4baaa53f4694439eb684ffb9
-  data.tar.gz: 6a8a68096e76d8d3c6becfceed11f5516b26f7dd
+  metadata.gz: c9f045c224b54d0ecc9ee1e45cc89fb352aa5160
+  data.tar.gz: c4a8bac272ea63b754689d6e8dcd2f680d117b8c
 SHA512:
-  metadata.gz: 866e805b09e1f788c3034dfe459685e11097cf47ab36bdbe7b85f6586e3fec5c88ac8937a6aa2283afcf2e2eb8276c271c59e3a821e817dc538847123c06b1de
-  data.tar.gz: 8211d6f878ccaec8df7a09d19139cd647b239f9c282d6571f5074a2484792ce78a04a6e04aa5ba3c3c9a8bc0fb0876b0b05d398367f3ca998829aa834cbf4094
+  metadata.gz: 1ff12b4b5343c8e441052f51ab771579d7d1355aa3e507d7e89124581c1ea727aaf95f760a571ce04f9735ae01ccadc72a3fb322158774342bd207a59834b06c
+  data.tar.gz: 2544f2cd88858f8db54f16689dfaf7cc498282a781f2774ac249d725c913197aac77fc5b71ec58e704f987b895f98e64edbae22ee32cdaf8d4dc0ebf5a45edd1

data/.rubocop.yml

@@ -28,7 +28,7 @@ Metrics/BlockLength:
 
 Metrics/MethodLength:
   CountComments: false  # count full line comments?
-  Max: 15
+  Max: 16
 
 Metrics/ModuleLength:
   Exclude:

data/README.md

@@ -37,9 +37,21 @@ Or install it yourself as:
 Hyper.sh requires you to create credentials on their [dashboard](https://console.hyper.sh/account/credential), after that you can configure your client as following:
 
 ```ruby
-client = Hyperb::Client.new(access_key: 'ak', secret_key: 'sk')
+client = Hyperb::Client.new(access_key: 'ak', secret_key: 'sk', region: 'us-west-1')
 ```
 
+or 
+
+```ruby
+client = Hyperb::Client.new do |client|
+  client.secret_key = 'secret_key',
+  client.access_key = 'access_key',
+  client.region = 'eu-central-1'
+end
+```
+
+If `region` is not set, `us-west-1` is set by default.
+
 ## Usage Examples
 
 After configuring a `client`, you can run the following examples.

data/hyperb.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'pry-byebug'
 
   spec.required_ruby_version = '>= 2.2'
 end

data/lib/hyperb/client.rb

@@ -1,19 +1,42 @@
 require 'hyperb/api'
+require 'hyperb/error'
 
 module Hyperb
   # client class
   class Client
     include Hyperb::API
 
-    attr_accessor :secret_key, :access_key
+    REGIONS = [
+      'us-west-1',
+      'eu-central-1'
+    ].freeze
+
+    attr_accessor :secret_key, :access_key, :region
 
     def initialize(options = {})
       options.each do |key, value|
         instance_variable_set("@#{key}", value)
       end
+      validate_and_set_region
       yield(self) if block_given?
     end
 
+    def validate_and_set_region
+      if @region.nil?
+        @region = default_region
+      else
+        raise Hyperb::Error::UnsupportedRegion, @region.to_s unless supported_region?(@region)
+      end
+    end
+
+    def default_region
+      REGIONS.first
+    end
+
+    def supported_region?(region)
+      REGIONS.include?(region.to_s)
+    end
+
     def credentials
       {
         secret_key: secret_key,

data/lib/hyperb/containers/host_config.rb

@@ -22,7 +22,7 @@ module Hyperb
     # @returns [Hash]
     def fmt
       formated = {}
-      attrs.keys.each do |key|
+      attrs.each_key do |key|
         formated[camelize(key)] = attrs[key]
       end
       formated

data/lib/hyperb/error.rb

@@ -3,6 +3,13 @@ module Hyperb
   class Error < StandardError
     attr_reader :code, :msg
 
+    # region not supported
+    class UnsupportedRegion < self
+      def initialize(region)
+        super("Unsupported region: #{region}", nil)
+      end
+    end
+
     # 4xx HTTP status code
     ClientError = Class.new(self)
 
@@ -36,7 +43,7 @@ module Hyperb
       500 => Hyperb::Error::InternalServerError
     }.freeze
 
-    def initialize(msg, code)
+    def initialize(msg, code = nil)
       super(msg)
       @code = code
     end

data/lib/hyperb/request.rb

@@ -11,12 +11,10 @@ module Hyperb
   class Request
     FMT = '%Y%m%dT%H%M%SZ'.freeze
     VERSION = 'v1.23'.freeze
-    HOST = 'us-west-1.hyper.sh'.freeze
-    REGION = 'us-west-1'.freeze
+
     SERVICE = 'hyper'.freeze
     ALGORITHM = 'HYPER-HMAC-SHA256'.freeze
     KEYPARTS_REQUEST = 'hyper_request'.freeze
-    BASE_URL = "https://#{HOST}/".freeze
 
     attr_accessor :verb, :path, :client, :date, :headers, :signed
 
@@ -28,19 +26,27 @@ module Hyperb
       @hashed_body = hexdigest(@body)
       @verb = verb.upcase
       @date = Time.now.utc.strftime(FMT)
+
+      set_base_url
+
       @headers = {
         content_type: 'application/json',
         x_hyper_date: @date,
-        host: HOST,
+        host: @host,
         x_hyper_content_sha256: @hashed_body
       }
       @headers.merge!(optional_headers) unless optional_headers.empty?
       @signed = false
     end
 
+    def set_base_url
+      @host = "#{client.region}.hyper.sh".freeze
+      @base_url = "https://#{@host}/".freeze
+    end
+
     def perform
       sign unless signed
-      final = BASE_URL + @path + '?' + @query
+      final = @base_url + @path + '?' + @query
       options = {}
       options[:body] = @body unless @body.empty?
       response = HTTP.headers(@headers).public_send(@verb.downcase.to_sym, final, options)
@@ -84,7 +90,7 @@ module Hyperb
     # https://docs.hyper.sh/Reference/API/2016-04-04%20[Ver.%201.23]/index.html
     def signature
       k_date = hmac('HYPER' + @client.secret_key, @date[0, 8])
-      k_region = hmac(k_date, REGION)
+      k_region = hmac(k_date, 'us-west-1')
       k_service = hmac(k_region, SERVICE)
       k_credentials = hmac(k_service, KEYPARTS_REQUEST)
       hexhmac(k_credentials, string_to_sign)
@@ -108,7 +114,7 @@ module Hyperb
     def credential_scope
       [
         @date[0, 8],
-        REGION,
+        'us-west-1',
         SERVICE,
         KEYPARTS_REQUEST
       ].join("/") # rubocop:disable StringLiterals
@@ -129,13 +135,13 @@ module Hyperb
 
   # func requests are very simple, they do not require signing
   class FuncCallRequest
-    REGION = 'us-west-1'.freeze
-    URL = "https://#{REGION}.hyperfunc.io/".freeze
-
-    attr_accessor :path, :query, :verb, :body, :headers
+    attr_accessor :client, :path, :query, :verb, :body, :headers
 
     def initialize(client, path, query = {}, verb = 'GET', body = '')
       @client = client
+
+      set_base_url
+
       @path = path
       @verb = verb
       @query = URI.encode_www_form(query)
@@ -143,8 +149,13 @@ module Hyperb
       @headers = { content_type: 'application/json' }
     end
 
+    def set_base_url
+      @host = "#{client.region}.hyperfunc.io".freeze
+      @base_url = "https://#{@host}/".freeze
+    end
+
     def perform
-      final_url = URL + @path + '?' + @query
+      final_url = @base_url + @path + '?' + @query
       options = {}
       options[:body] = @body unless @body.empty?
       response = HTTP.headers(@headers).public_send(@verb.downcase.to_sym, final_url, options)

data/lib/hyperb/version.rb

@@ -1,3 +1,3 @@
 module Hyperb
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/spec/client_spec.rb

@@ -22,6 +22,32 @@ RSpec.describe Hyperb::Client do
       client = Hyperb::Client.new(secret_key: 'SK')
       expect(client.credentials?).to be false
     end
+  end
+
+  describe '#region' do
+
+    it 'should set region' do
+      client = Hyperb::Client.new do |c|
+        c.access_key = 's'
+        c.secret_key = 'key'
+        c.region = 'eu-central-1'
+      end
+      expect(client.region).to eql('eu-central-1')
+    end
 
+    it 'should raise UnsupportedRegion' do
+      expect { Hyperb::Client.new(access_key: 's', secret_key: 'key', region: 'eu-unsup')}.to raise_error do |e|
+        expect(e).to be_a Hyperb::Error::UnsupportedRegion
+        expect(e.message).to eql('Unsupported region: eu-unsup')
+      end
+    end
+
+    it 'should set default region' do
+      client = Hyperb::Client.new do |c|
+        c.access_key = 's'
+        c.secret_key = 'key'
+      end
+      expect(client.region).to eql(client.default_region)
+    end
   end
 end

data/spec/compose_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Hyperb::Compose do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/compose/'
+    @base_path = "#{base_url(@client)}/compose/"
   end
 
   describe '#compose_down' do

data/spec/container_spec.rb

@@ -22,4 +22,4 @@ RSpec.describe Hyperb::Container do
     end
   end
 
-end
+end

data/spec/containers_spec.rb

@@ -6,7 +6,8 @@ RSpec.describe Hyperb::Containers do
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
 
-    @containers_base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/containers/'
+    @containers_base_path = "#{base_url(@client)}/containers/"
+
     @containers_path =  @containers_base_path + 'json'
     @remove_container_path = @containers_base_path
     @create_container_path = @containers_base_path + 'create'
@@ -404,7 +405,6 @@ RSpec.describe Hyperb::Containers do
       expect(a_request(:post, path)
             .with(body: "")).to have_been_made
     end
-
   end
 
   describe '#container_logs' do

data/spec/error_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Hyperb::Error do
 
   before do
     # random url for request mocking
-    @path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/version'
     @client = Hyperb::Client.new secret_key: '123', access_key: 'ak'
+    @path = "#{base_url(@client)}/version"
   end
 
   Hyperb::Error::ERRORS.each do |code, exception|

data/spec/funcs_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Hyperb::Funcs do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @funcs_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/funcs'
-    @call_path = Hyperb::FuncCallRequest::URL
+    @funcs_path = "#{base_url(@client)}/funcs"
+    @call_path = funcs_base_url(@client)
   end
 
   describe '#funcs' do

data/spec/helper.rb

@@ -16,6 +16,7 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!(allow: 'coveralls.io')
 
 RSpec.configure do |config|
+
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
 
@@ -25,6 +26,9 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
+
+  config.run_all_when_everything_filtered = true
+  config.filter_run focus: true
 end
 
 def fixture_path
@@ -33,4 +37,13 @@ end
 
 def fixture(file)
   File.new(fixture_path + '/' + file)
-end
+end
+
+def base_url(client)
+  host = "#{client.region}.hyper.sh".freeze
+  "https://#{host}/#{Hyperb::Request::VERSION}".freeze
+end
+
+def funcs_base_url(client)
+  "https://#{client.region}.hyperfunc.io/".freeze
+end

data/spec/images_spec.rb

@@ -5,10 +5,10 @@ RSpec.describe Hyperb::Images do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @images_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/images/json?all=true'
-    @create_image_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/images/create?fromImage=busybox'
-    @remove_image_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/images/busybox'
-    @inspect_image_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/images/busybox/json'
+    @images_path = "#{base_url(@client)}/images/json?all=true"
+    @create_image_path = "#{base_url(@client)}/images/create?fromImage=busybox"
+    @remove_image_path = "#{base_url(@client)}/images/busybox"
+    @inspect_image_path = "#{base_url(@client)}/images/busybox/json"
   end
 
   describe '#images' do
@@ -43,7 +43,6 @@ RSpec.describe Hyperb::Images do
         expect(img.created).to be_a Fixnum
       end
     end
-
   end
 
   describe '#create_image' do
@@ -68,7 +67,7 @@ RSpec.describe Hyperb::Images do
      end
 
      it 'create image with auth_object' do
-       p = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/images/create?fromImage=gcr.io/private/custom_busybox'
+       p = "#{base_url(@client)}/images/create?fromImage=gcr.io/private/custom_busybox"
        stub_request(:post, p)
        .to_return(body: fixture('create_image.json'))
 

data/spec/misc_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Hyperb::Misc do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/info'
+    @base_path = "#{base_url(@client)}/info"
   end
 
   describe '#info' do

data/spec/network_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Hyperb::Network do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/fips'
+    @base_path = "#{base_url(@client)}/fips"
   end
 
   describe '#fip_allocate' do

data/spec/services_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Hyperb::Services do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/services'
+    @base_path = "#{base_url(@client)}/services"
   end
 
   describe '#inspect_service' do

data/spec/snapshots_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Hyperb::Snapshots do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/snapshots'
+    @base_path = "#{base_url(@client)}/snapshots"
   end
 
   describe '#create_snapshot' do

data/spec/volumes_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Hyperb::Volumes do
 
   before do
     @client = Hyperb::Client.new(access_key: 'key', secret_key: '123')
-    @base_path = Hyperb::Request::BASE_URL + Hyperb::Request::VERSION + '/volumes'
+    @base_path = "#{base_url(@client)}/volumes"
   end
 
   describe '#remove_volume' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - drish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-10 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -114,6 +114,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.4
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
 description: The Hyper.sh Ruby Gem
 email:
 - carlosderich@gmail.com