newgem 0.13.0 → 0.13.1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.13.1 2007-08-22
+
+* Re-release as there seemed to be an incorrect Rakefile in 0.13.0
+* Added :newgem as a source for destroy script
+* application_generator
+  * test.rb passes APP_ROOT as parameter instead of a name, as APP_ROOT is already .../myproject
+  * add BASE_DIRs for a clean list of required folders
+* plain_theme_generator
+  * Renamed from plain_generator
+
 == 0.13.0 2007-08-20
 
 * HIGHLIGHT - RubiGen integration - using a Rails-like generator

data/Manifest.txt

@@ -14,6 +14,7 @@ app_generators/newgem/templates/config/hoe.rb
 app_generators/newgem/templates/config/requirements.rb
 app_generators/newgem/templates/empty.log
 app_generators/newgem/templates/module.rb
+app_generators/newgem/templates/readme
 app_generators/newgem/templates/script/destroy
 app_generators/newgem/templates/script/generate
 app_generators/newgem/templates/setup.rb
@@ -44,11 +45,11 @@ newgem_generators/install_website/templates/script/txt2html
 newgem_generators/install_website/templates/tasks/website.rake
 newgem_generators/install_website/templates/website/index.html
 newgem_generators/install_website/templates/website/index.txt
-newgem_theme_generators/plain/USAGE
-newgem_theme_generators/plain/plain_generator.rb
-newgem_theme_generators/plain/templates/website/javascripts/rounded_corners_lite.inc.js
-newgem_theme_generators/plain/templates/website/stylesheets/screen.css
-newgem_theme_generators/plain/templates/website/template.rhtml
+newgem_theme_generators/plain_theme/USAGE
+newgem_theme_generators/plain_theme/plain_theme_generator.rb
+newgem_theme_generators/plain_theme/templates/website/javascripts/rounded_corners_lite.inc.js
+newgem_theme_generators/plain_theme/templates/website/stylesheets/screen.css
+newgem_theme_generators/plain_theme/templates/website/template.rhtml
 rubygems_generators/application_generator/USAGE
 rubygems_generators/application_generator/application_generator_generator.rb
 rubygems_generators/application_generator/templates/bin
@@ -64,6 +65,7 @@ rubygems_generators/component_generator/templates/readme
 rubygems_generators/component_generator/templates/test.rb
 rubygems_generators/component_generator/templates/test_generator_helper.rb
 rubygems_generators/component_generator/templates/usage
+rubygems_generators/executable/USAGE
 rubygems_generators/executable/executable_generator.rb
 rubygems_generators/executable/templates/app.rb
 rubygems_generators/install_jruby/USAGE
@@ -92,9 +94,8 @@ test/test_helper.rb
 test/test_install_jruby_generator.rb
 test/test_install_rspec_generator.rb
 test/test_install_website_generator.rb
-test/test_newgem.rb
 test/test_newgem_generator.rb
-test/test_plain_generator.rb
+test/test_plain_theme_generator.rb
 website/images/beginning-ruby.jpg
 website/index.html
 website/index.txt

data/app_generators/newgem/newgem_generator.rb

@@ -28,8 +28,8 @@ class NewgemGenerator < RubiGen::Base
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
-    @destination_root = args.shift
-    @gem_name     = File.basename(File.expand_path(@destination_root))
+    @destination_root = File.expand_path(args.shift)
+    @gem_name     = File.basename(destination_root)
     @module_name  = gem_name.camelize
     extract_options
   end
@@ -37,7 +37,6 @@ class NewgemGenerator < RubiGen::Base
   def manifest
     # Use /usr/bin/env if no special shebang was specified
     script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
-    dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
     windows            = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
 
     record do |m|
@@ -59,11 +58,12 @@ class NewgemGenerator < RubiGen::Base
       m.template_copy_each %w( hoe.rb requirements.rb ), "config"
 
       # Scripts
-      %w( generate destroy ).each do |file|
-        m.template "script/#{file}",        "script/#{file}", script_options
-        m.template "script/win_script.cmd", "script/#{file}.cmd", 
-          :assigns => { :filename => file } if windows
-      end
+      # %w( generate destroy ).each do |file|
+      #   m.template "script/#{file}",        "script/#{file}", script_options
+      #   m.template "script/win_script.cmd", "script/#{file}.cmd", 
+      #     :assigns => { :filename => file } if windows
+      # end
+      m.dependency "install_rubigen_scripts", [destination_root, "rubygems", "newgem"], :shebang => options[:shebang]
       
       %w(debug).each { |file|
         m.file "empty.log", "log/#{file}.log", :chmod => 0666
@@ -94,6 +94,8 @@ class NewgemGenerator < RubiGen::Base
       end
       
       m.write_manifest "Manifest.txt"
+      
+      m.readme "readme"
     end
   end
 
@@ -127,7 +129,7 @@ EOS
               "Default: ~/.rubyforge/user-config.yml[user_name]") { |options[:author]| }
       opts.on("-r", "--ruby=path", String,
              "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
-             "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
+             "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
       opts.on("-T", "--test-with=TEST_FRAMEWORK", String,
               "Select your preferred testing framework.",
               "Options: test::unit (default), rspec.") { |options[:test_framework]| }           

data/app_generators/newgem/templates/readme

@@ -0,0 +1,5 @@
+Important
+=========
+
+* Open config/hoe.rb
+* Update missing details (gem description, dependent gems, etc.)

data/app_generators/newgem/templates/script/destroy

@@ -7,8 +7,9 @@ rescue LoadError
   require 'rubygems'
   require 'rubigen'
 end
-require 'rubigen/scripts/destroy'
+require 'rubigen/scripts/destroy
+'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! :rubygems
+RubiGen::Base.use_component_sources! :rubygems, :newgem
 RubiGen::Scripts::Destroy.new.run(ARGV)

data/lib/newgem/version.rb

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

data/newgem_generators/install_website/install_website_generator.rb

@@ -40,7 +40,7 @@ class InstallWebsiteGenerator < RubiGen::Base
       
       m.file_copy_each %w[ website.rake ], "tasks"
       
-      m.dependency "plain", [], :destination => destination_root
+      m.dependency "plain_theme", [], :destination => destination_root
     end
   end
 

data/newgem_theme_generators/{plain/plain_generator.rb → plain_theme/plain_theme_generator.rb}

@@ -1,4 +1,4 @@
-class PlainGenerator < RubiGen::Base
+class PlainThemeGenerator < RubiGen::Base
   
   default_options :author  => "TODO",
                   :email   => "todo@todo.com"

data/rubygems_generators/application_generator/templates/generator.rb

@@ -14,7 +14,8 @@ class <%= class_name %> < RubiGen::Base
   def manifest
     record do |m|
       # Ensure appropriate folder(s) exists
-      m.directory 'some_folder'
+      m.directory ''
+      BASEDIRS.each { |path| m.directory path }
 
       # Create stubs
       # m.template "template.rb",  "some_file_after_erb.rb"
@@ -48,4 +49,14 @@ EOS
       # raw instance variable value.
       # @author = options[:author]
     end
+
+    # Installation skeleton.  Intermediate directories are automatically
+    # created so don't sweat their absence here.
+    BASEDIRS = %w(
+      lib
+      log
+      script
+      test
+      tmp
+    )
 end

data/rubygems_generators/application_generator/templates/test.rb

@@ -26,9 +26,9 @@ class Test<%= class_name %> < Test::Unit::TestCase
   #   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 = "myapp"
-    run_generator('<%= name %>', [name], sources)
-    assert_generated_file("some_file")
+    run_generator('<%= name %>', [APP_ROOT], sources)
+    assert_directory_exists "path/to/included/folder"
+    assert_generated_file   "path/to/included/folder/some_file"
   end
   
   private

data/rubygems_generators/application_generator/templates/test_generator_helper.rb

@@ -3,7 +3,8 @@ require 'fileutils'
 
 # Must set before requiring generator libs.
 TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
-app_root = File.join(TMP_ROOT, "myproject")
+PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+app_root = File.join(TMP_ROOT, PROJECT_NAME)
 if defined?(APP_ROOT)
   APP_ROOT.replace(app_root)
 else

data/rubygems_generators/component_generator/templates/test_generator_helper.rb

@@ -3,7 +3,8 @@ require 'fileutils'
 
 # Must set before requiring generator libs.
 TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
-app_root = File.join(TMP_ROOT, "myproject")
+PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+app_root = File.join(TMP_ROOT, PROJECT_NAME)
 if defined?(APP_ROOT)
   APP_ROOT.replace(app_root)
 else

data/script/destroy

@@ -10,5 +10,5 @@ end
 require 'rubigen/scripts/destroy'
 
 ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! :rubygems
+RubiGen::Base.use_component_sources! :rubygems, :newgem
 RubiGen::Scripts::Destroy.new.run(ARGV)

data/test/test_application_generator_generator.rb

@@ -26,7 +26,7 @@ class TestApplicationGeneratorGenerator < Test::Unit::TestCase
   #   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 = "mygen"
+    name = "genname"
     run_generator('application_generator', [name], sources)
     
     assert_directory_exists "app_generators"

data/test/test_executable_generator.rb

@@ -4,17 +4,17 @@ class TestExecutableGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
   
   def setup
-    rubygems_setup
+    bare_setup
   end
   
   def teardown
-    rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options
-    app_name = "myapp"
-    run_generator('executable', [app_name], sources)
-    assert_generated_file("bin/#{app_name}")
+    name = "name"
+    run_generator('executable', [name], sources)
+    assert_generated_file("bin/#{name}")
   end
 
   def sources

data/test/test_generate_component_generator.rb

@@ -4,26 +4,26 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
-    rubygems_setup
+    bare_setup
   end
   
   def teardown
-    rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options
-    app_name = "myapp"
-    run_generator('component_generator', [app_name], sources)
-    assert_generated_file("generators/#{app_name}/#{app_name}_generator.rb")
-    assert_generated_file("generators/#{app_name}/USAGE")
-    assert_generated_file("test/test_#{app_name}_generator.rb")
+    name = "genname"
+    run_generator('component_generator', [name], sources)
+    assert_generated_file("generators/#{name}/#{name}_generator.rb")
+    assert_generated_file("generators/#{name}/USAGE")
+    assert_generated_file("test/test_#{name}_generator.rb")
     assert_generated_file("test/test_generator_helper.rb")
-    assert_directory_exists("generators/#{app_name}/templates")
-    assert_generated_class("generators/#{app_name}/#{app_name}_generator") do |body|
+    assert_directory_exists("generators/#{name}/templates")
+    assert_generated_class("generators/#{name}/#{name}_generator") do |body|
       # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
       assert_has_method body, "manifest"
     end
-    assert_generated_class("test/test_#{app_name}_generator") do |body|
+    assert_generated_class("test/test_#{name}_generator") do |body|
       assert_has_method body, "setup"
       assert_has_method body, "teardown"
       assert_has_method body, "test_generator_without_options"
@@ -33,20 +33,20 @@ class TestGenerateComponentGenerator < Test::Unit::TestCase
   end
 
   def test_generator_with_generator_type
-    app_name = "myapp"
+    name = "genname"
     gen_type = "fooapp"
-    run_generator('component_generator', [app_name, gen_type], sources)
+    run_generator('component_generator', [name, gen_type], sources)
     
-    assert_generated_file   "#{gen_type}_generators/#{app_name}/#{app_name}_generator.rb"
-    assert_generated_file   "#{gen_type}_generators/#{app_name}/USAGE"
-    assert_generated_file   "test/test_#{app_name}_generator.rb"
+    assert_generated_file   "#{gen_type}_generators/#{name}/#{name}_generator.rb"
+    assert_generated_file   "#{gen_type}_generators/#{name}/USAGE"
+    assert_generated_file   "test/test_#{name}_generator.rb"
     assert_generated_file   "test/test_generator_helper.rb"
-    assert_directory_exists "#{gen_type}_generators/#{app_name}/templates"
-    assert_generated_class  "#{gen_type}_generators/#{app_name}/#{app_name}_generator" do |body|
+    assert_directory_exists "#{gen_type}_generators/#{name}/templates"
+    assert_generated_class  "#{gen_type}_generators/#{name}/#{name}_generator" do |body|
       # assert_has_method body, "initialize" # as_has_m cannot pickup initialize(...) only initialize
       assert_has_method body, "manifest"
     end
-    assert_generated_class "test/test_#{app_name}_generator" do |body|
+    assert_generated_class "test/test_#{name}_generator" do |body|
       assert_has_method body, "setup"
       assert_has_method body, "teardown"
       assert_has_method body, "test_generator_without_options"

data/test/test_generator_helper.rb

@@ -3,7 +3,8 @@ require 'fileutils'
 
 # Must set before requiring generator libs.
 TMP_ROOT = File.dirname(__FILE__) + "/tmp" unless defined?(TMP_ROOT)
-app_root = File.join(TMP_ROOT, "myproject")
+PROJECT_NAME = "myproject" unless defined?(PROJECT_NAME)
+app_root = File.join(TMP_ROOT, PROJECT_NAME)
 if defined?(APP_ROOT)
   APP_ROOT.replace(app_root)
 else

data/test/test_install_jruby_generator.rb

@@ -4,11 +4,11 @@ class TestInstallJrubyGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
-    # see rubygems_setup
+    bare_setup
   end
   
   def teardown
-    # see rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options

data/test/test_install_rspec_generator.rb

@@ -4,11 +4,11 @@ class TestInstallRspecGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
-    rubygems_setup
+    bare_setup
   end
   
   def teardown
-    rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options

data/test/test_install_website_generator.rb

@@ -4,16 +4,16 @@ class TestInstallWebsiteGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
-    rubygems_setup
+    bare_setup
   end
   
   def teardown
-    rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options
     name = "myapp"
-    run_generator(generator_name, ['.'], sources)
+    run_generator(generator_name, [name], sources)
     
     %w[index.txt index.html template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
@@ -22,20 +22,9 @@ class TestInstallWebsiteGenerator < Test::Unit::TestCase
     assert_generated_file("tasks/website.rake")
   end
   
-  def test_generator_in_subfolder
-    name = "myapp"
-    subfolder = "subfolder"
-    run_generator(generator_name, ['.'], sources, {:destination => "#{APP_ROOT}/#{subfolder}"})
-    
-    %w[index.txt index.html stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
-      assert_generated_file("#{subfolder}/website/#{file}")
-    end
-    assert_generated_file("#{subfolder}/script/txt2html")
-  end
-  
   private
   def sources
-    [ RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path)),
+    [ RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__), "..", generator_path)),
       RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__), "..", "newgem_theme_generators"))
     ]
   end

