sensu-plugins-jenkins 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e757920a55c831fe7d0238b5845533a263b4e67
-  data.tar.gz: ae38f4a31c37b33a77619b2a788f7c4c326f6831
+  metadata.gz: ce5da8e2554e866365bfa1883dd804a087f5e8b5
+  data.tar.gz: bbcdaf848ac7bfdf329d0b7529088de7eb28db6d
 SHA512:
-  metadata.gz: 86379dc0571be4a12e1b7bfcfe934457574f83170c051d23d15e02e2d79b257269b75a26a94f9511f3139e760e72ffa1f2dc34a2bfb0d338f5be34853f656008
-  data.tar.gz: c24519f8cd7ea4e1d4b939d0e816d2cd2fd599f43b27a262e45ba281fe7779926ecc4bb9cb8da0d11c93a28aa68472198dbccdc194324463c7a661cc447ff737
+  metadata.gz: 77d61043c24ac39505cf80c8f3c4f3a6affe49068c79a4574f855f844cafa86bea7f9c5e6231a821ac4e812213c84ffc3b6eb9a5e89dec74f9097b19a6ffaaae
+  data.tar.gz: b36af9e56820c97762183b7f989bcfa699b87bc7f64693689dd6128f2be20320025acb85c857aa453222eab8c6e212274090266925c252b7d771b2cba7210357

data/CHANGELOG.md

@@ -3,7 +3,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
-## [Unreleased][unreleased]
+## [Unreleased]
+
+## [1.0.0] - 2016-10-04
+### Added
+- Ruby 2.3.0 support
+
+### Removed
+- Ruby 1.9.3 support
+
+### Changed
+- check-jenkins-job-status.rb: if a job is in progress, use the result of the last completed build instead
+- Update to rubocop 0.40 and cleanup
+- Relax `sensu-plugin` dependency
 
 ## [0.1.0] - 2015-12-14
 ### Added
@@ -27,12 +39,18 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
   fail to succeed within a certain duration or configurable time window.
 
 ## [0.0.2] - 2015-06-03
-
 ### Added
 - PR #1
     - Added ability to specify Jenkins port.  Will default to 8080
 
 ## 0.0.1 - 2015-05-04
-
 ### Added
 - initial release
+
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.1.0...1.0.0
+[0.1.0]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.5...0.1.0
+[0.0.5]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.4...0.0.5
+[0.0.4]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.3...0.0.4
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.2...0.0.3
+[0.0.2]: https://github.com/sensu-plugins/sensu-plugins-jenkins/compare/0.0.1...0.0.2

data/README.md

