rspec

Author: lucadevitis-msm

.gitignore

@@ -1,9 +1,9 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

Gemfile

@@ -1,10 +1,12 @@
 gemspec
 source 'https://rubygems.org' do
-  gem 'rake'
+  gem 'sensu-plugin'
   group :development do
     gem 'rubocop'
     gem 'rspec'
     gem 'coveralls'
+    gem 'bundler', '~> 1.11'
+    gem 'rake', '~> 10.0'
   end
   group :docs do
     gem 'yard'

Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    puppetfiles (0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    coveralls (0.8.13)
+      json (~> 1.8)
+      simplecov (~> 0.11.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6.0)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    json (1.8.3)
+    mixlib-cli (1.6.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
+    sensu-plugin (1.3.0)
+      json
+      mixlib-cli (>= 1.5.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
+    tins (1.6.0)
+    unicode-display_width (1.1.0)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.11)!
+  coveralls!
+  puppetfiles!
+  rake (~> 10.0)!
+  rspec!
+  rubocop!
+  sensu-plugin!
+  yard!
+
+BUNDLED WITH
+   1.12.5

bin/puppetfiles-update-module.rb

@@ -1,4 +1,4 @@
-# rubocop:disable Style/FileName
+#!ruby
 # @author Luca De Vitis <luca.devitis at moneysupermarket.com>
 require 'sensu-plugin/check/cli'
 require 'puppetfiles/bin/update_module'
@@ -23,4 +23,18 @@ class PuppetfilesUpdateModule < Sensu::Plugin::CLI
          long: '--set-option-ref REF',
          description: 'Set module git ref string',
          required: false
+
+  option :help,
+         long: '--help',
+         description: 'Show this message',
+         on: :tail,
+         boolean: true,
+         show_options: true,
+         exit: 0
+  def output(*args)
+    puts "#{self.class.name}: " + args.join(' ')
+  end
+  def run
+    main
+  end
 end

lib/puppetfiles/bin/update_module.rb

@@ -9,18 +9,18 @@ module Bin
     # Update 1 module details in all provided puppetfiles that contain it
     module UpdateModule
       # Run the module update
-      def run
+      def main
         mod = argv.first
         files = argv.drop(1)
         version = config[:version]
         keys = [:git, :ref]
         options = keys.map { |k| [k, config[k]] if config[k] }.compact.to_h
         ::Puppetfiles.load files
         ::Puppetfiles.update mod, version, options
-        loaded = ::Puppetfiles.loaded.count
+        count = ::Puppetfiles.loaded.count
         updated = ::Puppetfiles.loaded.count
         ::Puppetfiles.save
-        ok "#{loaded} Puppetfiles, `#{mod}' updated on #{updated}"
+        ok "#{count} Puppetfiles loaded, `#{mod}' updated on #{updated}"
       end
     end
   end

puppetfiles.gemspec

@@ -24,7 +24,4 @@ Gem::Specification.new do |spec|
   spec.bindir = 'bin'
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
 end

spec/bin/update_module_spec.rb

@@ -45,7 +45,7 @@ def output(msg = nil)
       UpdateModule.new([mod1[:name], puppetfile.path], version: value)
     end
     it 'should update module version' do
-      expect { script.run }.to raise_error(SystemExit)
+      expect { script.main }.to raise_error(SystemExit)
       expect(script.status).to eq(0)
       loaded = ::Puppetfiles.load [puppetfile.path]
       found = loaded.first[:modules].find { |m| m[:name] == mod1[:name] }
@@ -59,7 +59,7 @@ def output(msg = nil)
         UpdateModule.new([mod2[:name], puppetfile.path], name => value)
       end
       it "should update module option `:#{name}`" do
-        expect { script.run }.to raise_error(SystemExit)
+        expect { script.main }.to raise_error(SystemExit)
         expect(script.status).to eq(0)
         loaded = ::Puppetfiles.load [puppetfile.path]
         found = loaded.first[:modules].find { |m| m[:name] == mod2[:name] }