childprocess 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb43fc3ddc0c42605984500b3f073380238a8e16
-  data.tar.gz: 1ceed15f2e82753c305ff77a9525a62df6c88bfc
+  metadata.gz: 573e0b0d60408f86b192aff074302d8eb93b23c7
+  data.tar.gz: 82f862132d5965c1ce89a5149c50117659434115
 SHA512:
-  metadata.gz: 87623a410a97e76bed96a8b66c1c35387f0f0e5858ce77439aeb09b61609852d1efb45189e2b455b10471ed710a9e70a343ec618dfd65c3f3fa73e2b7a639d44
-  data.tar.gz: cf64f680c7207e4a50ab0cd449f836363eeb83bab81f9f460b058e8774d3c09c9931de7c2079ae55bc7cba5c381f1b9d44a4a43a93aff80d0bcc192d75b90bb7
+  metadata.gz: cf46ed57aa6bc03bbeccdd4174b467086acab0652158495ab3fdecbe986c95dd5a79826ac223d3cb6af1e5de8987fa72ed6fb1087ddc431a62d2108924601e06
+  data.tar.gz: c3f394a000ef43ee311d93ea4406dd9a327beb7526e94214cb00777c43875a6042e69f8cdc19ec3fef28fe4e11271f56e8a72ff626ccfb407028a0254ffac67c

data/.travis.yml

@@ -1,3 +1,7 @@
+os:
+  - linux
+  - osx
+
 rvm:
   - 1.9.3
   - jruby

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### Version 0.6.2 / 2017-02-25
+
+* Bug fix: Fixed a potentially broken edge case that could occur on older 32-bit OSX systems.
+
+
 ### Version 0.6.1 / 2017-01-22
 
 * Bug fix: Fixed a dependency that was accidentally declared as a runtime 

data/Gemfile

@@ -8,4 +8,8 @@ if RUBY_VERSION =~ /^1\./
   gem 'tins', '< 1.7' # The 'tins' gem requires Ruby 2.x on/after this version
   gem 'json', '< 2.0' # The 'json' gem drops pre-Ruby 2.x support on/after this version
   gem 'term-ansicolor', '< 1.4' # The 'term-ansicolor' gem requires Ruby 2.x on/after this version
+
+  if RbConfig::CONFIG['host_os'].downcase =~ /mswin|msys|mingw32/
+    gem 'ffi', '< 1.9.15' # The 'ffi' gem, for Windows, requires Ruby 2.x on/after this version
+  end
 end

data/README.md

@@ -7,6 +7,7 @@ The code originated in the [selenium-webdriver](https://rubygems.org/gems/seleni
 a standalone library.
 
 [![Build Status](https://secure.travis-ci.org/enkessler/childprocess.png)](http://travis-ci.org/enkessler/childprocess)
+[![Build status](https://ci.appveyor.com/api/projects/status/fn2snbcd7kku5myk/branch/dev?svg=true)](https://ci.appveyor.com/project/enkessler/childprocess/branch/dev)
 [![Gem Version](https://badge.fury.io/rb/childprocess.png)](http://badge.fury.io/rb/childprocess)
 [![Code Climate](https://codeclimate.com/github/enkessler/childprocess.png)](https://codeclimate.com/github/enkessler/childprocess)
 [![Coverage Status](https://coveralls.io/repos/enkessler/childprocess/badge.png?branch=master)](https://coveralls.io/r/enkessler/childprocess?branch=master)

data/appveyor.yml

@@ -0,0 +1,43 @@
+version: '1.0.{build}'
+
+environment:
+  matrix:
+    - CHILDPROCESS_POSIX_SPAWN: true
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 193-x64
+    - CHILDPROCESS_POSIX_SPAWN: false
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 193-x64
+    - CHILDPROCESS_POSIX_SPAWN: true
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 200-x64
+    - CHILDPROCESS_POSIX_SPAWN: false
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 200-x64
+    - CHILDPROCESS_POSIX_SPAWN: true
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 21-x64
+    - CHILDPROCESS_POSIX_SPAWN: false
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 21-x64
+    - CHILDPROCESS_POSIX_SPAWN: true
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 22-x64
+    - CHILDPROCESS_POSIX_SPAWN: false
+      CHILDPROCESS_UNSET: should-be-unset
+      RUBY_VERSION: 22-x64
+
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle install
+
+build: off
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/lib/childprocess.rb

@@ -116,14 +116,8 @@ module ChildProcess
         host_cpu = RbConfig::CONFIG['host_cpu'].downcase
         case host_cpu
         when /i[3456]86/
-
-          # Ruby 2.4 unifies Bignum and Fixnum into Integer. Also, I've heard that Darwin no
-          # longer has this issue, so on newer Ruby/Darwin combos this check shouldn't be
-          # needed anyway. Leaving it here for older combinations, however.
-
-          # Check for Ruby older version of Ruby
-          if (RUBY_VERSION =~ /^[123]\./) && (os == :macosx) && (0xfee1deadbeef.is_a?(Fixnum))
-            # Darwin always reports i686, even when running in 64bit mod
+          if workaround_older_macosx_misreported_cpu?
+            # Workaround case: older 64-bit Darwin Rubies misreported as i686
             "x86_64"
           else
             "i386"
@@ -174,6 +168,21 @@ module ChildProcess
       end
     end
 
+    # Workaround: detect the situation that an older Darwin Ruby is actually
+    # 64-bit, but is misreporting cpu as i686, which would imply 32-bit.
+    #
+    # @return [Boolean] `true` if:
+    #   (a) on Mac OS X
+    #   (b) actually running in 64-bit mode
+    def workaround_older_macosx_misreported_cpu?
+      os == :macosx && is_64_bit?
+    end
+
+    # @return [Boolean] `true` if this Ruby represents `1` in 64 bits (8 bytes).
+    def is_64_bit?
+      1.size == 8
+    end
+
   end # class << self
 end # ChildProcess
 

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/spec/platform_detection_spec.rb

@@ -0,0 +1,86 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+# Q: Should platform detection concern be extracted from ChildProcess?
+describe ChildProcess do
+
+  describe ".arch" do
+    subject { described_class.arch }
+
+    before(:each) { described_class.instance_variable_set(:@arch, nil) }
+
+    after(:each) { described_class.instance_variable_set(:@arch, nil) }
+
+    shared_examples 'expected_arch_for_host_cpu' do |host_cpu, expected_arch|
+      context "when host_cpu is '#{host_cpu}'" do
+        before :each do
+          allow(RbConfig::CONFIG).
+            to receive(:[]).
+            with('host_cpu').
+            and_return(expected_arch)
+        end
+
+        it { is_expected.to eq expected_arch }
+      end
+    end
+
+    # Normal cases: not macosx - depends only on host_cpu
+    context "when os is *not* 'macosx'" do
+      before :each do
+        allow(described_class).to receive(:os).and_return(:not_macosx)
+      end
+
+      [
+        { host_cpu: 'i386',    expected_arch: 'i386'    },
+        { host_cpu: 'i486',    expected_arch: 'i386'    },
+        { host_cpu: 'i586',    expected_arch: 'i386'    },
+        { host_cpu: 'i686',    expected_arch: 'i386'    },
+        { host_cpu: 'amd64',   expected_arch: 'x86_64'  },
+        { host_cpu: 'x86_64',  expected_arch: 'x86_64'  },
+        { host_cpu: 'ppc',     expected_arch: 'powerpc' },
+        { host_cpu: 'powerpc', expected_arch: 'powerpc' },
+        { host_cpu: 'unknown', expected_arch: 'unknown' },
+      ].each do |args|
+        include_context 'expected_arch_for_host_cpu', args.values
+      end
+    end
+
+    # Special cases: macosx - when host_cpu is i686, have to re-check
+    context "when os is 'macosx'" do
+      before :each do
+        allow(described_class).to receive(:os).and_return(:macosx)
+      end
+
+      context "when host_cpu is 'i686' " do
+        shared_examples 'expected_arch_on_macosx_i686' do |is_64, expected_arch|
+          context "when Ruby is #{is_64 ? 64 : 32}-bit" do
+            before :each do
+              allow(described_class).
+                to receive(:is_64_bit?).
+                and_return(is_64)
+            end
+
+            include_context 'expected_arch_for_host_cpu', 'i686', expected_arch
+          end
+        end
+
+        [
+          { is_64: true,  expected_arch: 'x86_64' },
+          { is_64: false, expected_arch: 'i386'   }
+        ].each do |args|
+          include_context 'expected_arch_on_macosx_i686', args.values
+        end
+      end
+
+      [
+        { host_cpu: 'amd64',   expected_arch: 'x86_64'  },
+        { host_cpu: 'x86_64',  expected_arch: 'x86_64'  },
+        { host_cpu: 'ppc',     expected_arch: 'powerpc' },
+        { host_cpu: 'powerpc', expected_arch: 'powerpc' },
+        { host_cpu: 'unknown', expected_arch: 'unknown' },
+      ].each do |args|
+        include_context 'expected_arch_for_host_cpu', args.values
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jari Bakken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -104,6 +104,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - childprocess.gemspec
 - lib/childprocess.rb
 - lib/childprocess/abstract_io.rb
@@ -137,6 +138,7 @@ files:
 - spec/io_spec.rb
 - spec/jruby_spec.rb
 - spec/pid_behavior.rb
+- spec/platform_detection_spec.rb
 - spec/spec_helper.rb
 - spec/unix_spec.rb
 - spec/windows_spec.rb
@@ -160,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: childprocess
-rubygems_version: 2.6.7
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A simple and reliable solution for controlling external programs running
@@ -171,6 +173,7 @@ test_files:
 - spec/io_spec.rb
 - spec/jruby_spec.rb
 - spec/pid_behavior.rb
+- spec/platform_detection_spec.rb
 - spec/spec_helper.rb
 - spec/unix_spec.rb
 - spec/windows_spec.rb