faastruby 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a1a88aee8aad3613b5db1de94997f0c3f9480e3871299b517699b9c64107ab
-  data.tar.gz: dd73212e59c23de6b4136bbcfa0b70148634962dac686fd6cef55bdc40ed3365
+  metadata.gz: 93b8ffe62b7276bfd5a04730fc3d4643b43eb9be2bebced9d9c13a984af3405c
+  data.tar.gz: d38f0c66d2d392916870ec2db8d651b887b1281deb0ee5a88e94e6fafae0c92e
 SHA512:
-  metadata.gz: '09ac10dd5bd82c2d55d0fef4f9e9aad9b62a95cbdd8dfe65293bb494a454ab2d8f77b5d8d7d4f3283c17262a9e8efc61cd293bae9d5bfc88970ddd2d2e787e9d'
-  data.tar.gz: 2406a92ce31f25d13032ed68df171ce93bad9a8e7ec027afce9627d9b276a01cc0e27bd1bac9343f0ce0b8292c2f5229ed953c06a8eebbc4e3b349a645ac4301
+  metadata.gz: 2b9e4b1cbb7abc709dbbe25c385aa40b881a0d14217fc6c56276de115f2b97653230e18dc8668255b8f33ad1b92711d3eb5c001b1c3dd9751084e0b69d30dd11
+  data.tar.gz: 1ed5d7c3d34154aa334f570b2e8825bf76efd00bdd687f6dd57ab7d9118f9897a0d7434b75cd64d4fd708addf96e7cabef19fb29e2a86f9d21af63b36fdfcd14

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,9 @@
+before_install:
+  - gem update --system
+  - gem update bundler
+rvm:
+  - 2.5.3
+script: bundle exec rspec
+# Send builds to container-based infrastructure
+# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+sudo: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.3 - Unreleased
+- Added #status_code to Workspace class to hold the API response code after a request
+- Added refresh_credentials endpoint
+- Fix the request headers
+- Fix bug with `faastruby help`
+
 ## 0.2.2 - Oct 20 2018
 ### New
 - Functions can be scheduled via faastruby.yml

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faastruby (0.2.0)
+    faastruby (0.2.3)
       colorize (~> 0.8)
       oj (~> 3.6)
       rest-client (~> 2.0)
@@ -12,10 +12,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     colorize (0.8.1)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     equatable (0.5.0)
+    hashdiff (0.3.7)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     mime-types (3.2.2)
@@ -23,16 +29,31 @@ GEM
     mime-types-data (3.2018.0812)
     necromancer (0.4.0)
     netrc (0.11.0)
