lbrt 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27989c6bae123c2e5f4779d1600f9a6ec365f55
-  data.tar.gz: 95da6ce9e50720d86acc023a839f4d1307b1c8c1
+  metadata.gz: b555b4fcdd3a4b7874718d2ac738a8f94662f34e
+  data.tar.gz: 9cabe6071054fdf219e15d19cea1717ea6741bbf
 SHA512:
-  metadata.gz: 1e3f8d702317ad9ad5cb938b91af277b930231161c53f6da70c121965ce73cb2bfc3b6d60151af931c40bfffbc18621bb971fac145f81823cd0e5786fd66a526
-  data.tar.gz: c00acd033ce7803f22193efa08cd79f6ec143e0e19ab104b69f9c594540c02ada1b60f86d91c563e93aa6e4053ba81182ce96ef51fc021dd8c475b954a28cbe7
+  metadata.gz: 6f73a2df7ded73d26b0d95525103efe4051ec71347ceeb64881c30d96a768e16361ed3f81b55b7b68ac016ef9cc57cb6a3421201d580ff99418bfae88fbc9fdb
+  data.tar.gz: c1655ea651077562dc8a3c14b6c6a73497d3ec5a44f51cbb6e054f6ae7f1023bc0c5da72c5092b887054224eb64d9003fca3f0efa56b6b953c9ecac3bc4443e3

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store
 test.rb

data/README.md

@@ -198,7 +198,7 @@ space "My Space2" do
 end
 ```
 
-### Space template
+## template
 
 ```ruby
 template "dstat" do
@@ -231,6 +231,8 @@ space "my-host-001" do
 end
 ```
 
+You can use the template in the `alert` and `service`.
+
 ## Show resource by [peco](https://github.com/peco/peco)
 
 ```sh

data/lib/lbrt/alert/dsl/context/alert/condition.rb

@@ -1,4 +1,6 @@
 class Lbrt::Alert::DSL::Context::Alert::Condition
+  include Lbrt::Utils::TemplateHelper
+
   REQUIRED_ATTRIBUTES = %w(
     type
     metric_name
@@ -11,12 +13,15 @@ class Lbrt::Alert::DSL::Context::Alert::Condition
     'active' => %W(duration),
   }
 
-  def initialize(alert_name, &block)
+  def initialize(context, alert_name, &block)
+    @context = context.dup
     @alert_name = alert_name
     @result = {}
     instance_eval(&block)
   end
 
+  attr_reader :context
+
   def result
     REQUIRED_ATTRIBUTES.each do |name|
       unless @result.has_key?(name)

data/lib/lbrt/alert/dsl/context/alert.rb

@@ -1,4 +1,6 @@
 class Lbrt::Alert::DSL::Context::Alert
+  include Lbrt::Utils::TemplateHelper
+
   REQUIRED_ATTRIBUTES = %w(
     description
     attributes
@@ -7,7 +9,8 @@ class Lbrt::Alert::DSL::Context::Alert
     rearm_per_signal
   )
 
-  def initialize(name, services, &block)
+  def initialize(context, name, services, &block)
+    @context = context.merge(:alert_name => name)
     @name = name
     @services = services
 
@@ -20,6 +23,8 @@ class Lbrt::Alert::DSL::Context::Alert
     instance_eval(&block)
   end
 
+  attr_reader :context
+
   def result
     REQUIRED_ATTRIBUTES.each do |name|
       unless @result.has_key?(name)
@@ -57,7 +62,7 @@ class Lbrt::Alert::DSL::Context::Alert
   end
 
   def condition(&block)
-    @result['conditions'] << Lbrt::Alert::DSL::Context::Alert::Condition.new(@name, &block).result
+    @result['conditions'] << Lbrt::Alert::DSL::Context::Alert::Condition.new(@context, @name, &block).result
   end
 
   def service(type, title)

data/lib/lbrt/alert/dsl/context.rb

@@ -1,5 +1,6 @@
 class Lbrt::Alert::DSL::Context
   include Lbrt::Utils::ContextHelper
