flapjack 1.2.1rc2 → 1.2.1rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c092ff47434ae5b8779b77e422ca2fbc3cec32df
-  data.tar.gz: 9c921600dc415ebb024ba5207571db063326e7fc
+  metadata.gz: 38c70a352010266d6ed0c087dfff6705dcaad41e
+  data.tar.gz: 3378b3979749e16bc14ea2d01a82197bfe20fac4
 SHA512:
-  metadata.gz: 85c23c132e45faea927de004b369a416fc7f88bc17e4ff6f682bede8a3493749731074fd6112f8bcac3142dfe283787f72526055d40929d618c62836fb99607f
-  data.tar.gz: 202737eae76714ffaee089982854ba0efe743a0f84fba9d30a3dc0bcf8bd370ee6c265d382051c7c9b49ff89dac9c17753da2cac09f03a05a8c63ae4a0107ada
+  metadata.gz: bde5f52706918626c4a1afb1c8b90e106619b027be7c1b6d907835c6f31d1a68b8d1687def8647dfdd3bb3550c6da7bfa5408be3c7c8239d740931a2d49daca2
+  data.tar.gz: c3e3deffb1a2baeb9be7d494236d08ed61a024593cf0fc00fa137988bde6b4574ee5d136271f07d446fd36c0848b753ca0842eac07a66caf77fde81ae932ba9e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Flapjack Changelog
 
+# 1.2.1rc3 - 2014-12-09
+- Bug: flapjack 1.2.0 ignores umask and makes logs world writable #708 (@ali-graham)
+- Bug: Can't get full name email syntax working #690 (@jessereynolds)
+
 # 1.2.1rc2 - 2014-12-04
 - Bug: Correct scheduled maintenance periods with expiry that don't match their timestamps #734 (@ali-graham)
 

data/Gemfile-ruby1.9.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    flapjack (1.2.1rc2)
+    flapjack (1.2.1rc3)
       activesupport (~> 3.2.14)
       blather (~> 0.8.3)
       chronic
       chronic_duration
-      dante
+      dante (= 0.2.0)
       em-http-request
       em-resque
       em-synchrony (~> 1.0.2)

data/features/steps/notifications_steps.rb

@@ -223,7 +223,7 @@ end
 
 When /^the email notification handler runs successfully$/ do
   Resque.redis = @redis
-  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525}})
+  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525, 'from' => 'flapjack@example'}})
   Flapjack::Gateways::Email.instance_variable_set('@redis', @redis)
   Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
   Flapjack::Gateways::Email.start
@@ -242,7 +242,7 @@ end
 
 When /^the email notification handler fails to send an email$/ do
   Resque.redis = @redis
-  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525}})
+  Flapjack::Gateways::Email.instance_variable_set('@config', {'smtp_config' => {'host' => '127.0.0.1', 'port' => 2525, 'from' => 'flapjack@example'}})
   Flapjack::Gateways::Email.instance_variable_set('@redis', @redis)
   Flapjack::Gateways::Email.instance_variable_set('@logger', @logger)
   Flapjack::Gateways::Email.start

data/flapjack.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Flapjack::VERSION
 
-  gem.add_dependency 'dante'
+  gem.add_dependency 'dante', '= 0.2.0'
   gem.add_dependency 'oj', '>= 2.9.0'
   gem.add_dependency 'eventmachine', '~> 1.0.0'
   gem.add_dependency 'redis', '~> 3.0.6'

data/lib/flapjack/cli/flapper.rb

@@ -60,8 +60,14 @@ module Flapjack
           puts "flapper is already running."
         else
           print "flapper starting..."
-          print "\n" unless @options[:daemonize]
+          main_umask = nil
+          if @options[:daemonize]
+            main_umask = File.umask
+          else
+            print "\n"
+          end
           runner.execute(:daemonize => @options[:daemonize]) do
+            File.umask(main_umask) if @options[:daemonize]
             main(@options['bind-ip'] || Flapjack::CLI::Flapper.local_ip, @options['bind-port'].to_i, @options[:frequency])
           end
           puts " done."
@@ -82,7 +88,9 @@ module Flapjack
 
       def restart
         print "flapper restarting..."
+        main_umask = File.umask
         runner.execute(:daemonize => true, :restart => true) do
+          File.umask(main_umask)
           main(@options['bind-ip'], @options['bind-port'].to_i, @options[:frequency])
         end
         puts " done."

data/lib/flapjack/cli/receiver.rb

@@ -64,9 +64,15 @@ module Flapjack
           puts "#{@options[:type]}-receiver is already running."
         else
           print "#{@options[:type]}-receiver starting..."
-          print "\n" unless @options[:daemonize]
+          main_umask = nil
+          if @options[:daemonize]
+            main_umask = File.umask
+          else
+            print "\n"
+          end
           runner(@options[:type]).execute(:daemonize => @options[:daemonize]) do
             begin
+              File.umask(main_umask) if @options[:daemonize]
               main(:fifo => @options[:fifo], :type => @options[:type])
             rescue Exception => e
               p e.message
@@ -91,8 +97,10 @@ module Flapjack
 
       def restart
         print "#{@options[:type]}-receiver restarting..."
+        main_umask = File.umask
         runner(@options[:type]).execute(:daemonize => true, :restart => true) do
           begin
+            File.umask(main_umask)
             main(:fifo => @options[:fifo], :type => @options[:type])
           rescue Exception => e
             p e.message

data/lib/flapjack/cli/server.rb

@@ -48,9 +48,15 @@ module Flapjack
           puts "Flapjack is already running."
         else
           print "Flapjack starting..."
-          print "\n" unless @options[:daemonize]
+          main_umask = nil
+          if @options[:daemonize]
+            main_umask = File.umask
+          else
+            print "\n"
+          end
           return_value = nil
           runner.execute(:daemonize => @options[:daemonize]) {
+            File.umask(main_umask) if @options[:daemonize]
             return_value = start_server
           }
           puts " done."
@@ -82,7 +88,10 @@ module Flapjack
         @runner = nil
 
         print "Flapjack starting..."
+
+        main_umask = File.umask
         runner.execute(:daemonize => true) {
+          File.umask(main_umask)
           start_server
         }
         puts " done."

data/lib/flapjack/gateways/email.rb

@@ -70,7 +70,13 @@ module Flapjack
                                :message_id => "<#{alert.notification_id}@#{@fqdn}>",
                                :alert      => alert)
 
-          smtp_args = {:from     => m_from,
+          smtp_from = m_from.clone
+          while smtp_from =~ /(<|>)/
+            smtp_from.sub!(/^.*</, '')
+            smtp_from.sub!(/>.*$/, '')
+          end
+
+          smtp_args = {:from     => smtp_from,
                        :to       => alert.address,
                        :content  => "#{mail.to_s}\r\n.\r\n",
                        :domain   => @fqdn,
@@ -105,7 +111,7 @@ module Flapjack
         # returns a Mail object
         def prepare_email(opts = {})
           from       = opts[:from]
-          reply_to   = opts[:reply_to] 
+          reply_to   = opts[:reply_to]
           to         = opts[:to]
           message_id = opts[:message_id]
           alert      = opts[:alert]

data/lib/flapjack/version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "1.2.1rc2"
+  VERSION = "1.2.1rc3"
 end
 

data/spec/lib/flapjack/gateways/email_spec.rb

@@ -45,7 +45,7 @@ describe Flapjack::Gateways::Email, :logger => true do
     expect(EM::P::SmtpClient).to receive(:send).with(
       hash_including(host: 'localhost',
                      port: 25,
-                     from: "Full Name <from@example.org>")
+                     from: "from@example.org")
     ).and_return(email)
 
     response = double(response)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 1.2.1rc2
+  version: 1.2.1rc3
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement