kapacitor-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 648af550f8893599e7dab2e111d49ac09e3f8cd1
-  data.tar.gz: 174d98096322da6abec4f25d797fb7d47d0ebd6a
+  metadata.gz: b4a827c3d35b876031f859fc3f4c63d92f206b52
+  data.tar.gz: 42a48f344172b64698d2dba66fd904904a70b6ef
 SHA512:
-  metadata.gz: 4a5056e8f63bdf1ea80ea00a21ce04cc8d5425e57404a73970d139564b2c083aec48d44be9e55961a69e9d504f4de13639b8083dedb4ac74d48cf1c8413b49ce
-  data.tar.gz: 7a60ee7d837261bbc527839606522465c55e67c99ffb25e310076c39f4c210a3a43268ffc5113d53e93a182acfc7780d0c85536fbb770b2b309d36bc2954fd8e
+  metadata.gz: d2f7791aa7238868888e1324d618409451af8c32f5de39b943e6dbbf6c132472649338c7d366221f6cedd77714dcf56609685e034fb9256267f340c861b97096
+  data.tar.gz: f20fe970cce5c7d481222b90a66169b55aa8622a3390b24b7970e50f68ee0b9fdb11111e0c2a8d3b17d7daa60978dac87c1dec34ebf33632387962a0f2031491

data/lib/kapacitor/client.rb

@@ -11,30 +11,44 @@ module Kapacitor
   class Client
     attr_reader :uri, :http
 
-    def initialize(host: 'localhost:9092', version: 'v1')
-      @uri = URI.parse("http://#{host}/kapacitor/#{version}")
+    def initialize(opts = {})
+      raise ArgumentError, "Kapacitor host is required" unless opts['host']
+      raise ArgumentError, "Kapacitor API version is required" unless opts['version']
+
+      @uri = URI.parse("http://#{opts['host']}/kapacitor/#{opts['version']}")
       @http = Net::HTTP.new(@uri.host, @uri.port)
     end
 
-    def define_template(id:, type:, script:)
+    def define_template(id, opts = {})
+      raise ArgumentError, "Kapacitor template type is required" unless opts['type']
+      raise ArgumentError, "Kapacitor template tickscript required" unless opts['script']
+
+      if opts['type']
+        raise ArgumentError, "Kapacitor template type can be either 'batch' or 'stream'" unless (opts['type'] == 'batch' or opts['type'] == 'stream')
+      end
+
       req = {
         'id' => id,
-        'type' => type,
-        'script' => script
+        'type' => opts['type'],
+        'script' => opts['script']
       }
 
       api_post('/templates', req)
     end
 
-    def update_template(id:, type: nil, script: nil)
+    def update_template(id, opts = {})
       req = {}
-      req['type'] = type if type
-      req['script'] = script if script
+      req['type'] = type if opts['type']
+      req['script'] = script if opts['script']
+
+      if opts['type']
+        raise ArgumentError, "Kapacitor template type can be either 'batch' or 'stream'" unless (opts['type'] == 'batch' or opts['type'] == 'stream')
+      end
 
       api_patch("/templates/#{id}", req) unless req.empty?
     end
 
-    def delete_template(id:)
+    def delete_template(id)
       api_delete("/templates/#{id}")
     end
 
@@ -42,44 +56,62 @@ module Kapacitor
       api_get('/templates')['templates']
     end
 
-    def define_task(id:, template_id: nil, type: nil, dbrps: , script: nil, status: 'enabled', vars: nil)
-      if (template_id.nil? and type.nil? and script.nil?) or (template_id and (type or script))
+    def define_task(id, opts = {})
+      raise ArgumentError, "Kapacitor task dbrps is required"
+
+      if (opts['template_id'].nil? and opts['type'].nil? and opts['script'].nil?) or (opts['template_id'] and (opts['type'] or opts['script']))
         raise ArgumentError, "Must specify either a Template ID or a script and type"
-      elsif template_id.nil? and (type.nil? or script.nil?)
+      elsif opts['template_id'].nil? and (opts['type'].nil? or opts['script'].nil?)
         raise ArgumentError, "Must specify both task type and script when not using a Template ID"
       end
 
+      if opts['status']
+        raise ArgumentError, "Kapacitor task status can be either 'enabled' or 'disabled'" unless (opts['status'] == 'enabled' or opts['status'] == 'disabled')
+      end
+
+      if opts['type']
+        raise ArgumentError, "Kapacitor task type can be either 'batch' or 'stream'" unless (opts['type'] == 'batch' or opts['type'] == 'stream')
+      end
+
       req = {
         'id' => id,
-        'dbrps' => dbrps,
-        'status' => status
+        'dbrps' => opts['dbrps'],
+        'status' => opts['status'] || 'enabled'
       }
 
-      if template_id
-        req['template-id'] = template_id
+      if opts['template_id']
+        req['template-id'] = opts['template_id']
       else
-        req['type'] = type
-        req['script'] = script
+        req['type'] = opts['type']
+        req['script'] = opts['script']
       end
 
-      req['vars'] = vars if vars
+      req['vars'] = opts['vars'] if opts['vars']
 
       api_post('/tasks', req)
     end
 
-    def update_task(id:, template_id: nil, type: nil, dbrps: nil, script: nil, status: nil, vars: nil)
+    def update_task(id, opts = {})
       req = {}
-      req['template-id'] = template_id if template_id
-      req['type'] = type if type
-      req['dbrps'] = dbrps if dbrps
-      req['script'] = script if script
-      req['status'] = status if status
-      req['vars'] = vars if vars
+      req['template-id'] = opts['template_id'] if opts['template_id']
+      req['type'] = opts['type'] if opts['type']
+      req['dbrps'] = opts['dbrps'] if opts['dbrps']
+      req['script'] = opts['script'] if opts['script']
+      req['status'] = opts['status'] if opts['status']
+      req['vars'] = opts['vars'] if opts['vars']
+
+      if opts['type']
+        raise ArgumentError, "Kapacitor template type can be either 'batch' or 'stream'" unless (opts['type'] == 'batch' or opts['type'] == 'stream')
+      end
+
+      if opts['status']
+        raise ArgumentError, "Kapacitor task status can be either 'enabled' or 'disabled'" unless (opts['status'] == 'enabled' or opts['status'] == 'disabled')
+      end
 
       api_patch("/tasks/#{id}", req) unless req.empty?
     end
 
-    def delete_task(id:)
+    def delete_task(id)
       api_delete("/tasks/#{id}")
     end
 

data/lib/kapacitor/version.rb

@@ -5,7 +5,7 @@
 #
 
 module Kapacitor
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kapacitor-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json