newgem 0.20.0 → 0.20.1

data/History.txt

@@ -1,3 +1,12 @@
+== 0.20.1 2008-03-30
+
+* extconf generator
+  * creates test/test_#{name}_extn.rb test file
+  * creates .autotest file for *.c -> test/test_*_extn.rb
+  * failed compilation destroyes *.o/so/bundle/dll files so tests fail too
+  * USAGE has docco on files to ignore in SCM + hoe
+* requirements.rb no longer loads main lib file; no idea why it did it before
+
 == 0.20.0 2008-03-30
 
 * extconf generator - for C-extensions

data/Manifest.txt

@@ -69,10 +69,13 @@ rubygems_generators/executable/executable_generator.rb
 rubygems_generators/executable/templates/app.rb
 rubygems_generators/extconf/USAGE
 rubygems_generators/extconf/extconf_generator.rb
-rubygems_generators/extconf/templates/ext/c_file.c
-rubygems_generators/extconf/templates/ext/extconf.rb
+rubygems_generators/extconf/templates/README.txt
+rubygems_generators/extconf/templates/autotest.rb
+rubygems_generators/extconf/templates/ext/c_file.c.erb
+rubygems_generators/extconf/templates/ext/extconf.rb.erb
 rubygems_generators/extconf/templates/tasks/extconf.rake
 rubygems_generators/extconf/templates/tasks/extconf_name.rake
+rubygems_generators/extconf/templates/test/test.rb.erb
 rubygems_generators/install_jruby/USAGE
 rubygems_generators/install_jruby/install_jruby_generator.rb
 rubygems_generators/install_jruby/templates/tasks/jruby.rake

data/app_generators/newgem/templates/config/requirements.rb

@@ -13,5 +13,3 @@ require 'rubygems'
 end
 
 $:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require '<%= gem_name %>'

data/lib/newgem/version.rb

@@ -2,7 +2,7 @@ module Newgem #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 20
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rubygems_generators/extconf/USAGE

@@ -1,5 +1,27 @@
 Description:
+  Creates a C-extension via extconf.
+
+  The extension be automatically built before running tests,
+  and will be built when the RubyGem is installed by users.
+
+Usage:
+  #{$0} #{spec.name} name
+
+  rake compile - builds the extensions
+  rake - runs your tests, AFTER building your extensions
   
+Important:
+  You may want to add the following pattern matches to your
+  SCM ignore list (e.g. .gitignore file):
   
-Usage:
+    Makefile
+    *.o
+    *.bundle
+    *.so
+    *.dll
+    pkg
+    doc
+    .DS_Store
   
+  Also, in your ~/.hoerc file ADD the following exclusions:
+    exclude: !ruby/regexp /tmp$|CVS|\.svn|_darcs|\.git|local/.*\.rb$|Makefile|.*\.o$|.*\.bundle$|.*\.so$|.*\.dll$/

data/rubygems_generators/extconf/extconf_generator.rb

@@ -2,12 +2,14 @@ class ExtconfGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_reader :name
+  attr_reader :name, :module_name, :test_module_name
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
     @name = args.shift
+    @module_name = name.camelcase
+    @test_module_name = @module_name + "Extn"
     extract_options
   end
 
@@ -16,19 +18,24 @@ class ExtconfGenerator < RubiGen::Base
       # Ensure appropriate folder(s) exists
       m.directory "ext/#{name}"
       m.directory "tasks/extconf"
+      m.directory "test"
 
       # Create stubs
-      m.template "ext/c_file.c",  "ext/#{name}/#{name}.c"
-      m.template "ext/extconf.rb",  "ext/#{name}/extconf.rb"
-      m.file     "tasks/extconf.rake", "tasks/extconf.rake"
+      m.template "ext/c_file.c.erb",    "ext/#{name}/#{name}.c"
+      m.template "ext/extconf.rb.erb",  "ext/#{name}/extconf.rb"
+      m.template "test/test.rb.erb",    "test/test_#{name}_extn.rb"
+      m.file     "tasks/extconf.rake",  "tasks/extconf.rake"
       m.file     "tasks/extconf_name.rake",  "tasks/extconf/#{name}.rake"
+
+      m.file     "autotest.rb",         ".autotest"
+      m.readme   "README.txt"
     end
   end
 
   protected
     def banner
       <<-EOS
-Creates a C-extension via extconf. 
+Creates a C-extension via extconf.
 
 The extension be automatically built before running tests,
 and will be built when the RubyGem is installed by users.

data/rubygems_generators/extconf/templates/README.txt

@@ -0,0 +1,15 @@
+Important:
+  You may want to add the following pattern matches to your
+  SCM ignore list (e.g. .gitignore file):
+  
+    Makefile
+    *.o
+    *.bundle
+    *.so
+    *.dll
+    pkg
+    doc
+    .DS_Store
+  
+  Also, in your ~/.hoerc file ADD the following exclusions:
+    exclude: !ruby/regexp /tmp$|CVS|\.svn|_darcs|\.git|local/.*\.rb$|Makefile|.*\.o$|.*\.bundle$|.*\.so$|.*\.dll$/

data/rubygems_generators/extconf/templates/autotest.rb

@@ -0,0 +1,9 @@
+Autotest.add_hook :initialize do |at|
+  at.add_mapping(/ext\/.*\/(.*)\.[ch]/) do |_, m|
+    ["test/test_#{m[1]}_extn.rb"]
+  end
+end
+
+Autotest.add_hook :run_command do |at|
+  system "rake compile"
+end

data/rubygems_generators/extconf/templates/tasks/extconf_name.rake

@@ -14,7 +14,7 @@ namespace :extconf do
 
 
   task :compile => extension do
-    if Dir.glob("**/#{extension}.*").length == 0
+    if Dir.glob("**/#{extension}.{o,so,dll}").length == 0
       STDERR.puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
       STDERR.puts "Gem actually failed to build.  Your system is"
       STDERR.puts "NOT configured properly to build #{GEM_NAME}."
@@ -32,7 +32,12 @@ namespace :extconf do
 
   file ext_so => ext_files do
     Dir.chdir(ext) do
-      sh(PLATFORM =~ /win32/ ? 'nmake' : 'make')
+      sh(PLATFORM =~ /win32/ ? 'nmake' : 'make') do |ok, res|
+        if !ok
+          require "fileutils"
+          FileUtils.rm Dir.glob('*.{so,o,dll,bundle}')
+        end
+      end
     end
   end
 end

data/rubygems_generators/extconf/templates/test/test.rb.erb

@@ -0,0 +1,10 @@
+require "test/unit"
+
+$:.unshift File.dirname(__FILE__) + "/../ext/<%= name %>"
+require "<%= name %>.so"
+
+class Test<%= test_module_name %> < Test::Unit::TestCase
+  def test_truth
+    assert true
+  end
+end

data/test/test_extconf_generator.rb

@@ -6,11 +6,11 @@ class TestExtconfGenerator < Test::Unit::TestCase
   def setup
     bare_setup
   end
-  
+
   def teardown
     bare_teardown
   end
-  
+
   # Some generator-related assertions:
   #   assert_generated_file(name, &block) # block passed the file contents
   #   assert_directory_exists(name)
@@ -24,24 +24,26 @@ class TestExtconfGenerator < Test::Unit::TestCase
   #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
   #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
-  
+
   def test_generator_without_options
-    name = "myext"
+    name = "my_ext"
     run_generator('extconf', [name], sources)
-    assert_directory_exists("ext/myext")
+    assert_directory_exists("ext/my_ext")
     assert_directory_exists("tasks/extconf")
-    assert_generated_file("ext/myext/extconf.rb")
-    assert_generated_file("ext/myext/myext.c")
-    assert_generated_file("tasks/extconf.rake")    
-    assert_generated_file("tasks/extconf/myext.rake")
+    assert_generated_file("ext/my_ext/extconf.rb")
+    assert_generated_file("ext/my_ext/my_ext.c")
+    assert_generated_file("tasks/extconf.rake")
+    assert_generated_file("tasks/extconf/my_ext.rake")
+    assert_generated_file("test/test_my_ext_extn.rb")
+    assert_generated_file(".autotest")
   end
-  
+
   private
   def sources
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
     ]
   end
-  
+
   def generator_path
     "rubygems_generators"
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>New Gem Generator</h1>
     <div id="version"> <!--  class="clickable" onclick='document.location = ""; return true' -->
       <p>Get Version</p>
-      <a href="" class="numbers">0.20.0</a>
+      <a href="" class="numbers">0.20.1</a>
       <p>Featured in</p>
       <a  href="http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2FBeginning-Ruby-Novice-Professional-Experts%2Fdp%2F1590597664%2F&tag=drnic-20&linkCode=ur2&camp=1789&creative=9325" class="book"><img src="images/beginning-ruby.jpg" /></a>
     </div>

data/website/rubyforge.html

@@ -33,7 +33,7 @@
     <h1>New Gem Generator</h1>
     <div id="version"> <!--  class="clickable" onclick='document.location = ""; return true' -->
       <p>Get Version</p>
-      <a href="" class="numbers">0.20.0</a>
+      <a href="" class="numbers">0.20.1</a>
       <p>Featured in</p>
       <a  href="http://www.amazon.com/gp/redirect.html?ie=UTF8&location=http%3A%2F%2Fwww.amazon.com%2FBeginning-Ruby-Novice-Professional-Experts%2Fdp%2F1590597664%2F&tag=drnic-20&linkCode=ur2&camp=1789&creative=9325" class="book"><img src="images/beginning-ruby.jpg" /></a>
     </div>

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "0.20.0";
+var version = "0.20.1";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.20.0";
+var version = "0.20.1";
 
 document.write(" - " + version);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-29 23:00:00 +01:00
+date: 2008-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ extra_rdoc_files:
 - app_generators/newgem/templates/README.txt
 - newgem_generators/install_website/templates/website/index.txt
 - newgem_theme_generators/long_box_theme/templates/website/index.txt
+- rubygems_generators/extconf/templates/README.txt
 - website/index.txt
 - website/rubyforge.txt
 - website/version-raw.txt
@@ -160,10 +161,13 @@ files:
 - rubygems_generators/executable/templates/app.rb
 - rubygems_generators/extconf/USAGE
 - rubygems_generators/extconf/extconf_generator.rb
-- rubygems_generators/extconf/templates/ext/c_file.c
-- rubygems_generators/extconf/templates/ext/extconf.rb
+- rubygems_generators/extconf/templates/README.txt
+- rubygems_generators/extconf/templates/autotest.rb
+- rubygems_generators/extconf/templates/ext/c_file.c.erb
+- rubygems_generators/extconf/templates/ext/extconf.rb.erb
 - rubygems_generators/extconf/templates/tasks/extconf.rake
 - rubygems_generators/extconf/templates/tasks/extconf_name.rake
+- rubygems_generators/extconf/templates/test/test.rb.erb
 - rubygems_generators/install_jruby/USAGE
 - rubygems_generators/install_jruby/install_jruby_generator.rb
 - rubygems_generators/install_jruby/templates/tasks/jruby.rake