sysdig 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0584253cc25878e18a5933ce1b8462474c5816dc
-  data.tar.gz: a6860512f09060d382985131bb1cd8553cbb5ba6
+  metadata.gz: 976ab5bf9c0d56e508aabe8cce280db889904138
+  data.tar.gz: 951c22606a8f96b4d4f74d5d3590a15c038318dc
 SHA512:
-  metadata.gz: 9cac5de1d482b9d7296e042a128286b706ed6fd4f977b269c68111d8738b2dd083fc72ef704248579aed8c3fe10b316a51e64e247d852ed04a36628c6fdceeda
-  data.tar.gz: 978b39ec9831166510a94774ce82d3aa07004eef3e684fa554d5a2aadbfbd7425543f33e13aa498699f21fc9d0107944bb49770c8708ebb672093a2262f57465
+  metadata.gz: 41ae7f0e86f9717310d8b327531a594f5afc1ce593ee1171ab98f9f5729f8509681a44a7691bc25e3c7671478adfe9b0e63b81d101da75db398663d4e57b2393
+  data.tar.gz: 5d15fc64b7900fba201241aa6a43bba690102e5f129b89bf37cb9b91e71419f97a588a20b0f30fe55805f2248ed77658ab8281968a2b7edbffaefe0faa862eef

data/lib/sysdig/user_notifications.rb

@@ -1,31 +1,38 @@
-class Sysdig::UserNotifications < Sysdig::Collection
+class Sysdig::UserNotifications < Sysdig::Singular
 
-  model Sysdig::UserNotification
+  attribute :sns_enabled, type: :boolean, squash: ["sns", "enabled"]
+  attribute :sns_topics,  type: :array, squash: ["sns", "topics"]
 
-  def all(options={})
-    load(service.get_user_notifications.body.fetch("userNotification")).tap { |_| self.records.compact! }
-  end
-
-  def get(type)
-    all.find { |r| r.identity == type.to_s }
-  end
+  attribute :email_enabled,    type: :boolean, squash: ["email", "enabled"]
+  attribute :email_recipients, type: :array, squash: ["email", "recipients"]
 
-  def new(args)
-    type, attributes = *args
+  attribute :pager_duty_enabled,         type: :boolean, squash: ["pagerDuty", "enabled"]
+  attribute :pager_duty_integrated,      type: :boolean, squash: ["pagerDuty", "integrated"]
+  attribute :pager_duty_bind_resolution, type: :boolean, squash: ["pagerDuty", "resolveOnOk"]
+  attribute :pager_duty_connect_url,     squash: ["pagerDuty", "connectUrl"]
 
-    unless attributes.is_a?(::Hash)
-      raise(ArgumentError.new("Initialization parameters must be an attributes hash, got #{attributes.class} #{attributes.inspect}"))
-    end
+  def fetch_attributes(options={})
+    service.get_user_notifications.body.fetch("userNotification")
+  end
 
-    concrete_model = model.types[type]
+  def save
+    data = service.update_user_notifications(
+      "sns" => {
+        "enabled" => self.sns_enabled,
+        "topics"  => self.sns_topics,
+      },
+      "email" => {
+        "enabled"    => self.email_enabled,
+        "recipients" => self.email_recipients,
+      },
+      "pagerDuty" => {
+        "enabled"     => self.pager_duty_enabled,
+        "integrated"  => self.pager_duty_integrated,
+        "resolveOnOk" => self.pager_duty_bind_resolution,
+        "connectUrl"  => self.pager_duty_connect_url,
+      },
+    ).body.fetch("userNotification")
 
-    if concrete_model
-      concrete_model.new(
-        {
-          :collection => self,
-          :service    => service,
-        }.merge(attributes)
-      )
-    end
+    merge_attributes(data)
   end
 end

data/lib/sysdig/version.rb

@@ -1,3 +1,3 @@
 class Sysdig
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/sysdig.rb

@@ -40,8 +40,4 @@ require 'sysdig/alert_notifications'
 
 require 'sysdig/get_user_notifications'
 require 'sysdig/update_user_notifications'
-require 'sysdig/user_notification'
 require 'sysdig/user_notifications'
-require 'sysdig/sns_notification'
-require 'sysdig/email_notification'
-require 'sysdig/pager_duty_notification'

data/sysdig.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency "cistern",            "~> 2.2"
+  spec.add_dependency "cistern",            "~> 2.2", "> 2.2.1"
   spec.add_dependency "ey-logger",          "~> 0.0"
   spec.add_dependency "faraday",            "~> 0.9"
   spec.add_dependency "faraday_middleware", "~> 0.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sysdig
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -66,6 +69,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: ey-logger
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +156,6 @@ files:
 - lib/sysdig/create_alert.rb
 - lib/sysdig/create_user.rb
 - lib/sysdig/destroy_alert.rb
-- lib/sysdig/email_notification.rb
 - lib/sysdig/get_alert.rb
 - lib/sysdig/get_alert_notification.rb
 - lib/sysdig/get_alert_notifications.rb
@@ -159,13 +164,10 @@ files:
 - lib/sysdig/login.rb
 - lib/sysdig/mock.rb
 - lib/sysdig/model.rb
-- lib/sysdig/pager_duty_notification.rb
 - lib/sysdig/real.rb
 - lib/sysdig/response.rb
-- lib/sysdig/sns_notification.rb
 - lib/sysdig/update_alert.rb
 - lib/sysdig/update_user_notifications.rb
-- lib/sysdig/user_notification.rb
 - lib/sysdig/user_notifications.rb
 - lib/sysdig/version.rb
 - sysdig.gemspec

data/lib/sysdig/email_notification.rb

@@ -1,15 +0,0 @@
-class Sysdig::EmailNotification < Sysdig::UserNotification
-
-  type :email
-
-  attribute :recipients, type: :array
-
-  def save
-    notification = service.update_user_notifications("email" => {
-      "enabled"    => self.enabled,
-      "recipients" => self.receipents,
-    }).body.fetch("userNotification")
-
-    merge_attributes(notification.fetch("email"))
-  end
-end

data/lib/sysdig/pager_duty_notification.rb

@@ -1,20 +0,0 @@
-class Sysdig::PagerDutyNotification < Sysdig::UserNotification
-
-  type :pagerDuty
-
-  attribute :enabled,         type:  :boolean
-  attribute :integrated,      type:  :boolean
-  attribute :bind_resolution, type:  :boolean, alias: "resolveOnOk"
-  attribute :connect_url,     alias: "connectUrl"
-
-  def save
-    notification = service.update_user_notifications("pagerDuty" => {
-      "enabled"     => self.enabled,
-      "integrated"  => self.integrated,
-      "resolveOnOk" => self.bind_resolution,
-      "connectUrl"  => self.connect_url,
-    }).body.fetch("userNotification")
-
-    merge_attributes(notification.fetch("pagerDuty"))
-  end
-end

data/lib/sysdig/sns_notification.rb

@@ -1,15 +0,0 @@
-class Sysdig::SnsNotification < Sysdig::UserNotification
-
-  type :sns
-
-  attribute :topics, type: :array
-
-  def save
-    notification = service.update_user_notifications(self.identity => {
-      "enabled" => self.enabled,
-      "topics"  => self.topics,
-    }).body.fetch("userNotification")
-
-    merge_attributes(notification.fetch(self.identity))
-  end
-end

data/lib/sysdig/user_notification.rb

@@ -1,31 +0,0 @@
-class Sysdig::UserNotification < Sysdig::Model
-
-  def self.types
-    @_types ||= Hash.new
-  end
-
-  def self.type(k=nil)
-    if k.nil?
-      @key
-    else
-      key = k.to_s
-      Sysdig::UserNotification.types[key] = self
-      @key = key
-    end
-  end
-
-  def self.inherited(klass)
-    klass.identity :category
-
-    super
-  end
-
-  attribute :enabled, type: :boolean
-
-  def initialize(attributes={})
-    self.identity = self.class.type
-
-    super
-  end
-
-end