{"action":"created","comment":{"url":"https://api.github.com/repos/chef/ohai/pulls/comments/43774955","id":43774955,"diff_hunk":"@@ -27,21 +27,25 @@\n     cpuinfo[\"flags\"] = []\n \n     # /var/run/dmesg.boot\n-    # CPU: Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz (3516.61-MHz K8-class CPU)\n-    # Origin = \"GenuineIntel\"  Id = 0x306a9  Family = 6  Model = 3a  Stepping = 9\n-    # Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>\n-    # Features2=0x209<SSE3,MON,SSSE3>\n-    # AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>\n-    # AMD Features2=0x1<LAHF>\n+    # CPU: Intel(R) Core(TM) i7-4980HQ CPU @ 2.80GHz (2793.59-MHz K8-class CPU)\n+    #   Origin=\"GenuineIntel\"  Id=0x40661  Family=0x6  Model=0x46  Stepping=1\n+    #   Features=0x783fbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE,SSE2>\n+    #   Features2=0x5ed8220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AESNI,XSAVE,OSXSAVE,AVX,RDRAND>\n+    #   AMD Features=0x28100800<SYSCALL,NX,RDTSCP,LM>\n+    #   AMD Features2=0x21<LAHF,ABM>\n+    #   Structured Extended Features=0x2000<NFPUSG>\n+    #   TSC: P-state invariant\n \n     File.open(\"/var/run/dmesg.boot\").each do |line|\n       case line\n       when /CPU:\\s+(.+) \\(([\\d.]+).+\\)/\n         cpuinfo[\"model_name\"] = $1\n         cpuinfo[\"mhz\"] = $2\n-      when /Origin = \"(.+)\"\\s+Id = (.+)\\s+Stepping = (.+)/\n+      when /Origin.*\"(.*)\".*Family.*0x(\\S+).*Model.*0x(\\S+).*Stepping.*(\\S+)/","path":"lib/ohai/plugins/freebsd/cpu.rb","position":25,"original_position":25,"commit_id":"8e52ccb86ae76ec00effeee43a61d40b78a721c4","original_commit_id":"8e52ccb86ae76ec00effeee43a61d40b78a721c4","user":{"login":"tas50","id":1015200,"avatar_url":"https://avatars.githubusercontent.com/u/1015200?v=3","gravatar_id":"","url":"https://api.github.com/users/tas50","html_url":"https://github.com/tas50","followers_url":"https://api.github.com/users/tas50/followers","following_url":"https://api.github.com/users/tas50/following{/other_user}","gists_url":"https://api.github.com/users/tas50/gists{/gist_id}","starred_url":"https://api.github.com/users/tas50/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tas50/subscriptions","organizations_url":"https://api.github.com/users/tas50/orgs","repos_url":"https://api.github.com/users/tas50/repos","events_url":"https://api.github.com/users/tas50/events{/privacy}","received_events_url":"https://api.github.com/users/tas50/received_events","type":"User","site_admin":false},"body":"We probably should just convert the values.  Let me see about adding that.","created_at":"2015-11-03T17:00:37Z","updated_at":"2015-11-03T17:00:37Z","html_url":"https://github.com/chef/ohai/pull/640#discussion_r43774955","pull_request_url":"https://api.github.com/repos/chef/ohai/pulls/640","_links":{"self":{"href":"https://api.github.com/repos/chef/ohai/pulls/comments/43774955"},"html":{"href":"https://github.com/chef/ohai/pull/640#discussion_r43774955"},"pull_request":{"href":"https://api.github.com/repos/chef/ohai/pulls/640"}}},"pull_request":{"url":"https://api.github.com/repos/chef/ohai/pulls/640","id":49184032,"html_url":"https://github.com/chef/ohai/pull/640","diff_url":"https://github.com/chef/ohai/pull/640.diff","patch_url":"https://github.com/chef/ohai/pull/640.patch","issue_url":"https://api.github.com/repos/chef/ohai/issues/640","number":640,"state":"open","locked":false,"title":"Fix and extend CPU detection on FreeBSD","user":{"login":"tas50","id":1015200,"avatar_url":"https://avatars.githubusercontent.com/u/1015200?v=3","gravatar_id":"","url":"https://api.github.com/users/tas50","html_url":"https://github.com/tas50","followers_url":"https://api.github.com/users/tas50/followers","following_url":"https://api.github.com/users/tas50/following{/other_user}","gists_url":"https://api.github.com/users/tas50/gists{/gist_id}","starred_url":"https://api.github.com/users/tas50/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tas50/subscriptions","organizations_url":"https://api.github.com/users/tas50/orgs","repos_url":"https://api.github.com/users/tas50/repos","events_url":"https://api.github.com/users/tas50/events{/privacy}","received_events_url":"https://api.github.com/users/tas50/received_events","type":"User","site_admin":false},"body":"The comment block and the tests had an incorrect sample of what\r\ndmesg.boot looked like.  I got 68 different people to send me samples of\r\nwhat the output looks like, with about 100 samples total.  The Origin\r\nline is always indented and the spacing around the equals\r\nsigns differ.  On 10.2+ there are not spaces, but on 10.1 and earlier there are \r\nspaces.  I updated the regex to properly detect the existing fields and\r\nalso added family/model values, which we already gathered on Linux.","created_at":"2015-10-29T18:54:59Z","updated_at":"2015-11-03T17:00:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":"34730021683d283a742e84ef69ea7c68d7cbfbe8","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/chef/ohai/pulls/640/commits","review_comments_url":"https://api.github.com/repos/chef/ohai/pulls/640/comments","review_comment_url":"https://api.github.com/repos/chef/ohai/pulls/comments{/number}","comments_url":"https://api.github.com/repos/chef/ohai/issues/640/comments","statuses_url":"https://api.github.com/repos/chef/ohai/statuses/8e52ccb86ae76ec00effeee43a61d40b78a721c4","head":{"label":"tas50:master","ref":"master","sha":"8e52ccb86ae76ec00effeee43a61d40b78a721c4","user":{"login":"tas50","id":1015200,"avatar_url":"https://avatars.githubusercontent.com/u/1015200?v=3","gravatar_id":"","url":"https://api.github.com/users/tas50","html_url":"https://github.com/tas50","followers_url":"https://api.github.com/users/tas50/followers","following_url":"https://api.github.com/users/tas50/following{/other_user}","gists_url":"https://api.github.com/users/tas50/gists{/gist_id}","starred_url":"https://api.github.com/users/tas50/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tas50/subscriptions","organizations_url":"https://api.github.com/users/tas50/orgs","repos_url":"https://api.github.com/users/tas50/repos","events_url":"https://api.github.com/users/tas50/events{/privacy}","received_events_url":"https://api.github.com/users/tas50/received_events","type":"User","site_admin":false},"repo":{"id":7804620,"name":"ohai-1","full_name":"tas50/ohai-1","owner":{"login":"tas50","id":1015200,"avatar_url":"https://avatars.githubusercontent.com/u/1015200?v=3","gravatar_id":"","url":"https://api.github.com/users/tas50","html_url":"https://github.com/tas50","followers_url":"https://api.github.com/users/tas50/followers","following_url":"https://api.github.com/users/tas50/following{/other_user}","gists_url":"https://api.github.com/users/tas50/gists{/gist_id}","starred_url":"https://api.github.com/users/tas50/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tas50/subscriptions","organizations_url":"https://api.github.com/users/tas50/orgs","repos_url":"https://api.github.com/users/tas50/repos","events_url":"https://api.github.com/users/tas50/events{/privacy}","received_events_url":"https://api.github.com/users/tas50/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/tas50/ohai-1","description":"Ohai profiles your system and emits JSON","fork":true,"url":"https://api.github.com/repos/tas50/ohai-1","forks_url":"https://api.github.com/repos/tas50/ohai-1/forks","keys_url":"https://api.github.com/repos/tas50/ohai-1/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tas50/ohai-1/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tas50/ohai-1/teams","hooks_url":"https://api.github.com/repos/tas50/ohai-1/hooks","issue_events_url":"https://api.github.com/repos/tas50/ohai-1/issues/events{/number}","events_url":"https://api.github.com/repos/tas50/ohai-1/events","assignees_url":"https://api.github.com/repos/tas50/ohai-1/assignees{/user}","branches_url":"https://api.github.com/repos/tas50/ohai-1/branches{/branch}","tags_url":"https://api.github.com/repos/tas50/ohai-1/tags","blobs_url":"https://api.github.com/repos/tas50/ohai-1/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tas50/ohai-1/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tas50/ohai-1/git/refs{/sha}","trees_url":"https://api.github.com/repos/tas50/ohai-1/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tas50/ohai-1/statuses/{sha}","languages_url":"https://api.github.com/repos/tas50/ohai-1/languages","stargazers_url":"https://api.github.com/repos/tas50/ohai-1/stargazers","contributors_url":"https://api.github.com/repos/tas50/ohai-1/contributors","subscribers_url":"https://api.github.com/repos/tas50/ohai-1/subscribers","subscription_url":"https://api.github.com/repos/tas50/ohai-1/subscription","commits_url":"https://api.github.com/repos/tas50/ohai-1/commits{/sha}","git_commits_url":"https://api.github.com/repos/tas50/ohai-1/git/commits{/sha}","comments_url":"https://api.github.com/repos/tas50/ohai-1/comments{/number}","issue_comment_url":"https://api.github.com/repos/tas50/ohai-1/issues/comments{/number}","contents_url":"https://api.github.com/repos/tas50/ohai-1/contents/{+path}","compare_url":"https://api.github.com/repos/tas50/ohai-1/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tas50/ohai-1/merges","archive_url":"https://api.github.com/repos/tas50/ohai-1/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tas50/ohai-1/downloads","issues_url":"https://api.github.com/repos/tas50/ohai-1/issues{/number}","pulls_url":"https://api.github.com/repos/tas50/ohai-1/pulls{/number}","milestones_url":"https://api.github.com/repos/tas50/ohai-1/milestones{/number}","notifications_url":"https://api.github.com/repos/tas50/ohai-1/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tas50/ohai-1/labels{/name}","releases_url":"https://api.github.com/repos/tas50/ohai-1/releases{/id}","created_at":"2013-01-24T18:55:07Z","updated_at":"2015-03-24T20:00:17Z","pushed_at":"2015-10-31T00:55:32Z","git_url":"git://github.com/tas50/ohai-1.git","ssh_url":"git@github.com:tas50/ohai-1.git","clone_url":"https://github.com/tas50/ohai-1.git","svn_url":"https://github.com/tas50/ohai-1","homepage":"http://wiki.opscode.com/display/ohai","size":4203,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"chef:master","ref":"master","sha":"ae08e09da6d96b7977584ca42dd14c45b51f6e5e","user":{"login":"chef","id":29740,"avatar_url":"https://avatars.githubusercontent.com/u/29740?v=3","gravatar_id":"","url":"https://api.github.com/users/chef","html_url":"https://github.com/chef","followers_url":"https://api.github.com/users/chef/followers","following_url":"https://api.github.com/users/chef/following{/other_user}","gists_url":"https://api.github.com/users/chef/gists{/gist_id}","starred_url":"https://api.github.com/users/chef/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chef/subscriptions","organizations_url":"https://api.github.com/users/chef/orgs","repos_url":"https://api.github.com/users/chef/repos","events_url":"https://api.github.com/users/chef/events{/privacy}","received_events_url":"https://api.github.com/users/chef/received_events","type":"Organization","site_admin":false},"repo":{"id":108289,"name":"ohai","full_name":"chef/ohai","owner":{"login":"chef","id":29740,"avatar_url":"https://avatars.githubusercontent.com/u/29740?v=3","gravatar_id":"","url":"https://api.github.com/users/chef","html_url":"https://github.com/chef","followers_url":"https://api.github.com/users/chef/followers","following_url":"https://api.github.com/users/chef/following{/other_user}","gists_url":"https://api.github.com/users/chef/gists{/gist_id}","starred_url":"https://api.github.com/users/chef/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chef/subscriptions","organizations_url":"https://api.github.com/users/chef/orgs","repos_url":"https://api.github.com/users/chef/repos","events_url":"https://api.github.com/users/chef/events{/privacy}","received_events_url":"https://api.github.com/users/chef/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/chef/ohai","description":"Ohai profiles your system and emits JSON","fork":false,"url":"https://api.github.com/repos/chef/ohai","forks_url":"https://api.github.com/repos/chef/ohai/forks","keys_url":"https://api.github.com/repos/chef/ohai/keys{/key_id}","collaborators_url":"https://api.github.com/repos/chef/ohai/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/chef/ohai/teams","hooks_url":"https://api.github.com/repos/chef/ohai/hooks","issue_events_url":"https://api.github.com/repos/chef/ohai/issues/events{/number}","events_url":"https://api.github.com/repos/chef/ohai/events","assignees_url":"https://api.github.com/repos/chef/ohai/assignees{/user}","branches_url":"https://api.github.com/repos/chef/ohai/branches{/branch}","tags_url":"https://api.github.com/repos/chef/ohai/tags","blobs_url":"https://api.github.com/repos/chef/ohai/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/chef/ohai/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/chef/ohai/git/refs{/sha}","trees_url":"https://api.github.com/repos/chef/ohai/git/trees{/sha}","statuses_url":"https://api.github.com/repos/chef/ohai/statuses/{sha}","languages_url":"https://api.github.com/repos/chef/ohai/languages","stargazers_url":"https://api.github.com/repos/chef/ohai/stargazers","contributors_url":"https://api.github.com/repos/chef/ohai/contributors","subscribers_url":"https://api.github.com/repos/chef/ohai/subscribers","subscription_url":"https://api.github.com/repos/chef/ohai/subscription","commits_url":"https://api.github.com/repos/chef/ohai/commits{/sha}","git_commits_url":"https://api.github.com/repos/chef/ohai/git/commits{/sha}","comments_url":"https://api.github.com/repos/chef/ohai/comments{/number}","issue_comment_url":"https://api.github.com/repos/chef/ohai/issues/comments{/number}","contents_url":"https://api.github.com/repos/chef/ohai/contents/{+path}","compare_url":"https://api.github.com/repos/chef/ohai/compare/{base}...{head}","merges_url":"https://api.github.com/repos/chef/ohai/merges","archive_url":"https://api.github.com/repos/chef/ohai/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/chef/ohai/downloads","issues_url":"https://api.github.com/repos/chef/ohai/issues{/number}","pulls_url":"https://api.github.com/repos/chef/ohai/pulls{/number}","milestones_url":"https://api.github.com/repos/chef/ohai/milestones{/number}","notifications_url":"https://api.github.com/repos/chef/ohai/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/chef/ohai/labels{/name}","releases_url":"https://api.github.com/repos/chef/ohai/releases{/id}","created_at":"2009-01-15T20:50:43Z","updated_at":"2015-10-20T23:58:45Z","pushed_at":"2015-10-31T00:55:33Z","git_url":"git://github.com/chef/ohai.git","ssh_url":"git@github.com:chef/ohai.git","clone_url":"https://github.com/chef/ohai.git","svn_url":"https://github.com/chef/ohai","homepage":"http://docs.chef.io/ohai.html","size":9665,"stargazers_count":474,"watchers_count":474,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":342,"mirror_url":null,"open_issues_count":52,"forks":342,"open_issues":52,"watchers":474,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/chef/ohai/pulls/640"},"html":{"href":"https://github.com/chef/ohai/pull/640"},"issue":{"href":"https://api.github.com/repos/chef/ohai/issues/640"},"comments":{"href":"https://api.github.com/repos/chef/ohai/issues/640/comments"},"review_comments":{"href":"https://api.github.com/repos/chef/ohai/pulls/640/comments"},"review_comment":{"href":"https://api.github.com/repos/chef/ohai/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/chef/ohai/pulls/640/commits"},"statuses":{"href":"https://api.github.com/repos/chef/ohai/statuses/8e52ccb86ae76ec00effeee43a61d40b78a721c4"}}}}