newgem 0.15.0 → 0.16.0

data/History.txt

@@ -1,3 +1,11 @@
+== 0.16 2006-11-11
+
+* Added a newgem_simple_generator to support the creation of a skinny gem
+  skeleton [thx wycats]
+* Added '.git*' to default list of ignored files by hoe
+* Cleaned the history join string to make proper \n instead of \\n
+* Checked in empty_log as empty.log was being ignored by svn
+
 == 0.15.0 2007-11-05
 
 * Promoted 'application_generator' and 'component_generator' to Rubigen

data/Manifest.txt

@@ -12,7 +12,7 @@ app_generators/newgem/templates/Rakefile
 app_generators/newgem/templates/app.rb
 app_generators/newgem/templates/config/hoe.rb
 app_generators/newgem/templates/config/requirements.rb
-app_generators/newgem/templates/empty.log
+app_generators/newgem/templates/empty_log
 app_generators/newgem/templates/module.rb
 app_generators/newgem/templates/readme
 app_generators/newgem/templates/setup.rb
@@ -24,6 +24,15 @@ app_generators/newgem/templates/tasks/website.rake
 app_generators/newgem/templates/test.rb
 app_generators/newgem/templates/test_helper.rb
 app_generators/newgem/templates/version.rb
+app_generators/newgem_simple/USAGE
+app_generators/newgem_simple/newgem_simple_generator.rb
+app_generators/newgem_simple/templates/LICENSE
+app_generators/newgem_simple/templates/README
+app_generators/newgem_simple/templates/Rakefile
+app_generators/newgem_simple/templates/TODO
+app_generators/newgem_simple/templates/lib/templates.rb
+app_generators/newgem_simple/templates/spec/spec_helper.rb
+app_generators/newgem_simple/templates/spec/templates_spec.rb.erb
 bin/newgem
 bundles/RubyGem.tmbundle/Snippets/History header trunk.tmSnippet
 bundles/RubyGem.tmbundle/Snippets/History header.tmSnippet
@@ -79,6 +88,7 @@ test/test_install_jruby_generator.rb
 test/test_install_rspec_generator.rb
 test/test_install_website_generator.rb
 test/test_newgem_generator.rb
+test/test_newgem_simple_generator.rb
 test/test_plain_theme_generator.rb
 website/images/beginning-ruby.jpg
 website/index.html

data/app_generators/newgem/newgem_generator.rb

@@ -59,7 +59,7 @@ class NewgemGenerator < RubiGen::Base
       m.template_copy_each %w( hoe.rb requirements.rb ), "config"
 
       %w(debug).each { |file|
-        m.file "empty.log", "log/#{file}.log", :chmod => 0666
+        m.file "empty_log", "log/#{file}.log", :chmod => 0666
       }
       
       # Tasks
@@ -134,6 +134,8 @@ EOS
               "Default: 0.0.1") { |options[:version]| }
       opts.on("-W", "--website-disable", 
               "Disables the generation of the website for your RubyGem.") { |options[:disable_website]| }
+      opts.on("--simple", 
+              "Creates a simple RubyGems scaffold.") { |x| }
     end
     
     def extract_options

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

@@ -55,10 +55,10 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.url = HOMEPATH
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store', '.git*']  #An array of file patterns to delete on clean.
   
   # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   <% if is_jruby %>
   # JRuby gem created, e.g. <%= gem_name %>-X.Y.Z-jruby.gem

data/app_generators/newgem_simple/USAGE

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

data/app_generators/newgem_simple/newgem_simple_generator.rb

@@ -0,0 +1,69 @@
+class NewgemSimpleGenerator < 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?
+    @destination_root = File.expand_path(args.shift)
+    @name = base_name
+    extract_options
+  end
+
+  def manifest
+    record do |m|
+      # Ensure appropriate folder(s) exists
+      m.directory ''
+      BASEDIRS.each { |path| m.directory path }
+
+      # Create stubs
+      # m.template "template.rb",  "some_file_after_erb.rb"
+      m.file "lib/templates.rb", "lib/#{name}.rb"
+      m.template "spec/templates_spec.rb.erb", "spec/#{name}_spec.rb"
+            
+      %w[ LICENSE Rakefile README TODO spec/spec_helper.rb ].each {|file| m.file file, file }      
+      
+      m.dependency "install_rubigen_scripts", [destination_root, 'newgem_simple'], 
+        :shebang => options[:shebang], :collision => :force
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a simple RubyGems scaffold.
+
+USAGE: #{spec.name} name --simple"
+EOS
+    end
+
+    def add_options!(opts)
+      opts.separator ''
+      opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+    
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+
+    # Installation skeleton.  Intermediate directories are automatically
+    # created so don't sweat their absence here.
+    BASEDIRS = %w(
+      lib
+      spec
+    )
+end

data/app_generators/newgem_simple/templates/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2007 YOUR NAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app_generators/newgem_simple/templates/README

@@ -0,0 +1,4 @@
+templates
+=================
+
+A plugin for the Merb framework that provides ....

data/app_generators/newgem_simple/templates/Rakefile

@@ -0,0 +1,37 @@
+require 'rubygems'
+require 'rake/gempackagetask'
+
+GEM = "new_gem"
+VERSION = "0.0.1"
+AUTHOR = "Your Name"
+EMAIL = "Your Email"
+HOMEPAGE = "http://example.com"
+SUMMARY = "A gem that provides..."
+
+spec = Gem::Specification.new do |s|
+  s.name = GEM
+  s.version = VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
+  s.summary = SUMMARY
+  s.description = s.summary
+  s.author = AUTHOR
+  s.email = EMAIL
+  s.homepage = HOMEPAGE
+  
+  # Uncomment this to add a dependency
+  # s.add_dependency "foo"
+  
+  s.require_path = 'lib'
+  s.autorequire = GEM
+  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{GEM}-#{VERSION}}
+end

