logstash-output-email 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGExYjgwYzBlYTE4OGRjY2I1YjQ0MzdkZjNjZjliNWEwNDM4OTcxZg==
-  data.tar.gz: !binary |-
-    OTQ5MWUwNjhjNzNjMDQ5OTk5YzAyOWE4MzRkMzIwNWJiYTJmYzEwNQ==
+SHA1:
+  metadata.gz: 57f7aa4ebd232c89a45338d658fb97a05463f740
+  data.tar.gz: ae8f383feb1291e5da8d559ee614d8dab44e3ba0
 SHA512:
-  metadata.gz: !binary |-
-    NzRiYmFjMjM5MjliYzVmZDQwNzQ3Mjk0NDBlMjg3ZGJkZGY4YjkwZDQ2Zjkw
-    MDc1OGQ2Mzc4N2U4NTM0ODVlMGQ5MTQzMjE2ZDc1NTM4NWIwYThjMjU4OWUw
-    NGM1YmNmYTVmM2U1ZjVlYTIwYzk1ZmI4ZjY3YTJjODQyMjg3YTA=
-  data.tar.gz: !binary |-
-    MGE4Y2U3ZjM2M2QyNzIxNDcxYWUwNmFlNThlMjZlNGEzZDA2M2Q4ZTMyMzQw
-    MTljZmMzYzJmZDA5Y2M4ZjRiY2U4MzIzYWM5YjNlNThkZDM4NGFlNWY3Nzk2
-    MTc2ZTRlYThhYjU2MjhjNjllZTcxMmI1MDQ3ODAzZjkxNGVkZDg=
+  metadata.gz: 1d581dfaffa7361379b94be39bb0bea172740ad2a5fcaeaba29e47b7b767f875a8695e12294fb53c0eaeeb489c99abe32aa08157398c70331d8118d6d89ae6d7
+  data.tar.gz: 09a818a48d115e37ec4f73f497f67ee93f10470cdd499090ba13257bdb212bf1d3129dcd4d8e60ff59fc1f08d7b53e43699797c2c7be40fa455be91ec82cc087

data/Gemfile

@@ -1,4 +1,3 @@
-source 'http://rubygems.org'
-gem 'rake'
-gem 'gem_publisher'
-gem 'archive-tar-minitar'
+source 'https://rubygems.org'
+gemspec
+gem "logstash", :github => "elasticsearch/logstash", :branch => "1.5"

data/LICENSE

@@ -0,0 +1,13 @@
+Copyright (c) 2012-2014 Elasticsearch <http://www.elasticsearch.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/Rakefile

@@ -4,3 +4,4 @@ task :default do
   system("rake -T")
 end
 
+require "logstash/devutils/rake"

data/lib/logstash/outputs/email.rb

@@ -12,7 +12,7 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
   # This setting is deprecated in favor of Logstash's "conditionals" feature
   # If you were using this setting previously, please use conditionals instead.
   #
-  # If you need help converting your older 'match' setting to a conditional,
+  # If you need help converting your older `match` setting to a conditional,
   # I welcome you to join the #logstash irc channel on freenode or to email
   # the logstash-users@googlegroups.com mailling list and ask for help! :)
   config :match, :validate => :hash, :deprecated => true
@@ -20,9 +20,9 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
   # The fully-qualified email address to send the email to.
   #
   # This field also accepts a comma-separated string of addresses, for example: 
-  # "me@host.com, you@host.com"
+  # `"me@host.com, you@host.com"`
   #
-  # You can also use dynamic fields from the event with the %{fieldname} syntax.
+  # You can also use dynamic fields from the event with the `%{fieldname}` syntax.
   config :to, :validate => :string, :required => true
 
   # The fully-qualified email address for the From: field in the email.
@@ -34,7 +34,7 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
   # The fully-qualified email address(es) to include as cc: address(es).
   #
   # This field also accepts a comma-separated string of addresses, for example: 
-  # "me@host.com, you@host.com"
+  # `"me@host.com, you@host.com"`
   config :cc, :validate => :string
 
   # How Logstash should send the email, either via SMTP or by invoking sendmail.
@@ -42,13 +42,13 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
 
   # Specify the options to use:
   #
-  # Via SMTP: smtpIporHost, port, domain, userName, password, authenticationType, starttls
+  # Via SMTP: `smtpIporHost`, `port`, `domain`, `userName`, `password`, `authenticationType`, `starttls`
   #
-  # Via sendmail: location, arguments
+  # Via sendmail: `location`, `arguments`
   #
   # If you do not specify any `options`, you will get the following equivalent code set in
   # every new mail object:
-  #
+  # [source,ruby]
   #     Mail.defaults do
   #       delivery_method :smtp, { :smtpIporHost         => "localhost",
   #                                :port                 => 25,
@@ -70,15 +70,15 @@ class LogStash::Outputs::Email < LogStash::Outputs::Base
   #
   # Each mail object inherits the defaults set in Mail.delivery_method. However, on
   # a per email basis, you can override the method:
