radiosonde 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b40282fc9d94f7f6dbeb5f325bc2077c744bbb
-  data.tar.gz: 72f13e77d30ba5dfcd393444cb8b65cdc6e0e151
+  metadata.gz: 18a311529994a7e6c2d904c7bc03e5bea0b8878e
+  data.tar.gz: ca993fb584d98096b84100c1ffe9a7d672c1b2ee
 SHA512:
-  metadata.gz: 8d5411e4fff69d18bbad868eb411f0bb4e096388e9d5b299122dabea146d2206572f773fd8ba4b08c96bd6498c966995e690c9d74f57b032c242ade7fe7d939a
-  data.tar.gz: 33d53cc74162e59bebce55d090d1cdcb50d8e1cab3e53e4516366e431bc79e7250ae770e6a722aa13edb6c69f5b4b400e1395196d86344519fb994783f2a6d98
+  metadata.gz: 7aca86843cbefaa798a0b78525dd2548c269597ffc6d2a5b80896045fef79f19b788beae4fbeed957b2f090d440f2b8b95fd78c047c0ea6611d3b442e9dffa35
+  data.tar.gz: d9353663ffdd3f483f66909ea3beb962f38a1dc75fc29bd0858b6e3e2c862ce6208870664e52890dbe3b52c5939a018cc544e0401ad05e262c84660ca56809e8

data/README.md

@@ -81,5 +81,32 @@ alarm "alarm2" do
 end
 ```
 
+### Use template
+
+```ruby
+template "basic" do
+  namespace "AWS/EC2"
+  metric_name "CPUUtilization"
+  dimensions "InstanceId"=>"i-XXXXXXXX"
+  period 300
+  statistic :average
+  threshold ">=", 50.0
+  evaluation_periods 1
+  actions_enabled true
+  alarm_actions []
+  ok_actions []
+  insufficient_data_actions [context.sns_topic]
+end
+
+alarm "alarm1" do
+  include_template "basic", :sns_topic=>"arn:aws:sns:us-east-1:123456789012:my_topic"
+end
+
+alarm "alarm2" do
+  context.sns_topic = "arn:aws:sns:us-east-1:123456789012:my_topic2"
+  include_template "basic"
+end
+```
+
 ## Similar tools
 * [Codenize.tools](http://codenize.tools/)

data/lib/radiosonde/dsl/context/alarm.rb

@@ -1,8 +1,10 @@
 class Radiosonde::DSL::Context::Alarm
   include Radiosonde::DSL::Validator
+  include Radiosonde::TemplateHelper
 
-  def initialize(name, &block)
+  def initialize(context, name, &block)
     @error_identifier = "Alarm `#{name}`"