data/app_generators/newgem_simple/templates/TODO

@@ -0,0 +1,4 @@
+TODO:
+Fix LICENSE with your name
+Fix Rakefile with your name and contact info
+Add your code to lib/<%= name %>.rb

data/app_generators/newgem_simple/templates/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$TESTING=true
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')

data/app_generators/newgem_simple/templates/spec/templates_spec.rb.erb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "<%= name %>" do
+  it "should do nothing" do
+    true.should == true
+  end
+end

data/bin/newgem

@@ -7,7 +7,11 @@ if %w(-v --version).include? ARGV.first
   exit(0)
 end
 
-
 require 'rubigen/scripts/generate'
 RubiGen::Base.use_application_sources! :rubygems, :newgem, :newgem_theme
-RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'newgem')
+
+if ARGV.delete "--simple"
+  RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'newgem_simple')
+else
+  RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'newgem')
+end

data/lib/newgem/version.rb

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

data/test/test_newgem_simple_generator.rb

@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
+
+class TestNewgemSimpleGenerator < Test::Unit::TestCase
+  include RubiGen::GeneratorTestHelper
+
+  def setup
+    bare_setup
+  end
+  
+  def teardown
+    bare_teardown
+  end
+  
+  # Some generator-related assertions:
+  #   assert_generated_file(name, &block) # block passed the file contents
+  #   assert_directory_exists(name)
+  #   assert_generated_class(name, &block)
+  #   assert_generated_module(name, &block)
+  #   assert_generated_test_for(name, &block)
+  # The assert_generated_(class|module|test_for) &block is passed the body of the class/module within the file
+  #   assert_has_method(body, *methods) # check that the body has a list of methods (methods with parentheses not supported yet)
+  #
+  # Other helper methods are:
+  #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
+  #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
+  #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
+  
+  def test_generator_without_options
+    run_generator('newgem_simple', [APP_ROOT], sources)
+    assert_directory_exists "lib"
+    assert_generated_file "lib/#{PROJECT_NAME}.rb"
+    assert_directory_exists "spec"    
+    assert_generated_file "spec/spec_helper.rb"
+    assert_generated_file "spec/#{PROJECT_NAME}_spec.rb" do |file|
+      file =~ /describe "#{PROJECT_NAME}" do/
+    end
+    assert_generated_file "LICENSE"
+    assert_generated_file "Rakefile"
+    assert_generated_file "README"
+    assert_generated_file "TODO"         
+  end
+  
+  private
+  def sources
+    [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
+    ]
+  end
+  
+  def generator_path
+    "app_generators"
+  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.15.0</a>
+      <a href="" class="numbers">0.16.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>
@@ -336,7 +336,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>, 16th October 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 17th October 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 = ""; return true' -->
       <p>Get Version</p>
-      <a href="" class="numbers">0.15.0</a>
+      <a href="" class="numbers">0.16.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>
@@ -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>, 23rd June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 24th June 2007<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.15.0";
+var version = "0.16.0";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "0.15.0";
+var version = "0.16.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.15.0
-date: 2007-11-05 00:00:00 -08:00
+  version: 0.16.0
+date: 2007-11-12 00:00:00 +10:00
 summary: Make your own gems at home
 require_paths: 
 - lib
@@ -43,7 +43,7 @@ files:
 - app_generators/newgem/templates/app.rb
 - app_generators/newgem/templates/config/hoe.rb
 - app_generators/newgem/templates/config/requirements.rb
-- app_generators/newgem/templates/empty.log
+- app_generators/newgem/templates/empty_log
 - app_generators/newgem/templates/module.rb
 - app_generators/newgem/templates/readme
 - app_generators/newgem/templates/setup.rb
@@ -55,6 +55,15 @@ files:
 - app_generators/newgem/templates/test.rb
 - app_generators/newgem/templates/test_helper.rb
 - app_generators/newgem/templates/version.rb
+- app_generators/newgem_simple/USAGE
+- app_generators/newgem_simple/newgem_simple_generator.rb
+- app_generators/newgem_simple/templates/LICENSE
+- app_generators/newgem_simple/templates/README
+- app_generators/newgem_simple/templates/Rakefile
+- app_generators/newgem_simple/templates/TODO
+- app_generators/newgem_simple/templates/lib/templates.rb
+- app_generators/newgem_simple/templates/spec/spec_helper.rb
+- app_generators/newgem_simple/templates/spec/templates_spec.rb.erb
 - bin/newgem
 - bundles/RubyGem.tmbundle/Snippets/History header trunk.tmSnippet
 - bundles/RubyGem.tmbundle/Snippets/History header.tmSnippet
@@ -110,6 +119,7 @@ files:
 - test/test_install_rspec_generator.rb
 - test/test_install_website_generator.rb
 - test/test_newgem_generator.rb
+- test/test_newgem_simple_generator.rb
 - test/test_plain_theme_generator.rb
 - website/images/beginning-ruby.jpg
 - website/index.html
@@ -132,6 +142,7 @@ test_files:
 - test/test_install_rspec_generator.rb
 - test/test_install_website_generator.rb
 - test/test_newgem_generator.rb
+- test/test_newgem_simple_generator.rb
 - test/test_plain_theme_generator.rb
 rdoc_options: 
 - --main