fauxhai 4.1.0 → 5.0.0

data/lib/fauxhai/platforms/windows/8.json

@@ -1,4 +1,5 @@
 {
+  "deprecated": true,
   "chef_packages": {
     "chef": {
       "version": "12.13.37",

data/lib/fauxhai/runner.rb

@@ -18,12 +18,12 @@ module Fauxhai
 
       result = @system.data.dup.delete_if { |k, v| !whitelist_attributes.include?(k) }.merge(
         'languages' => languages,
-        'chef_packages' => chef_packages,
         'counters' => counters,
         'current_user' => current_user,
         'domain' => domain,
         'etc' => etc,
         'hostname' => hostname,
+        'machinename' => hostname,
         'fqdn' => fqdn,
         'ipaddress' => ipaddress,
         'keys' => keys,
@@ -31,12 +31,15 @@ module Fauxhai
         'network' => network,
         'uptime' => uptime,
         'uptime_seconds' => uptime_seconds,
+        'idle' => uptime,
+        'idletime_seconds' => uptime_seconds,
         'cpu' => cpu,
         'memory' => memory,
-        'virtualization' => virtualization
+        'virtualization' => virtualization,
+        'time' => time
       )
 
-      puts JSON.pretty_generate(result)
+      puts JSON.pretty_generate(result.sort.to_h)
     end
   end
 end

data/lib/fauxhai/runner/default.rb

@@ -5,52 +5,52 @@ module Fauxhai
         '/usr/local/bin'
       end
 
-      def chef_packages
-        return {} if @system.data['chef_packages'].nil?
-
-        chef_version = @system.data['chef_packages']['chef']['version']
-        ohai_version = @system.data['chef_packages']['ohai']['version']
-
-        {
-          'chef' => {
-            'version' => chef_version,
-            'chef_root' => ['/opt/chef/embedded/lib/ruby/gems/2.1.0/gems', "chef-#{chef_version}", 'lib'].join('/')
-          },
-          'ohai' => {
-            'version' => ohai_version,
-            'ohai_root' => ['/opt/chef/embedded/lib/ruby/gems/2.1.0/gems', "ohai-#{ohai_version}", 'lib', 'ohai'].join('/')
-          }
-        }
-      end
-
       def counters
         {
           'network' => {
             'interfaces' => {
-              'eth0' => {
+              'lo' => {
+                'tx' => {
+                  'queuelen' => '1',
+                  'bytes' =>  0,
+                  'packets' =>  0,
+                  'errors' =>  0,
+                  'drop' =>  0,
+                  'carrier' => 0,
+                  'collisions' => 0,
+                },
+                'rx' =>  {
+                  'bytes' => 0,
+                  'packets' => 0,
+                  'errors' => 0,
+                  'drop' => 0,
+                  'overrun' => 0,
+                },
+              },
+              default_interface.to_s => {
                 'rx' => {
-                  'bytes' => '0',
-                  'packets' => '0',
-                  'errors' => '0',
+                  'bytes' => 0,
+                  'packets' => 0,
+                  'errors' => 0,
                   'drop' => 0,
                   'overrun' => 0,
                   'frame' => 0,
                   'compressed' => 0,
-                  'multicast' => 0
+                  'multicast' => 0,
                 },
                 'tx' => {
-                  'bytes' => '342',
-                  'packets' => '0',
-                  'errors' => '0',
+                  'bytes' => 0,
+                  'packets' => 0,
+                  'errors' => 0,
                   'drop' => 0,
                   'overrun' => 0,
-                  'collisions' => '0',
+                  'collisions' => 0,
                   'carrier' => 0,
-                  'compressed' => 0
-                }
-              }
-            }
-          }
+                  'compressed' => 0,
+                },
+              },
+            },
+          },
         }
       end
 
@@ -63,7 +63,16 @@ module Fauxhai
       end
 
       def default_interface
-        'eth0'
+        case @system.data['platform_family']
+        when 'mac_os_x'
+          'en0'
+        when /bsd/
+          'em0'
+        when 'arch', 'fedora'
+          'enp0s3'
+        else
+          'eth0'
+        end
       end
 
       def domain
@@ -78,17 +87,17 @@ module Fauxhai
               'gid' => 0,
               'uid' => 0,
               'shell' => '/bin/bash',