@@ -5,7 +5,6 @@
 [![Code Climate](https://codeclimate.com/github/sensu-plugins/sensu-plugins-jenkins/badges/gpa.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-jenkins)
 [![Test Coverage](https://codeclimate.com/github/sensu-plugins/sensu-plugins-jenkins/badges/coverage.svg)](https://codeclimate.com/github/sensu-plugins/sensu-plugins-jenkins)
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-jenkins.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-jenkins)
-[![Codeship Status for sensu-plugins/sensu-plugins-jenkins](https://codeship.com/projects/996809a0-d48b-0132-55b8-02473ab9142c/status?branch=master)](https://codeship.com/projects/77815)
 
 ## Functionality
 

data/bin/check-jenkins-build-time.rb

@@ -115,15 +115,15 @@ class JenkinsBuildTime < Sensu::Plugin::Check::CLI
     time_after_window_start_yesterday = (window_start - ONE_DAY) < time
     time_in_window_yesterday = time_after_window_start_yesterday && (window_end - ONE_DAY) > time
 
-    if @now < window_end && @now > window_start # we are in the window, so we will accept today or yesterday
-      time_ok = (time_in_window_today || time_in_window_yesterday)
-    elsif @now < window_end
-      # we are before the window, so we only accept yesterday
-      time_ok = time_in_window_yesterday
-    else
-      # we are after the window, so we only accept today
-      time_ok = time_in_window_today
-    end
+    time_ok = if @now < window_end && @now > window_start # we are in the window, so we will accept today or yesterday
+                (time_in_window_today || time_in_window_yesterday)
+              elsif @now < window_end
+                # we are before the window, so we only accept yesterday
+                time_in_window_yesterday
+              else
+                # we are after the window, so we only accept today
+                time_in_window_today
+              end
     time_ok
   end
 
@@ -144,7 +144,7 @@ class JenkinsBuildTime < Sensu::Plugin::Check::CLI
     job_param = config[:jobs].split(',')
     job_param.each do |j|
       name, time_expression = j.split('=')
-      fail "Jobs mut be expressed as JOB_NAME=TIME_EXPRESSION. Invalid parameter: '#{j}'" if time_expression.nil?
+      raise "Jobs mut be expressed as JOB_NAME=TIME_EXPRESSION. Invalid parameter: '#{j}'" if time_expression.nil?
       jobs[name] = time_expression
     end
     jobs

data/bin/check-jenkins-health.rb

@@ -4,6 +4,7 @@
 #
 # DESCRIPTION:
 #   This plugin checks that the Jenkins Metrics healthcheck is healthy throughout
+#   See the Jenkins Metric plugin: https://wiki.jenkins-ci.org/display/JENKINS/Metrics+Plugin
 #
 # OUTPUT:
 #   plain text

data/bin/check-jenkins-job-status.rb

@@ -84,7 +84,14 @@ class JenkinsJobChecker < Sensu::Plugin::Check::CLI
   end
 
   def job_status(job_name)
-    jenkins_api_client.job.get_current_build_status(job_name)
+    status = jenkins_api_client.job.get_current_build_status(job_name)
+    # If the job is currently running, get the status of the last build instead
+    if status == 'running'
+      last_build = jenkins_api_client.job.get_current_build_number(job_name) - 1
+      build = jenkins_api_client.job.get_build_details(job_name, last_build)
+      status = build['result'].downcase
+    end
+    status
   rescue
     critical "Error looking up Jenkins job: #{job_name}"
   end

data/bin/metrics-jenkins-jqs.rb

@@ -38,7 +38,7 @@ require 'json'
 # Jenkins JQS Metrics
 #
 class JenkinsJQSMetrics < Sensu::Plugin::Metric::CLI::Graphite
-  SKIP_ROOT_KEYS = %w(version)
+  SKIP_ROOT_KEYS = %w(version).freeze
 
   option :scheme,
          description: 'Metric naming scheme',

data/bin/metrics-jenkins.rb

@@ -38,7 +38,7 @@ require 'json'
 # Jenkins Metrics
 #
 class JenkinsMetrics < Sensu::Plugin::Metric::CLI::Graphite
-  SKIP_ROOT_KEYS = %w(version)
+  SKIP_ROOT_KEYS = %w(version).freeze
 
   option :scheme,
          description: 'Metric naming scheme',

data/lib/sensu-plugins-jenkins/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsJenkins
   module Version
-    MAJOR = 0
-    MINOR = 1
+    MAJOR = 1
+    MINOR = 0
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,51 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-jenkins
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDgDCCAmigAwIBAgIBATANBgkqhkiG9w0BAQUFADBDMRIwEAYDVQQDDAltYXR0
-  am9uZXMxGDAWBgoJkiaJk/IsZAEZFgh5aWVsZGJvdDETMBEGCgmSJomT8ixkARkW
-  A2NvbTAeFw0xNTAxMjgyMTAyNTFaFw0xNjAxMjgyMTAyNTFaMEMxEjAQBgNVBAMM
-  CW1hdHRqb25lczEYMBYGCgmSJomT8ixkARkWCHlpZWxkYm90MRMwEQYKCZImiZPy
-  LGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTSzVYnO
-  CLgyrIyT1mBQakArQyW8xhi6MlDqyzXHJGeERT790U6EgoBVeS4XoK0ptFZNR8Tf
-  zko0w+Nv47TarSCgkPOaxY+mxWnAVR10dOmfeLr7huiMyps+YD56/EF2FqQ3jf/+
-  qohENfKD91qy1ieEy+Fn7Pf74ltbNKUdkb9a9eFXQ0DQ4ip5vik7DzjQkUTj4lca
-  k6ArwnmHX4YDhZoYtrQJ8jVktN0/+NtA40M5qkCYHNe5tUW25b/tKVYuioxG6b2Z
-  oIzaZxRLxf6HVAWpCVRT/F5+/yjigkX4u++eYacfLGleXQzoK7BL65vHGMJygWEE
-  0TKGqFOrl/L0AQIDAQABo38wfTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
-  HQ4EFgQUEf6a8Td7MrSZc8ImbLFZAENPbz0wIQYDVR0RBBowGIEWbWF0dGpvbmVz
-  QHlpZWxkYm90LmNvbTAhBgNVHRIEGjAYgRZtYXR0am9uZXNAeWllbGRib3QuY29t
-  MA0GCSqGSIb3DQEBBQUAA4IBAQBbzXAYA3BVGw8DZ0YYoY1VHPNEcH5qPIApmHO8
-  rvSmuUT0yMEi7u00H/5uHRFf4LleGT/+sTdyXKsNPGT9kdRuQEgwi+vf7Zfvd8aX
-  UF/+4VkEYf/8rV8Ere6u2QaWPgApdMV6JjKr1fAwCTd8AuGXNaWItiPPMseSQzLJ
-  JKP4hVvbc1d+oS925B1lcBiqn2aYvElbyNAVmQPywNNqkWmvtlqj9ZVJfV5HQLdu
-  8sHuVruarogxxKPBzlL2is4EUb6oN/RdpGx2l4254+nyR+abg//Ed27Ym0PkB4lk
-  HP0m8WSjZmFr109pE/sVsM5jtOCvogyujQOjNVGN4gz1wwPr
-  -----END CERTIFICATE-----
-date: 2015-12-14 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -89,143 +67,143 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.8'
 description: |-
   This plugin provides native Jenkins instrumentation
                                 for monitoring and metrics collection, including:
                                 health, job status, metrics via `JQS`, and others
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-jenkins.rb
-- metrics-jenkins-jqs.rb
-- check-jenkins.rb
-- check-jenkins-job-status.rb
-- check-jenkins-health.rb
 - check-jenkins-build-time.rb
+- check-jenkins-health.rb
+- check-jenkins-job-status.rb
+- check-jenkins.rb
+- metrics-jenkins-jqs.rb
+- metrics-jenkins.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -258,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -266,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for jenkins

metadata.gz.sig

@@ -1 +0,0 @@
-i�ܛ�*LJC�G=�f&1�#7L?ܨ�V6:g���%4�������#��R3��Bo�EJ��0������h�xG����F�RT�;�F^"��-�yKC�\v�8�@��X�=)$�>�I���[�/c]�Ty��