newgem 0.13.5 → 0.14.0

data/History.txt

@@ -1,3 +1,10 @@
+== 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]
+
 == 0.13.5 2007-09-07
 
 * rake tasks use rubyforge_username instead of RUBYFORGE_USERNAME constant

data/app_generators/newgem/newgem_generator.rb

@@ -71,22 +71,22 @@ class NewgemGenerator < RubiGen::Base
         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"
       

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

@@ -71,3 +71,4 @@ end
 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'

data/config/hoe.rb

@@ -60,3 +60,4 @@ end
 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'

data/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

data/newgem_generators/install_website/templates/tasks/website.rake

@@ -8,7 +8,7 @@ end
 desc 'Upload website files to rubyforge'
 task :website_upload do
   host = "#{rubyforge_username}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
+  remote_dir = "/var/www/gforge-projects/#{PATH}/"
   local_dir = 'website'
   sh %{rsync -aCv #{local_dir}/ #{host}:#{remote_dir}}
 end

data/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

data/rubygems_generators/application_generator/templates/generator.rb

@@ -1,5 +1,8 @@
 class <%= class_name %> < RubiGen::Base
   
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+  
   default_options :author => nil
   
   attr_reader :name
@@ -7,7 +10,8 @@ class <%= class_name %> < RubiGen::Base
   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 @@ class <%= class_name %> < RubiGen::Base
       # 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
 

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.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>
@@ -72,35 +72,63 @@
 
 <pre>$ cd ~/ruby_projects
 $ newgem wizzo
-creating: wizzo
-creating: wizzo/README.txt
-creating: wizzo/lib
-creating: wizzo/script
-creating: wizzo/website
-creating: wizzo/website/javascripts
-creating: wizzo/website/stylesheets
-creating: wizzo/lib/wizzo
-creating: wizzo/lib/wizzo.rb
-creating: wizzo/lib/wizzo/version.rb
-creating: wizzo/bin
-creating: wizzo/test
-creating: wizzo/test/test_helper.rb
-creating: wizzo/test/test_wizzo.rb
-creating: wizzo/examples
-creating: wizzo/setup.rb
-creating: wizzo/Rakefile
-creating: wizzo/History.txt
-creating: wizzo/License.txt
-creating: wizzo/Manifest.txt
-creating: wizzo/script/txt2html
-creating: wizzo/website/index.txt
-creating: wizzo/website/index.html
-creating: wizzo/website/template.rhtml
-copying: wizzo/website/javascripts/rounded_corners_lite.inc.js
-copying: wizzo/website/stylesheets/screen.css
-NOW - update wizzo/Rakefile with gem description, etc
+      create  
+      create  config
+      create  doc
+      create  lib
+      create  log
+      create  script
+      create  tasks
+      create  test
+      create  tmp
+      create  lib/wizzo
+      create  History.txt
+      create  License.txt
+      create  Rakefile
+      create  README.txt
+      create  setup.rb
+      create  lib/wizzo.rb
+      create  lib/wizzo/version.rb
+      create  config/hoe.rb
+      create  config/requirements.rb
+      create  log/debug.log
+      create  tasks/deployment.rake
+      create  tasks/environment.rake
+      create  tasks/website.rake
+      create  test/test_helper.rb
+      create  test/test_wizzo.rb
+  dependency  install_website
+      create    website/javascripts
+      create    website/stylesheets
+      exists    script
+      exists    tasks
+      create    website/index.txt
+      create    website/index.html
+      create    script/txt2html
+overwrite tasks/website.rake? [Ynaqd] 
+       force    tasks/website.rake
+  dependency    plain_theme
+      exists      website/javascripts
+      exists      website/stylesheets
+      create      website/template.rhtml
+      create      website/stylesheets/screen.css
+      create      website/javascripts/rounded_corners_lite.inc.js
+  dependency  install_rubigen_scripts
+      exists    script
+      create    script/generate
+      create    script/destroy
+      create  Manifest.txt
+      readme  readme
+Important
+=========
+
+* Open config/hoe.rb
+* Update missing details (gem description, dependent gems, etc.)
 </pre>
 
+	<p><strong>tasks/website.rake</strong> will be written twice in newgem version 0.13.5.  Simply hit enter to accept the default option (overwrite).</p>
+
+
 	<p>As of 0.10.0 &#8211; you can generate test::unit or rspec test stubs via the <code>-t</code> or <code>--test-with</code> options. For example, <code>-t rspec</code> generates a <code>spec</code> folder with some test stubs.</p>
 
 
@@ -110,13 +138,13 @@ NOW - update wizzo/Rakefile with gem description, etc
 	<h3>Setup</h3>
 
 
-	<p>Now modify the constants at the top of <strong>Rakefile</strong>, with your name, email and the location where you&#8217;ll host your website for the gem. The defaults are tied to RubyForge for uploading the gems and the website (see below).</p>
+	<p>Now modify the constants at the top of <strong>config/hoe.rb</strong>, with your name, email and the location where you&#8217;ll host your website for the gem. The defaults are tied to RubyForge for uploading the gems and the website (see below).</p>
 
 
 	<h3>Create code and tests</h3>
 
 
-	<p>Then create your libraries (files in <code>lib</code>) and your tests (files in <code>test</code> that look like <code>test_TESTNAME.rb</code>). John Grey <span class="caps">III</span> did a nice video on test-driven design, that&#8217;s worth watching if <span class="caps">TDD</span> is new to you.</p>
+	<p>Then create your libraries (files in <code>lib</code>) and your tests (files in <code>test</code> that look like <code>test_TESTNAME.rb</code>). <a href="http://blog.grayproductions.net/">James Edward Gray II</a> did a <a href="http://macromates.com/screencasts">nice video</a> on test-driven design, that&#8217;s worth watching if <span class="caps">TDD</span> is new to you.</p>
 
 
 	<p>If you create any new files, you need to manually add them to the Manifest.txt. Alphabetical order is optional, but it will make the results of <code>rake check_manifest</code> look clean if you keep them ordered. If a file is not in the Manifest.txt it will not be included in the gem when you package and release it.</p>
@@ -315,7 +343,7 @@ other stories and things.</p>
 
 	<p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a>.</p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 18th August 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 14th October 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -24,46 +24,73 @@ Go to the folder where you want to create your new gem folder structure, and run
 
 <pre>$ cd ~/ruby_projects
 $ newgem wizzo
-creating: wizzo
-creating: wizzo/README.txt
-creating: wizzo/lib
-creating: wizzo/script
-creating: wizzo/website
-creating: wizzo/website/javascripts
-creating: wizzo/website/stylesheets
-creating: wizzo/lib/wizzo
-creating: wizzo/lib/wizzo.rb
-creating: wizzo/lib/wizzo/version.rb
-creating: wizzo/bin
-creating: wizzo/test
-creating: wizzo/test/test_helper.rb
-creating: wizzo/test/test_wizzo.rb
-creating: wizzo/examples
-creating: wizzo/setup.rb
-creating: wizzo/Rakefile
-creating: wizzo/History.txt
-creating: wizzo/License.txt
-creating: wizzo/Manifest.txt
-creating: wizzo/script/txt2html
-creating: wizzo/website/index.txt
-creating: wizzo/website/index.html
-creating: wizzo/website/template.rhtml
-copying: wizzo/website/javascripts/rounded_corners_lite.inc.js
-copying: wizzo/website/stylesheets/screen.css
-NOW - update wizzo/Rakefile with gem description, etc
+      create  
+      create  config
+      create  doc
+      create  lib
+      create  log
+      create  script
+      create  tasks
+      create  test
+      create  tmp
+      create  lib/wizzo
+      create  History.txt
+      create  License.txt
+      create  Rakefile
+      create  README.txt
+      create  setup.rb
+      create  lib/wizzo.rb
+      create  lib/wizzo/version.rb
+      create  config/hoe.rb
+      create  config/requirements.rb
+      create  log/debug.log
+      create  tasks/deployment.rake
+      create  tasks/environment.rake
+      create  tasks/website.rake
+      create  test/test_helper.rb
+      create  test/test_wizzo.rb
+  dependency  install_website
+      create    website/javascripts
+      create    website/stylesheets
+      exists    script
+      exists    tasks
+      create    website/index.txt
+      create    website/index.html
+      create    script/txt2html
+overwrite tasks/website.rake? [Ynaqd] 
+       force    tasks/website.rake
+  dependency    plain_theme
+      exists      website/javascripts
+      exists      website/stylesheets
+      create      website/template.rhtml
+      create      website/stylesheets/screen.css
+      create      website/javascripts/rounded_corners_lite.inc.js
+  dependency  install_rubigen_scripts
+      exists    script
+      create    script/generate
+      create    script/destroy
+      create  Manifest.txt
+      readme  readme
+Important
+=========
+
+* Open config/hoe.rb
+* Update missing details (gem description, dependent gems, etc.)
 </pre>
 
+*tasks/website.rake* will be written twice in newgem version 0.13.5.  Simply hit enter to accept the default option (overwrite).
+
 As of 0.10.0 - you can generate test::unit or rspec test stubs via the <code>-t</code> or <code>--test-with</code> options. For example, <code>-t rspec</code> generates a <code>spec</code> folder with some test stubs.
 
 As of 0.11.0 - you can generate <code>wizzo/trunk|branches|tags</code> subfolders using the <code>-s</code> or <code>--svn</code> options. If used, the generated files will be populated within <code><gemname>/trunk</code>
 
 h3. Setup
 
-Now modify the constants at the top of *Rakefile*, with your name, email and the location where you'll host your website for the gem. The defaults are tied to RubyForge for uploading the gems and the website (see below).
+Now modify the constants at the top of *config/hoe.rb*, with your name, email and the location where you'll host your website for the gem. The defaults are tied to RubyForge for uploading the gems and the website (see below).
 
 h3. Create code and tests
 
-Then create your libraries (files in <code>lib</code>) and your tests (files in <code>test</code> that look like <code>test_TESTNAME.rb</code>). John Grey III did a nice video on test-driven design, that's worth watching if TDD is new to you.
+Then create your libraries (files in <code>lib</code>) and your tests (files in <code>test</code> that look like <code>test_TESTNAME.rb</code>). "James Edward Gray II":http://blog.grayproductions.net/ did a "nice video":http://macromates.com/screencasts on test-driven design, that's worth watching if TDD is new to you.
 
 If you create any new files, you need to manually add them to the Manifest.txt. Alphabetical order is optional, but it will make the results of <code>rake check_manifest</code> look clean if you keep them ordered. If a file is not in the Manifest.txt it will not be included in the gem when you package and release it.
 

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.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>

data/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);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.13.5";
+var version = "0.14.0";
 
 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.5
-date: 2007-09-07 00:00:00 +02:00
+  version: 0.14.0
+date: 2007-10-17 00:00:00 +10:00
 summary: Make your own gems at home
 require_paths: 
 - lib