Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
pitr-ch committed Oct 31, 2018
1 parent ad9081a commit 00d8328
Show file tree
Hide file tree
Showing 15 changed files with 2,526 additions and 1,921 deletions.
55 changes: 44 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,29 @@ edge_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-edge.

require 'rake/javaextensiontask'

Rake::JavaExtensionTask.new('concurrent_ruby', core_gemspec) do |ext|
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
if RUBY_PLATFORM =~ /java/
begin
cpath = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
rescue => e
end
end
unless jruby_cpath
jruby_cpath = JRUBY_JAR_PATH
raise "#{jruby_cpath} does not exist" unless File.exist? jruby_cpath
end
jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
end
end

ConcurrentRubyJavaExtensionTask.new('concurrent_ruby', core_gemspec) do |ext|
ext.ext_dir = 'ext/concurrent-ruby'
ext.lib_dir = 'lib/concurrent'
end
Expand Down Expand Up @@ -203,14 +225,25 @@ namespace :release do

task :checks => "yard:#{current_yard_version_name}:uptodate" do
Dir.chdir(__dir__) do
begin
STDOUT.puts "Is this a final release build? (Do git checks?) (y/n)"
input = STDIN.gets.strip.downcase
end until %w(y n).include?(input)
if input == 'y'
sh 'test -z "$(git status --porcelain)"'
sh 'git fetch'
sh 'test $(git show-ref --verify --hash refs/heads/master) = $(git show-ref --verify --hash refs/remotes/github/master)'
sh 'test -z "$(git status --porcelain)"' do |ok, res|
unless ok
begin
STDOUT.puts 'Command failed. Continue? (y/n)'
input = STDIN.gets.strip.downcase
end until %w(y n).include?(input)
exit 1 if input == 'n'
end
end
sh 'git fetch'
sh 'test $(git show-ref --verify --hash refs/heads/master) = ' +
'$(git show-ref --verify --hash refs/remotes/github/master)' do |ok, res|
unless ok
begin
STDOUT.puts 'Command failed. Continue? (y/n)'
input = STDIN.gets.strip.downcase
end until %w(y n).include?(input)
exit 1 if input == 'n'
end
end
end
end
Expand Down Expand Up @@ -243,10 +276,10 @@ namespace :release do
namespace :publish do
task :ask do
begin
STDOUT.puts "Do you want to publish? (y/n)"
STDOUT.puts 'Do you want to publish? (y/n)'
input = STDIN.gets.strip.downcase
end until %w(y n).include?(input)
raise 'reconsidered' if input == 'n'
exit 1 if input == 'n'
end

desc '** tag HEAD with current version and push to github'
Expand Down
2 changes: 1 addition & 1 deletion docs-source/signpost.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
Pick a version:

* [master](./master/index.html)
* [1.1.0.pre2](./1.1.0/index.html)
* [1.1.0](./1.1.0/index.html)
* [1.0.5](./1.0.5/index.html)
4 changes: 2 additions & 2 deletions docs/1.1.0/Concurrent.html
Original file line number Diff line number Diff line change
Expand Up @@ -653,12 +653,12 @@ <h2>
<dt id="VERSION-constant" class="">VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.0.pre2</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="EDGE_VERSION-constant" class="">EDGE_VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.0.pre2</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="NULL_LOGGER-constant" class="">NULL_LOGGER =
<div class="docstring">
Expand Down
168 changes: 84 additions & 84 deletions docs/1.1.0/Concurrent/AtomicReference.html
Original file line number Diff line number Diff line change
Expand Up @@ -429,18 +429,18 @@ <h3 class="signature first" id="initialize-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -542,18 +542,18 @@ <h3 class="signature first" id="compare_and_set-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -611,18 +611,18 @@ <h3 class="signature " id="get-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -699,18 +699,18 @@ <h3 class="signature " id="get_and_set-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -787,18 +787,18 @@ <h3 class="signature " id="set-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -860,12 +860,12 @@ <h3 class="signature " id="to_s-instance_method">
<pre class="lines">


188
189
190</pre>
198
199
200</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 188</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 198</span>

<span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
<span class='id identifier rubyid_format'>format</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>%s value:%s&gt;</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span> <span class='kw'>super</span><span class='lbracket'>[</span><span class='int'>0</span><span class='op'>..</span><span class='op'>-</span><span class='int'>2</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='id identifier rubyid_get'>get</span>
Expand Down Expand Up @@ -964,18 +964,18 @@ <h3 class="signature " id="try_update-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -1099,18 +1099,18 @@ <h3 class="signature " id="try_update!-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down Expand Up @@ -1207,18 +1207,18 @@ <h3 class="signature " id="update-instance_method">
<pre class="lines">


185
186
187
188
189
190
191
192
193</pre>
195
196
197
198
199
200
201
202
203</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>

<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>

Expand Down
Loading

0 comments on commit 00d8328

Please sign in to comment.