fyi 1.0.10 → 1.1.0

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+pkg/
+Gemfile.lock
+

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/Rakefile

@@ -1,24 +1 @@
-$LOAD_PATH.unshift 'lib'
-require 'fyi/version'
-
-desc 'Build the gem.'
-task :build do
-  sh 'gem build fyi.gemspec'
-end
-
-desc 'Build and install the gem locally.'
-task :install => :build do
-  sh "gem install fyi-#{Fyi::VERSION}.gem"
-end
-
-desc 'Tag the code and push tags to origin.'
-task :tag do
-  sh "git tag v#{Fyi::VERSION}"
-  sh "git push origin master --tags"
-end
-
-desc 'Publish to rubygems.org.'
-task :publish => [:build, :tag] do
-  sh "gem push fyi-#{Fyi::VERSION}.gem"
-  # sh "git clean -fd"
-end
+require 'bundler/gem_tasks'

data/bin/fyi

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
 
+lib_dir = File.expand_path '../lib', __FILE__
+$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include? lib_dir
+
 require 'fyi'
 Fyi.run ARGV.join(' ')

data/config_example.yml

@@ -13,8 +13,10 @@ email:
   to: you@yourdomain.com
   smtp:
     address: smtp.yourserver.com
-    port: 25
+    port: 465
+    domain: yourdomain.com
     user_name: username
     password: password
-    authentication: :login
-    domain: yourdomain.com
+    authentication: 'plain'
+    enable_starttls_auto: false
+    ssl: true

data/fyi.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-$LOAD_PATH.unshift 'lib'
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'fyi/version'
 
 Gem::Specification.new do |s|
@@ -12,11 +12,13 @@ Gem::Specification.new do |s|
   s.homepage           = 'http://github.com/airblade/fyi'
   s.authors            = ['Andy Stewart']
   s.email              = 'boss@airbladesoftware.com'
-  s.files              = %w( README.md Rakefile fyi.gemspec config_example.yml )
-  s.files             += Dir.glob("bin/**/*")
-  s.files             += Dir.glob("lib/**/*")
-  s.executables        = %w( fyi )
-  s.extra_rdoc_files   = %w( README.md )
-  s.add_dependency 'pony',    ['>= 1.3']
-  s.add_dependency 'systemu', ['>= 2.4.0']
+
+  s.files              = `git ls-files`.split("\n")
+  s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables        = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths      = %w[ lib ]
+
+  s.add_development_dependency 'rake', '0.9.2.2'
+  s.add_dependency 'mail',    '~> 2.4.4'
+  s.add_dependency 'systemu', '>= 2.4.0'
 end

data/lib/fyi.rb

@@ -1,9 +1,4 @@
-begin
-  require 'systemu'
-rescue LoadError
-  abort '** Please install systemu.'
-end
-
+require 'systemu'
 require 'fyi/config'
 require 'fyi/core_ext'
 

data/lib/fyi/notifiers/email.rb

@@ -1,8 +1,4 @@
-begin
-  require 'pony'
-rescue LoadError
-  abort '** Please install pony.'
-end
+require 'mail'
 
 class Fyi
   class Notifier
@@ -21,20 +17,19 @@ class Fyi
       #   Optional.  Defaults to true.
       # +smtp+: you should supply SMTP config options under this key.
       #
-      # SMTP config options are:
-      # +host+
-      # +port+
-      # +user+
-      # +password+
-      # +auth+
-      # +domain+
+      # SMTP config options are whatever Mail takes.
+      # https://github.com/mikel/mail/blob/master/lib/mail/network/delivery_methods/smtp.rb
       def initialize options
         @from = options['from']
         @to   = options['to']
-        @smtp = symbolize_keys options['smtp']
         @on_success = options['on_success']
         # Notify of failures by default.
         @on_failure = options.has_key?('on_failure') ? options['on_failure'] : true
+
+        smtp = symbolize_keys(options['smtp'])
+        Mail.defaults do
+          delivery_method :smtp, smtp
+        end
       end
 
       def notify command, result, duration, output, error = '', host = ''
@@ -48,12 +43,17 @@ class Fyi
       end
 
       def send_email command, result, duration, output, error, host
-        Pony.mail :to          => @to,
-                  :from        => @from,
-                  :subject     => subject(command, result),
-                  :body        => body(command, duration, output, error, host),
-                  :via         => :smtp,
-                  :via_options => @smtp
+        _subject = subject(command, result)
+        _body    = body(command, duration, output, error, host)
+        _to      = @to
+        _from    = @from
+
+        Mail.deliver do
+          to      _to
+          from    _from
+          subject _subject
+          body    _body
+        end
       end
 
       def subject command, result

data/lib/fyi/version.rb

@@ -1,3 +1,3 @@
 class Fyi
-  VERSION = '1.0.10'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,107 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fyi
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 10
-  version: 1.0.10
 platform: ruby
-authors: 
+authors:
 - Andy Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: pony
+date: 2012-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153492000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2153492000
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &2153491460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: systemu
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153491460
+- !ruby/object:Gem::Dependency
+  name: systemu
+  requirement: &2153490780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2153490780
 description: Find out what cron is doing.
 email: boss@airbladesoftware.com
-executables: 
+executables:
 - fyi
 extensions: []
-
-extra_rdoc_files: 
-- README.md
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - README.md
 - Rakefile
-- fyi.gemspec
-- config_example.yml
 - bin/fyi
+- config_example.yml
+- fyi.gemspec
+- lib/fyi.rb
 - lib/fyi/config.rb
 - lib/fyi/core_ext.rb
 - lib/fyi/notifiers/email.rb
 - lib/fyi/notifiers/log.rb
 - lib/fyi/version.rb
-- lib/fyi.rb
-has_rdoc: true
 homepage: http://github.com/airblade/fyi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1551681380249218475
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1551681380249218475
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Find out what cron is doing.
 test_files: []
-