+    @context = context.merge(:alarm_name => name)
     @result = OpenStruct.new(
       :alarm_name => name,
       :alarm_actions => [],

data/lib/radiosonde/dsl/context.rb

@@ -1,5 +1,6 @@
 class Radiosonde::DSL::Context
   include Radiosonde::DSL::Validator
+  include Radiosonde::TemplateHelper
 
   class << self
     def eval(dsl, path, opts = {})
@@ -16,13 +17,24 @@ class Radiosonde::DSL::Context
     @options = options
     @result = OpenStruct.new(:alarms => [])
     @alarm_names = []
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
   private
 
+  def template(name, &block)
+    @context.templates[name.to_s] = block
+  end
+
   def require(file)
-    alarmfile = File.expand_path(File.join(File.dirname(@path), file))
+    alarmfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
     if File.exist?(alarmfile)
       instance_eval(File.read(alarmfile), alarmfile)
@@ -39,7 +51,7 @@ class Radiosonde::DSL::Context
       not @alarm_names.include?(name)
     end
 
-    @result.alarms << Radiosonde::DSL::Context::Alarm.new(name, &block).result
+    @result.alarms << Radiosonde::DSL::Context::Alarm.new(@context, name, &block).result
     @alarm_names << name
   end
 end

data/lib/radiosonde/logger.rb

@@ -21,7 +21,8 @@ class Radiosonde::Logger < ::Logger
       message << ": #{log_id}" if log_id
       message << ' (dry-run)' if @options && @options[:dry_run]
       logger = (@options && @options[:logger]) || Radiosonde::Logger.instance
-      logger.send(level, message.send(color))
+      message = message.send(color) if color
+      logger.send(level, message)
     end
   end
 end

data/lib/radiosonde/template_helper.rb

@@ -0,0 +1,18 @@
+module Radiosonde::TemplateHelper
+  def include_template(template_name, context = {})
+    tmplt = @context.templates[template_name.to_s]
+
+    unless tmplt
+      raise "Template `#{template_name}` is not defined"
+    end
+
+    context_orig = @context
+    @context = @context.merge(context)
+    instance_eval(&tmplt)
+    @context = context_orig
+  end
+
+  def context
+    @context
+  end
+end

data/lib/radiosonde/utils.rb

@@ -22,4 +22,18 @@ module Radiosonde::Utils
     return hash
   end
   module_function :collect_to_hash
+
+  class << self
+    def diff(obj1, obj2, options = {})
+      diffy = Diffy::Diff.new(
+        obj1.pretty_inspect,
+        obj2.pretty_inspect,
+        :diff => '-u'
+      )
+
+      out = diffy.to_s(options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+      out.gsub!(/^/, options[:indent]) if options[:indent]
+      out
+    end
+  end # of class methods
 end

data/lib/radiosonde/version.rb

@@ -1,3 +1,3 @@
 module Radiosonde
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/radiosonde/wrapper/alarm.rb

@@ -56,7 +56,10 @@ class Radiosonde::Wrapper::Alarm
 
   def update(dsl)
     delta = diff(dsl)
-    log(:info, 'Update Alarm', :green, "#{self.alarm_name}: #{format_delta(delta)}")
+    old_attrs = Hash[delta.map {|k, v| [k, v[:old]] }]
+    new_attrs = Hash[delta.map {|k, v| [k, v[:new]] }]
+    log(:info, 'Update Alarm', :green)
+    log(:info, "  #{self.alarm_name}:\n".green + Radiosonde::Utils.diff(old_attrs, new_attrs, :color => @options[:color], :indent => '    '), false)
 
     unless @options[:dry_run]
       opts = self.class.normalize_attrs(dsl)
@@ -91,12 +94,6 @@ class Radiosonde::Wrapper::Alarm
     return delta
   end
 
-  def format_delta(delta)
-    delta.map {|name, values|
-      "#{name}(#{values[:old].inspect} --> #{values[:new].inspect})"
-    }.join(', ')
-  end
-
   def normalize(name, value)
     if [Array, Hash].any? {|c| value.kind_of?(c) }
       value.sort_by {|i| i.to_s }

data/lib/radiosonde.rb

@@ -5,11 +5,15 @@ require 'json'
 require 'logger'
 require 'ostruct'
 require 'singleton'
+require 'pp'
 
 require 'aws-sdk-v1'
 require 'term/ansicolor'
+require 'diffy'
+require 'hashie'
 
 require 'radiosonde/logger'
+require 'radiosonde/template_helper'
 require 'radiosonde/utils'
 require 'radiosonde/client'
 require 'radiosonde/dsl'

data/radiosonde.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk-v1'
-  spec.add_dependency "json"
-  spec.add_dependency "term-ansicolor"
+  spec.add_dependency 'json'
+  spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'diffy'
+  spec.add_dependency 'hashie'
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiosonde
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +152,7 @@ files:
 - lib/radiosonde/ext/cloud_watch_ext.rb
 - lib/radiosonde/ext/string_ext.rb
 - lib/radiosonde/logger.rb
+- lib/radiosonde/template_helper.rb
 - lib/radiosonde/utils.rb
 - lib/radiosonde/version.rb
 - lib/radiosonde/wrapper.rb
@@ -153,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Radiosonde is a tool to manage CloudWatch Alarm.