newgem 0.24.0 → 0.25.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.25.0 2008-06-19
+
+* newgem: added --project option to allow a different Rubyforge [Yossef Mendelssohn]
+* newgem: README contains generated year + name for license section [Yossef Mendelssohn]
+* updated copyright in license
+
 == 0.24.0 2008-06-17
 
 * Refactored generated tests into install_test_unit, so rspec users don't get test folder

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2007 Dr Nic Williams
+Copyright (c) 2006-2008 Dr Nic Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.txt

@@ -75,7 +75,7 @@ Alternately, download the gem and install manually.
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+Copyright (c) 2006-2008 Dr Nic Williams
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app_generators/newgem/newgem_generator.rb

@@ -16,7 +16,7 @@ class NewgemGenerator < RubiGen::Base
                     :version     => '0.0.1'
 
 
-  attr_reader :gem_name, :module_name
+  attr_reader :gem_name, :module_name, :project_name
   attr_reader :version, :version_str, :author, :email
 
   # extensions/option
@@ -32,6 +32,7 @@ class NewgemGenerator < RubiGen::Base
     @destination_root = File.expand_path(args.shift)
     @gem_name = base_name
     @module_name  = gem_name.camelize
+    @project_name = @gem_name
     extract_options
   end
 
@@ -123,6 +124,9 @@ EOS
       opts.on("-a", "--author=PATH", String,
               "Your name to be inserted into generated files.",
               "Default: ~/.rubyforge/user-config.yml[user_name]") { |x| options[:author] = x }
+      opts.on("-p", "--project=PROJECT", String,
+              "Rubyforge project name for the gem you are creating.",
+              "Default: same as gem name") { |x| options[:project] = x }
       opts.on("-r", "--ruby=path", String,
              "Path to the Ruby binary of your choice (otherwise scripts use env, dispatchers current path).",
              "Default: #{DEFAULT_SHEBANG}") { |x| options[:shebang] = x }
@@ -155,6 +159,7 @@ EOS
 
       @test_framework    = options[:test_framework] || "test::unit"
       @is_jruby          = options[:jruby]
+      @project_name      = options[:project] if options.include?(:project)
     end
 
   # Installation skeleton.  Intermediate directories are automatically

data/app_generators/newgem/templates/PostInstall.txt

@@ -1,5 +1,5 @@
 
-For more information on <%= gem_name %>, see http://<%= gem_name %>.rubyforge.org
+For more information on <%= gem_name %>, see http://<%= project_name %>.rubyforge.org
 
 NOTE: Change this information in PostInstall.txt 
 You can also delete it if you don't want it.

data/app_generators/newgem/templates/README.txt

@@ -26,7 +26,7 @@ FIX (describe your package)
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+Copyright (c) <%= Time.now.year %> <%= author %>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -4,7 +4,7 @@ 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
-RUBYFORGE_PROJECT = '<%= gem_name %>' # The unix name for your project
+RUBYFORGE_PROJECT = '<%= project_name %>' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [

data/lib/newgem/rubyforge.rb

@@ -13,7 +13,7 @@ module Newgem
     end
 
     def rubyforge
-      @rubyforge ||= RubyForge.new(::RubyForge::CONFIG_F)
+      @rubyforge ||= RubyForge.new(::RubyForge::CONFIG_F).configure
     end
 
   end

data/lib/newgem/version.rb

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

data/test/test_newgem_generator.rb

@@ -112,6 +112,36 @@ class TestNewgemGenerator < Test::Unit::TestCase
     generator = run_generator('newgem', [app_root], sources)
     assert_equal(expected_gem_name, generator.gem_name)
   end
+  
+  def test_gem_name_should_come_from_project
+    gen = build_generator('newgem', [APP_ROOT], sources, {})
+    assert_equal 'myproject', gen.gem_name
+  end
+  
+  def test_module_name_should_come_from_gem_name
+    gen = build_generator('newgem', [APP_ROOT], sources, {})
+    assert_equal 'Myproject', gen.module_name
+  end
+  
+  def test_project_name_should_default_to_gem_name
+    gen = build_generator('newgem', [APP_ROOT], sources, {})
+    assert_equal 'myproject', gen.project_name
+  end
+  
+  def test_project_name_can_be_overriden
+    gen = build_generator('newgem', [APP_ROOT], sources, { :project => 'my_other_project' })
+    assert_equal 'my_other_project', gen.project_name
+  end
+  
+  def test_gem_name_does_not_change_if_project_name_is_overriden
+    gen = build_generator('newgem', [APP_ROOT], sources, { :project => 'my_other_project' })
+    assert_equal 'myproject', gen.gem_name
+  end
+  
+  def test_module_name_does_not_change_if_project_name_is_overriden
+    gen = build_generator('newgem', [APP_ROOT], sources, { :project => 'my_other_project' })
+    assert_equal 'Myproject', gen.module_name
+  end
 
   private
   def sources

data/test/test_rubyforge.rb

@@ -0,0 +1,66 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require 'newgem/rubyforge'
+
+class TestRubyforge < Test::Unit::TestCase
+  
+  def set_rubyforge_home(dir)
+    RubyForge.send(:remove_const, :HOME)     if RubyForge.const_defined?(:HOME)
+    RubyForge.send(:remove_const, :CONFIG_D) if RubyForge.const_defined?(:CONFIG_D)
+    RubyForge.send(:remove_const, :CONFIG_F) if RubyForge.const_defined?(:CONFIG_F)
+    
+    RubyForge.const_set(:HOME, dir)
+    RubyForge.const_set(:CONFIG_D, File.join(dir, '.rubyforge'))
+    RubyForge.const_set(:CONFIG_F, File.join(dir, '.rubyforge', 'user-config.yml'))
+  end
+  
+  def test_full_name_should_be_placeholder_if_nothing_found
+    set_rubyforge_home('/tmp')
+    ENV.delete('NAME')
+    assert_equal 'FIXME full name', Newgem::Rubyforge.new.full_name
+  end
+  
+  def test_email_should_be_placeholder_if_nothing_found
+    set_rubyforge_home('/tmp')
+    ENV.delete('EMAIL')
+    assert_equal 'FIXME email', Newgem::Rubyforge.new.email
+  end
+  
+  def test_github_username_should_be_placeholder_if_nothing_found
+    set_rubyforge_home('/tmp')
+    ENV.delete('GITHUB_USERNAME')
+    assert_equal 'GITHUB_USERNAME', Newgem::Rubyforge.new.github_username
+  end
+  
+  def test_full_name_should_come_from_environment
+    set_rubyforge_home('/tmp')
+    ENV['NAME'] = 'Environment Fullname'
+    assert_equal 'Environment Fullname', Newgem::Rubyforge.new.full_name
+  end
+  
+  def test_email_should_come_from_environment
+    set_rubyforge_home('/tmp')
+    ENV['EMAIL'] = 'env@email.com'
+    assert_equal 'env@email.com', Newgem::Rubyforge.new.email
+  end
+  
+  def test_github_username_should_come_from_environment
+    set_rubyforge_home('/tmp')
+    ENV['GITHUB_USERNAME'] = 'ghuser'
+    assert_equal 'ghuser', Newgem::Rubyforge.new.github_username
+  end
+  
+  def test_full_name_should_come_from_user_config
+    set_rubyforge_home File.join(File.dirname(__FILE__), 'fixtures', 'home')
+    assert_equal 'Fullname McDeveloper', Newgem::Rubyforge.new.full_name
+  end
+  
+  def test_email_should_come_from_user_config
+    set_rubyforge_home File.join(File.dirname(__FILE__), 'fixtures', 'home')
+    assert_equal 'firstlast@newgem.tld', Newgem::Rubyforge.new.email
+  end
+  
+  def test_github_username_should_come_from_user_config
+    set_rubyforge_home File.join(File.dirname(__FILE__), 'fixtures', 'home')
+    assert_equal 'githubbahubba', Newgem::Rubyforge.new.github_username
+  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 true' -->
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.24.0</a>
+      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.25.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/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 true' -->
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.24.0</a>
+      <a href="http://rubyforge.org/projects/newgem" class="numbers">0.25.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.24.0";
+var version = "0.25.0";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 +10:00
+date: 2008-06-19 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -279,3 +279,4 @@ test_files:
 - test/test_newgem_generator.rb
 - test/test_newgem_simple_generator.rb
 - test/test_plain_theme_generator.rb
+- test/test_rubyforge.rb