data/test/{test_plain_generator.rb → test_plain_theme_generator.rb}

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
 
-class TestPlainGenerator < Test::Unit::TestCase
+class TestPlainThemeGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
-    rubygems_setup
+    bare_setup
   end
   
   def teardown
-    rubygems_teardown
+    bare_teardown
   end
   
   def test_generator_without_options
-    run_generator('plain', [], sources)
+    run_generator('plain_theme', [], sources)
     %w[template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
     end
   end
   
   def test_generator_with_author_and_email
-    run_generator('plain', [], sources, {:author => "AUTHOR", :email => "EMAIL"})
+    run_generator('plain_theme', [], sources, {:author => "AUTHOR", :email => "EMAIL"})
     %w[template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
     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.13.0</a>
+      <a href="" class="numbers">0.13.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.13.0</a>
+      <a href="" class="numbers">0.13.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.13.0";
+var version = "0.13.1";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.3
 specification_version: 1
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 0.13.0
-date: 2007-08-20 00:00:00 +02:00
+  version: 0.13.1
+date: 2007-08-22 00:00:00 +02:00
 summary: Make your own gems at home
 require_paths: 
 - lib
@@ -45,6 +45,7 @@ files:
 - app_generators/newgem/templates/config/requirements.rb
 - app_generators/newgem/templates/empty.log
 - app_generators/newgem/templates/module.rb
+- app_generators/newgem/templates/readme
 - app_generators/newgem/templates/script/destroy
 - app_generators/newgem/templates/script/generate
 - app_generators/newgem/templates/setup.rb
@@ -75,11 +76,11 @@ files:
 - newgem_generators/install_website/templates/tasks/website.rake
 - newgem_generators/install_website/templates/website/index.html
 - newgem_generators/install_website/templates/website/index.txt
-- newgem_theme_generators/plain/USAGE
-- newgem_theme_generators/plain/plain_generator.rb
-- newgem_theme_generators/plain/templates/website/javascripts/rounded_corners_lite.inc.js
-- newgem_theme_generators/plain/templates/website/stylesheets/screen.css
-- newgem_theme_generators/plain/templates/website/template.rhtml
+- newgem_theme_generators/plain_theme/USAGE
+- newgem_theme_generators/plain_theme/plain_theme_generator.rb
+- newgem_theme_generators/plain_theme/templates/website/javascripts/rounded_corners_lite.inc.js
+- newgem_theme_generators/plain_theme/templates/website/stylesheets/screen.css
+- newgem_theme_generators/plain_theme/templates/website/template.rhtml
 - rubygems_generators/application_generator/USAGE
 - rubygems_generators/application_generator/application_generator_generator.rb
 - rubygems_generators/application_generator/templates/bin
@@ -95,6 +96,7 @@ files:
 - rubygems_generators/component_generator/templates/test.rb
 - rubygems_generators/component_generator/templates/test_generator_helper.rb
 - rubygems_generators/component_generator/templates/usage
+- rubygems_generators/executable/USAGE
 - rubygems_generators/executable/executable_generator.rb
 - rubygems_generators/executable/templates/app.rb
 - rubygems_generators/install_jruby/USAGE
@@ -123,9 +125,8 @@ files:
 - test/test_install_jruby_generator.rb
 - test/test_install_rspec_generator.rb
 - test/test_install_website_generator.rb
-- test/test_newgem.rb
 - test/test_newgem_generator.rb
-- test/test_plain_generator.rb
+- test/test_plain_theme_generator.rb
 - website/images/beginning-ruby.jpg
 - website/index.html
 - website/index.txt
@@ -148,9 +149,8 @@ test_files:
 - test/test_install_jruby_generator.rb
 - test/test_install_rspec_generator.rb
 - test/test_install_website_generator.rb
-- test/test_newgem.rb
 - test/test_newgem_generator.rb
-- test/test_plain_generator.rb
+- test/test_plain_theme_generator.rb
 rdoc_options: 
 - --main
 - README.txt

data/test/test_newgem.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class NewgemTest < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end