olag 0.1.18 → 0.1.22

data/ChangeLog

@@ -1,3 +1,13 @@
+2012-03-18	Oren Ben-Kiki <github-oren@ben-kiki.org>
+
+	* Remove bug introduced by previous fix.
+	* Fix nasty timing bug (tempfile finalizer).
+	* Update to latest gem versions.
+
+2012-01-27	Oren Ben-Kiki <github-oren@ben-kiki.org>
+
+	* Fix syntax highlighting.
+
 2012-01-17	Oren Ben-Kiki <github-oren@ben-kiki.org>
 
 	* Add hack for sorting hash YAML keys.

data/codnar.html

@@ -800,12 +800,12 @@ The Olag::Rake class sets up the tasks listed above as follows:
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">olag/update_version</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">olag/version</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rake/clean</span><span class="Special">&quot;</span>
-<span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rake/gempackagetask</span><span class="Special">&quot;</span>
-<span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rake/rdoctask</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rake/testtask</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rcov/rcovtask</span><span class="Special">&quot;</span>
+<span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rdoc/task</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">reek/rake/task</span><span class="Special">&quot;</span>
 <span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">roodi</span><span class="Special">&quot;</span>
+<span class="PreProc">require</span> <span class="Special">&quot;</span><span class="Constant">rubygems/package_task</span><span class="Special">&quot;</span>
 
 <span class="PreProc">module</span> <span class="Type">Olag</span>
 
@@ -827,6 +827,8 @@ Automate Rake task creation for a gem.
 <pre class='ruby code syntax'>
   <span class="PreProc">class</span> <span class="Type">Rake</span>
 
+    <span class="PreProc">include</span> ::<span class="Type">Rake</span>::<span class="Type">DSL</span>
+
 </pre>
     <table class='layout'>
 <tr>
@@ -884,18 +886,18 @@ Define a task that does “everything”.
 <td class='html'>
 <div class='rdoc comment markup'>
 <p>
-This is a problem. If the version number gets updated, GemPackageTask
+This is a problem. If the version number gets updated, Gem::PackageTask
 fails. This is better than if it used the old version number, I suppose,
 but not as nice as if it just used @spec.version everywhere. The solution
-for this is to do a dry run before doing the final <tt>rake</tt>
-<tt>commit</tt>, which is a good idea in general.
+for this is to do a dry run before doing the final <code>rake</code>
+<code>commit</code>, which is a good idea in general.
 </p>
 </div>
 </td>
 </tr>
 </table>
 <pre class='ruby code syntax'>
-      ::<span class="Type">Rake</span>::<span class="Type">GemPackageTask</span>.new(<span class="Identifier">@spec</span>) { |<span class="Identifier">package</span>| }
+      <span class="Type">Gem</span>::<span class="Type">PackageTask</span>.new(<span class="Identifier">@spec</span>) { |<span class="Identifier">package</span>| }
     end
 
 </pre>
@@ -1790,14 +1792,14 @@ This module contains all the Olag code.
 <div class='rdoc comment markup'>
 <p>
 This version number. The third number is automatically updated to track the
-number of Git commits by running <tt>rake version</tt>.
+number of Git commits by running <code>rake version</code>.
 </p>
 </div>
 </td>
 </tr>
 </table>
 <pre class='ruby code syntax'>
-  <span class="Type">VERSION</span> = <span class="Special">&quot;</span><span class="Constant">0.1.18</span><span class="Special">&quot;</span>
+  <span class="Type">VERSION</span> = <span class="Special">&quot;</span><span class="Constant">0.1.22</span><span class="Special">&quot;</span>
 
 end
 </pre>
@@ -3385,8 +3387,8 @@ when the test is done.
       file = <span class="Type">Tempfile</span>.open(path, directory)
       file.write(content)
       file.close(<span class="Constant">false</span>)
-      (<span class="Identifier">@tempfiles</span> ||= []) &lt;&lt; (path = file.path)
-      <span class="Statement">return</span> path
+      (<span class="Identifier">@tempfiles</span> ||= []) &lt;&lt; file
+      <span class="Statement">return</span> file.path
     <span class="PreProc">end</span>
 
 </pre>
@@ -3409,8 +3411,8 @@ complex file tests that can’t use FakeFS.
 <pre class='ruby code syntax'>
     <span class="PreProc">def</span> <span class="Identifier">create_tempdir</span>(directory = <span class="Special">&quot;</span><span class="Constant">.</span><span class="Special">&quot;</span>)
       file = <span class="Type">Tempfile</span>.open(<span class="Special">&quot;</span><span class="Constant">dir</span><span class="Special">&quot;</span>, directory)
