poise-monit 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -0
  3. data/CHANGELOG.md +4 -0
  4. data/Gemfile +1 -1
  5. data/lib/poise_monit/monit_providers/binaries.rb +7 -3
  6. data/lib/poise_monit/version.rb +1 -1
  7. data/poise-monit.gemspec +1 -1
  8. data/test/gemfiles/master.gemfile +1 -1
  9. data/test/spec/monit_providers/binaries_spec.rb +24 -9
  10. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f47b9d1c32a3af42021e1a8b7cdb98c39e00f4e8
4
- data.tar.gz: 9ff65baa3d1da13f8987c783877aba69ac8cdcd6
3
+ metadata.gz: f6d5bb865abb7d614f50d0688d4eb2938fe87007
4
+ data.tar.gz: 5735c8757230cb75f30c2633a0a6d136ff1dffc7
5
5
  SHA512:
6
- metadata.gz: d7e83a4af5eedb1c12a6fb3fcd95abda4513dc74fa1210736a17afed1131433a42afa7c50888d31406d0f60c1d1d84c9aa68fb4f16a98c44360e828ab992230a
7
- data.tar.gz: 425505c36a7d6e2931db851fb6c7d11c638c397cc3d5e920f13e6d0cc12b0cc771ceb3e8d43f78cb5af60369b906d1e688e0c1f58f514beacffec86dd159ca52
6
+ metadata.gz: 5785034c296f4aa66c41fdcb61f2ca763513d5638d960fe130ae6a6b25ba000359eaa02a42d4c1e034f154e52a768ff388fe6ce2e2b18e48bd08307a21bc4812
7
+ data.tar.gz: 4527c6dda84d8b3482fbcaa92980286482ff8bb04220772f567c4452ff7b04576896daf05dcc45714611f25ad8fc5072753b067fc64cafbda9b795fd4133cad9
data/.travis.yml CHANGED
@@ -12,6 +12,7 @@ env:
12
12
  global:
13
13
  - USE_SYSTEM_GECODE=true
14
14
  - secure: l7GLeLWfqrrkxpc1R9gLasQP7W5MKZztoDGtTMs3itwfgmuA+HRuaex8vUDPxVHVKCdzu9Xhr56IqkVkDcXyasIyfNM2PKPW45qNLTx9dxes3ZnovNQgSuULD4YQOgVnJsSpM530zeNh+1j2tTiMrJW/+A0vCDc54L6FqsNu43XYT40wvRNR1q/DodvWhZFzPBJJ4CZSfjvQWdhXlR6r/vnqX7TeS0j8icBhA8V3nbGqT1YqblFYb6zkJTsf+SaV7XoSiprPp1tgaiKniT4wxGsLffkTnbY7biYC+ZnroUfVjxMoQqhl/0soO9bsJ6i6/6jpAFH9jruPDOnTPAXf+noSwJyxymGZZItvieXbTHsc7Pjg0hR0+4QeQEDISgXfLEZ1nyeAriAXyOXvZl36KQ2bCXEpS2x7xhhV2cbNTBB1q0RhfHb9PCKkyFgJF1M/AC3M/H9R7b4js+lKsJCJACpMKuvuiT1l8zxkl1zi7PnIqYFhBFqXZ9wD0/I7hLToehaPWrcCnjZiUfIAsoeV/O6wSqY4PcDRgBqGqaidoj3xNnhmhAGK9vbT1A+jW//QQQZJ2xFbPUvR4ThAk5h2jJEhdzd0YamqUBO2DGaXfp4Hf+VfAlGtDkcpvMf1E6tvJ0kX9l0FTOdAq5HwhDYS7tyJ8nBix9WKnFZbowmHB3Q=
15
+ before_install: "gem install bundler"
15
16
  bundler_args: "--binstubs=$PWD/bin --jobs 3 --retry 3"
16
17
  script:
17
18
  - "./bin/rake travis"
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Poise-Monit Changelog
2
2
 
3
+ ## v1.2.1
4
+
5
+ * Fix static binary URLs for recent versions of Monit on AIX.
6
+
3
7
  ## v1.2.0
4
8
 
5
9
  * New resource `monit_check` for more easily creating service checks.
data/Gemfile CHANGED
@@ -30,7 +30,7 @@ end
30
30
  dev_gem 'halite'
