convox_api_client 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e2b8582bab65a923ff12fe788b8c6564c7d546
-  data.tar.gz: a4a024126915eeb6167914de4a38469ff201b957
+  metadata.gz: 1cc3151a9e156b1619ba0d40b3d29e6992297423
+  data.tar.gz: 2c9478cac7c2a17bb6f7bc98d323293323e96a7d
 SHA512:
-  metadata.gz: 7a9f9f430eedea601dcde8416388cd4e3578da1ae725e0bedee1dea59b0fe46f0b965da4029738af761cab6fab839b3baf9d08112f9bc3f4c97c27181f3ed622
-  data.tar.gz: 0dca56d19adf82be44f7841785c58c7c7e37cd9c84ade4c4479834f436e235ba880b4cc17eb2c73379697d7c5206386152aa95b6d193fae75ffec7ce69935754
+  metadata.gz: b5f4fca50610a51738abcc1517189a3acbcc05ad30832072306e81b99ad5a1f569eec5c5f587c8ae6ec334575f2ae5f9198eb7527ec8f2d47648ec353b90caf3
+  data.tar.gz: d5019afb5410c5c0a284f0f268c8194b309150b5a1513a13aa9bf801923a382fea919a9c49f8c8d88049d1e2aec05426db3641731736bcb89ca0aea8c3c91ec3

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.3
+before_install: gem install bundler -v 1.14.3

data/README.md

@@ -1,4 +1,4 @@
-# ConvoxApiClient
+# Convox API Client
 
 Thin wrapper around the Convox console API found at:
 

data/convox_api_client.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'httparty', '>= 0.14.0'
   spec.add_dependency 'httmultiparty', '>= 0.3.16'
+  spec.add_dependency 'faye-websocket', '>= 0.10.6'
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'webmock', '~> 2.3.2'
+  spec.add_development_dependency 'byebug'
 end

data/lib/convox_api_client.rb

@@ -1,5 +1,8 @@
 require 'httparty'
 require 'httmultiparty'
+require 'faye/websocket'
+require 'eventmachine'
+
 require 'convox_api_client/version'
 require 'convox_api_client/client'
 

data/lib/convox_api_client/client.rb

@@ -2,69 +2,54 @@ module Convox
   module Api
     class Client
       include HTTMultiParty
-      debug_output $stdout
       format :json
       base_uri 'https://console.convox.com'
       
-      def initialize(api_key)
+      def initialize(api_key, debug = false)
         raise 'api_key must be set' if api_key.nil?
         @api_key = api_key
+        self.class.debug_output $stdout if debug
       end
             
       def apps(rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get('/apps', query: query, headers: authorization_headers))
+        parsed_response!(self.class.get('/apps', headers: headers(rack: rack)))
       end
       
       def create_app(name, rack: nil)
         query = {name: name}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.post('/apps', query: query, headers: authorization_headers))
+        parsed_response!(self.class.post('/apps', query: query, headers: headers(rack: rack)))
       end
       
       def delete_app(name, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.delete("/apps/#{name}", query: query, headers: authorization_headers))
+        parsed_response!(self.class.delete("/apps/#{name}", headers: headers(rack: rack)))
       end
       
       def app(app, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}", query: query, headers: authorization_headers))
+        parsed_response!(self.class.get("/apps/#{app}", headers: headers(rack: rack)))
       end
       
       def app_builds(app, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/builds", query: query, headers: authorization_headers))
+        parsed_response!(self.class.get("/apps/#{app}/builds", headers: headers(rack: rack)))
       end
       
       def create_app_build(app, rack: nil, cache: nil, description: nil, manifest: 'docker-compose.yml', repo: nil, source: nil)
         query = {}
-        query[:rack] = rack if rack
         query[:cache] = cache if cache
         query[:description] = description if description
         query[:manifest] = manifest if manifest
         query[:repo] = repo if repo
         query[:source] = source if source
         
-        parsed_response!(self.class.post("/apps/#{app}/builds", query: query, headers: authorization_headers))
+        parsed_response!(self.class.post("/apps/#{app}/builds", query: query, headers: headers(rack: rack)))
       end
       
       # API not functioning
       def delete_app_build(app, build, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.delete("/apps/#{app}/builds/#{build}", query: query, headers: authorization_headers))
+        parsed_response!(self.class.delete("/apps/#{app}/builds/#{build}", headers: headers(rack: rack)))
       end
       
-      # API not functioning
       def app_build(app, build, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.delete("/apps/#{app}/builds/#{build}", query: query, headers: authorization_headers))
+        parsed_response!(self.class.get("/apps/#{app}/builds/#{build}", headers: headers(rack: rack)))
       end
       
       def update_app_build(app, build, rack: nil)
@@ -72,21 +57,16 @@ module Convox
       end
       
       def app_environment(app, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/environment", query: query, headers: authorization_headers))
+        parsed_response!(self.class.get("/apps/#{app}/environment", headers: headers(rack: rack)))
       end
       
       def set_app_environment(app, environment, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.post("/apps/#{app}/environment", query: query, body: environment, headers: authorization_headers))
+        environment = environment.to_a.collect{|e| e.join "="}.join "\n"
+        parsed_response!(self.class.post("/apps/#{app}/environment", body: environment, headers: headers(rack: rack)))
       end
       
       def delete_app_environment_key(app, key, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.delete("/apps/#{app}/environment/#{key}", query: query, headers: authorization_headers))
+        parsed_response!(self.class.delete("/apps/#{app}/environment/#{key}", query: query, headers: headers(rack: rack)))
       end
       
       def app_formation(app, rack: nil)
@@ -122,27 +102,19 @@ module Convox
       end
       
       def app_releases(app, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/releases", query: query, headers: authorization_headers))      
+        parsed_response!(self.class.get("/apps/#{app}/releases", headers: headers(rack: rack)))
       end
       
       def app_release(app, release, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/releases/#{release}", query: query, headers: authorization_headers))      
+        parsed_response!(self.class.get("/apps/#{app}/releases/#{release}", headers: headers(rack: rack)))
       end
       
       def promote_app_release(app, release, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/releases/#{release}/promote", query: query, headers: authorization_headers))      
+        parsed_response!(self.class.post("/apps/#{app}/releases/#{release}/promote", headers: headers(rack: rack)))
       end
       
       def app_ssls(app, rack: nil)
-        query = {}
-        query[:rack] = rack if rack
-        parsed_response!(self.class.get("/apps/#{app}/ssl", query: query, headers: authorization_headers))
+        parsed_response!(self.class.get("/apps/#{app}/ssl", headers: headers(rack: rack)))
       end
       
       def set_app_ssl(app, process, port, rack: nil)
@@ -225,12 +197,41 @@ module Convox
         raise 'Not implemented'    
       end
       
-      private
+      # Not documented in Swagger
+      def app_logs(app, rack: nil)
+        logs = []
+        EM.run {
+          ws = Faye::WebSocket::Client.new("wss://console.convox.com/apps/#{app}/logs", nil, {headers: headers(rack)})
+ 
+          ws.on :open do |event|
+            EventMachine.add_timer 2, proc { ws.close }
+          end
+
+          ws.on :message do |event|
+            logs << event.data
+          end
+
+          ws.on :close do |event|
+            p [:close, event.code, event.reason]
+            ws = nil
+            EM.stop_event_loop
+          end
+        }
+        logs
+      end
+      
+      private      
       def parsed_response!(response)
         raise "Error: #{response.code} #{response.body}" unless response.code == 200
         response.parsed_response        
       end
       
+      def headers(rack: nil)
+        headers = {}
+        headers[:rack] = rack if rack
+        headers.merge authorization_headers
+      end
+      
       def authorization_headers
         auth_b64 = Base64.encode64("convox:#{@api_key}")
         {'Authorization' => "Basic #{auth_b64}"}

data/lib/convox_api_client/version.rb

@@ -1,3 +1,3 @@
 module ConvoxApiClient
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convox_api_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - fw.matt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.16
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt