newgem 0.22.0 → 0.22.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.22.1 2008-04-05
+
+* moved the 'by Daniel Cadenas' reference to the correct template.rhtml
+* renamed template.rhtml -> template.html.erb in gem + generators
+* fixed broken install_rspec_stories test
+
 == 0.22.0 2008-04-03
 
 * script/console - irb/console for your gem under development [Orion]

data/Manifest.txt

@@ -60,12 +60,12 @@ newgem_theme_generators/long_box_theme/long_box_theme_generator.rb
 newgem_theme_generators/long_box_theme/templates/website/index.txt
 newgem_theme_generators/long_box_theme/templates/website/javascripts/rounded_corners_lite.inc.js
 newgem_theme_generators/long_box_theme/templates/website/stylesheets/screen.css
-newgem_theme_generators/long_box_theme/templates/website/template.rhtml
+newgem_theme_generators/long_box_theme/templates/website/template.html.erb
 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
+newgem_theme_generators/plain_theme/templates/website/template.html.erb
 rubygems_generators/executable/USAGE
 rubygems_generators/executable/executable_generator.rb
 rubygems_generators/executable/templates/app.rb
@@ -121,8 +121,8 @@ website/javascripts/rounded_corners_lite.inc.js
 website/rubyforge.html
 website/rubyforge.txt
 website/stylesheets/screen.css
+website/template.html.erb
 website/template.js
-website/template.rhtml
 website/version-raw.js
 website/version-raw.txt
 website/version.js

data/README.txt

@@ -39,7 +39,7 @@ creating: wizzo/History.txt
 creating: wizzo/script/generate
 creating: wizzo/script/txt2html
 creating: wizzo/website/index.txt
-creating: wizzo/website/template.rhtml
+creating: wizzo/website/template.html.erb
 copying: wizzo/website/javascripts/rounded_corners_lite.inc.js
 copying: wizzo/website/stylesheets/screen.css
 NOW - update wizzo/Rakefile with gem description, etc

data/config/hoe.rb

@@ -47,7 +47,6 @@ 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.5.0'],
     ['RedCloth','>=3.0.4'],
     ['syntax','>=1.0.0'],
     ['activesupport','>=2.0.2'],

data/lib/newgem/version.rb

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

data/newgem_generators/install_website/templates/script/txt2html

@@ -42,10 +42,10 @@ end
 
 if ARGV.length >= 1
   src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
   
 else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
   exit!
 end
 

data/newgem_theme_generators/long_box_theme/long_box_theme_generator.rb

@@ -23,7 +23,8 @@ class LongBoxThemeGenerator < RubiGen::Base
       m.directory 'website/stylesheets'
 
       # Website
-      m.template_copy_each %w( template.rhtml index.txt ), "website"
+      m.template  'website/template.html.erb', 'website/template.html.erb'
+      m.template_copy_each %w( index.txt ), "website"
       m.file_copy_each     %w( stylesheets/screen.css javascripts/rounded_corners_lite.inc.js ), "website"
     end
   end

data/newgem_theme_generators/long_box_theme/templates/website/{template.rhtml → template.html.erb}

@@ -38,7 +38,8 @@
     <%%= body %>
     <p class="coda">
       <a href="<%= email %>"><%= author %></a>, <%%= modified.pretty %><br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>,
+      by Daniel Cadenas via <a href="http://depgraph.rubyforge.org/">DepGraph</a>
     </p>
     </div>
 </div>

data/newgem_theme_generators/plain_theme/plain_theme_generator.rb

@@ -17,7 +17,7 @@ class PlainThemeGenerator < RubiGen::Base
       m.directory 'website/stylesheets'
 
       # Website
-      m.template_copy_each %w( template.rhtml ), "website"
+      m.template  'website/template.html.erb', 'website/template.html.erb'
       m.file_copy_each     %w( stylesheets/screen.css javascripts/rounded_corners_lite.inc.js ), "website"
     end
   end

data/newgem_theme_generators/plain_theme/templates/website/{template.rhtml → template.html.erb}

@@ -38,8 +38,7 @@
     <%%= body %>
     <p class="coda">
       <a href="<%= email %>"><%= author %></a>, <%%= modified.pretty %><br>
-      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>,
-      by Daniel Cadenas via <a href="http://depgraph.rubyforge.org/">DepGraph</a>
+      Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
 

data/script/txt2html

@@ -36,10 +36,10 @@ download = ENV['DOWNLOAD_PATH']
 
 if ARGV.length >= 1
   src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
+  template ||= File.join(File.dirname(__FILE__), '/../website/template.html.erb')
   
 else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+  puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
   exit!
 end
 

data/script/txt2html.rb

@@ -37,10 +37,10 @@ module Txt2Html
 
   if ARGV.length >= 1
     src, template = ARGV
-    template ||= File.dirname(__FILE__) + '/../website/template.rhtml'
+    template ||= File.dirname(__FILE__) + '/../website/template.html.erb'
 
   else
-    puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
+    puts("Usage: #{File.split($0).last} source.txt [template.html.erb] > output.html")
     exit!
   end
 

data/test/test_install_rspec_stories_generator.rb

@@ -26,11 +26,10 @@ class TestInstallRspecStoriesGenerator < 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('install_rspec_stories', [name], sources)
+    run_generator('install_rspec_stories', [], sources)
     assert_directory_exists("stories/steps")
-    assert_generated_file("stories/steps/myapp_steps.rb")
-    assert_generated_file("stories/sell_myapp.story")
+    assert_generated_file("stories/steps/myproject_steps.rb")
+    assert_generated_file("stories/sell_myproject.story")
     assert_generated_file("stories/all.rb")
   end
   

data/test/test_install_website_generator.rb

@@ -15,7 +15,7 @@ class TestInstallWebsiteGenerator < Test::Unit::TestCase
     name = "myapp"
     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|
+    %w[index.txt index.html template.html.erb stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
     end
     assert_generated_file("script/txt2html")

data/test/test_newgem_generator.rb

@@ -57,7 +57,7 @@ class TestNewgemGenerator < Test::Unit::TestCase
       assert_generated_file("script/#{file}")
     end
     
-    %w[index.txt index.html template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
+    %w[index.txt index.html template.html.erb stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
     end
     

data/test/test_plain_theme_generator.rb

@@ -13,14 +13,14 @@ class TestPlainThemeGenerator < Test::Unit::TestCase
   
   def test_generator_without_options
     run_generator('plain_theme', [], sources)
-    %w[template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
+    %w[template.html.erb 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_theme', [], sources, {:author => "AUTHOR", :email => "EMAIL"})
-    %w[template.rhtml stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
+    %w[template.html.erb stylesheets/screen.css javascripts/rounded_corners_lite.inc.js].each do |file|
       assert_generated_file("website/#{file}")
     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.22.0</a>
+      <a href="" class="numbers">0.22.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>
@@ -109,7 +109,7 @@ $ newgem wizzo
   dependency    plain_theme
       exists      website/javascripts
       exists      website/stylesheets
-      create      website/template.rhtml
+      create      website/template.html.erb
       create      website/stylesheets/screen.css
       create      website/javascripts/rounded_corners_lite.inc.js
   dependency  install_rubigen_scripts
@@ -341,7 +341,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>, 5th March 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 5th April 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -61,7 +61,7 @@ $ newgem wizzo
   dependency    plain_theme
       exists      website/javascripts
       exists      website/stylesheets
-      create      website/template.rhtml
+      create      website/template.html.erb
       create      website/stylesheets/screen.css
       create      website/javascripts/rounded_corners_lite.inc.js
   dependency  install_rubigen_scripts

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.22.0</a>
+      <a href="" class="numbers">0.22.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>
@@ -263,7 +263,7 @@ OPTIONS
       specify whether release_notes/changes are preformatted
 </pre>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 4th March 2008<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 5th March 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/version-raw.js

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

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 0.22.0
+  version: 0.22.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,18 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-03 00:00:00 +02:00
+date: 2008-04-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   version_requirement: 
@@ -152,12 +143,12 @@ files:
 - newgem_theme_generators/long_box_theme/templates/website/index.txt
 - newgem_theme_generators/long_box_theme/templates/website/javascripts/rounded_corners_lite.inc.js
 - newgem_theme_generators/long_box_theme/templates/website/stylesheets/screen.css
-- newgem_theme_generators/long_box_theme/templates/website/template.rhtml
+- newgem_theme_generators/long_box_theme/templates/website/template.html.erb
 - 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
+- newgem_theme_generators/plain_theme/templates/website/template.html.erb
 - rubygems_generators/executable/USAGE
 - rubygems_generators/executable/executable_generator.rb
 - rubygems_generators/executable/templates/app.rb
@@ -213,8 +204,8 @@ files:
 - website/rubyforge.html
 - website/rubyforge.txt
 - website/stylesheets/screen.css
+- website/template.html.erb
 - website/template.js
-- website/template.rhtml
 - website/version-raw.js
 - website/version-raw.txt
 - website/version.js