celluloid-essentials 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06b378549089c71c661eb25c11fe031ab71f33c
-  data.tar.gz: aa4e43ec6fa721d6712b52f7cacab131c3ae382c
+  metadata.gz: 298af10b2efa750acf7ed68d7fe8d1380d02aa7d
+  data.tar.gz: fb8f2c3b686218ac91f6c4de93b1f6edc66f0022
 SHA512:
-  metadata.gz: 3380fe0205bdaac19d6a438f88c7febb581382dc85569232296f302554d84e3522633868a1f1e07080cc5c6fec2ead6926e59449106bf08c54666589469abfe1
-  data.tar.gz: 4a1f722532d49b4642f8a27b69f9a994e223d6741b2e7c43a32322770764db83ab90f5ab6d58102580e44aff0639f874a0ba4a6977a1d33b495aa57817bde23c
+  metadata.gz: f0beda51987351c6f0111d7d1c753058fdcb1e6390e58ff56515cf0743c58a1c4ef43629a7aab30de11cc4eff4ae1a03686b6d38dd9db3879e995837e31aa482
+  data.tar.gz: 2b9064f0c050853e00400fa225bcf14d78b0db1fc928c7ea37af52baa86a57089fdc09fc1f8eed2b71a1e2237e20430e5a0e16f57d5b7c88cc491b8ab6f68c13

data/celluloid-essentials.gemspec

@@ -4,7 +4,7 @@ require File.expand_path("../culture/sync", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name         = "celluloid-essentials"
-  gem.version      = "0.20.0"
+  gem.version      = "0.20.1"
   gem.platform     = Gem::Platform::RUBY
   gem.summary      = "Internally used tools, and superstructural dependencies of Celluloid"
   gem.description  = "Notifications, Internals, Logging, Probe, and essential Celluloid pieces demanding Supervision"

data/lib/celluloid/internals/cpu_counter.rb

@@ -6,29 +6,56 @@ module Celluloid
           @cores ||= count_cores
         end
 
-        private
+        private unless $CELLULOID_TEST
 
         def count_cores
-          result = from_env || from_sysdev || from_sysctl
-          Integer(result.to_s[/\d+/], 10) if result
+          from_result(from_env || from_sysdev || from_java || from_proc || from_win32ole || from_sysctl) || 1
         end
 
         def from_env
           result = ENV["NUMBER_OF_PROCESSORS"]
-          result if result
+          result if result && !result.empty?
+        rescue
         end
 
         def from_sysdev
           ::IO.read("/sys/devices/system/cpu/present").split("-").last.to_i + 1
         rescue Errno::ENOENT
-          result = Dir["/sys/devices/system/cpu/cpu*"].count { |n| n =~ /cpu\d+/ }
-          result unless result.zero?
+          begin
+            result = Dir["/sys/devices/system/cpu/cpu*"].count { |n| n =~ /cpu\d+/ }
+            result unless result.zero?
+          rescue
+          end
+        rescue
+        end
+
+        def from_java
+          Java::Java.lang.Runtime.getRuntime.availableProcessors if defined? Java::Java
+        rescue
+        end
+
+        def from_proc
+          File.read('/proc/cpuinfo').scan(/^processor\s*:/).size if File.exist?('/proc/cpuinfo')
+        rescue
+        end
+
+        def from_win32ole
+          require 'win32ole'
+          WIN32OLE.connect("winmgmts://").ExecQuery("select * from Win32_ComputerSystem").NumberOfProcessors
+        rescue
         end
 
         def from_sysctl
-          result = `sysctl -n hw.ncpu`
-          result if $CHILD_STATUS.success?
-        rescue Errno::ENOENT
+          Integer `sysctl -n hw.ncpu 2>/dev/null`
+        rescue
+        end
+
+        def from_result(result)
+          if result
+            i = Integer(result.to_s[/\d+/], 10)
+            return i if i > 0
+          end
+        rescue
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-essentials
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Internally used tools, and superstructural dependencies of Celluloid