flapjack 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402e2bdf881bed38ea358f612379fb80d6447a28
-  data.tar.gz: 8cb9bc4bb2956c611ceec529456a8908955d515a
+  metadata.gz: 72ee9f50915de6e7b9cf6b41ff8e8673521724be
+  data.tar.gz: f381a0c2be5382fe9f7cee78fb9216cd41234ca1
 SHA512:
-  metadata.gz: 6fa99305fd86b34e3d3fa7460012c9b7d5f611b21c80d7e6619f218a4688f595ef5c0eb9670aa78a1831658fe1bd3ebac43480a41cbffafd2a96ccd0e5195fe3
-  data.tar.gz: c348219851002bfcb5597a25a9d75888ae27e1f4129b62f7a1c2de6b19cbb1ba3056e1628410bd047be8302e9cbe979fcfe0b13ad3ee4beb92333ded6bf30740
+  metadata.gz: a11151cfb128667fd55e2d703e7a1faf56cb5e175d337c8507df68bc6f4a2cac9f6996012be16cec412de7d8409c1c2bfa16f28250ee701fd1edf01b110f5f9e
+  data.tar.gz: db3f5b366159a9250c1888850a63708fe3e8e7abb55221e11fc6a1f3053b46267f34f7d84e4f599c764915ff0bc03d1c83eeba017542da89bd9de710604e6519

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 ## Flapjack Changelog
 
+# 0.8.8 - 2014-03-20
+- Feature: Be able to disable automatic sched maint by setting duration to zero gh-457, gh-458 (@portertech)
+- Bug: Make bin/flapjack-populator explicitly whinge about `-f` instead of dying gh-455 (@damncabbage)
+
 # 0.8.7 - 2014-03-19
-- Added "tags" (array of strings) to event hash gh-453 (@portertech)
-- Allow contacts to be associated with a common entity "ALL" gh-454 (@portertech)
+- Feature: Added "tags" (array of strings) to event hash gh-453 (@portertech)
+- Feature: Allow contacts to be associated with a common entity "ALL" gh-454 (@portertech)
 
 # 0.8.6 - 2014-03-14
 - Bug: tie Thin to < 2.0.0pre gh-442 (@mattdelves)

data/bin/flapjack-populator

@@ -45,6 +45,12 @@ optparse = OptionParser.new do |opts|
 end
 optparse.parse!(ARGV)
 
+bail_with_usage = proc do |message|
+  puts message
+  puts "\n#{optparse}"
+  exit(false)
+end
+
 if options.help
   puts optparse
   exit
@@ -52,13 +58,12 @@ elsif options.version
   puts Flapjack::VERSION
   exit
 elsif !["import-contacts", "import-entities", "purge-events"].include?(ARGV[0])
-  if ARGV.nil? || ARGV.empty?
-    puts "No command provided"
-  else
-    puts "Unknown command provided: '#{ARGV[0]}'"
-  end
-  puts "\n#{optparse}"
-  exit 1
+  message = if ARGV.nil? || ARGV.empty?
+              "No command provided"
+            else
+              "Unknown command provided: '#{ARGV[0]}'"
+            end
+  bail_with_usage.call message
 end
 
 FLAPJACK_ENV = ENV['FLAPJACK_ENV'] || 'production'
@@ -73,14 +78,12 @@ if config_env.nil? || config_env.empty?
   exit(false)
 end
 
-if options.from
-  filename = options.from
-  file     = File.new(filename)
-end
-
 case ARGV[0]
 when "import-contacts"
-  contacts = Oj.load(file)
+  unless options.from
+    bail_with_usage.call "No import file provided with --from, eg. --from contacts.json"
+  end
+  contacts = Oj.load(File.new(options.from))
 
   if contacts && contacts.is_a?(Enumerable) && contacts.any? {|e| !e['id'].nil?}
     @persistence = Redis.new(redis_options)
@@ -95,7 +98,10 @@ when "import-contacts"
   end
 
 when "import-entities"
-  entities = Oj.load(file)
+  unless options.from
+    bail_with_usage.call "No import file provided with --from, eg. --from contacts.json"
+  end
+  entities = Oj.load(File.new(options.from))
 
   if entities && entities.is_a?(Enumerable) && entities.any? {|e| !e['id'].nil?}
     @persistence = Redis.new(redis_options)
@@ -121,7 +127,6 @@ when "purge-events"
   @persistence.quit
 
 else
-  puts "you need to give me something to do, eg a command like 'import-entities' or 'import-clients' etc"
-  raise ArgumentError
+  bail_with_usage.call "You need to give me something to do, eg. a command like 'import-entities', 'import-clients', etc."
 end
 

data/features/cli_flapjack-populator.feature

@@ -78,3 +78,12 @@ test:
     When I run `bin/flapjack-populator import-entities --from tmp/cucumber_cli/flapjack-populator-entities.json --config tmp/cucumber_cli/flapjack-populator.yaml`
     Then the exit status should be 0
 
+  Scenario Outline: Running an flapjack-populator import command with a missing '--from' exits uncleanly and shows usage
+    When I run `bin/flapjack-populator <Command> example.json --config tmp/cucumber_cli/flapjack-populator.yaml`
+    Then the exit status should not be 0
+    And  the output should contain "No import file provided with --from"
+    And  the output should contain "Usage: flapjack-populator"
+    Examples:
+      | Command         |
+      | import-entities |
+      | import-contacts |

data/lib/flapjack/processor.rb

@@ -36,7 +36,7 @@ module Flapjack
       @events_archive_maxage = @config['events_archive_maxage']
 
       ncsm_duration_conf = @config['new_check_scheduled_maintenance_duration'] || '100 years'
-      @ncsm_duration = ChronicDuration.parse(ncsm_duration_conf)
+      @ncsm_duration = ChronicDuration.parse(ncsm_duration_conf, :keep_zero => true)
 
       @exit_on_queue_empty = !! @config['exit_on_queue_empty']
 
@@ -196,7 +196,7 @@ module Flapjack
         if previous_state.nil?
           @logger.info("No previous state for event #{event.id}")
 
-          if @ncsm_duration >= 0
+          if @ncsm_duration > 0
             @logger.info("Setting scheduled maintenance for #{time_period_in_words(@ncsm_duration)}")
             entity_check.create_scheduled_maintenance(timestamp,
               @ncsm_duration, :summary => 'Automatically created for new check')

data/lib/flapjack/version.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Lindsay Holmwood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dante