== 0.14.0 2007-10-14

* application_generator includes the install_rubigen_scripts generator
* if website included, no "overwrite tasks/website.rake" questions



git-svn-id: svn+ssh://rubyforge.org/var/svn/newgem/trunk@120 b8dfb574-5f1f-0410-9469-b441dc4e948f

History.txt

@@ -1,5 +1,7 @@
-== TRUNK 2007-10-14
+== 0.14.0 2007-10-14
 
+* application_generator includes the install_rubigen_scripts generator
+* if website included, no "overwrite tasks/website.rake" questions
 * Update to docco for rubigen-based output [thx Noah Gibbs]
 * Fixed website dir location if gem name + project name differ [thx Noah Gibbs]
 

app_generators/newgem/newgem_generator.rb

@@ -71,22 +71,22 @@ def manifest
         m.template "test_helper.rb",    "test/test_helper.rb"
         m.template "test.rb",           "test/test_#{gem_name}.rb"
       when "rspec"
-        m.dependency "install_rspec", [gem_name], :destination => destination_root
+        m.dependency "install_rspec", [gem_name], :destination => destination_root, :collision => :force
       end 
 
       # Website
       m.dependency "install_website", [gem_name], 
-         :author => author, :email => email, :destination => destination_root unless disable_website
+         :author => author, :email => email, :destination => destination_root, :collision => :force unless disable_website
 
      # JRuby
-     m.dependency "install_jruby", [gem_name], :destination => destination_root if is_jruby
+     m.dependency "install_jruby", [gem_name], :destination => destination_root, :collision => :force if is_jruby
 
       # Executables
       for bin_name in bin_names_list
-        m.dependency "executable", [bin_name], :destination => destination_root 
+        m.dependency "executable", [bin_name], :destination => destination_root, :collision => :force 
       end
 
-      m.dependency "install_rubigen_scripts", [destination_root, "rubygems", "newgem", "newgem_theme"], :shebang => options[:shebang]
+      m.dependency "install_rubigen_scripts", [destination_root, "rubygems", "newgem", "newgem_theme"], :shebang => options[:shebang], :collision => :force
 
       m.write_manifest "Manifest.txt"
 

app_generators/newgem/templates/config/hoe.rb

@@ -71,3 +71,4 @@ def extra_deps
 CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
 hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+hoe.rsync_args = '-av --delete --ignore-errors'

config/hoe.rb

@@ -60,3 +60,4 @@ def rubyforge_username
 CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "\#{RUBYFORGE_PROJECT}/\#{GEM_NAME}"
 hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+hoe.rsync_args = '-av --delete --ignore-errors'

lib/newgem/version.rb

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

rubygems_generators/application_generator/application_generator_generator.rb

@@ -1,4 +1,5 @@
 class ApplicationGeneratorGenerator < RubiGen::Base
+
   default_options 
 
   attr_reader :name, :class_name, :generator_path

rubygems_generators/application_generator/templates/generator.rb

@@ -1,13 +1,17 @@
 class <%= class_name %> < RubiGen::Base
   
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+  
   default_options :author => nil
 
   attr_reader :name
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
-    @name = args.shift
+    @destination_root = File.expand_path(args.shift)
+    @name = base_name
     extract_options
   end
 
@@ -20,6 +24,9 @@ def manifest
       # Create stubs
       # m.template "template.rb",  "some_file_after_erb.rb"
       # m.file     "file",         "some_file_copied"
+
+      m.dependency "install_rubigen_scripts", [destination_root, "<%= name %>"], 
+        :shebang => options[:shebang], :collision => :force
     end
   end
 

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.5</a>
+      <a href="" class="numbers">0.14.0</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>

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.5</a>
+      <a href="" class="numbers">0.14.0</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>

website/version-raw.js

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

website/version.js

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