-      (<span class="Identifier">@tempfiles</span> ||= []) &lt;&lt; (path = file.path)
-      <span class="Type">File</span>.delete(path)
+      (<span class="Identifier">@tempfiles</span> ||= []) &lt;&lt; file
+      <span class="Type">File</span>.delete(path = file.path)
       <span class="Type">Dir</span>.mkdir(path)
       <span class="Statement">return</span> path
     <span class="PreProc">end</span>
@@ -3456,7 +3458,8 @@ Automatically clean up the temporary files when the test is done.
         <span class="PreProc">def</span> <span class="Identifier">teardown</span>
           tempfile_original_teardown
           (<span class="Identifier">@tempfiles</span> || []).each <span class="Statement">do</span> |<span class="Identifier">tempfile</span>|
-            <span class="Type">FileUtils</span>.rm_rf(tempfile) <span class="Statement">if</span> <span class="Type">File</span>.exist?(tempfile)
+            path = tempfile.path
+            <span class="Type">FileUtils</span>.rm_rf(path) <span class="Statement">if</span> <span class="Type">File</span>.exist?(path)
           <span class="Statement">end</span>
         <span class="PreProc">end</span>
 
@@ -4655,7 +4658,8 @@ function contents_lists() {
   var container;
   var indices = [];
   var h_elements = all_h_elements();
-  for (var e in h_elements) {
+  /* Using "for (var e in h_elements)" is too sensitive to other libraries */
+  for (var e = 0; e < h_elements.length; e++) {
     h = h_elements[e];
     var level = h.tagName.substring(1, 2) - 1;
     container = pop_container(container, indices, level);

data/lib/olag/rake.rb

@@ -4,18 +4,20 @@ require "olag/gem_specification"
 require "olag/update_version"
 require "olag/version"
 require "rake/clean"
-require "rake/gempackagetask"
-require "rake/rdoctask"
 require "rake/testtask"
 require "rcov/rcovtask"
+require "rdoc/task"
 require "reek/rake/task"
 require "roodi"
+require "rubygems/package_task"
 
 module Olag
 
   # Automate Rake task creation for a gem.
   class Rake
 
+    include ::Rake::DSL
+
     # Define all the Rake tasks.
     def initialize(spec)
       @spec = spec
@@ -34,12 +36,12 @@ module Olag
       define_verify_task
       define_doc_task
       define_commit_task
-      # This is a problem. If the version number gets updated, GemPackageTask
+      # This is a problem. If the version number gets updated, Gem::PackageTask
       # fails. This is better than if it used the old version number, I
       # suppose, but not as nice as if it just used @spec.version everywhere.
       # The solution for this is to do a dry run before doing the final +rake+
       # +commit+, which is a good idea in general.
-      ::Rake::GemPackageTask.new(@spec) { |package| }
+      Gem::PackageTask.new(@spec) { |package| }
     end
 
     # {{{ Verify gem functionality

data/lib/olag/test/with_tempfile.rb

@@ -12,8 +12,8 @@ module Test
       file = Tempfile.open(path, directory)
       file.write(content)
       file.close(false)
-      (@tempfiles ||= []) << (path = file.path)
-      return path
+      (@tempfiles ||= []) << file
+      return file.path
     end
 
     # Create a temporary directory on the disk. The directory will be
@@ -21,8 +21,8 @@ module Test
     # complex file tests that can't use FakeFS.
     def create_tempdir(directory = ".")
       file = Tempfile.open("dir", directory)
-      (@tempfiles ||= []) << (path = file.path)
-      File.delete(path)
+      (@tempfiles ||= []) << file
+      File.delete(path = file.path)
       Dir.mkdir(path)
       return path
     end
@@ -38,7 +38,8 @@ module Test
         def teardown
           tempfile_original_teardown
           (@tempfiles || []).each do |tempfile|
-            FileUtils.rm_rf(tempfile) if File.exist?(tempfile)
+            path = tempfile.path
+            FileUtils.rm_rf(path) if File.exist?(path)
           end
         end
 

data/lib/olag/version.rb

@@ -3,6 +3,6 @@ module Olag
 
   # This version number. The third number is automatically updated to track the
   # number of Git commits by running <tt>rake version</tt>.
-  VERSION = "0.1.18"
+  VERSION = "0.1.22"
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: olag
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - Oren Ben-Kiki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 Z
+date: 2012-03-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: Saikuro
@@ -205,7 +205,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --title
-- Olag 0.1.18
+- Olag 0.1.22
 - --main
 - README.rdoc
 - --line-numbers