Merge pull request #783 from ruby-concurrency/minor

Minor

Author: pitr-ch

Rakefile

@@ -18,8 +18,6 @@ edge_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-edge.
 
 require 'rake/javaextensiontask'
 
-JRUBY_JAR_PATH = '/usr/local/opt/rbenv/versions/jruby-9.1.17.0/lib/jruby.jar'
-
 class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
   def java_classpath_arg(*args)
     jruby_cpath = nil
@@ -42,10 +40,15 @@ class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
     end
 
     unless jruby_cpath
-      jruby_cpath = JRUBY_JAR_PATH
-      raise "#{jruby_cpath} does not exist" unless File.exist? jruby_cpath
+      jruby_home = ENV['JRUBY_HOME']
+      if jruby_home
+        candidate = File.join(jruby_home, 'lib', 'jruby.jar')
+        jruby_cpath = candidate if File.exist? candidate
+      end
     end
 
+    raise "jruby.jar path not found" unless jruby_cpath
+
     jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
     jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
   end
@@ -74,7 +77,9 @@ namespace :repackage do
   desc '* with Windows fat distributions'
   task :all do
     Dir.chdir(__dir__) do
+      # store gems in vendor cache for docker
       sh 'bundle package'
+
       # needed only if the jar is built outside of docker
       Rake::Task['lib/concurrent/concurrent_ruby.jar'].invoke
       RakeCompilerDock.exec 'support/cross_building.sh'

docs-source/promises.in.md

@@ -61,6 +61,7 @@ future = Concurrent::Promises.future(0.1) do |duration|
   sleep duration
   :result
 end
+future.value
 ```
 
 Asks if the future is resolved, here it will be still in the middle of the

docs-source/promises.out.md

@@ -95,13 +95,14 @@ future = Concurrent::Promises.future(0.1) do |duration|
   :result
 end
 # => #<Concurrent::Promises::Future:0x000005 pending>
+future.value                             # => :result
 ```
 
 Asks if the future is resolved, here it will be still in the middle of the
 sleep call.
 
 ```ruby
-future.resolved?                         # => false
+future.resolved?                         # => true
 ```
 
 Retrieving the value will block until the future is **resolved**.
@@ -264,7 +265,7 @@ do_stuff arg }`) is **required**. Both of the following bad examples may break:
 ```ruby
 arg = 1                                  # => 1
 Thread.new { do_stuff arg }
-# => #<Thread:0x00000c@promises.in.md:203 run>
+# => #<Thread:0x00000c@promises.in.md:204 run>
 Concurrent::Promises.future { do_stuff arg }
 # => #<Concurrent::Promises::Future:0x00000d pending>
 ```
@@ -274,7 +275,7 @@ Correct:
 ```ruby
 arg = 1                                  # => 1
 Thread.new(arg) { |arg| do_stuff arg }
-# => #<Thread:0x00000e@promises.in.md:211 run>
+# => #<Thread:0x00000e@promises.in.md:212 run>
 Concurrent::Promises.future(arg) { |arg| do_stuff arg }
 # => #<Concurrent::Promises::Future:0x00000f pending>
 ```
@@ -593,7 +594,7 @@ and `:io` for long-running and blocking tasks.
 ```ruby
 Concurrent::Promises.future_on(:fast) { 2 }.
     then_on(:io) { File.read __FILE__ }.
-    value.size                           # => 27117
+    value.size                           # => 27130
 ```
 
 ## Run (simulated process)
@@ -607,7 +608,7 @@ count = lambda do |v|
   v += 1
   v < 5 ? Concurrent::Promises.future_on(:fast, v, &count) : v
 end
-# => #<Proc:0x000018@promises.in.md:520 (lambda)>
+# => #<Proc:0x000018@promises.in.md:521 (lambda)>
 400.times.
     map { Concurrent::Promises.future_on(:fast, 0, &count).run.value! }.
     all? { |v| v == 5 }                  # => true

docs/master/file.CHANGELOG.html

@@ -59,6 +59,10 @@
 
       <div id="content"><div id='filecontents'><h2>Current</h2>
 
+<ul>
+<li>(#776) Fix NameError on defining a struct with a name which is already taken in an ancestor</li>
+</ul>
+
 <h2>Release v1.1.3 (7 Nov 2018)</h2>
 
 <ul>

docs/master/file.promises.out.html

@@ -148,12 +148,13 @@ <h2>Asynchronous task</h2>
   <span class='symbol'>:result</span>
 <span class='kw'>end</span>
 <span class='comment'># =&gt; #&lt;Concurrent::Promises::Future:0x000005 pending&gt;
+</span><span class='id identifier rubyid_future'>future</span><span class='period'>.</span><span class='id identifier rubyid_value'>value</span>                             <span class='comment'># =&gt; :result
 </span></code></pre>
 
 <p>Asks if the future is resolved, here it will be still in the middle of the
 sleep call.</p>
 
-<pre class="code ruby"><code class="ruby"><span class='id identifier rubyid_future'>future</span><span class='period'>.</span><span class='id identifier rubyid_resolved?'>resolved?</span>                         <span class='comment'># =&gt; false
+<pre class="code ruby"><code class="ruby"><span class='id identifier rubyid_future'>future</span><span class='period'>.</span><span class='id identifier rubyid_resolved?'>resolved?</span>                         <span class='comment'># =&gt; true
 </span></code></pre>
 
 <p>Retrieving the value will block until the future is <strong>resolved</strong>.</p>
@@ -303,7 +304,7 @@ <h2>Chaining</h2>
 
 <pre class="code ruby"><code class="ruby"><span class='id identifier rubyid_arg'>arg</span> <span class='op'>=</span> <span class='int'>1</span>                                  <span class='comment'># =&gt; 1
 </span><span class='const'>Thread</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span> <span class='lbrace'>{</span> <span class='id identifier rubyid_do_stuff'>do_stuff</span> <span class='id identifier rubyid_arg'>arg</span> <span class='rbrace'>}</span>
-<span class='comment'># =&gt; #&lt;Thread:0x00000c@promises.in.md:203 run&gt;
+<span class='comment'># =&gt; #&lt;Thread:0x00000c@promises.in.md:204 run&gt;
 </span><span class='const'><span class='object_link'><a href="Concurrent.html" title="Concurrent (module)">Concurrent</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Concurrent/Promises.html" title="Concurrent::Promises (module)">Promises</a></span></span><span class='period'>.</span><span class='id identifier rubyid_future'><span class='object_link'><a href="Concurrent/Promises/FactoryMethods.html#future-instance_method" title="Concurrent::Promises::FactoryMethods#future (method)">future</a></span></span> <span class='lbrace'>{</span> <span class='id identifier rubyid_do_stuff'>do_stuff</span> <span class='id identifier rubyid_arg'>arg</span> <span class='rbrace'>}</span>
 <span class='comment'># =&gt; #&lt;Concurrent::Promises::Future:0x00000d pending&gt;
 </span></code></pre>
@@ -312,7 +313,7 @@ <h2>Chaining</h2>
 
 <pre class="code ruby"><code class="ruby"><span class='id identifier rubyid_arg'>arg</span> <span class='op'>=</span> <span class='int'>1</span>                                  <span class='comment'># =&gt; 1
 </span><span class='const'>Thread</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_arg'>arg</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_arg'>arg</span><span class='op'>|</span> <span class='id identifier rubyid_do_stuff'>do_stuff</span> <span class='id identifier rubyid_arg'>arg</span> <span class='rbrace'>}</span>
-<span class='comment'># =&gt; #&lt;Thread:0x00000e@promises.in.md:211 run&gt;
+<span class='comment'># =&gt; #&lt;Thread:0x00000e@promises.in.md:212 run&gt;
 </span><span class='const'><span class='object_link'><a href="Concurrent.html" title="Concurrent (module)">Concurrent</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Concurrent/Promises.html" title="Concurrent::Promises (module)">Promises</a></span></span><span class='period'>.</span><span class='id identifier rubyid_future'><span class='object_link'><a href="Concurrent/Promises/FactoryMethods.html#future-instance_method" title="Concurrent::Promises::FactoryMethods#future (method)">future</a></span></span><span class='lparen'>(</span><span class='id identifier rubyid_arg'>arg</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_arg'>arg</span><span class='op'>|</span> <span class='id identifier rubyid_do_stuff'>do_stuff</span> <span class='id identifier rubyid_arg'>arg</span> <span class='rbrace'>}</span>
 <span class='comment'># =&gt; #&lt;Concurrent::Promises::Future:0x00000f pending&gt;
 </span></code></pre>
@@ -610,7 +611,7 @@ <h2>Using executors</h2>
 
 <pre class="code ruby"><code class="ruby"><span class='const'><span class='object_link'><a href="Concurrent.html" title="Concurrent (module)">Concurrent</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Concurrent/Promises.html" title="Concurrent::Promises (module)">Promises</a></span></span><span class='period'>.</span><span class='id identifier rubyid_future_on'><span class='object_link'><a href="Concurrent/Promises/FactoryMethods.html#future_on-instance_method" title="Concurrent::Promises::FactoryMethods#future_on (method)">future_on</a></span></span><span class='lparen'>(</span><span class='symbol'>:fast</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='int'>2</span> <span class='rbrace'>}</span><span class='period'>.</span>
     <span class='id identifier rubyid_then_on'>then_on</span><span class='lparen'>(</span><span class='symbol'>:io</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_read'>read</span> <span class='kw'>__FILE__</span> <span class='rbrace'>}</span><span class='period'>.</span>
-    <span class='id identifier rubyid_value'>value</span><span class='period'>.</span><span class='id identifier rubyid_size'>size</span>                           <span class='comment'># =&gt; 27117
+    <span class='id identifier rubyid_value'>value</span><span class='period'>.</span><span class='id identifier rubyid_size'>size</span>                           <span class='comment'># =&gt; 27130
 </span></code></pre>
 
 <h2>Run (simulated process)</h2>
@@ -623,7 +624,7 @@ <h2>Run (simulated process)</h2>
   <span class='id identifier rubyid_v'>v</span> <span class='op'>+=</span> <span class='int'>1</span>
   <span class='id identifier rubyid_v'>v</span> <span class='op'>&lt;</span> <span class='int'>5</span> <span class='op'>?</span> <span class='const'><span class='object_link'><a href="Concurrent.html" title="Concurrent (module)">Concurrent</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Concurrent/Promises.html" title="Concurrent::Promises (module)">Promises</a></span></span><span class='period'>.</span><span class='id identifier rubyid_future_on'><span class='object_link'><a href="Concurrent/Promises/FactoryMethods.html#future_on-instance_method" title="Concurrent::Promises::FactoryMethods#future_on (method)">future_on</a></span></span><span class='lparen'>(</span><span class='symbol'>:fast</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_count'>count</span><span class='rparen'>)</span> <span class='op'>:</span> <span class='id identifier rubyid_v'>v</span>
 <span class='kw'>end</span>
-<span class='comment'># =&gt; #&lt;Proc:0x000018@promises.in.md:520 (lambda)&gt;
+<span class='comment'># =&gt; #&lt;Proc:0x000018@promises.in.md:521 (lambda)&gt;
 </span><span class='int'>400</span><span class='period'>.</span><span class='id identifier rubyid_times'>times</span><span class='period'>.</span>
     <span class='id identifier rubyid_map'>map</span> <span class='lbrace'>{</span> <span class='const'><span class='object_link'><a href="Concurrent.html" title="Concurrent (module)">Concurrent</a></span></span><span class='op'>::</span><span class='const'><span class='object_link'><a href="Concurrent/Promises.html" title="Concurrent::Promises (module)">Promises</a></span></span><span class='period'>.</span><span class='id identifier rubyid_future_on'><span class='object_link'><a href="Concurrent/Promises/FactoryMethods.html#future_on-instance_method" title="Concurrent::Promises::FactoryMethods#future_on (method)">future_on</a></span></span><span class='lparen'>(</span><span class='symbol'>:fast</span><span class='comma'>,</span> <span class='int'>0</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_count'>count</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_run'><span class='object_link'><a href="Concurrent/Promises/Future.html#run-instance_method" title="Concurrent::Promises::Future#run (method)">run</a></span></span><span class='period'>.</span><span class='id identifier rubyid_value!'><span class='object_link'><a href="Concurrent/Promises/Future.html#value!-instance_method" title="Concurrent::Promises::Future#value! (method)">value!</a></span></span> <span class='rbrace'>}</span><span class='period'>.</span>
     <span class='id identifier rubyid_all?'>all?</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span> <span class='op'>==</span> <span class='int'>5</span> <span class='rbrace'>}</span>                  <span class='comment'># =&gt; true