v2.1.0

This reverts commit 01ca86de8b.

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v2.1.0
+
+### New Features
+
+- #117 - ruby 2.7 compatibility
+
 ## v2.0.2
 
 ### Fixes

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "json"
 gem "rspec"
 gem "rake"
-gem "simplecov"
+gem "simplecov", "~> 0.15.0"
 gem "yard"
 gem "rdoc"
 gem "redcarpet"

Gemfile.lock

@@ -2,31 +2,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    docile (1.3.2)
-    json (2.2.0)
-    rake (12.3.2)
-    rdoc (6.1.1)
-    redcarpet (3.4.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    docile (1.1.5)
+    json (2.3.0)
+    rake (13.0.1)
+    rdoc (6.2.1)
+    redcarpet (3.5.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    simplecov (0.15.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     syntax (1.2.2)
-    yard (0.9.20)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
@@ -38,9 +38,9 @@ DEPENDENCIES
   rdoc
   redcarpet
   rspec
-  simplecov
+  simplecov (~> 0.15.0)
   syntax
   yard
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

lib/rscons/environment.rb

@@ -1,7 +1,6 @@
 require "fileutils"
 require "set"
 require "shellwords"
-require "thwait"
 
 module Rscons
   # The Environment class is the main programmatic interface to Rscons. It
@@ -702,10 +701,7 @@ module Rscons
           !thread.alive?
         end
       else
-        if @threads.empty?
-          raise "No threads to wait for"
-        end
-        ThreadsWait.new(*@threads.keys).next_wait
+        Util.wait_for_thread(*@threads.keys)
       end
     end
 

lib/rscons/util.rb

@@ -191,6 +191,32 @@ module Rscons
         deps
       end
 
+      # Wait for any of a number of threads to complete.
+      #
+      # @param threads [Array<Thread>]
+      #   Threads to wait for.
+      #
+      # @return [Thread]
+      #   The Thread that completed.
+      def wait_for_thread(*threads)
+        if threads.empty?
+          raise "No threads to wait for"
+        end
+        queue = Queue.new
+        threads.each do |thread|
+          # Create a wait thread for each thread we're waiting for.
+          Thread.new do
+            begin
+              thread.join
+            ensure
+              queue.push(thread)
+            end
+          end
+        end
+        # Wait for any thread to complete.
+        queue.pop
+      end
+
       private
 
       # Check if a directory contains a certain executable.

lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # Project version.
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

spec/build_tests_spec.rb

@@ -143,7 +143,7 @@ EOF
       end
     end
     stdout, stderr, status = nil, nil, nil
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       env = ENV.to_h
       path = ["#{@build_test_run_dir}/_bin", "#{env["PATH"]}"]
       if options[:path]