fauxhai 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8cfa32798da5c0f38d150f3e0c95a546099c63
-  data.tar.gz: f634a93dfedd7a058520309680440c7d074d0040
+  metadata.gz: d3e04b0080f4863d1a998c188e1f4e078a03197a
+  data.tar.gz: e8fff77423484867d3bbb1f177fad33e929937a7
 SHA512:
-  metadata.gz: 3ac3d581a97c9b0213e3417727c0e7f92e19cb06b2013e00287261d8aee092bbca553f03d3f83c46004d4f483f957b88a037778af1bffb5655596754e8c94ed3
-  data.tar.gz: a4683f6931bad98905fb1ed3f03e295c061f7753c991067f7c7f6246c90849fc3fffadc417bf95c9cadb386139953dfc979329c6c84691590aeb3529326a5123
+  metadata.gz: 020c91a7d9883c980f06aad5f5f9e40e050bd8e16c646f5010a7d2ee5fc134bc7f00cf85d7a056d940eb951ebd6d67ef79a45ffa100ef72cf7070fe3e8610145
+  data.tar.gz: d67008355c275e52ed57479d7f154f0dda93d8e08c1aed46325a6e0b0377989be30d7689085ad705c0b4f1c1ad3e0cde14d43316c37d842ed93654553c862026

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 # Fauxhai Changelog
+
+## v3.2.0
+- Updated OS X 10.11 to include root_group and kernel processor information
+- Recaptured Solaris 5.11 with the latest Ohai
+- Updated CPU attributes and fixed memory to be in kB on Solaris 5.10
+- Added node['virtualization']['systems'] = {} to the runner and updated data in existing dumps
+- Updated the runner to mock out chef_packages install paths using Omnibus paths not gem install paths and added it to existing dumps.
+
 ## v3.1.0
 - Added collection of root_group, init_package, and cpu cores to the runner
 - Added root_group to existing Linux systems

data/bin/fauxhai

@@ -13,8 +13,8 @@ unless (args & ['-v', '--version']).empty?
 end
 
 unless (args & ['-h', '--help']).empty?
-  puts "Usage: fauxhai"
-  puts "(There are no flags or options)"
+  puts 'Usage: fauxhai'
+  puts '(There are no flags or options)'
   exit(0)
 end
 

data/fauxhai.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |spec|
   spec.version       = Fauxhai::VERSION
   spec.authors       = ['Seth Vargo']
   spec.email         = ['sethvargo@gmail.com']
-  spec.description   = %q{Easily mock out ohai data}
-  spec.summary       = %q{Fauxhai provides an easy way to mock out your ohai data for testing with chefspec!}
+  spec.description   = 'Easily mock out ohai data'
+  spec.summary       = 'Fauxhai provides an easy way to mock out your ohai data for testing with chefspec!'
   spec.homepage      = 'https://github.com/customink/fauxhai'
   spec.license       = 'MIT'
 
   spec.required_ruby_version = '>= 1.9'
 
   spec.files         = `git ls-files`.split($\)
-  spec.executables   = spec.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 

data/lib/fauxhai/fetcher.rb

@@ -15,7 +15,7 @@ module Fauxhai
         end
 
         # cache this data so we do not have to SSH again
-        File.open(cache_file, 'w+'){ |f| f.write(@data.to_json) }
+        File.open(cache_file, 'w+') { |f| f.write(@data.to_json) }
       end
 
       yield(@data) if block_given?
@@ -23,7 +23,7 @@ module Fauxhai
       if defined?(ChefSpec)
         data = @data
         ::ChefSpec::ChefRunner.send :define_method, :fake_ohai do |ohai|
-          data.each_pair do |attribute,value|
+          data.each_pair do |attribute, value|
             ohai[attribute] = value
           end
         end
@@ -37,7 +37,7 @@ module Fauxhai
     end
 
     def cached?
-      File.exists?(cache_file)
+      File.exist?(cache_file)
     end
 
     def cache_key
@@ -64,6 +64,7 @@ module Fauxhai
     end
 
     private
+
     def host
       @host ||= begin
         raise ArgumentError, ':host is a required option for Fauxhai.fetch' unless @options[:host]

data/lib/fauxhai/mocker.rb

@@ -39,20 +39,21 @@ module Fauxhai
     end
 
     private
+
     def fauxhai_data
       @fauxhai_data ||= lambda do
         # If a path option was specified, use it
         if @options[:path]
           filepath = File.expand_path(@options[:path])
 
-          unless File.exists?(filepath)
+          unless File.exist?(filepath)
             raise Fauxhai::Exception::InvalidPlatform.new("You specified a path to a JSON file on the local system that does not exist: '#{filepath}'")
           end
         else
           filepath = File.join(platform_path, "#{version}.json")
         end
 
-        if File.exists?(filepath)
+        if File.exist?(filepath)
           JSON.parse( File.read(filepath) )
         elsif
           # Try loading from github (in case someone submitted a PR with a new file, but we haven't
@@ -68,7 +69,7 @@ module Fauxhai
             path = Pathname.new(filepath)
             FileUtils.mkdir_p(path.dirname)
 
-            File.open(filepath, 'w'){ |f| f.write(response_body) }
+            File.open(filepath, 'w') { |f| f.write(response_body) }
             return JSON.parse(response_body)
           else
             raise Fauxhai::Exception::InvalidPlatform.new("Could not find platform '#{platform}/#{version}' in any of the sources!")

data/lib/fauxhai/platforms/aix/6.1.json

@@ -559,11 +559,11 @@
   "chef_packages": {
     "chef": {
       "version": "12.0.0.alpha.0",
-      "chef_root": "/usr/local/gems/chef-12.0.0.alpha.0/lib"
+      "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/chef-12.0.0.alpha.0/lib"
     },
     "ohai": {
       "version": "7.2.0",
-      "ohai_root": "/usr/local/gems/ohai-7.2.0/lib/ohai"
+      "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/ohai-7.2.0/lib/ohai"
     }
   },
   "counters": {
@@ -674,5 +674,9 @@
   },
   "memory": {
     "total": "1048576kB"
+  },
+  "virtualization": {
+    "systems": {
+    }
   }
 }

data/lib/fauxhai/platforms/aix/7.1.json

@@ -568,11 +568,11 @@
   "chef_packages": {
     "chef": {
       "version": "12.0.0.alpha.0",
-      "chef_root": "/usr/local/gems/chef-12.0.0.alpha.0/lib"
+      "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/chef-12.0.0.alpha.0/lib"
     },
     "ohai": {
       "version": "7.2.0",
-      "ohai_root": "/usr/local/gems/ohai-7.2.0/lib/ohai"
+      "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/ohai-7.2.0/lib/ohai"
     }
   },
   "counters": {
@@ -683,5 +683,9 @@
   },
   "memory": {
     "total": "1048576kB"
+  },
+  "virtualization": {
+    "systems": {
+    }
   }
 }

data/lib/fauxhai/platforms/amazon/2012.09.json

@@ -1,122 +1,91 @@
 {
   "kernel": {
     "name": "Linux",
-    "release": "3.2.30-49.59.amzn1.x86_64",
-    "version": "#1 SMP Wed Oct 3 19:54:33 UTC 2012",
+    "release": "3.2.38-5.48.amzn1.x86_64",
+    "version": "#1 SMP Wed Feb 13 01:07:25 UTC 2013",
     "machine": "x86_64",
+    "processor": "x86_64",
+    "os": "GNU/Linux",
     "modules": {
-      "ext3": {
-        "size": "211770",
-        "refcount": "1"
-      },
-      "jbd": {
-        "size": "77405",
-        "refcount": "1"
-      },
       "ipv6": {
-        "size": "317151",
+        "size": "317603",
         "refcount": "10"
       },
       "binfmt_misc": {
-        "size": "7368",
+        "size": "7695",
         "refcount": "1"
       },
+      "dm_mod": {
+        "size": "75314",
+        "refcount": "0"
+      },
       "scsi_mod": {
-        "size": "199543",
+        "size": "199417",
         "refcount": "0"
       },
       "ext4": {
-        "size": "456530",
+        "size": "456134",
         "refcount": "1"
       },
       "mbcache": {
-        "size": "7109",
-        "refcount": "2"
+        "size": "7270",
+        "refcount": "1"
       },
       "jbd2": {
-        "size": "86650",
+        "size": "86039",
         "refcount": "1"
       },
       "crc16": {
-        "size": "1527",
-        "refcount": "1"
-      },
-      "dm_mirror": {
-        "size": "13888",
-        "refcount": "0"
-      },
-      "dm_region_hash": {
-        "size": "9528",
+        "size": "1557",
         "refcount": "1"
-      },
-      "dm_log": {
-        "size": "9143",
-        "refcount": "2"
-      },
-      "dm_mod": {
-        "size": "74308",
-        "refcount": "2"
       }
-    },
-    "os": "GNU/Linux"
+    }
   },
   "os": "linux",