-              'gecos' => 'Fauxhai'
-            }
+              'gecos' => 'Fauxhai',
+            },
           },
           'group' => {
             'fauxhai' => {
               'gid' => 0,
               'members' => [
-                'fauxhai'
-              ]
-            }
-          }
+                'fauxhai',
+              ],
+            },
+          },
         }
       end
 
@@ -118,7 +127,7 @@ module Fauxhai
 
       def keys
         {
-          'ssh' => ssh
+          'ssh' => ssh,
         }
       end
 
@@ -128,7 +137,7 @@ module Fauxhai
                                                             'gem_bin' => gem_bin,
                                                             'gems_dir' => gems_dir,
                                                             'ruby_bin' => ruby_bin),
-          'powershell' => @system.data['languages']['powershell']
+          'powershell' => @system.data['languages']['powershell'],
         }
       end
 
@@ -138,28 +147,65 @@ module Fauxhai
 
       def network
         {
-          'default_gateway' => default_gateway,
-          'default_interface' => default_interface,
-          'settings' => {},
           'interfaces' => {
-            "#{default_interface}" => {
+            'lo' => {
+              'mtu' => '65536',
+              'flags' => %w(LOOPBACK UP LOWER_UP),
+              'encapsulation' => 'Loopback',
               'addresses' => {
-                "#{ipaddress}" => {
-                  'broadcast' => '10.0.0.255',
+                '127.0.0.1' => {
+                  'family' => 'inet',
+                  'prefixlen' => '8',
+                  'netmask' => '255.0.0.0',
+                  'scope' => 'Node',
+                  'ip_scope' => 'LOOPBACK',
+                },
+                '::1' => {
+                  'family' => 'inet6',
+                  'prefixlen' => '128',
+                  'scope' => 'Node',
+                  'tags' => [],
+                  'ip_scope' => 'LINK LOCAL LOOPBACK',
+                },
+              },
+              'state' => 'unknown',
+            },
+            default_interface.to_s => {
+              'type' => default_interface.chop,
+              'number' => '0',
+              'mtu' => '1500',
+              'flags' => %w(BROADCAST MULTICAST UP LOWER_UP),
+              'encapsulation' => 'Ethernet',
+              'addresses' => {
+                macaddress.to_s => {
+                  'family' => 'lladdr',
+                },
+                ipaddress.to_s => {
                   'family' => 'inet',
-                  'netmask' => '255.255.255.0',
                   'prefixlen' => '24',
-                  'scope' => 'Global'
-                }
+                  'netmask' => '255.255.255.0',
+                  'broadcast' => '10.0.0.255',
+                  'scope' => 'Global',
+                  'ip_scope' => 'RFC1918 PRIVATE',
+                },
+                'fe80::11:1111:1111:1111' => {
+                  'family' => 'inet6',
+                  'prefixlen' => '64',
+                  'scope' => 'Link',
+                  'tags' => [],
+                  'ip_scope' => 'LINK LOCAL UNICAST',
+                },
               },
+              'state' => 'up',
               'arp' => {
-                '10.0.0.1' => 'fe:ff:ff:ff:ff:ff'
+                '10.0.0.1' => 'fe:ff:ff:ff:ff:ff',
               },
-              'encapsulation' => 'Ethernet',
-              'flags' => %w(BROADCAST MULTICAST UP LOWER_UP),
-              'mtu' => '1500',
-              'number' => '0',
               'routes' => [
+                {
+                  'destination' => 'default',
+                  'family' => 'inet',
+                  'via' => default_gateway,
+                },
                 {
                   'destination' => '10.0.0.0/24',
                   'family' => 'inet',
@@ -167,11 +213,18 @@ module Fauxhai
                   'proto' => 'kernel',
                   'src' => ipaddress,
                 },
+                {
+                  'destination' => 'fe80::/64',
+                  'family' => 'inet6',
+                  'metric' => '256',
+                  'proto' => 'kernel',
+                },
               ],
-              'state' => 'up',
-              'type' => 'eth'
-            }
-          }
+              'ring_params' => {},
+            },
+          },
+          'default_interface' => default_interface,
+          'default_gateway' => default_gateway,
         }
       end
 
@@ -181,8 +234,8 @@ module Fauxhai
 
       def ssh
         {
-          'host_dsa_public' => File.read( File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_dsa.pub') ).strip,
-          'host_rsa_public' => File.read( File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_rsa.pub') ).strip
+          'host_dsa_public' => File.read(File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_dsa.pub')).strip,
+          'host_rsa_public' => File.read(File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_rsa.pub')).strip,
         }
       end
 
@@ -198,19 +251,25 @@ module Fauxhai
         {
           'real' => 1,
           'total' => 1,
-          'cores' => 1
+          'cores' => 1,
         }
       end
 
       def memory
         {
-          'total' => '1048576kB'
+          'total' => '1048576kB',
         }
       end
 
       def virtualization
         {
-          'systems' => {}
+          'systems' => {},
+        }
+      end
+
+      def time
+        {
+          'timezone' => 'GMT',
         }
       end
 
@@ -220,21 +279,28 @@ module Fauxhai
       # @return [Array] - the key of whitelisted attributes
       def whitelist_attributes
         %w(
+          block_device
+          chef_packages
           command
           dmi
           filesystem
+          fips
+          init_package
           kernel
           lsb
           ohai_time
           os
           os_version
+          packages
           platform
           platform_version
           platform_build
           platform_family
-          init_package
-          root_group)
+          root_group
+          shard_seed
+          shells
+        )
       end
     end
   end
-end
+end

data/lib/fauxhai/version.rb

@@ -1,3 +1,3 @@
 module Fauxhai
-  VERSION = '4.1.0'
+  VERSION = '5.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fauxhai
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -28,28 +28,28 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '8.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '8.5'
 - !ruby/object:Gem::Dependency
@@ -105,6 +105,8 @@ files:
 - lib/fauxhai/platforms/amazon/2015.09.json
 - lib/fauxhai/platforms/amazon/2016.03.json
 - lib/fauxhai/platforms/amazon/2016.09.json
+- lib/fauxhai/platforms/amazon/2017.03.json
+- lib/fauxhai/platforms/arch/4.10.13-1-ARCH.json
 - lib/fauxhai/platforms/arch/4.5.4-1-ARCH.json
 - lib/fauxhai/platforms/arch/4.9.11-1-ARCH.json
 - lib/fauxhai/platforms/centos/5.0.json
@@ -128,12 +130,14 @@ files:
 - lib/fauxhai/platforms/centos/6.6.json
 - lib/fauxhai/platforms/centos/6.7.json
 - lib/fauxhai/platforms/centos/6.8.json
+- lib/fauxhai/platforms/centos/6.9.json
 - lib/fauxhai/platforms/centos/7.0.1406.json
 - lib/fauxhai/platforms/centos/7.0.json
 - lib/fauxhai/platforms/centos/7.1.1503.json
 - lib/fauxhai/platforms/centos/7.2.1511.json
 - lib/fauxhai/platforms/centos/7.3.1611.json
 - lib/fauxhai/platforms/chefspec/0.6.1.json
+- lib/fauxhai/platforms/clearos/7.0.json
 - lib/fauxhai/platforms/debian/7.0.json
 - lib/fauxhai/platforms/debian/7.1.json
 - lib/fauxhai/platforms/debian/7.10.json
@@ -152,6 +156,7 @@ files:
 - lib/fauxhai/platforms/debian/8.5.json
 - lib/fauxhai/platforms/debian/8.6.json
 - lib/fauxhai/platforms/debian/8.7.json
+- lib/fauxhai/platforms/debian/8.8.json
 - lib/fauxhai/platforms/dragonfly4/4.2-RELEASE.json
 - lib/fauxhai/platforms/fedora/21.json
 - lib/fauxhai/platforms/fedora/22.json
@@ -165,8 +170,10 @@ files:
 - lib/fauxhai/platforms/freebsd/9.3.json
 - lib/fauxhai/platforms/gentoo/2.2.json
 - lib/fauxhai/platforms/ios_xr/6.0.0.14I.json
+- lib/fauxhai/platforms/linuxmint/18.1.json
 - lib/fauxhai/platforms/mac_os_x/10.10.json
 - lib/fauxhai/platforms/mac_os_x/10.11.1.json
+- lib/fauxhai/platforms/mac_os_x/10.11.json
 - lib/fauxhai/platforms/mac_os_x/10.12.json
 - lib/fauxhai/platforms/mac_os_x/10.9.2.json
 - lib/fauxhai/platforms/nexus/5.json
@@ -233,7 +240,7 @@ files:
 - lib/fauxhai/runner/windows.rb
 - lib/fauxhai/version.rb
 - tmp/.gitkeep
-homepage: https://github.com/customink/fauxhai
+homepage: https://github.com/chefspec/fauxhai
 licenses:
 - MIT
 metadata: {}
@@ -253,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Fauxhai provides an easy way to mock out your ohai data for testing with