collins_notify 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/collins_notify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "collins_notify"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Matheny"]
-  s.date = "2013-01-29"
+  s.date = "2013-01-31"
   s.description = "Send notifications via hipchat, IRC and email"
   s.email = "bmatheny@tumblr.com"
   s.executables = ["collins-notify"]

data/lib/collins_notify/notifier.rb

@@ -103,17 +103,18 @@ module CollinsNotify
 
     # b is the binding to use
     def get_message_body b
-      if config.stdin? then
+      if config.template? then
+        tmpl = config.resolved_template
+        logger.debug "Using template file #{tmpl}"
+        render_template File.new(tmpl), b
+      elsif config.stdin? then
         message_txt = $stdin.read.strip
+        logger.debug "Using stdin for message body"
         if config.template_processor == :erb then
           render_template message_txt, b
         else
           message_txt
         end
-      elsif config.template? then
-        tmpl = config.resolved_template
-        logger.debug "Using template file #{tmpl}"
-        render_template File.new(tmpl), b
       else
         raise CollinsNotify::CollinsNotifyException.new "Unknown message body type"
       end

metadata

@@ -1,103 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: collins_notify
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Blake Matheny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: collins_client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.10
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: collins_client
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.2.10
-- !ruby/object:Gem::Dependency
-  name: hipchat
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hipchat
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.4
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mail
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.4.4
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.5.2
+  type: :runtime
+  version_requirements: *id005
 description: Send notifications via hipchat, IRC and email
 email: bmatheny@tumblr.com
-executables:
+executables: 
 - collins-notify
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -123,31 +101,31 @@ files:
 - templates/default_hipchat.erb
 - templates/default_irc.erb
 homepage: https://github.com/tumblr/collins/tree/master/support/ruby/collins-notify
-licenses:
+licenses: 
 - MIT
 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
-      version: '0'
-      segments:
-      - 0
-      hash: -3273446281456660358
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Notifications for Collins
 test_files: []
+