-  "os_version": "3.2.30-49.59.amzn1.x86_64",
+  "os_version": "3.2.38-5.48.amzn1.x86_64",
+  "lsb": {
+  },
   "platform": "amazon",
   "platform_version": "2012.09",
   "platform_family": "rhel",
-  "cpu": {
-    "real": 1,
-    "total": 1,
-    "cores": 1
-  },
-  "memory": {
-    "total": "1048576kB"
-  },
-  "ohai_time": 1352176490.6813455,
   "dmi": {
   },
+  "root_group": "root",
   "command": {
     "ps": "ps -ef"
   },
   "filesystem": {
     "/dev/xvda1": {
-      "kb_size": "8256952",
-      "kb_used": "1022016",
-      "kb_available": "7151052",
-      "percent_used": "13%",
+      "kb_size": "2064208",
+      "kb_used": "881284",
+      "kb_available": "1161964",
+      "percent_used": "44%",
       "mount": "/",
+      "total_inodes": "131072",
+      "inodes_used": "35565",
+      "inodes_available": "95507",
+      "inodes_percent_used": "28%",
       "fs_type": "ext4",
       "mount_options": [
         "rw",
         "noatime"
-      ],
-      "uuid": "ebbf1f1c-fb71-40aa-93a3-056b455e5127",
-      "label": "/"
+      ]
     },
     "tmpfs": {
-      "kb_size": "848480",
+      "kb_size": "304328",
       "kb_used": "0",
-      "kb_available": "848480",
+      "kb_available": "304328",
       "percent_used": "0%",
       "mount": "/dev/shm",
+      "total_inodes": "76082",
+      "inodes_used": "1",
+      "inodes_available": "76081",
+      "inodes_percent_used": "1%",
       "fs_type": "tmpfs",
       "mount_options": [
         "rw"
       ]
     },
-    "/dev/xvda2": {
-      "kb_size": "153899044",
-      "kb_used": "192068",
-      "kb_available": "145889352",
-      "percent_used": "1%",
-      "mount": "/media/ephemeral0",
-      "fs_type": "ext3",
-      "mount_options": [
-        "rw"
-      ],
-      "uuid": "05ed183c-12fd-465b-afc1-4c5081537b08"
-    },
     "proc": {
       "mount": "/proc",
       "fs_type": "proc",
@@ -147,10 +116,6 @@
         "rw"
       ]
     },
-    "/dev/xvda3": {
-      "fs_type": "swap",
-      "uuid": "0e291033-975c-419d-a126-7dc4418001c4"
-    },
     "rootfs": {
       "mount": "/",
       "fs_type": "rootfs",
@@ -163,42 +128,32 @@
       "fs_type": "devtmpfs",
       "mount_options": [
         "rw",
-        "nosuid",
         "relatime",
-        "size=837648k",
-        "nr_inodes=209412",
+        "size=296148k",
+        "nr_inodes=74037",
         "mode=755"
       ]
     }
   },
-  "root_group": "root",
+  "ohai_time": 1458950465.4448612,
+  "init_package": "init",
   "languages": {
     "ruby": {
-      "platform": "x86_64-linux",
-      "version": "1.8.7",
-      "release_date": "2012-02-08",
-      "target": "x86_64-amazon-linux-gnu",
-      "target_cpu": "x86_64",
-      "target_vendor": "amazon",
-      "target_os": "linux",
-      "host": "x86_64-redhat-linux-gnu",
-      "host_cpu": "x86_64",
-      "host_os": "linux-gnu",
-      "host_vendor": "redhat",
       "bin_dir": "/usr/local/bin",
-      "ruby_bin": "/usr/local/bin/ruby",
+      "gem_bin": "/usr/local/bin/gem",
       "gems_dir": "/usr/local/gems",
-      "gem_bin": "/usr/local/bin/gem"
-    }
+      "ruby_bin": "/usr/local/bin/ruby"
+    },
+    "powershell": null
   },
   "chef_packages": {
     "chef": {
-      "version": "10.16.2",
-      "chef_root": "/usr/local/gems/chef-10.16.2/lib"
+      "version": "12.8.1",
+      "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/chef-12.8.1/lib"
     },
     "ohai": {
-      "version": "6.14.0",
-      "ohai_root": "/usr/local/gems/ohai-6.14.0/lib/ohai"
+      "version": "8.11.1",
+      "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/ohai-8.11.1/lib/ohai"
     }
   },
   "counters": {
@@ -263,7 +218,8 @@
   "network": {
     "default_gateway": "10.0.0.1",
     "default_interface": "eth0",
-    "settings": {},
+    "settings": {
+    },
     "interfaces": {
       "eth0": {
         "addresses": {
@@ -299,5 +255,17 @@
     }
   },
   "uptime": "30 days 15 hours 07 minutes 30 seconds",
-  "uptime_seconds": 2646450
+  "uptime_seconds": 2646450,
+  "cpu": {
+    "real": 1,
+    "total": 1,
+    "cores": 1
+  },
+  "memory": {
+    "total": "1048576kB"
+  },
+  "virtualization": {
+    "systems": {
+    }
+  }
 }

data/lib/fauxhai/platforms/amazon/2013.09.json

@@ -1,132 +1,131 @@
 {
+  "lsb": {
+  },
   "kernel": {
     "name": "Linux",
-    "release": "3.4.68-59.97.amzn1.x86_64",
-    "version": "#1 SMP Tue Nov 5 07:40:09 UTC 2013",
-    "machine": "x86_64",
+    "release": "3.4.68-59.97.amzn1.i686",
+    "version": "#1 SMP Tue Nov 5 07:39:21 UTC 2013",
+    "machine": "i686",
+    "processor": "i686",
+    "os": "GNU/Linux",
     "modules": {
-      "ext3": {
-        "size": "215312",
-        "refcount": "1"
-      },
-      "jbd": {
-        "size": "79093",
-        "refcount": "1"
-      },
       "ipv6": {
-        "size": "329579",
+        "size": "282375",
         "refcount": "10"
       },
       "binfmt_misc": {
-        "size": "7864",
+        "size": "6420",
         "refcount": "1"
       },
       "scsi_mod": {
-        "size": "203562",
+        "size": "171899",
         "refcount": "0"
       },
       "acpiphp": {
-        "size": "17564",
+        "size": "15344",
         "refcount": "0"
       },
       "pci_hotplug": {
-        "size": "12845",
+        "size": "10695",
         "refcount": "1"
       },
       "crc32c_intel": {
-        "size": "2187",
+        "size": "1695",
+        "refcount": "0"
+      },
+      "aesni_intel": {
+        "size": "9483",
         "refcount": "0"
       },
+      "cryptd": {
+        "size": "7818",
+        "refcount": "1"
+      },
+      "aes_i586": {
+        "size": "7222",
+        "refcount": "1"
+      },
+      "aes_generic": {
+        "size": "26367",
+        "refcount": "2"
+      },
       "microcode": {
-        "size": "12515",
+        "size": "9641",
         "refcount": "0"
       },
       "ext4": {
-        "size": "468843",
+        "size": "424800",
         "refcount": "1"
       },
       "mbcache": {
-        "size": "7407",
-        "refcount": "2"
+        "size": "5559",
+        "refcount": "1"
       },
       "jbd2": {
-        "size": "92431",
+        "size": "80824",
         "refcount": "1"
       },
       "crc16": {
-        "size": "1566",
+        "size": "1282",
         "refcount": "1"
       },
       "dm_mirror": {
-        "size": "14096",
+        "size": "12266",
         "refcount": "0"
       },
       "dm_region_hash": {
-        "size": "9733",
+        "size": "8012",
         "refcount": "1"
       },
       "dm_log": {
-        "size": "9396",
+        "size": "8257",
         "refcount": "2"
       },
       "dm_mod": {
-        "size": "78506",
+        "size": "66416",
         "refcount": "2"
       }
-    },
-    "os": "GNU/Linux"
+    }
   },
   "os": "linux",
-  "os_version": "3.4.68-59.97.amzn1.x86_64",
-  "command": {
-    "ps": "ps -ef"
-  },
-  "dmi": {
-  },
-  "lsb": {
-  },
+  "os_version": "3.4.68-59.97.amzn1.i686",
   "platform": "amazon",
   "platform_version": "2013.09",
   "platform_family": "rhel",
-  "ohai_time": 1395617389.734144,
   "filesystem": {
     "/dev/xvda1": {
       "kb_size": "8256952",
-      "kb_used": "1309776",
-      "kb_available": "6863292",
-      "percent_used": "17%",
+      "kb_used": "1283900",
+      "kb_available": "6889168",
+      "percent_used": "16%",
       "mount": "/",
+      "total_inodes": "524288",
+      "inodes_used": "53098",
+      "inodes_available": "471190",
+      "inodes_percent_used": "11%",
       "fs_type": "ext4",
       "mount_options": [
         "rw",
         "noatime"
       ],
-      "uuid": "1701d228-e1bd-4094-a14c-8c64d6819362",
+      "uuid": "b5d93184-d426-4052-82fb-1d630c4a37dc",
       "label": "/"
     },
     "tmpfs": {
-      "kb_size": "848344",
+      "kb_size": "307688",
       "kb_used": "0",
-      "kb_available": "848344",
+      "kb_available": "307688",
       "percent_used": "0%",
       "mount": "/dev/shm",
+      "total_inodes": "76922",
+      "inodes_used": "1",
+      "inodes_available": "76921",
+      "inodes_percent_used": "1%",
       "fs_type": "tmpfs",
       "mount_options": [
         "rw"
       ]
     },
-    "/dev/xvda2": {
-      "kb_size": "153899044",
-      "kb_used": "192068",
-      "kb_available": "145889352",
-      "percent_used": "1%",
-      "mount": "/media/ephemeral0",
-      "fs_type": "ext3",
-      "mount_options": [
-        "rw"
-      ],
-      "uuid": "b3c490c3-3a22-4bf9-8dc1-a80729216b70"
-    },
     "proc": {
       "mount": "/proc",
       "fs_type": "proc",
@@ -157,10 +156,6 @@
         "rw"
       ]
     },
-    "/dev/xvda3": {
-      "fs_type": "swap",
-      "uuid": "a3e34831-91a5-46ce-9b0e-109fde024db3"
-    },
     "rootfs": {
       "mount": "/",
       "fs_type": "rootfs",
@@ -174,40 +169,48 @@
       "mount_options": [
         "rw",
         "relatime",
-        "size=836300k",
-        "nr_inodes=209075",
+        "size=299852k",
+        "nr_inodes=74963",
         "mode=755"
       ]
     }
   },
+  "command": {
+    "ps": "ps -ef"
+  },
+  "ohai_time": 1458950458.7630599,
+  "dmi": {
+  },
+  "init_package": "init",
   "root_group": "root",
   "languages": {
     "ruby": {
-      "platform": "x86_64-linux",
+      "platform": "i386-linux",
       "version": "1.8.7",
       "release_date": "2013-06-27",
-      "target": "x86_64-amazon-linux-gnu",
-      "target_cpu": "x86_64",
+      "target": "i686-amazon-linux-gnu",
+      "target_cpu": "i386",
       "target_vendor": "amazon",
       "target_os": "linux",
-      "host": "x86_64-redhat-linux-gnu",
-      "host_cpu": "x86_64",
+      "host": "i686-redhat-linux-gnu",
+      "host_cpu": "i686",
       "host_os": "linux-gnu",
       "host_vendor": "redhat",
       "bin_dir": "/usr/local/bin",
       "ruby_bin": "/usr/local/bin/ruby",
       "gems_dir": "/usr/local/gems",
       "gem_bin": "/usr/local/bin/gem"
-    }
+    },
+    "powershell": null
   },
   "chef_packages": {
     "chef": {
-      "version": "11.10.4",
-      "chef_root": "/usr/local/gems/chef-11.10.4/lib"
+      "version": "12.8.1",
+      "chef_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/chef-12.8.1/lib"
     },
     "ohai": {
-      "version": "6.20.0",
-      "ohai_root": "/usr/local/gems/ohai-6.20.0/lib/ohai"
+      "version": "8.11.1",
+      "ohai_root": "/opt/chef/embedded/lib/ruby/gems/2.1.0/gems/ohai-8.11.1/lib/ohai"
     }
   },
   "counters": {
@@ -317,5 +320,9 @@
   },
   "memory": {
     "total": "1048576kB"
+  },
+  "virtualization": {
+    "systems": {
+    }
   }
 }