fauxhai 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274df03ed198e04c66a40ef402c457fa134ff12b1743318d0323b738cca5cba7
-  data.tar.gz: 6421a7904788a9b9acf5bb57a793c0e9890de503aa4868a546ff6a42ce270670
+  metadata.gz: f8758e2957229d8875e474fd7b2cb5c382129421fdc91dbc7ff0047194e7075b
+  data.tar.gz: 316a128aea7f8603ad71599b9770a0c11f9eb85f5a50bd193cd035945abcbb58
 SHA512:
-  metadata.gz: 2aa995c73fd977d2a7256b279508603d12ca6594cdde4fa0c510e62e8142185a51919512e898e27a8c2d4c61f8b7ff80c68645473de8eafff5d2d32a1a39a002
-  data.tar.gz: 7115dba0806a8d5a6261de4bae80960403a3199c7ae2159bd6cb2ece530d9cad9269516fa028500ff7c9c0d0aab7f39f8e7978893ba7e43ffef1c184932910a3
+  metadata.gz: 9b52807f92d14264e5aa1834409c6e364dc10ecfc37b95bab6604e7b88d5ab9834811b02763d54de1e7e7ead7150538462912b0d9f16e55daba63ee3e08aba02
+  data.tar.gz: b0935dce4685b22d5fd4cb88b7042d6a5815e4f4d1eb0054893549d35b90512a2d3285d417cea7afc40cf2565cc362dbe3168e0824977762822b836e903b280d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Fauxhai Changelog
 
+## v6.3.0 (2018-06-11)
+
+New intelligent platform and version matching. This means if you specify the platform centos we'll now automatically match you to the latest version. If you specify the version of 6 we'll automatically match you to 6.9\. This should make it easier to write specs that don't need constant updating as we deprecate dumps of minor versions.
+
 ## v6.2.0 (2018-05-07)
 
 ### New Platforms

data/fauxhai.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'chef', '>= 12.0'
   spec.add_development_dependency 'ohai', '>= 8.5'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
 end

data/lib/fauxhai.rb

@@ -1,8 +1,8 @@
 module Fauxhai
-  require 'fauxhai/exception'
-  require 'fauxhai/fetcher'
-  require 'fauxhai/mocker'
-  require 'fauxhai/version'
+  autoload :Exception, 'fauxhai/exception'
+  autoload :Fetcher, 'fauxhai/fetcher'
+  autoload :Mocker, 'fauxhai/mocker'
+  autoload :VERSION, 'fauxhai/version'
 
   def self.root
     @@root ||= File.expand_path('../../', __FILE__)

data/lib/fauxhai/mocker.rb

@@ -10,9 +10,6 @@ module Fauxhai
     # A message about where to find a list of platforms
     PLATFORM_LIST_MESSAGE = 'A list of available platforms is available at https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md'.freeze
 
-    # @return [Hash] The raw ohai data for the given Mock
-    attr_reader :data
-
     # Create a new Ohai Mock with fauxhai.
     #
     # @param [Hash] options
@@ -28,15 +25,10 @@ module Fauxhai
     def initialize(options = {}, &override_attributes)
       @options = { github_fetching: true }.merge(options)
 
-      @data = fauxhai_data
-      yield(@data) if block_given?
-
-      @data
+      yield(data) if block_given?
     end
 
-    private
-
-    def fauxhai_data
+    def data
       @fauxhai_data ||= lambda do
         # If a path option was specified, use it
         if @options[:path]
@@ -80,6 +72,8 @@ module Fauxhai
       end.call
     end
 
+    private
+
     # As major releases of Ohai ship it's difficult and sometimes impossible
     # to regenerate all fauxhai data. This allows us to deprecate old releases
     # and eventually remove them while giving end users ample warning.
@@ -93,7 +87,7 @@ module Fauxhai
 
     def platform
       @options[:platform] ||= begin
-                                STDERR.puts "WARNING: you must specify a 'platform' and 'version' to your ChefSpec Runner and/or Fauxhai constructor, in the future omitting these will become a hard error. #{PLATFORM_LIST_MESSAGE}"
+                                STDERR.puts "WARNING: you must specify a 'platform' and optionally a 'version' for your ChefSpec Runner and/or Fauxhai constructor, in the future omitting the platform will become a hard error. #{PLATFORM_LIST_MESSAGE}"
                                 'chefspec'
                               end
     end
@@ -103,11 +97,47 @@ module Fauxhai
     end
 
     def version
-      @options[:version] ||= chefspec_version || raise(Fauxhai::Exception::InvalidVersion.new("Platform version not specified. #{PLATFORM_LIST_MESSAGE}"))
-    end
+      @version ||= begin
+        if File.exist?("#{platform_path}/#{@options[:version]}.json")
+          # Whole version, use it as-is.
+          @options[:version]
+        else
+          # Check if it's a prefix of an existing version.
+          versions = Dir["#{platform_path}/*.json"].map {|path| File.basename(path, '.json') }
+          unless @options[:version].to_s == ''
+            # If the provided version is nil or '', that means take anything,
+            # otherwise run the prefix match with an extra \D to avoid the
+            # case where "7.1" matches "7.10.0".
+            prefix_re = /^#{Regexp.escape(@options[:version])}\D/
+            versions.select! {|ver| ver =~ prefix_re }
+          end
 
-    def chefspec_version
-      platform == 'chefspec' ? '0.6.1' : nil
+          if versions.empty?
+            # No versions available, either an unknown platform or nothing matched
+            # the prefix check. Pass through the option as given so we can try
+            # github fetching.
+            @options[:version]
+          else
+            # Take the highest version available, trying to use rules that should
+            # probably mostly work on all OSes. Famous last words. The idea of
+            # the regex is to split on any punctuation (the common case) and
+            # also any single letter with digit on either side (2012r2). This
+            # leaves any long runs of letters intact (4.2-RELEASE). Then convert
+            # any run of digits to an integer to get version-ish comparison.
+            # This is basically a more flexible version of Gem::Version.
+            versions.max_by do |ver|
+              ver.split(/[^a-z0-9]|(?<=\d)[a-z](?=\d)/i).map do |part|
+                if part =~ /^\d+$/
+                  part.to_i
+                else
+                  part
+                end
+              end
+            end
+          end
+        end
+      end
     end
+
   end
 end

data/lib/fauxhai/version.rb

@@ -1,3 +1,3 @@
 module Fauxhai
-  VERSION = '6.2.0'.freeze
+  VERSION = '6.3.0'.freeze
 end

data/spec/mocker_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe Fauxhai::Mocker do
+  describe "#data" do
+    let(:options) { {} }
+    subject { described_class.new({github_fetching: false}.merge(options)).data }
+
+    context 'with a platform and version' do
+      let(:options) { {platform: 'chefspec', version: '0.6.1'} }
+      its(['hostname']) { is_expected.to eq 'chefspec' }
+    end
+
+    context 'with a Windows platform and version' do
+      let(:options) { {platform: 'windows', version: '10'} }
+      its(['hostname']) { is_expected.to eq 'Fauxhai' }
+    end
+  end
+
+  describe '#version' do
+    let(:options) { {} }
+    subject { described_class.new({github_fetching: false}.merge(options)).send(:version) }
+
+    context 'with a platform and version' do
+      let(:options) { {platform: 'chefspec', version: '0.6.1'} }
+      it { is_expected.to eq '0.6.1' }
+    end
+
+    context 'with a platform and no version' do
+      let(:options) { {platform: 'chefspec'} }
+      it { is_expected.to eq '0.6.1' }
+    end
+
+    context 'with a platform and a blank version' do
+      let(:options) { {platform: 'chefspec', version: ''} }
+      it { is_expected.to eq '0.6.1' }
+    end
+
+    context 'with a platform and a partial version' do
+      let(:options) { {platform: 'chefspec', version: '0.6'} }
+      it { is_expected.to eq '0.6.1' }
+    end
+
+    context 'with a platform and a non-matching partial version' do
+      let(:options) { {platform: 'chefspec', version: '0.7'} }
+      it { is_expected.to eq '0.7' }
+    end
+
+    context 'with a Windows platform and no version' do
+      let(:options) { {platform: 'windows'} }
+      it { is_expected.to eq '2016' }
+    end
+
+    context 'with a Windows platform and a partial version' do
+      let(:options) { {platform: 'windows', version: '2008'} }
+      it { is_expected.to eq '2008R2' }
+    end
+
+    context 'with a Windows platform and an exact partial version' do
+      let(:options) { {platform: 'windows', version: '2012'} }
+      it { is_expected.to eq '2012' }
+    end
+
+    context 'with a CentOS platform and a partial version' do
+      let(:options) { {platform: 'centos', version: '6'} }
+      it { is_expected.to eq '6.9' }
+    end
+
+    context 'with a platform and an invalid version' do
+      let(:options) { {platform: 'chefspec', version: '99'} }
+      it { is_expected.to eq '99' }
+    end
+
+    context 'with an invalid platform and an invalid version' do
+      let(:options) { {platform: 'notthere', version: '99'} }
+      it { is_expected.to eq '99' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+require 'rspec'
+require 'rspec/its'
+require 'fauxhai'
+
+RSpec.configure do |config|
+  # Basic configuraiton
+  config.run_all_when_everything_filtered = true
+  config.filter_run(:focus)
+  config.add_formatter('documentation')
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+  config.seed = ENV['SEED'].to_i if ENV['SEED']
+
+  # Enable full backtrace if $DEBUG is set.
+  config.full_backtrace = true if ENV['DEBUG']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fauxhai
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Easily mock out ohai data
 email:
 - sethvargo@gmail.com
@@ -194,6 +222,8 @@ files:
 - lib/fauxhai/runner/default.rb
 - lib/fauxhai/runner/windows.rb
 - lib/fauxhai/version.rb
+- spec/mocker_spec.rb
+- spec/spec_helper.rb
 - tmp/.gitkeep
 homepage: https://github.com/chefspec/fauxhai
 licenses:
@@ -220,4 +250,6 @@ signing_key:
 specification_version: 4
 summary: Fauxhai provides an easy way to mock out your ohai data for testing with
   chefspec!
-test_files: []
+test_files:
+- spec/mocker_spec.rb
+- spec/spec_helper.rb