-  #
+  # [source,ruby]
   #     mail.delivery_method :sendmail
   #
   # Or you can override the method and pass in settings:
-  #
+  # [source,ruby]
   #     mail.delivery_method :sendmail, { :address => 'some.host' }
   #
   # You can also just modify the settings:
-  #
+  # [source,ruby]
   #     mail.delivery_settings = { :address => 'some.host' }
   #
   # The hash you supply is just merged against the defaults with "merge!" and the result

data/logstash-output-email.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-email'
-  s.version         = '0.1.0'
+  s.version         = '0.1.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send email when an output is received."
-  s.description     = "Send email when an output is received."
+  s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elasticsearch"]
-  s.email           = 'richard.pijnenburg@elasticsearch.com'
-  s.homepage        = "http://logstash.net/"
+  s.email           = 'info@elasticsearch.com'
+  s.homepage        = "http://www.elasticsearch.org/guide/en/logstash/current/index.html"
   s.require_paths = ["lib"]
 
   # Files
@@ -17,12 +17,13 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { "logstash_plugin" => "true", "group" => "output" }
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
   s.add_runtime_dependency 'logstash', '>= 1.4.0', '< 2.0.0'
 
   s.add_runtime_dependency 'mail'
 
+  s.add_development_dependency 'logstash-devutils'
 end
 

data/spec/outputs/email_spec.rb

@@ -1,12 +1,12 @@
-require "spec_helper"
+require "logstash/devutils/rspec/spec_helper"
 require "rumbster"
 require "message_observers"
 
 describe "outputs/email", :broken => true do
     
 
-    @@port=2525
-    let (:rumbster) { Rumbster.new(@@port) }
+    port = 2525
+    let (:rumbster) { Rumbster.new(port) }
     let (:message_observer) { MailMessageObserver.new }
 
     before :each do
@@ -36,7 +36,7 @@ describe "outputs/email", :broken => true do
             email {
                 to => "email1@host, email2@host"
                 match => ["mymatch", "dummy_match,ok"]
-                options => ["port", #{@@port}]
+                options => ["port", #{port}]
             }
         }
         CONFIG
@@ -67,7 +67,7 @@ describe "outputs/email", :broken => true do
             email {
                 to => "%{to_addr}"
                 match => ["mymatch", "dummy_match,ok"]
-                options => ["port", #{@@port}]
+                options => ["port", #{port}]
             }
         }
         CONFIG
@@ -98,7 +98,7 @@ describe "outputs/email", :broken => true do
                 subject => "Hello World"
                 body => "Line1\\nLine2\\nLine3"
                 match => ["mymatch", "dummy_match,*"]
-                options => ["port", #{@@port}]
+                options => ["port", #{port}]
             }
         }
         CONFIG
@@ -130,7 +130,7 @@ describe "outputs/email", :broken => true do
                 subject => "Hello World"
                 body => "Line1\\nLine2\\nLine3"
                 match => ["mymatch", "dummy_match,*"]
-                options => ["port", #{@@port}, "authenticationType", "nil"]
+                options => ["port", #{port}, "authenticationType", "nil"]
             }
         }
         CONFIG
@@ -157,7 +157,7 @@ describe "outputs/email", :broken => true do
                 subject => "Hello World"
                 body => "Mail body"
                 match => ["messageAndSourceMatch", "message,*hello,,and,source,*generator"]
-                options => ["port", #{@@port}, "authenticationType", "nil"]
+                options => ["port", #{port}, "authenticationType", "nil"]
             }
         }
         CONFIG

metadata

@@ -1,87 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-email
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Elasticsearch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  type: :runtime
+  name: logstash
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: mail
+  prerelease: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-devutils
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Send email when an output is received.
-email: richard.pijnenburg@elasticsearch.com
+description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
+email: info@elasticsearch.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE
 - Rakefile
 - lib/logstash/outputs/email.rb
 - logstash-output-email.gemspec
-- rakelib/publish.rake
-- rakelib/vendor.rake
 - spec/outputs/email_spec.rb
-homepage: http://logstash.net/
+homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
 metadata:
   logstash_plugin: 'true'
-  group: output
-post_install_message: 
+  logstash_group: output
+post_install_message:
 rdoc_options: []
 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.4.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Send email when an output is received.
 test_files:

data/rakelib/publish.rake

@@ -1,9 +0,0 @@
-require "gem_publisher"
-
-desc "Publish gem to RubyGems.org"
-task :publish_gem do |t|
-  gem_file = Dir.glob(File.expand_path('../*.gemspec',File.dirname(__FILE__))).first
-  gem = GemPublisher.publish_if_updated(gem_file, :rubygems)
-  puts "Published #{gem}" if gem
-end
-

data/rakelib/vendor.rake

@@ -1,169 +0,0 @@
-require "net/http"
-require "uri"
-require "digest/sha1"
-
-def vendor(*args)
-  return File.join("vendor", *args)
-end
-
-directory "vendor/" => ["vendor"] do |task, args|
-  mkdir task.name
-end
-
-def fetch(url, sha1, output)
-
-  puts "Downloading #{url}"
-  actual_sha1 = download(url, output)
-
-  if actual_sha1 != sha1
-    fail "SHA1 does not match (expected '#{sha1}' but got '#{actual_sha1}')"
-  end
-end # def fetch
-
-def file_fetch(url, sha1)
-  filename = File.basename( URI(url).path )
-  output = "vendor/#{filename}"
-  task output => [ "vendor/" ] do
-    begin
-      actual_sha1 = file_sha1(output)
-      if actual_sha1 != sha1
-        fetch(url, sha1, output)
-      end
-    rescue Errno::ENOENT
-      fetch(url, sha1, output)
-    end
-  end.invoke
-
-  return output
-end
-
-def file_sha1(path)
-  digest = Digest::SHA1.new
-  fd = File.new(path, "r")
-  while true
-    begin
-      digest << fd.sysread(16384)
-    rescue EOFError
-      break
-    end
-  end
-  return digest.hexdigest
-ensure
-  fd.close if fd
-end
-
-def download(url, output)
-  uri = URI(url)
-  digest = Digest::SHA1.new
-  tmp = "#{output}.tmp"
-  Net::HTTP.start(uri.host, uri.port, :use_ssl => (uri.scheme == "https")) do |http|
-    request = Net::HTTP::Get.new(uri.path)
-    http.request(request) do |response|
-      fail "HTTP fetch failed for #{url}. #{response}" if [200, 301].include?(response.code)
-      size = (response["content-length"].to_i || -1).to_f
-      count = 0
-      File.open(tmp, "w") do |fd|
-        response.read_body do |chunk|
-          fd.write(chunk)
-          digest << chunk
-          if size > 0 && $stdout.tty?
-            count += chunk.bytesize
-            $stdout.write(sprintf("\r%0.2f%%", count/size * 100))
-          end
-        end
-      end
-      $stdout.write("\r      \r") if $stdout.tty?
-    end
-  end
-
-  File.rename(tmp, output)
-
-  return digest.hexdigest
-rescue SocketError => e
-  puts "Failure while downloading #{url}: #{e}"
-  raise
-ensure
-  File.unlink(tmp) if File.exist?(tmp)
-end # def download
-
-def untar(tarball, &block)
-  require "archive/tar/minitar"
-  tgz = Zlib::GzipReader.new(File.open(tarball))
-  # Pull out typesdb
-  tar = Archive::Tar::Minitar::Input.open(tgz)
-  tar.each do |entry|
-    path = block.call(entry)
-    next if path.nil?
-    parent = File.dirname(path)
-    
-    mkdir_p parent unless File.directory?(parent)
-
-    # Skip this file if the output file is the same size
-    if entry.directory?
-      mkdir path unless File.directory?(path)
-    else
-      entry_mode = entry.instance_eval { @mode } & 0777
-      if File.exists?(path)
-        stat = File.stat(path)
-        # TODO(sissel): Submit a patch to archive-tar-minitar upstream to
-        # expose headers in the entry.
-        entry_size = entry.instance_eval { @size }
-        # If file sizes are same, skip writing.
-        next if stat.size == entry_size && (stat.mode & 0777) == entry_mode
-      end
-      puts "Extracting #{entry.full_name} from #{tarball} #{entry_mode.to_s(8)}"
-      File.open(path, "w") do |fd|
-        # eof? check lets us skip empty files. Necessary because the API provided by
-        # Archive::Tar::Minitar::Reader::EntryStream only mostly acts like an
-        # IO object. Something about empty files in this EntryStream causes
-        # IO.copy_stream to throw "can't convert nil into String" on JRuby
-        # TODO(sissel): File a bug about this.
-        while !entry.eof?
-          chunk = entry.read(16384)
-          fd.write(chunk)
-        end
-          #IO.copy_stream(entry, fd)
-      end
-      File.chmod(entry_mode, path)
-    end
-  end
-  tar.close
-  File.unlink(tarball) if File.file?(tarball)
-end # def untar
-
-def ungz(file)
-
-  outpath = file.gsub('.gz', '')
-  tgz = Zlib::GzipReader.new(File.open(file))
-  begin
-    File.open(outpath, "w") do |out|
-      IO::copy_stream(tgz, out)
-    end
-    File.unlink(file)
-  rescue
-    File.unlink(outpath) if File.file?(outpath)
-   raise
-  end
-  tgz.close
-end
-
-desc "Process any vendor files required for this plugin"
-task "vendor" do |task, args|
-
-  @files.each do |file| 
-    download = file_fetch(file['url'], file['sha1'])
-    if download =~ /.tar.gz/
-      prefix = download.gsub('.tar.gz', '').gsub('vendor/', '')
-      untar(download) do |entry|
-        if !file['files'].nil?
-          next unless file['files'].include?(entry.full_name.gsub(prefix, ''))
-          out = entry.full_name.split("/").last
-        end
-        File.join('vendor', out)
-      end
-    elsif download =~ /.gz/
-      ungz(download)
-    end
-  end
-
-end