vagrant-serverspec 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57204d1d8fb236c49d49df0faf38e220f0678f31
-  data.tar.gz: 05e3709aa15d9976e98e5f056e5531fc3182ffd1
+  metadata.gz: 65483a9e7c94f56f1c4f258cd9cd769e0b1b2e4a
+  data.tar.gz: 8c26e878a228aed6398d33aa803e2ff9d60d31dc
 SHA512:
-  metadata.gz: 4d48d4a935352e481fd189dab8c2cc5fc84888e21ac46904cd0e53ac50d6d3ef99cf7a913aa80e4bc63c9548ae5cf58f34f1fa7163c2fc69f212af08f9f33e7e
-  data.tar.gz: 38147000f3642bd699f10e2e8029420900fbf092a524d3936aae911f5992d9d1f673e0ecb5c1489c375fc1895a4a055e7d16687c6b27d0d804116321a4562944
+  metadata.gz: c3a241aa690d2ff2148aa21500195e700cc7febbe1d74baad959f091d7e2ed76a4bd3eaae9d4b3ba1007bf8718eb1a86731e63ac9f124f9b3e87b3898a0f22af
+  data.tar.gz: 18b81cb4445213f3f99ac3d7596aa2919859d6ef87cfd4a25973914bfcb94bb65a761845a68d66115a69e8415c396d334924c8fb90276220dc5dffe69e952676

data/README.md

@@ -42,7 +42,12 @@ Vagrant.configure('2') do |config|
   EOF
 
   config.vm.provision :serverspec do |spec|
+    # pattern for specfiles to search
     spec.pattern = '*_spec.rb'
+    # disable error if no specfile was found ( usefull with dynamic specfile retrieving through another provisionner like Ansible Galaxy => specfiles can be saved into ansible role repository for example ). Default: true
+    spec.error_no_spec_files = false
+    # save result into html an report, saved into a 'rspec_html_reports' directory. Default: false
+    spec.html_output = true
   end
 end
 ```

data/WINDOWS_README.md

@@ -34,7 +34,13 @@ Vagrant.configure("2") do |config|
     config.vm.network :forwarded_port, guest: 22, host: 2222, id: "ssh", auto_correct: true
 
   config.vm.provision :serverspec do |spec|
+    # pattern for specfiles to search
     spec.pattern = '*_spec.rb'
+    # disable error if no specfile was found ( usefull with dynamic specfile retrieving through another provisionner like Ansible Galaxy => specfiles can be saved into ansible role repository for example ). Default: true
+    spec.error_no_spec_files = false
+    # save result into html an report, saved into a 'rspec_html_reports' directory. Default: false
+    spec.html_output = true
+
   end
 
 end

data/lib/vagrant-serverspec/config.rb

@@ -2,18 +2,38 @@ module VagrantPlugins
   module ServerSpec
     class Config < Vagrant.plugin('2', :config)
       attr_accessor :spec_files
+      attr_accessor :spec_pattern
+      attr_accessor :error_no_spec_files_found
+      attr_accessor :html_output_format
 
       def initialize
         super
         @spec_files = UNSET_VALUE
+        @html_output_format = UNSET_VALUE
+        @error_no_spec_files_found = UNSET_VALUE
       end
 
       def pattern=(pat)
         @spec_files = Dir.glob(pat)
+        @spec_pattern = pat
+      end
+
+      def error_no_spec_files=(warn_spec)
+        if [true, false].include? warn_spec
+          @error_no_spec_files_found = warn_spec
+        end
+      end
+
+      def html_output=(html_out)
+        if [true, false].include? html_out
+          @html_output_format = html_out
+        end
       end
 
       def finalize!
         @spec_files = [] if @spec_files == UNSET_VALUE
+        @html_output_format = false if @html_output_format == UNSET_VALUE
+        @error_no_spec_files_found = true if @error_no_spec_files_found == UNSET_VALUE
       end
 
       def validate(machine)
@@ -28,7 +48,9 @@ module VagrantPlugins
           errors << I18n.t('vagrant.config.serverspec.missing_spec_files', files: missing_files.join(', '))
         end
 
-        { 'serverspec provisioner' => errors }
+        if @error_no_spec_files_found
+          { 'serverspec provisioner' => errors }
+        end
       end
     end
   end

data/lib/vagrant-serverspec/error.rb

@@ -3,5 +3,11 @@ module Vagrant
     class ServerSpecFailed < VagrantError
       error_key(:serverspec_failed)
     end
+    class ServerSpecFailedHtml < VagrantError
+      error_key(:serverspec_failed_html)
+    end
+    class ServerSpecFilesNotFound < VagrantError
+      error_key(:serverspec_filesnotfound)
+    end
   end
 end

data/lib/vagrant-serverspec/provisioner.rb

@@ -7,6 +7,8 @@ module VagrantPlugins
       def initialize(machine, config)
         super
         @spec_files = config.spec_files
+        @spec_pattern = config.spec_pattern
+        @error_no_spec_files_found = config.error_no_spec_files_found
       end
 
       def provision
@@ -66,9 +68,32 @@ module VagrantPlugins
         # same process
         RSpec.clear_examples
 
-        status = RSpec::Core::Runner.run(@spec_files)
-
-        raise Vagrant::Errors::ServerSpecFailed if status != 0
+        @spec_files = Dir.glob(@spec_pattern)
+        raise Vagrant::Errors::ServerSpecFilesNotFound if @spec_files.length == 0 and @error_no_spec_files_found
+
+        if config.html_output_format
+          require 'json'
+          require 'rspec'
+          require 'rspec_html_formatter'
+          config_rspec = RSpec.configuration
+          formatter = RspecHtmlFormatter.new(config_rspec.output_stream)
+
+          # create reporter with RspecHtmlFormatter
+          reporter =  RSpec::Core::Reporter.new(config_rspec)
+          config_rspec.instance_variable_set(:@reporter, reporter)
+
+          # api may not be stable, make sure lock down Rspec version
+          loader = config_rspec.send(:formatter_loader)
+          notifications = loader.send(:notifications_for, RspecHtmlFormatter)
+          reporter.register_listener(formatter, *notifications)
+	        
+          status = RSpec::Core::Runner.run(@spec_files)
+          raise Vagrant::Errors::ServerSpecFailedHtml if status != 0
+        else
+          status = RSpec::Core::Runner.run(@spec_files)
+          raise Vagrant::Errors::ServerSpecFailed if status != 0
+        end
+        
       end
 
       private

data/lib/vagrant-serverspec/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServerSpec
-    VERSION = '1.2'
+    VERSION = '1.3'
   end
 end

data/locales/en.yml

@@ -11,3 +11,9 @@ en:
       serverspec_failed: |-
         ServerSpec failed to complete successfully. Any error output should be
         visible above. Please fix these errors and try again.
+      serverspec_failed_html: |-
+        ServerSpec failed to complete successfully. Any error output should be
+        visible above. Please fix these errors and try again. Please look into 'rspec_html_reports'
+        directory to see errors into 'overview.html' file
+      serverspec_filesnotfound: |-
+        ServerSpec failed to find any spec files.

data/vagrant-serverspec.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   #add onlly dependencies for winrm without nokogiri
   gem.add_runtime_dependency 'winrm', '~> 2.1', '>= 2.1'
   gem.add_runtime_dependency 'os', '~> 0.9.6'
+  gem.add_runtime_dependency 'rspec_html_formatter', '~> 0.3', '>= 0.3.1'
   
   gem.add_development_dependency 'bundler', '~> 1.6', '>= 1.6.2'
   gem.add_development_dependency 'rake', '~> 10.3', '>= 10.3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serverspec
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Jeremy Voorhis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -64,6 +64,26 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: rspec_html_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement