poise-monit 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6d5bb865abb7d614f50d0688d4eb2938fe87007
-  data.tar.gz: 5735c8757230cb75f30c2633a0a6d136ff1dffc7
+  metadata.gz: 07ff0116df0ba8f85dd624148cfbf3439b3189d3
+  data.tar.gz: 34f52b07a049dbcd0b40955cb7b27453c07670a8
 SHA512:
-  metadata.gz: 5785034c296f4aa66c41fdcb61f2ca763513d5638d960fe130ae6a6b25ba000359eaa02a42d4c1e034f154e52a768ff388fe6ce2e2b18e48bd08307a21bc4812
-  data.tar.gz: 4527c6dda84d8b3482fbcaa92980286482ff8bb04220772f567c4452ff7b04576896daf05dcc45714611f25ad8fc5072753b067fc64cafbda9b795fd4133cad9
+  metadata.gz: 761460bd6768bedb0a30a33f048004b1939a6ee02fc2bcccb6466588d69cf09c412dc7b006db94724e80fe918734e7d19b6694e81b74e053a5114835f1979ecf
+  data.tar.gz: 5b06b17af6e9411ac51004ed178650502a953bc22bdaf739850644db925973207097c645cae495b86f7c4be6c0197b37f558cbcea18ea4ef0209695ffbecbcef

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Monit Changelog
 
+## v1.3.0
+
+* More complete `:dummy` provider for weird install conditions.
+
 ## v1.2.1
 
 * Fix static binary URLs for recent versions of Monit on AIX.

data/README.md

@@ -238,6 +238,10 @@ monit 'monit' do
 end
 ```
 
+#### Provider Options
+
+* `monit_binary` – Path to the `monit` executable. *(default: /usr/bin/monit)*
+
 ## Service Provider
 
 The `monit` service provider is included to allow [`poise_service` resources](https://github.com/poise/poise-service)

data/lib/poise_monit/monit_providers/dummy.rb

@@ -24,6 +24,15 @@ module PoiseMonit
     class Dummy < Base
       provides(:dummy)
 
+      # Manual overrides for dummy data.
+      #
+      # @api private
+      def self.default_inversion_options(node, resource)
+        super.merge({
+          monit_binary: '/usr/bin/monit',
+        })
+      end
+
       # Enable by default on ChefSpec.
       #
       # @api private
@@ -35,8 +44,7 @@ module PoiseMonit
       #
       # @return [String]
       def monit_binary
-        # Until I run into a counter example, probably always true.
-        '/bin/monit'
+        options['monit_binary']
       end
 
       private

data/lib/poise_monit/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseMonit
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/test/spec/monit_providers/dummy_spec.rb

@@ -29,7 +29,7 @@ describe PoiseMonit::MonitProviders::Dummy do
   describe '#monit_binary' do
     subject { monit_resource.monit_binary }
 
-    it { is_expected.to eq '/bin/monit' }
+    it { is_expected.to eq '/usr/bin/monit' }
   end # /describe #monit_binary
 
   describe 'action :enable' do

data/test/spec/resources/monit_service_spec.rb

@@ -43,7 +43,7 @@ describe PoiseMonit::Resources::MonitService do
     else
       allow(fake_cmd).to receive(:error!)
     end
-    matcher = receive(:poise_shell_out).with(['/bin/monit', (verbose ? '-v' : []), '-c', '/etc/monit/monitrc', cmd, 'myapp'].flatten, user: nil, group: nil).and_return(fake_cmd).ordered
+    matcher = receive(:poise_shell_out).with(['/usr/bin/monit', (verbose ? '-v' : []), '-c', '/etc/monit/monitrc', cmd, 'myapp'].flatten, user: nil, group: nil).and_return(fake_cmd).ordered
     matcher = block.call(matcher) if block
     expect(test_provider).to matcher
   end

data/test/spec/resources/monit_spec.rb

@@ -24,7 +24,7 @@ describe PoiseMonit::Resources::Monit do
     # Force the default log level because it alters the tests.
     chefspec_options.delete(:log_level)
     allow_any_instance_of(described_class::Resource).to receive(:shell_out).and_call_original
-    allow_any_instance_of(described_class::Resource).to receive(:shell_out).with(%w{/bin/monit -V}).and_return(monit_version_cmd)
+    allow_any_instance_of(described_class::Resource).to receive(:shell_out).with(%w{/usr/bin/monit -V}).and_return(monit_version_cmd)
   end
   def service_resource(name)
     chef_run.monit(name).provider_for_action(:enable).send(:service_resource)
@@ -56,7 +56,7 @@ EOH
     it { is_expected.to create_directory('/etc/monit/conf.d') }
     it { is_expected.to create_directory('/var/lib/monit') }
     it { is_expected.to create_directory('/var/lib/monit/events') }
-    it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120' }
+    it { expect(service_resource('monit').command).to eq '/usr/bin/monit -c /etc/monit/monitrc -I -d 120' }
 
     context 'with a different name' do
       recipe do
@@ -84,7 +84,7 @@ EOH
       it { is_expected.to create_directory('/etc/monit-other/conf.d') }
       it { is_expected.to create_directory('/var/lib/monit-other') }
       it { is_expected.to create_directory('/var/lib/monit-other/events') }
-      it { expect(service_resource('other').command).to eq '/bin/monit -c /etc/monit-other/monitrc -I -d 120' }
+      it { expect(service_resource('other').command).to eq '/usr/bin/monit -c /etc/monit-other/monitrc -I -d 120' }
     end # /context with a different name
 
     context 'with daemon_delay 0' do
@@ -112,7 +112,7 @@ SET HTTPD UNIXSOCKET /var/run/monit.sock
 
 INCLUDE /etc/monit/conf.d/*
 EOH
-      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I' }
+      it { expect(service_resource('monit').command).to eq '/usr/bin/monit -c /etc/monit/monitrc -I' }
     end # /context with daemon_delay 0
 
     context 'with daemon_delay 5' do
@@ -141,7 +141,7 @@ SET HTTPD UNIXSOCKET /var/run/monit.sock
 
 INCLUDE /etc/monit/conf.d/*
 EOH
-      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I' }
+      it { expect(service_resource('monit').command).to eq '/usr/bin/monit -c /etc/monit/monitrc -I' }
     end # /context with daemon_delay 5
 
     context 'with 0 events slots' do
@@ -171,7 +171,7 @@ EOH
         end
       end
 
-      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
+      it { expect(service_resource('monit').command).to eq '/usr/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
     end # /context with daemon_verbose
 
     context 'with log_level debug' do
@@ -182,7 +182,7 @@ EOH
         allow(Chef::Log).to receive(:debug)
       end
 
-      it { expect(service_resource('monit').command).to eq '/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
+      it { expect(service_resource('monit').command).to eq '/usr/bin/monit -c /etc/monit/monitrc -I -d 120 -v' }
     end # /context with log_level debug
   end # /context action :enable
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-monit
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite