newgem 0.10.0 → 0.10.1

data/History.txt

@@ -1,62 +1,74 @@
-+++ 0.10.0 2007-05-19
-
-+ 3 major enhancements
-	+ can generate rspec default tests (or still test::unit tests) using --with-test=rspec [thx Robby Russell]
-  + fetches your full name and email from ~/.rubyforge/user-config.yml (add keys user_name and email)
-+ 2 minor enhancements
-  + Generated lib/#{gem_name}.rb includes an empty module
-  + Generated lib/#{gem_name}.rb does not include "require all", instead you do it manually for each included file
-
-+++ 0.9.4 2007-05-18
-
-+ 5 minor enhancements
-	+ Pass your full name into the generator to be inserted into License.txt, index.txt, Rakefile etc
-  + 'Licence' => 'License' (thx Peter Burns)
-  + Generates a blank index.html so that 'rake package' works straight away
-  + Includes :local_deploy which does tasks :website_generate and :install_gem
-  + License.txt generated + this gem has a License.txt file (MIT license)
-
-+++ 0.9.3 20/4/2007
-
-+ 1 minor enhancement
-  + Added 'deploy' task that generates website AND release new gem
-+ 1 website fix
-  + Fixed download link
-
-+++ 0.9.2 18/4/2007
-
-+ 1 minor improvement:
-  + Generated apps include a "require 'rubygems' line at the top"
-+ 1 website fix
-  + Notes that the index.txt file includes Dr Nic details, not their own.[FIXME!!]
-
-+++ 0.9.1 16/4/2007
-
-+ 1 bugfix:
-  + I thoughtfully added an extra line (commented out) for sending the website to a subfolder... it caused grief at the 13th hour
-
-+++ 0.9.0 12/4/2007
-
-+ 3 major enhancements:
-  + Includes a basic website template, with rake tasks for generation and upload to rubyforge
-  + Generates a History.txt file, and automatically uses it in Hoe task
-  + Generated applications include framework for supporting command line options
-+ 3 minor enhancements:
-  + Include History.txt in this gem
-  + test files ordered correctly in generated Manifest.txt
-  + no blank line in Manifest.txt if no bin apps
-
-+++ 0.8.1 
+== 0.10.1 2007-05-24
+
+* 4 minor enhancements
+  * Fixed the generation of test files in the manifest
+  * Generated rakefile#deploy prompts user to do svn tag
+  * Renamed README -> README.txt to conform to new hoe change
+  * Changed History.txt markup (+++ => ==; + => *) [Thx Jeroen Janssen]
+* 1 dependency update:
+  * Hoe 1.2.1
+* Still being worked on:
+  * Gems using rspec include a #spec task to run all spec tests; currently tests aren't working.
+  
+== 0.10.0 2007-05-19
+
+* 3 major enhancements
+	* can generate rspec default tests (or still test::unit tests) using --with-test=rspec [thx Robby Russell]
+  * fetches your full name and email from ~/.rubyforge/user-config.yml (add keys user_name and email)
+* 2 minor enhancements
+  * Generated lib/#{gem_name}.rb includes an empty module
+  * Generated lib/#{gem_name}.rb does not include "require all", instead you do it manually for each included file
+
+== 0.9.4 2007-05-18
+
+* 5 minor enhancements
+	* Pass your full name into the generator to be inserted into License.txt, index.txt, Rakefile etc
+  * 'Licence' => 'License' (thx Peter Burns)
+  * Generates a blank index.html so that 'rake package' works straight away
+  * Includes :local_deploy which does tasks :website_generate and :install_gem
+  * License.txt generated * this gem has a License.txt file (MIT license)
+
+== 0.9.3 20/4/2007
+
+* 1 minor enhancement
+  * Added 'deploy' task that generates website AND release new gem
+* 1 website fix
+  * Fixed download link
+
+== 0.9.2 18/4/2007
+
+* 1 minor improvement:
+  * Generated apps include a "require 'rubygems' line at the top"
+* 1 website fix
+  * Notes that the index.txt file includes Dr Nic details, not their own.[FIXME!!]
+
+== 0.9.1 16/4/2007
+
+* 1 bugfix:
+  * I thoughtfully added an extra line (commented out) for sending the website to a subfolder... it caused grief at the 13th hour
+
+== 0.9.0 12/4/2007
+
+* 3 major enhancements:
+  * Includes a basic website template, with rake tasks for generation and upload to rubyforge
+  * Generates a History.txt file, and automatically uses it in Hoe task
+  * Generated applications include framework for supporting command line options
+* 3 minor enhancements:
+  * Include History.txt in this gem
+  * test files ordered correctly in generated Manifest.txt
+  * no blank line in Manifest.txt if no bin apps
+
+== 0.8.1 
 
   - Generated test file's class name now prefixed with Test, instead of suffixed
 
-+++ 0.8.0 
+== 0.8.0 
 
   - Uses hoe itself - less hypocritical
 	- Generated test files use name 'test_<gemname>.rb' instead of '<gemname>_test.rb' to support
 	  ZenTest's autotest expectations of naming. Manifest updated too.
 
-+++ 0.7.1 
+== 0.7.1 
 
   - Installed gems now don't require 'hoe' (based on comments at  http://blog.evanweaver.com/articles/2007/01/10/if-you-dont-want-to-hoe-echoe)
 

data/Manifest.txt

@@ -1,7 +1,7 @@
 History.txt
 License.txt
 Manifest.txt
-README
+README.txt
 Rakefile
 Todo.txt
 bin/newgem
@@ -19,6 +19,7 @@ templates/Rakefile
 templates/app.rb
 templates/scripts/txt2html
 templates/setup.rb
+templates/spec.opts
 templates/spec.rb
 templates/test.rb
 templates/website/index.html

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
+require 'rake/testtask'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
@@ -14,6 +15,8 @@ AUTHOR = "Dr Nic Williams"
 EMAIL = "drnicwilliams@gmail.com"
 DESCRIPTION = "Make your own gems at home"
 GEM_NAME = "newgem" # what ppl will type to install your gem
+config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+RUBYFORGE_USERNAME = config["username"]
 RUBYFORGE_PROJECT = "newgem"
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
@@ -42,13 +45,17 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = [
-    ['hoe', '>=1.2.0'],
+    ['hoe', '>=1.2.1'],
     ['RedCloth','>=3.0.4'],
     ['syntax','>=1.0.0']
   ]
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 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')
+
 desc 'Generate website files'
 task :website_generate => :load_consts do
   (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt|
@@ -81,7 +88,13 @@ task :load_consts do
 end
 
 desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release]
+task :deploy => [:check_version, :website, :publish_docs, :release] do
+  puts "Remember to create SVN tag:"
+  puts "svn copy svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/trunk " +
+    "svn+ssh://#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/#{PATH}/tags/REL-#{VERS} "
+  puts "Suggested comment:"
+  puts "Tagging release #{CHANGES}"
+end
 
 desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
 task :local_deploy => [:website_generate, :install_gem]

data/bin/newgem

@@ -167,10 +167,20 @@ if test_framework == 'rspec'
   test_template = 'spec.rb'
   unit_test = test + "/" + project_name + "_spec.rb"
   test_file_prefix = 'spec/NAME_spec'
+  spec_opts = 'spec.opts'
   unit_test_template = <<-eos
 require 'spec'
-require File.dirname(__FILE__) + '/../lib/#{project_name}'
 eos
+  requirements = <<-eos
+require 'spec/rake/spectest'
+  eos
+  test_task = <<-eos
+desc "Run the specs under spec/models"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/*_spec.rb']
+end
+  eos
 else  
   test = project_name + "/test"
   test_helper = test + "/test_helper.rb"
@@ -181,6 +191,8 @@ else
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/#{project_name}'
 eos
+  requirements = ''
+  test_task = ''
 end
 
 puts "creating: " + test
@@ -198,6 +210,15 @@ File.open(unit_test, 'w') do |file|
   file << eval('"' + template.gsub(/"/, '\"') + '"')
 end
 
+if test_framework == 'rspec'
+  spec_opts_file = test + "/" + spec_opts
+  puts "creating: " + spec_opts_file
+  template = File.open(templates + spec_opts, 'r') { |f| f.readlines.join }  
+  File.open(spec_opts_file, 'w') do |file|
+    file << eval('"' + template.gsub(/"/, '\""') + '"')
+  end  
+end
+
 puts "creating: " + examples
 Dir.mkdir examples
 
@@ -209,7 +230,7 @@ end
 
 bin_names_list = bin_names_list.collect {|name| 'bin/' + name }.join("\n")
 bin_names_list += "\n" if bin_names_list.size > 0
-test_names_list = ['helper.rb',"#{project_name}.rb"].sort.collect {|name| test_file_prefix.gsub('NAME', name) + name }.join("\n")
+test_names_list = ['helper.rb',"#{project_name}.rb"].sort.collect {|name| test_file_prefix.gsub('NAME', name) }.join("\n")
 
 template_files.each do |template_file|
   puts "creating: " + project_name + '/' + template_file

data/lib/newgem/version.rb

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

data/templates/History.txt

@@ -1,4 +1,4 @@
-+++ #{version_str} #{Date.today}
+== #{version_str} #{Date.today}
 
-+ 1 major enhancement:
-  + Initial release
+* 1 major enhancement:
+  * Initial release

data/templates/Manifest.txt

@@ -1,4 +1,5 @@
 History.txt
+License.txt
 Manifest.txt
 README.txt
 Rakefile

data/templates/Rakefile

@@ -8,6 +8,7 @@ require 'rake/rdoctask'
 require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 require 'hoe'
+#{requirements}
 include FileUtils
 require File.join(File.dirname(__FILE__), 'lib', '#{gem_name}', 'version')
 
@@ -15,6 +16,8 @@ AUTHOR = '#{author}'  # can also be an array of Authors
 EMAIL = "#{email}"
 DESCRIPTION = "description of gem"
 GEM_NAME = '#{gem_name}' # what ppl will type to install your gem
+config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+RUBYFORGE_USERNAME = config["username"]
 RUBYFORGE_PROJECT = '#{gem_name}' # The unix name for your project
 HOMEPATH = "http://\#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/\#{RUBYFORGE_PROJECT}"
@@ -53,6 +56,9 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 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')
 
 desc 'Generate website files'
 task :website_generate do
@@ -65,8 +71,7 @@ desc 'Upload website files to rubyforge'
 task :website_upload do
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
   host = "\#{config["username"]}@rubyforge.org"
-  remote_dir = "/var/www/gforge-projects/\#{RUBYFORGE_PROJECT}/"
-  # remote_dir = "/var/www/gforge-projects/\#{RUBYFORGE_PROJECT}/\#{GEM_NAME}"
+  remote_dir = "/var/www/gforge-projects/\#{PATH}/"
   local_dir = 'website'
   sh %{rsync -av \#{local_dir}/ \#{host}:\#{remote_dir}}
 end
@@ -75,7 +80,13 @@ desc 'Generate and upload website files'
 task :website => [:website_generate, :website_upload]
 
 desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release]
+task :deploy => [:check_version, :website, :release] do
+  puts "Remember to create SVN tag:"
+  puts "svn copy svn+ssh://\#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/\#{PATH}/trunk " +
+    "svn+ssh://\#{RUBYFORGE_USERNAME}@rubyforge.org/var/svn/\#{PATH}/tags/REL-\#{VERS} "
+  puts "Suggested comment:"
+  puts "Tagging release \#{CHANGES}"
+end
 
 desc 'Runs tasks website_generate and install_gem as a local deployment of the gem'
 task :local_deploy => [:website_generate, :install_gem]
@@ -91,3 +102,4 @@ task :check_version do
   end
 end
 
+#{test_task}

data/templates/spec.opts

@@ -0,0 +1 @@
+--colour

data/templates/spec.rb

@@ -1,4 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 # Time to add your specs!
-# http://rspec.rubyforge.org/
+# http://rspec.rubyforge.org/
+context "Place your specs here" do
+  
+  specify "find this spec in spec directory" do
+    violate "Be sure to write your specs"
+  end
+  
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>New Gem Generator</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/newgem"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.10.0</a>
+      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.10.1</a>
     </div>
     <h1>&#x2192; &#8216;newgem&#8217;</h1>
 
@@ -290,7 +290,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>, 19th May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 20th May 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/rubyforge.html

@@ -33,7 +33,7 @@
     <h1>New Gem Generator</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/newgem"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.10.0</a>
+      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.10.1</a>
     </div>
     <h1>&#x2192; using &#8216;rubyforge&#8217;</h1>
 

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
-date: 2007-05-19 00:00:00 -07:00
+  version: 0.10.1
+date: 2007-05-24 00:00:00 +02:00
 summary: Make your own gems at home
 require_paths: 
 - lib
@@ -32,7 +32,7 @@ files:
 - History.txt
 - License.txt
 - Manifest.txt
-- README
+- README.txt
 - Rakefile
 - Todo.txt
 - bin/newgem
@@ -50,6 +50,7 @@ files:
 - templates/app.rb
 - templates/scripts/txt2html
 - templates/setup.rb
+- templates/spec.opts
 - templates/spec.rb
 - templates/test.rb
 - templates/website/index.html
@@ -74,10 +75,23 @@ files:
 test_files: 
 - test/test_helper.rb
 - test/test_newgem.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
+- Todo.txt
+- templates/History.txt
+- templates/License.txt
+- templates/Manifest.txt
+- templates/website/index.txt
+- website/index.txt
+- website/rubyforge.txt
+- website/version-raw.txt
+- website/version.txt
 executables: 
 - newgem
 extensions: []
@@ -92,7 +106,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -119,5 +133,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: