duffy 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 100c63ff9b828098a5bd8e821b29ce9d3c1624ba
-  data.tar.gz: 7c9aefa4b82df694a0701e26b820f1225a6c93c7
+  metadata.gz: 4e08825eab80f162c76e7815a7be79bfc481a81f
+  data.tar.gz: e7ca62ca598dfa32a4ba3d4dbda468bdbe54e54d
 SHA512:
-  metadata.gz: 8aa53762c95c0fc78041971c1538d4ceb88bc44c2621159f0808c5188d4994139cf12a7fdac919efc29001346a3f915e9f54c94c868fe44c0a530f81eb0daad9
-  data.tar.gz: b6f28ff62cd5863ae7eb7fe03bc577eed0546817c2529193f18a91f038ac01b5da3c0cadecb80d863df2724a5e04ed0ff8d836075f0678d3563203450b64d3de
+  metadata.gz: 47b1d4e7cdee31059a26845436300537a9227b380d91776eda64ca28457b240980990d588a1179c1af1952c746facc9cbb8ded54c3e202e4a2b4b0b7fef8d95e
+  data.tar.gz: ed3c3003ba38f10fb3ffd8b4baee7b35ee55d44fac0ed4708a4e2351d58785b3d791a602b900ca3b9118dfd7aa8df18fe1b802719d82b69565379e0745445aa0

data/README.md

@@ -46,7 +46,7 @@ This one is namespaced in case you use the 'git' gem.  I found it to be overkill
 ```
 
 CPU Detection:
-Linux only for now, each method returns 1 on non-Linux hosts.
+Linux and Mac only for now, each method returns 1 on unsupported hosts.
 Example results for my dual core i5 with hyperthreading.
 ```ruby
    Duffy::System.cpus     # => 1

data/lib/duffy/system.rb

@@ -9,20 +9,34 @@ module Duffy
     class << self
 
       # How many Physical CPUs do you have.
-      # Detected by counting unique physical IDs
+      # Linux:  Detected by counting unique physical IDs
+      # Mac:    hw.packages
       def cpus
-        File.read('/proc/cpuinfo').scan(/^physical id.*/).uniq.count rescue 1
+        case RUBY_PLATFORM
+          when /linux/  then File.read('/proc/cpuinfo').scan(/^physical id.*/).uniq.count rescue 1
+          when /darwin/ then `sysctl -n hw.packages`.to_i rescue 1
+          else 1
+        end
       end
 
       # How many actual CPU cores do we have not including Hyperthreading
-      # "cpu cores" in cpuinfo is on a per physical processor basis, so we multiply by the number of CPUs
+      # Linux:  "cpu cores" in cpuinfo is on a per physical processor basis, so we multiply by the number of CPUs
+      # Mac:    hw.physicalcpu
       def cores
-        (File.read('/proc/cpuinfo').scan(/^cpu cores.*/).first.scan(/\d+$/).first.to_i rescue 1) * cpus
+        case RUBY_PLATFORM
+          when /linux/  then (File.read('/proc/cpuinfo').scan(/^cpu cores.*/).first.scan(/\d+$/).first.to_i rescue 1) * cpus
+          when /darwin/ then `sysctl -n hw.physicalcpu`.to_i rescue 1
+          else 1
+        end
       end
 
       # How many threads does the system have.
       def threads
-        File.read('/proc/cpuinfo').scan(/^processor\s*:/).size rescue 1
+        case RUBY_PLATFORM
+          when /linux/  then File.read('/proc/cpuinfo').scan(/^processor\s*:/).size rescue 1
+          when /darwin/ then `sysctl -n hw.ncpu`.to_i rescue 1
+          else 1
+        end
       end
 
     end

data/lib/duffy/version.rb

@@ -1,3 +1,3 @@
 module Duffy
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duffy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jacob Duffy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Library of things