meteorlog 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd8a0522aeef3bc4ce2618c6dac055860057a74
-  data.tar.gz: a8222fcc0506fec02b883bb620f2615ea5ce14ab
+  metadata.gz: 14078db7b428f519f929a6539e004e8245c84e96
+  data.tar.gz: 61abc3d1efcb3df9a1979a0c4c8861db4ce9c36f
 SHA512:
-  metadata.gz: 6524482cd3a2a8ee960989850c941223847e143364d44d82576c64bde0148fe88ead629bb5e8bc3fd93751008062f4e8abfbff69d3cfe1f8b03fbd330d74cba2
-  data.tar.gz: ace680bc4626ca97d727c85c009634fd4f83f4ba2d1d6ca2993c2fb56dcca0cd7b0edcb9eb8b9c656799367a3792158bbbc0133d2cf7212cccd187542987a78c
+  metadata.gz: 1923845c8531277cd45ce6df7437879147c60ea0bf24596d5dedd89a0a072043f998d1675225d5e6d07c2608b6834c4ef5f6733ac43b26444191702297e62609
+  data.tar.gz: 05d7ee11c1baf977b426db7e8df488415ba8ac96b64b89fb941d5a5cf1460cb8df33798719cb43d4e605314c7245cd19e25bd3fa3cb795f1d86875247108f8fb

data/README.md

@@ -85,3 +85,6 @@ log_group "/var/log/maillog" do
   end
 end
 ```
+
+## Similar tools
+* [Codenize.tools](http://http://codenize.tools/)

data/bin/meteorlog

@@ -34,6 +34,8 @@ ARGV.options do |opt|
     opt.on('',   '--skip-delete-group')     {    options[:skip_delete_group] = true }
     opt.on('-e', '--export')                {    mode              = :export        }
     opt.on('-o', '--output FILE')           {|v| output_file       = v              }
+    opt.on('',   '--include REGEXP')        {|v| options[:include] = Regexp.new(v)  }
+    opt.on('',   '--exclude REGEXP')        {|v| options[:exclude] = Regexp.new(v)  }
     opt.on(''  , '--no-color')              {    options[:color]   = false          }
     opt.on(''  , '--debug')                 {    options[:debug]   = true           }
     opt.parse!

data/lib/meteorlog.rb

@@ -10,6 +10,7 @@ require 'aws-sdk-core'
 require 'term/ansicolor'
 
 require 'meteorlog/logger'
+require 'meteorlog/template_helper'
 require 'meteorlog/utils'
 require 'meteorlog/client'
 require 'meteorlog/dsl'

data/lib/meteorlog/client.rb

@@ -25,6 +25,7 @@ class Meteorlog::Client
     aws_log_groups = collect_to_hash(aws.log_groups, :log_group_name)
 
     dsl_log_groups.each do |log_group_name, dsl_log_group|
+      next unless Meteorlog::Utils.matched?(log_group_name, @options[:include], @options[:exclude])
       aws_log_group = aws_log_groups[log_group_name]
 
       unless aws_log_group
@@ -34,12 +35,14 @@ class Meteorlog::Client
     end
 
     dsl_log_groups.each do |log_group_name, dsl_log_group|
+      next unless Meteorlog::Utils.matched?(log_group_name, @options[:include], @options[:exclude])
       aws_log_group = aws_log_groups.delete(log_group_name)
       walk_log_group(dsl_log_group, aws_log_group)
     end
 
     unless @options[:skip_delete_group]
       aws_log_groups.each do |log_group_name, aws_log_group|
+        next unless Meteorlog::Utils.matched?(log_group_name, @options[:include], @options[:exclude])
         aws_log_group.delete
       end
     end

data/lib/meteorlog/dsl/context.rb

@@ -1,5 +1,6 @@
 class Meteorlog::DSL::Context
   include Meteorlog::DSL::Validator
+  include Meteorlog::TemplateHelper
 
   class << self
     def eval(dsl, path, opts = {})
@@ -21,8 +22,12 @@ class Meteorlog::DSL::Context
 
   private
 
+  def template(name, &block)
+    @context.templates[name.to_s] = block
+  end
+
   def require(file)
-    logsfile = File.expand_path(File.join(File.dirname(@path), file))
+    logsfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
     if File.exist?(logsfile)
       instance_eval(File.read(logsfile), logsfile)

data/lib/meteorlog/dsl/context/log_group.rb

@@ -1,5 +1,6 @@
 class Meteorlog::DSL::Context::LogGroup
   include Meteorlog::DSL::Validator
+  include Meteorlog::TemplateHelper
 
   attr_reader :result
 

data/lib/meteorlog/dsl/context/metric_filter.rb

@@ -1,5 +1,6 @@
 class Meteorlog::DSL::Context::MetricFilter
   include Meteorlog::DSL::Validator
+  include Meteorlog::TemplateHelper
 
   attr_reader :result
 

data/lib/meteorlog/exporter.rb

@@ -26,6 +26,9 @@ class Meteorlog::Exporter
 
   def export_log_graoup(log_group, result)
     log_group_name = log_group.log_group_name
+
+    return unless Meteorlog::Utils.matched?(log_group_name, @options[:include], @options[:exclude])
+
     log_streams = @cloud_watch_logs.describe_log_streams(
       :log_group_name => log_group_name).log_streams
     metric_filters = @cloud_watch_logs.describe_metric_filters(

data/lib/meteorlog/template_helper.rb

@@ -0,0 +1,18 @@
+module Meteorlog::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/meteorlog/utils.rb

@@ -1,4 +1,19 @@
 module Meteorlog::Utils
+  def matched?(name, include_r, exclude_r)
+    result = true
+
+    if exclude_r
+      result &&= name !~ exclude_r
+    end
+
+    if include_r
+      result &&= name =~ include_r
+    end
+
+    result
+  end
+  module_function :matched?
+
   def collect_to_hash(collection, *key_attrs)
     opts = key_attrs.last.kind_of?(Hash) ? key_attrs.pop : {}
     hash = {}

data/lib/meteorlog/version.rb

@@ -1,3 +1,3 @@
 module Meteorlog
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/meteorlog.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['sgwr_dts@yahoo.co.jp']
   spec.description   = "Meteorlog is a tool to manage CloudWatch Logs. It defines the state of CloudWatch Logs using DSL, and updates CloudWatch Logs according to DSL."
   spec.summary       = "Meteorlog is a tool to manage CloudWatch Logs."
-  spec.homepage      = 'https://github.com/winebarrel/meteorlog'
+  spec.homepage      = 'http://meteorlog.codenize.tools/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: meteorlog
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   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: term-ansicolor
   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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Meteorlog is a tool to manage CloudWatch Logs. It defines the state of
@@ -103,8 +103,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,6 +121,7 @@ files:
 - lib/meteorlog/exporter.rb
 - lib/meteorlog/ext/string_ext.rb
 - lib/meteorlog/logger.rb
+- lib/meteorlog/template_helper.rb
 - lib/meteorlog/utils.rb
 - lib/meteorlog/version.rb
 - lib/meteorlog/wrapper.rb
@@ -134,7 +135,7 @@ files:
 - meteorlog.gemspec
 - spec/meteorlog_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/winebarrel/meteorlog
+homepage: http://meteorlog.codenize.tools/
 licenses:
 - MIT
 metadata: {}
@@ -144,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Meteorlog is a tool to manage CloudWatch Logs.