newgem 0.13.2 → 0.13.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.13.3 2007-09-02
+
+* Clean up newgem_gen usage statement
+* website generated by default, -W to turn off, -w is no longer an option
+
 == 0.13.2 2007-08-22
 
 * Upgrade rubigen dependency to 1.0.3 to pushout upgrade

data/app_generators/newgem/newgem_generator.rb

@@ -10,9 +10,9 @@ class NewgemGenerator < RubiGen::Base
                     :author      => nil,
                     :import_path => nil,
                     :jruby       => nil,
-                    :test_framework => 'test::unit',
-                    :version     => '0.0.1',
-                    :website  => false
+                    :disable_website => nil,
+                    :test_framework  => 'test::unit',
+                    :version     => '0.0.1'
   
   
   attr_reader :gem_name, :module_name
@@ -21,7 +21,7 @@ class NewgemGenerator < RubiGen::Base
   # extensions/option
   attr_reader :test_framework
   attr_reader :bin_names_list
-  attr_reader :website
+  attr_reader :disable_website
   attr_reader :manifest
   attr_reader :is_jruby
   
@@ -36,8 +36,8 @@ 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] }
-    windows            = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
+    script_options = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+    windows        = (RUBY_PLATFORM =~ /dos|win32|cygwin/i) || (RUBY_PLATFORM =~ /(:?mswin|mingw)/)
 
     record do |m|
       # Root directory and all subdirectories.
@@ -75,7 +75,7 @@ class NewgemGenerator < RubiGen::Base
         
       # Website
       m.dependency "install_website", [gem_name], 
-         :author => author, :email => email, :destination => destination_root if website
+         :author => author, :email => email, :destination => destination_root unless disable_website
         
      # JRuby
      m.dependency "install_jruby", [gem_name], :destination => destination_root if is_jruby
@@ -99,7 +99,7 @@ class NewgemGenerator < RubiGen::Base
 Take any library or Rails plugin or command line application,
 gemify it, and easily share it with the Ruby world.
 
-Usage: #{File.basename $0} /path/to/your/app [options]"
+Usage: #{File.basename $0} /path/to/your/app [options]
 EOS
     end
 
@@ -131,8 +131,8 @@ EOS
       opts.on("-V", "--set-version=YOUR_VERSION", String,
               "Version of the gem you are creating.",
               "Default: 0.0.1") { |options[:version]| }
-      opts.on("-w", "--website", 
-              "Includes a website for your RubyGem.") { |options[:website]| }
+      opts.on("-W", "--website-disable", 
+              "Disables the generation of the website for your RubyGem.") { |options[:disable_website]| }
     end
     
     def extract_options
@@ -147,10 +147,11 @@ EOS
         @email  ||= rubyforge_config.email
       end
       @bin_names_list    = (options[:bin_name] || "").split(',')
-      @website           = options[:website]
+      @disable_website   = options[:disable_website]
 
       @test_framework    = options[:test_framework] || "test::unit"
       @is_jruby          = options[:jruby]
+      p options
     end
 
   # Installation skeleton.  Intermediate directories are automatically

data/lib/newgem/version.rb

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

data/newgem_theme_generators/plain_theme/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/test/test_newgem_generator.rb

@@ -50,8 +50,8 @@ class TestNewgemGenerator < Test::Unit::TestCase
     assert_manifest_complete
   end
 
-  def test_newgem_with_website
-    run_generator('newgem', [APP_ROOT], sources, {:website => true})
+  def test_newgem_with_website_by_default
+    run_generator('newgem', [APP_ROOT], sources)
     
     %w[txt2html].each do |file|
       assert_generated_file("script/#{file}")
@@ -64,6 +64,15 @@ class TestNewgemGenerator < Test::Unit::TestCase
     assert_manifest_complete
   end
 
+  def test_newgem_with_no_website
+    run_generator('newgem', [APP_ROOT], sources, {:no_website => true})
+    
+    assert !File.exists?("#{APP_ROOT}/script/txt2html"), "No script/txt2html should be generated"
+    assert !File.exists?("#{APP_ROOT}/website"), "No website folder should be generated"
+    
+    assert_manifest_complete
+  end
+
   def test_newgem_with_executable
     @executables = ["some_executable", "another"]
     run_generator('newgem', [APP_ROOT], sources, {:bin_name => @executables.join(',')})

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.2</a>
+      <a href="" class="numbers">0.13.3</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.2</a>
+      <a href="" class="numbers">0.13.3</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.2";
+var version = "0.13.3";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.13.2";
+var version = "0.13.3";
 
 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.2
-date: 2007-08-22 00:00:00 +02:00
+  version: 0.13.3
+date: 2007-09-02 00:00:00 +02:00
 summary: Make your own gems at home
 require_paths: 
 - lib