+  include Lbrt::Utils::TemplateHelper
 
   def self.eval(client, dsl, path, options = {})
     self.new(client, path, options) {
@@ -8,12 +9,20 @@ class Lbrt::Alert::DSL::Context
   end
 
   attr_reader :result
+  attr_reader :context
 
   def initialize(client, path, options = {}, &block)
     @path = path
     @options = options
     @result = {}
     @services = Lbrt::Service::Exporter.export(client, options)
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
@@ -26,7 +35,7 @@ class Lbrt::Alert::DSL::Context
       raise "Alert `#{name}` is already defined"
     end
 
-    alrt = Lbrt::Alert::DSL::Context::Alert.new(name, @services, &block).result
+    alrt = Lbrt::Alert::DSL::Context::Alert.new(@context, name, @services, &block).result
     @result[name] = alrt
   end
 end

data/lib/lbrt/service/dsl/context/service.rb

@@ -1,15 +1,20 @@
 class Lbrt::Service::DSL::Context::Service
+  include Lbrt::Utils::TemplateHelper
+
   REQUIRED_ATTRIBUTES = %w(
     settings
   )
 
-  def initialize(type, title, &block)
+  def initialize(context, type, title, &block)
+    @context = context.merge(:service_type => type, :service_title => title)
     @type = type
     @title = title
     @result = {}
     instance_eval(&block)
   end
 
+  attr_reader :context
+
   def result
     REQUIRED_ATTRIBUTES.each do |name|
       unless @result.has_key?(name)

data/lib/lbrt/service/dsl/context.rb

@@ -1,5 +1,6 @@
 class Lbrt::Service::DSL::Context
   include Lbrt::Utils::ContextHelper
+  include Lbrt::Utils::TemplateHelper
 
   def self.eval(dsl, path, options = {})
     self.new(path, options) {
@@ -8,11 +9,19 @@ class Lbrt::Service::DSL::Context
   end
 
   attr_reader :result
+  attr_reader :context
 
   def initialize(path, options = {}, &block)
     @path = path
     @options = options
     @result = {}
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
@@ -27,7 +36,7 @@ class Lbrt::Service::DSL::Context
       raise "Service `#{type}/#{title}` is already defined"
     end
 
-    srvc = Lbrt::Service::DSL::Context::Service.new(type, title, &block).result
+    srvc = Lbrt::Service::DSL::Context::Service.new(@context, type, title, &block).result
     @result[key] = srvc
   end
 end

data/lib/lbrt/space/dsl/context/space/chart/stream.rb

@@ -1,4 +1,6 @@
 class Lbrt::Space::DSL::Context::Space::Chart::Stream
+  include Lbrt::Utils::TemplateHelper
+
   REQUIRED_ATTRIBUTES = %w(
     metric
     type

data/lib/lbrt/space/dsl/context/space/chart.rb

@@ -1,4 +1,6 @@
 class Lbrt::Space::DSL::Context::Space::Chart
+  include Lbrt::Utils::TemplateHelper
+
   REQUIRED_ATTRIBUTES = %w(
     type
   )

data/lib/lbrt/space/dsl/context/space.rb

@@ -1,9 +1,10 @@
 class Lbrt::Space::DSL::Context::Space
-  def initialize(name_or_id, templates, &block)
+  include Lbrt::Utils::TemplateHelper
+
+  def initialize(context, name_or_id, &block)
+    @context = context.merge(:space_name => name_or_id)
     @name_or_id = name_or_id
-    @templates = templates
     @result = {'charts' => {}}
-    @context = Hashie::Mash.new(:space_name => name_or_id)
     instance_eval(&block)
   end
 
@@ -12,16 +13,6 @@ class Lbrt::Space::DSL::Context::Space
 
   private
 
-  def include_template(template_name)
-    tmplt = @templates[template_name.to_s]
-
-    unless tmplt
-      raise "Space `#{@name_or_id}`: Template `#{template_name}` is not defined"
-    end
-
-    instance_eval(&tmplt)
-  end
-
   def chart(chart_name_or_id, &block)
     if @result[chart_name_or_id]
       raise "Space `#{@name_or_id}` > Chart `#{chart_name_or_id}` is already defined"

data/lib/lbrt/space/dsl/context.rb

@@ -1,5 +1,6 @@
 class Lbrt::Space::DSL::Context
   include Lbrt::Utils::ContextHelper
+  include Lbrt::Utils::TemplateHelper
 
   def self.eval(dsl, path, options = {})
     self.new(path, options) {
@@ -8,27 +9,30 @@ class Lbrt::Space::DSL::Context
   end
 
   attr_reader :result
+  attr_reader :context
 
   def initialize(path, options = {}, &block)
     @path = path
     @options = options
-    @templates = {}
     @result = {}
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
   private
 
-  def template(name, &block)
-    @templates[name.to_s] = block
-  end
-
   def space(name_or_id, &block)
     if @result[name_or_id]
       raise "Space `#{name_or_id}` is already defined"
     end
 
-    spc = Lbrt::Space::DSL::Context::Space.new(name_or_id, @templates, &block).result
+    spc = Lbrt::Space::DSL::Context::Space.new(@context, name_or_id, &block).result
     @result[name_or_id] = spc
   end
 end

data/lib/lbrt/utils.rb

@@ -33,6 +33,22 @@ class Lbrt::Utils
         Kernel.require(file)
       end
     end
+
+    def template(name, &block)
+      @context.templates[name.to_s] = block
+    end
+  end
+
+  module TemplateHelper
+    def include_template(template_name)
+      tmplt = @context.templates[template_name.to_s]
+
+      unless tmplt
+        raise "Template `#{template_name}` is not defined"
+      end
+
+      instance_eval(&tmplt)
+    end
   end
 
   module CLIHelper

data/lib/lbrt/version.rb

@@ -1,3 +1,3 @@
 module Lbrt
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lbrt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Genki Sugawara