31
31
  dev_gem 'poise'
32
32
  dev_gem 'poise-boiler'
33
- dev_gem 'poise-languages'
33
+ dev_gem 'poise-languages', github: 'poise/poise-languages'
34
34
  dev_gem 'poise-profiler'
35
35
  dev_gem 'poise-service'
36
36
 
data/lib/poise_monit/monit_providers/binaries.rb CHANGED
@@ -30,7 +30,7 @@ module PoiseMonit
30
30
  provides(:binaries)
31
31
  include PoiseLanguages::Static(
32
32
  name: 'monit',
33
- versions: %w{5.16},
33
+ versions: %w{5.17.1},
34
34
  machines: %w{aix5.3-ppc aix6.1-ppc freebsd-x64 freebsd-x86 linux-x64 linux-x86 linux-arm macosx-universal openbsd-x64 openbsd-x86 solaris-sparc solaris-x64},
35
35
  url: 'https://bitbucket.org/tildeslash/monit/downloads/monit-%{version}-%{machine_label}.tar.gz'
36
36
  )
@@ -61,7 +61,7 @@ module PoiseMonit
61
61
  # Compute the machine label in the format Monit uses.
62
62
  #
63
63
  # @api private
64
- def self.static_machine_label(node)
64
+ def self.static_machine_label(node, resource=nil)
65
65
  # Get the machine type in the format Monit uses.
66
66
  raw_machine = (node['kernel']['machine'] || 'unknown').downcase
67
67
  machine = MACHINE_ALIASES.fetch(raw_machine, raw_machine)
@@ -70,10 +70,14 @@ module PoiseMonit
70
70
  raw_kernel = (node['kernel']['name'] || 'unknown').downcase
71
71
  kernel = case raw_kernel
72
72
  when 'aix'
73
+ # Monit 5.16 and higher just use "aix". If we don't have a version,
74
+ # assume it's going to be the latest version.
75
+ if !resource || !resource.version || ::Gem::Version.create(resource.version) >= ::Gem::Version.create('5.16')
76
+ 'aix'
73
77
  # Less correct than "aix#{node['kernel']['version']}.#{node['kernel']['release']}"
74
78
  # but more likely to work on more systems. Notably we think the 6.1
75
79
  # build should work on AIX 7 just fine.
76
- if node['kernel']['version'].to_i <= 5
80
+ elsif node['kernel']['version'].to_i <= 5
77
81
  'aix5.3'
78
82
  else
79
83
  'aix6.1'
data/lib/poise_monit/version.rb CHANGED
@@ -16,5 +16,5 @@
16
16
 
17
17
 
18
18
  module PoiseMonit
19
- VERSION = '1.2.0'
19
+ VERSION = '1.2.1'
20
20
  end
data/poise-monit.gemspec CHANGED
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
35
35
 
36
36
  spec.add_dependency 'halite', '~> 1.1'
37
37
  spec.add_dependency 'poise', '~> 2.6'
38
- spec.add_dependency 'poise-languages', '~> 1.3'
38
+ spec.add_dependency 'poise-languages', '~> 1.4'
39
39
  spec.add_dependency 'poise-service', '~> 1.1'
40
40
 
41
41
  spec.add_development_dependency 'berkshelf', '~> 4.0'
data/test/gemfiles/master.gemfile CHANGED
@@ -20,6 +20,6 @@ gem 'chef', github: 'chef/chef'
20
20
  gem 'halite', github: 'poise/halite'
21
21
  gem 'poise', github: 'poise/poise'
22
22
  gem 'poise-boiler', github: 'poise/poise-boiler'
23
- gem 'poise-languages', github: 'poise/poise-languages'
23
+ # gem 'poise-languages', github: 'poise/poise-languages'
24
24
  gem 'poise-profiler', github: 'poise/poise-profiler'
25
25
  gem 'poise-service', github: 'poise/poise-service'
data/test/spec/monit_providers/binaries_spec.rb CHANGED
@@ -37,7 +37,7 @@ describe PoiseMonit::MonitProviders::Binaries do
37
37
  end
38
38
 
39
39
  context 'with no version' do
40
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x64.tar.gz'
40
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-linux-x64.tar.gz'
41
41
  end # /context with no version
42
42
 
43
43
  context 'with version 5.14' do
@@ -58,39 +58,54 @@ describe PoiseMonit::MonitProviders::Binaries do
58
58
 
59
59
  context 'on CentOS 7' do
60
60
  let(:chefspec_options) { {platform: 'centos', version: '7.0'} }
61
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x64.tar.gz'
61
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-linux-x64.tar.gz'
62
62
  end # /context on CentOS 7
63
63
 
64
64
  context 'on Fedora 18 (x86)' do
65
65
  let(:chefspec_options) { {platform: 'fedora', version: '18'} }
66
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-linux-x86.tar.gz'
66
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-linux-x86.tar.gz'
67
67
  end # /context on Fedora 18 (x86)
68
68
 
69
69
  context 'on AIX 5' do
70
70
  # Fauxhai doesn't have AIX 5 data, so fake it.
71
71
  let(:chefspec_options) { {platform: 'aix', version: '6.1'} }
72
72
  before { chef_runner.node.automatic['kernel']['version'] = 5 }
73
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix5.3-ppc.tar.gz'
73
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-aix-ppc.tar.gz'
74
+
75
+ context 'with Monit 5.15' do
76
+ let(:monit_version) { '5.15' }
77
+ it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-aix5.3-ppc.tar.gz'
78
+ end # /context with Monit 5.15
74
79
  end # /context on AIX 5
75
80
 
76
81
  context 'on AIX 6' do
77
82
  let(:chefspec_options) { {platform: 'aix', version: '6.1'} }
78
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix6.1-ppc.tar.gz'
83
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-aix-ppc.tar.gz'
84
+
85
+ context 'with Monit 5.15' do
86
+ let(:monit_version) { '5.15' }
87
+ it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-aix6.1-ppc.tar.gz'
88
+ end # /context with Monit 5.15
79
89
  end # /context on AIX 6
80
90
 
81
91
  context 'on AIX 7' do
82
92
  let(:chefspec_options) { {platform: 'aix', version: '7.1'} }
83
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-aix6.1-ppc.tar.gz'
93
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-aix-ppc.tar.gz'
94
+
95
+ context 'with Monit 5.15' do
96
+ let(:monit_version) { '5.15' }
97
+ it_behaves_like 'binaries provider', 'monit-5.15', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.15-aix6.1-ppc.tar.gz'
98
+ end # /context with Monit 5.15
84
99
  end # /context on AIX 7
85
100
 
86
101
  context 'on Solaris 5.11' do
87
102
  let(:chefspec_options) { {platform: 'solaris2', version: '5.11'} }
88
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-solaris-x64.tar.gz'
103
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-solaris-x64.tar.gz'
89
104
  end # /context on Solaris 5.11
90
105
 
91
106
  context 'on OS X 10.11.1' do
92
107
  let(:chefspec_options) { {platform: 'mac_os_x', version: '10.11.1'} }
93
- it_behaves_like 'binaries provider', 'monit-5.16', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.16-macosx-universal.tar.gz'
108
+ it_behaves_like 'binaries provider', 'monit-5.17.1', 'https://bitbucket.org/tildeslash/monit/downloads/monit-5.17.1-macosx-universal.tar.gz'
94
109
  end # /context on OS X 10.11.1
95
110
 
96
111
  context 'action :disable' do
@@ -102,6 +117,6 @@ describe PoiseMonit::MonitProviders::Binaries do
102
117
  end
103
118
  end
104
119
 
105
- it { is_expected.to uninstall_poise_languages_static('/opt/monit-5.16') }
120
+ it { is_expected.to uninstall_poise_languages_static('/opt/monit-5.17.1') }
106
121
  end # /context action :disable
107
122
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: poise-monit
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Noah Kantrowitz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-27 00:00:00.000000000 Z
11
+ date: 2016-03-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: halite
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '1.3'
47
+ version: '1.4'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '1.3'
54
+ version: '1.4'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: poise-service
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
179
179
  version: '0'
180
180
  requirements: []
181
181
  rubyforge_project:
182
- rubygems_version: 2.5.2
182
+ rubygems_version: 2.6.2
183
183
  signing_key:
184
184
  specification_version: 4
185
185
  summary: A Chef cookbook for managing the Monit process manager.