-    oj (3.6.11)
+    oj (3.6.12)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
+    public_suffix (3.0.3)
     rake (10.5.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rubyzip (1.2.2)
+    safe_yaml (1.0.4)
     strings (0.1.4)
       strings-ansi (~> 0.1.0)
       unicode-display_width (~> 1.4.0)
@@ -54,6 +75,10 @@ GEM
     unf_ext (0.0.7.5)
     unicode-display_width (1.4.0)
     unicode_utils (1.4.0)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
@@ -62,6 +87,8 @@ DEPENDENCIES
   bundler (~> 1.16)
   faastruby!
   rake (~> 10.0)
+  rspec (~> 3.8)
+  webmock (~> 3.4)
 
 BUNDLED WITH
    1.16.5

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/faastruby.svg)](https://badge.fury.io/rb/faastruby)
+[![Build Status](https://travis-ci.org/FaaStRuby/faastruby-cli.svg?branch=master)](https://travis-ci.org/FaaStRuby/faastruby-cli)
 
 # faastruby-cli
 

data/faastruby.gemspec

@@ -38,4 +38,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "webmock", "~> 3.4"
 end

data/lib/faastruby/api.rb

@@ -3,16 +3,19 @@ require 'rest-client'
 module FaaStRuby
   class API
     @@api_version = 'v2'
+    attr_reader :api_url, :credentials, :headers
     def initialize
       @api_url = "#{HOST}/#{@@api_version}"
       @credentials = {'API-KEY' => FaaStRuby.api_key, 'API-SECRET' => FaaStRuby.api_secret}
-      @headers = {content_type: :json, accept: :json}.merge(@credentials)
+      @headers = {content_type: 'application/json', accept: 'application/json'}.merge(@credentials)
+      @struct = Struct.new(:response, :body, :errors, :code)
     end
 
-    def create_workspace(workspace_name:, email: nil)
+    def create_workspace(workspace_name:, email: nil, provider: nil)
       url = "#{@api_url}/workspaces"
       payload = {'name' => workspace_name}
       payload['email'] = email if email
+      payload['provider'] = provider if provider
       parse RestClient.post(url, Oj.dump(payload), @headers){|response, request, result| response }
     end
 
@@ -31,21 +34,27 @@ module FaaStRuby
       parse RestClient.get(url, @headers){|response, request, result| response }
     end
 
+    def refresh_credentials(workspace_name)
+      url = "#{@api_url}/workspaces/#{workspace_name}/credentials"
+      payload = {}
+      parse RestClient.put(url, payload, @credentials){|response, request, result| response }
+    end
+
     def deploy(workspace_name:, package:)
       url = "#{@api_url}/workspaces/#{workspace_name}/deploy"
       payload = {package: File.new(package, 'rb')}
       parse RestClient.post(url, payload, @credentials){|response, request, result| response }
     end
 
-    def delete_from_workspace(function:, workspace:)
-      url = "#{@api_url}/workspaces/#{workspace.name}/functions/#{function.name}"
+    def delete_from_workspace(function_name:, workspace_name:)
+      url = "#{@api_url}/workspaces/#{workspace_name}/functions/#{function_name}"
       parse RestClient.delete(url, @headers){|response, request, result| response }
     end
 
-    def list_workspace_functions(workspace_name)
-      url = "#{@api_url}/workspaces/#{workspace_name}/functions"
-      parse RestClient.get(url, @headers){|response, request, result| response }
-    end
+    # def list_workspace_functions(workspace_name)
+    #   url = "#{@api_url}/workspaces/#{workspace_name}/functions"
+    #   parse RestClient.get(url, @headers){|response, request, result| response }
+    # end
 
     def run(function_name:, workspace_name:, payload:, method:, headers: {}, time: false, query: nil)
       url = "#{HOST}/#{workspace_name}/#{function_name}#{query}"
@@ -57,41 +66,33 @@ module FaaStRuby
       end
     end
 
-    def update_function_context(function:, workspace:, payload:)
+    def update_function_context(function_name:, workspace_name:, payload:)
       # payload is a string
-      url = "#{@api_url}/workspaces/#{workspace.name}/functions/#{function.name}"
+      url = "#{@api_url}/workspaces/#{workspace_name}/functions/#{function_name}"
       parse RestClient.patch(url, Oj.dump(payload), @headers){|response, request, result| response }
     end
 
     def parse(response)
-      struct = Struct.new(:response, :body, :errors, :code)
+      body = Oj.load(response.body) unless [500, 408].include?(response.code)
       case response.code
-      when 401
-        body = Oj.load(response.body)
-        return struct.new(nil, nil, ["(401) Unauthorized - #{body['error']}"], 401)
-      when 404
-        body = Oj.load(response.body)
-        return struct.new(nil, nil, ["(404) Not Found - #{body['error']}"], 404)
-      when 409
-        body = Oj.load(response.body)
-        return struct.new(nil, nil, ["(409) Conflict - #{body['error']}"], 409)
-      when 500
-        return struct.new(nil, nil, ["(500) Error"], 500)
-      when 408
-        return struct.new(nil, nil, ["(408) Request Timeout"], 408)
+      when 401 then return error(["(401) Unauthorized - #{body['error']}"], 401)
+      when 404 then return error(["(404) Not Found - #{body['error']}"], 404)
+      when 409 then return error(["(409) Conflict - #{body['error']}"], 409)
+      when 500 then return error(["(500) Error"], 500)
+      when 408 then return error(["(408) Request Timeout"], 408)
+      when 402 then return error(["(402) Limit Exceeded - #{body['error']}"], 402)
       when 422
-        body = Oj.load(response.body)
         errors = ["(422) Unprocessable Entity"]
         errors << body['error'] if body['error']
         errors += body['errors'] if body['errors']
-        return struct.new(nil, nil, errors, 422)
-      when 402 # Limit excedeed
-        body = Oj.load(response.body)
-        return struct.new(nil, nil, ["(402) Limit Exceeded - #{body['error']}"], 402)
+        return error(errors, 422)
       else
-        body = Oj.load(response.body)
-        return struct.new(response, body, (body['errors'] || []), response.code)
+        return @struct.new(response, body, (body['errors'] || []), response.code)
       end
     end
+
+    def error(errors, code)
+      @struct.new(nil, nil, errors, code)
+    end
   end
 end

data/lib/faastruby/cli/commands/function/update_context.rb

@@ -16,8 +16,8 @@ module FaaStRuby
         def run
           spinner = spin("Uploading context data to '#{@workspace_name}'...")
           workspace = FaaStRuby::Workspace.new(name: @workspace_name)
-          function = FaaStRuby::Function.new(name: @function_name, workspace: workspace, context: @options['data'])
-          function.update
+          function = FaaStRuby::Function.new(name: @function_name, workspace: workspace)
+          function.update(new_context: @options['data'])
           if function.errors.any?
             spinner.stop('Failed :(')
             FaaStRuby::CLI.error(function.errors)

data/lib/faastruby/cli/commands/help.rb

@@ -13,18 +13,23 @@ module FaaStRuby
         puts
         workspaces = ["Workspaces:"]
         functions = ["Functions:"]
+        credentials = ["Credentials:"]
         FaaStRuby::Command::COMMANDS.each do |command, klass|
           next if command == 'upgrade'
           next if klass.to_s.match(/.+Command::Help$/)
           next if klass.to_s.match(/.+Command::Version$/)
           section = functions if klass.to_s.match(/.+::Function::.+/)
           section = workspaces if klass.to_s.match(/.+::Workspace::.+/)
+          section = credentials if klass.to_s.match(/.+::Credentials::.+/)
+          section ||= []
           section << "  #{klass.help}"
         end
         puts workspaces
         puts
         puts functions
         puts
+        puts credentials
+        puts
       end
     end
   end

data/lib/faastruby/cli/credentials.rb

@@ -45,6 +45,7 @@ module FaaStRuby
 
     def self.load_from_env(workspace_name)
       return nil unless ENV['FAASTRUBY_API_KEY'] && ENV['FAASTRUBY_API_SECRET']
+      puts "#{"WARNING:".red} Using credentials from env vars FAASTRUBY_API_KEY and FAASTRUBY_API_SECRET"
       {workspace_name => {'api_key' => ENV['FAASTRUBY_API_KEY'], 'api_secret' => ENV['FAASTRUBY_API_SECRET']}}
     end
   end

data/lib/faastruby/function.rb

@@ -1,22 +1,22 @@
 module FaaStRuby
   class Function < BaseObject
-    attr_accessor :name, :workspace, :errors, :context
+    attr_accessor :name, :workspace, :errors, :context, :updated_at, :created_at
 
     def run(options)
-      method = options['method'] || 'get'
-      headers = options['headers'] || {}
-      response = @api.run(function_name: name, workspace_name: options['workspace_name'], payload: options['body'], method: method, headers: headers, time: options['time'], query: options['query'])
+      options['method'] ||= 'get'
+      options['headers'] ||= {}
+      response = @api.run(function_name: name, workspace_name: options['workspace_name'], payload: options['body'], method: options['method'], headers: options['headers'], time: options['time'], query: options['query'])
       response
     end
 
     def destroy
-      response = @api.delete_from_workspace(function: self, workspace: @workspace)
+      response = @api.delete_from_workspace(function_name: self.name, workspace_name: @workspace.name)
       @errors += response.errors if response.errors.any?
     end
 
-    def update
-      payload = {'context' => context}
-      response = @api.update_function_context(function: self, workspace: @workspace, payload: payload)
+    def update(new_context:)
+      payload = {'context' => new_context}
+      response = @api.update_function_context(function_name: self.name, workspace_name: @workspace.name, payload: payload)
       @errors += response.errors if response.errors.any?
       unless @errors.any?
         self.context = response.body['context']

data/lib/faastruby/version.rb

@@ -1,3 +1,3 @@
 module FaaStRuby
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/faastruby/workspace.rb

@@ -1,11 +1,14 @@
+require 'faastruby/api'
+
 module FaaStRuby
   class Workspace < BaseObject
 
     ##### Class methods
-    def self.create(name:, email: nil)
+    def self.create(name:, email: nil, provider: nil)
       api = API.new
-      workspace = Workspace.new(name: name, email: email, errors: [])
-      response = api.create_workspace(workspace_name: name, email: email)
+      workspace = Workspace.new(name: name, email: email, errors: [], provider: provider)
+      response = api.create_workspace(workspace_name: name, email: email, provider: provider)
+      workspace.status_code = response.code
       if response.errors.any?
         workspace.errors += response.errors
         return workspace
@@ -23,27 +26,47 @@ module FaaStRuby
     ###################
 
     ##### Instance methods
-    attr_accessor :name, :errors, :functions, :email, :object, :credentials
+    attr_accessor :name, :errors, :functions, :email, :object, :credentials, :updated_at, :created_at, :status_code, :provider
 
     def destroy
       response = @api.destroy_workspace(@name)
+      @status_code = response.code
       @errors += response.errors if response.errors.any?
     end
 
     def deploy(package_file_name)
       response = @api.deploy(workspace_name: @name, package: package_file_name)
+      @status_code = response.code
+      @errors += response.errors if response.errors.any?
+      self
+    end
+
+    def refresh_credentials
+      response = @api.refresh_credentials(@name)
+      @status_code = response.code
+      @credentials = response.body[@name] unless response.body.nil?
       @errors += response.errors if response.errors.any?
       self
     end
 
     def fetch
       response = @api.get_workspace_info(@name)
+      @status_code = response.code
       if response.errors.any?
         @errors += response.errors
       else
-        self.assign_attributes(response.body)
+        parse_attributes(response.body)
       end
       self
     end
+
+    def parse_attributes(attributes)
+      @functions = attributes['functions']
+      @email = attributes['email']
+      @object = attributes['object']
+      @updated_at = attributes['updated_at']
+      @created_at = attributes['created_at']
+      @provider = attributes['provider']
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faastruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Paulo Arruda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-20 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -122,6 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: 
 email:
 - parrudaj@gmail.com
@@ -131,6 +159,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock