newgem 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,7 @@
+== 1.2.0 2008-12-11
+
+* Newgem + RubiGen are Ruby 1.9.1 compliant.
+
 == 1.1.0 2008-11-11
 
 * Support for ~/.newgem.yml file for default CLI arguments

data/Manifest.txt

@@ -1,3 +1,36 @@
+.test-result/TestExecutableGenerator/test_generator_without_options/passed
+.test-result/TestExtconfGenerator/test_generator_for_rspec_project/passed
+.test-result/TestExtconfGenerator/test_generator_without_options/passed
+.test-result/TestFeatureGenerator/test_generator_without_options/passed
+.test-result/TestInstallCucumberGenerator/test_generator_without_options/passed
+.test-result/TestInstallJrubyGenerator/test_generator_without_options/passed
+.test-result/TestInstallRspecGenerator/test_generator_without_options/passed
+.test-result/TestInstallTestUnitGenerator/test_generator_without_options/passed
+.test-result/TestInstallWebsiteGenerator/test_generator_without_options/passed
+.test-result/TestNewgemGenerator/test_gem_name_does_not_change_if_project_name_is_overriden/passed
+.test-result/TestNewgemGenerator/test_gem_name_should_come_from_project/passed
+.test-result/TestNewgemGenerator/test_module_name_does_not_change_if_project_name_is_overriden/passed
+.test-result/TestNewgemGenerator/test_module_name_should_come_from_gem_name/passed
+.test-result/TestNewgemGenerator/test_newgem_with_executable/passed
+.test-result/TestNewgemGenerator/test_newgem_with_jruby/passed
+.test-result/TestNewgemGenerator/test_newgem_with_no_website/passed
+.test-result/TestNewgemGenerator/test_newgem_with_rspec/passed
+.test-result/TestNewgemGenerator/test_newgem_with_website/passed
+.test-result/TestNewgemGenerator/test_project_name_can_be_overriden/passed
+.test-result/TestNewgemGenerator/test_project_name_should_default_to_gem_name/passed
+.test-result/TestNewgemGenerator/test_run_in_trunk_path_finds_parent_path_for_gem_name/passed
+.test-result/TestNewgemSimpleGenerator/test_generator_without_options/passed
+.test-result/TestPlainThemeGenerator/test_generator_with_author_and_email/passed
+.test-result/TestPlainThemeGenerator/test_generator_without_options/passed
+.test-result/TestRubyforge/test_email_should_be_placeholder_if_nothing_found/passed
+.test-result/TestRubyforge/test_email_should_come_from_environment/passed
+.test-result/TestRubyforge/test_email_should_come_from_user_config/passed
+.test-result/TestRubyforge/test_full_name_should_be_placeholder_if_nothing_found/passed
+.test-result/TestRubyforge/test_full_name_should_come_from_environment/passed
+.test-result/TestRubyforge/test_full_name_should_come_from_user_config/passed
+.test-result/TestRubyforge/test_github_username_should_be_placeholder_if_nothing_found/passed
+.test-result/TestRubyforge/test_github_username_should_come_from_environment/passed
+.test-result/TestRubyforge/test_github_username_should_come_from_user_config/passed
 History.txt
 Manifest.txt
 PostInstall.txt
@@ -47,7 +80,7 @@ features/steps/rubygems.rb
 lib/hoe-patched.rb
 lib/newgem.rb
 lib/newgem/quick_template.rb
-lib/newgem/rubyforge.rb
+lib/newgem/rubyforge-ext.rb
 lib/newgem/support/tasks.rb
 lib/newgem/tasks.rb
 newgem_generators/install_website/USAGE

data/app_generators/newgem/newgem_generator.rb

@@ -151,7 +151,7 @@ EOS
       @author            = options[:author]
       @email             = options[:email]
       unless @author && @email
-        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge'
+        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge-ext' unless Newgem.const_defined?("Rubyforge")
         rubyforge_config = Newgem::Rubyforge.new
         @author ||= rubyforge_config.full_name
         @email  ||= rubyforge_config.email

data/features/executable_generator.feature

@@ -23,14 +23,14 @@ Feature: Generate an executable/CLI scaffold
   Scenario: Run CLI app from executable generator to show help
     Given an existing newgem scaffold [called 'my_project']
     Given 'executable' generator is invoked with arguments 'my_app'
-    When run executable 'bin/my_app' with arguments '-h'
+    When run project executable 'bin/my_app' with arguments '-h'
     Then help options '-h' and '--help' are displayed
     Then help options '-p' and '--path' are displayed
 
   Scenario: Run CLI app from executable generator should not fail
     Given an existing newgem scaffold [called 'my_project']
     Given 'executable' generator is invoked with arguments 'my_app'
-    When run executable 'bin/my_app' with arguments ''
+    When run project executable 'bin/my_app' with arguments ''
     Then output does match /lib\/my_app\/cli.rb/
   
   Scenario: Run unit tests after executable generator should all pass for test/unit

data/features/steps/cli.rb

@@ -1,8 +1,12 @@
+def in_tmp_folder(&block)
+  FileUtils.chdir(@tmp_root, &block)
+end
+
 Given %r{^an existing newgem scaffold \[called '(.*)'\]} do |project_name|
   Given "a safe folder"
   newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
   setup_active_project_folder project_name
-  FileUtils.chdir @tmp_root do
+  in_tmp_folder do
     @stdout = "newgem.out"
     system "ruby #{newgem} #{project_name} > #{@stdout} 2> #{@stdout}"
     force_local_lib_override
@@ -13,7 +17,7 @@ Given %r{^an existing newgem scaffold using options '(.*)' \[called '(.*)'\]} do
   Given "a safe folder"
   newgem = File.expand_path(File.dirname(__FILE__) + "/../../bin/newgem")
   setup_active_project_folder project_name
-  FileUtils.chdir @tmp_root do
+  in_tmp_folder do
     @stdout = "newgem.out"
     system "ruby #{newgem} #{arguments} #{project_name} > #{@stdout} 2> #{@stdout}"
     force_local_lib_override
@@ -48,7 +52,7 @@ end
 When %r{^newgem is executed for project '(.*)' with no options$} do |project_name|
   @newgem_cmd = newgem_cmd
   setup_active_project_folder project_name
-  FileUtils.chdir @tmp_root do
+  in_tmp_folder do
     @stdout = "newgem.out"
     system "ruby #{@newgem_cmd} #{project_name} > #{@stdout}"
     force_local_lib_override
@@ -58,7 +62,7 @@ end
 When %r{^newgem is executed for project '(.*)' with options '(.*)'$} do |project_name, arguments|
   @newgem_cmd = newgem_cmd
   setup_active_project_folder project_name
-  FileUtils.chdir @tmp_root do
+  in_tmp_folder do
     @stdout = "newgem.out"
     system "ruby #{@newgem_cmd} #{arguments} #{project_name} > #{@stdout}"
     force_local_lib_override
@@ -67,7 +71,7 @@ end
 
 When /^newgem is executed only with options '(.*)'$/ do |arguments|
   @newgem_cmd = newgem_cmd
-  FileUtils.chdir @tmp_root do
+  in_tmp_folder do
     @stdout = "newgem.out"
     system "ruby #{@newgem_cmd} #{arguments} > #{@stdout}"
   end

data/features/steps/common.rb

@@ -54,13 +54,18 @@ When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, argu
   end
 end
 
-When %r{run executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+When %r{run project executable '(.*)' with arguments '(.*)'} do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "ruby #{executable} #{arguments} > #{@stdout}"
+  in_project_folder do
+    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
   end
 end
 
+When %r{run local executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  system "ruby bin/#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+end
+
 When %r{^task 'rake (.*)' is invoked$} do |task|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
   FileUtils.chdir(@active_project_folder) do

data/lib/newgem.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require "hoe-patched"
 
 module Newgem
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/newgem/{rubyforge.rb → rubyforge-ext.rb}

@@ -1,5 +1,10 @@
-require 'rubygems'
-require 'rubyforge'
+begin
+  require 'rubyforge'
+rescue LoadError
+  require 'rubygems'
+  gem 'rubyforge'
+  require 'rubyforge'
+end
 
 module Newgem
   class Rubyforge

data/newgem_generators/install_website/install_website_generator.rb

@@ -87,7 +87,7 @@ EOS
 
     def github_username
       @github_username ||= begin
-        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge'
+        require File.dirname(__FILE__) + '/../../lib/newgem/rubyforge-ext' unless Newgem.const_defined?("Rubyforge")
         rubyforge_config = Newgem::Rubyforge.new
         rubyforge_config.github_username
       end

data/rubygems_generators/install_cucumber/templates/features/steps/common.rb

@@ -54,13 +54,18 @@ When %r{^'(.*)' generator is invoked with arguments '(.*)'$} do |generator, argu
   end
 end
 
-When %r{run executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+When %r{run project executable '(.*)' with arguments '(.*)'} do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
-  FileUtils.chdir(@active_project_folder) do
-    system "ruby #{executable} #{arguments} > #{@stdout}"
+  in_project_folder do
+    system "ruby #{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
   end
 end
 
+When %r{run local executable '(.*)' with arguments '(.*)'} do |executable, arguments|
+  @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
+  system "ruby bin/#{executable} #{arguments} > #{@stdout} 2> #{@stdout}"
+end
+
 When %r{^task 'rake (.*)' is invoked$} do |task|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
   FileUtils.chdir(@active_project_folder) do

data/test/test_newgem_generator.rb

@@ -7,6 +7,7 @@ class TestNewgemGenerator < Test::Unit::TestCase
   def setup
     bare_setup
     @gem_name = File.basename(File.expand_path(APP_ROOT))
+    ENV['HOME'] = "/some/path" # so it doesn't find dev's local ~/.newgem.yml
   end
 
   def teardown

data/test/test_rubyforge.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), "test_helper.rb")
-require 'newgem/rubyforge'
+require 'newgem/rubyforge-ext'
 
 class TestRubyforge < Test::Unit::TestCase
   

data/website/index.html

@@ -39,7 +39,7 @@
     
       <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">1.1.0</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.2.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

@@ -39,7 +39,7 @@
     
       <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">1.1.0</a>
+        <a href="http://rubyforge.org/projects/newgem" class="numbers">1.2.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,7 +72,7 @@
 $ rubyforge setup
 $ mate ~/.rubyforge/user-config.yml
 </pre>
-<p>This creates a configuration folder <code>.rubyforge</code> in your home folder (on Windows it is XXXXXX). The last line is to edit the config file.</p>
+<p>This creates a configuration folder <code>.rubyforge</code> in your home folder (on Windows it is <span class="caps">XXXXXX</span>). The last line is to edit the config file.</p>
 <p>The only two lines to set are your RubyForge <strong>username</strong> and <strong>password</strong>. Ignore the rest.</p>
 <pre>$ rubyforge config</pre>
 <p>This generates a file <code>~/.rubyforge/auto-config.yml</code> which will be mostly empty now, but one day will be full of projects and all the releases of different versions of gems. One day soon I hope.</p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newgem
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-11 00:00:00 +10:00
+date: 2008-12-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -106,6 +106,39 @@ extra_rdoc_files:
 - website/version-raw.txt
 - website/version.txt
 files: 
+- .test-result/TestExecutableGenerator/test_generator_without_options/passed
+- .test-result/TestExtconfGenerator/test_generator_for_rspec_project/passed
+- .test-result/TestExtconfGenerator/test_generator_without_options/passed
+- .test-result/TestFeatureGenerator/test_generator_without_options/passed
+- .test-result/TestInstallCucumberGenerator/test_generator_without_options/passed
+- .test-result/TestInstallJrubyGenerator/test_generator_without_options/passed
+- .test-result/TestInstallRspecGenerator/test_generator_without_options/passed
+- .test-result/TestInstallTestUnitGenerator/test_generator_without_options/passed
+- .test-result/TestInstallWebsiteGenerator/test_generator_without_options/passed
+- .test-result/TestNewgemGenerator/test_gem_name_does_not_change_if_project_name_is_overriden/passed
+- .test-result/TestNewgemGenerator/test_gem_name_should_come_from_project/passed
+- .test-result/TestNewgemGenerator/test_module_name_does_not_change_if_project_name_is_overriden/passed
+- .test-result/TestNewgemGenerator/test_module_name_should_come_from_gem_name/passed
+- .test-result/TestNewgemGenerator/test_newgem_with_executable/passed
+- .test-result/TestNewgemGenerator/test_newgem_with_jruby/passed
+- .test-result/TestNewgemGenerator/test_newgem_with_no_website/passed
+- .test-result/TestNewgemGenerator/test_newgem_with_rspec/passed
+- .test-result/TestNewgemGenerator/test_newgem_with_website/passed
+- .test-result/TestNewgemGenerator/test_project_name_can_be_overriden/passed
+- .test-result/TestNewgemGenerator/test_project_name_should_default_to_gem_name/passed
+- .test-result/TestNewgemGenerator/test_run_in_trunk_path_finds_parent_path_for_gem_name/passed
+- .test-result/TestNewgemSimpleGenerator/test_generator_without_options/passed
+- .test-result/TestPlainThemeGenerator/test_generator_with_author_and_email/passed
+- .test-result/TestPlainThemeGenerator/test_generator_without_options/passed
+- .test-result/TestRubyforge/test_email_should_be_placeholder_if_nothing_found/passed
+- .test-result/TestRubyforge/test_email_should_come_from_environment/passed
+- .test-result/TestRubyforge/test_email_should_come_from_user_config/passed
+- .test-result/TestRubyforge/test_full_name_should_be_placeholder_if_nothing_found/passed
+- .test-result/TestRubyforge/test_full_name_should_come_from_environment/passed
+- .test-result/TestRubyforge/test_full_name_should_come_from_user_config/passed
+- .test-result/TestRubyforge/test_github_username_should_be_placeholder_if_nothing_found/passed
+- .test-result/TestRubyforge/test_github_username_should_come_from_environment/passed
+- .test-result/TestRubyforge/test_github_username_should_come_from_user_config/passed
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -155,7 +188,7 @@ files:
 - lib/hoe-patched.rb
 - lib/newgem.rb
 - lib/newgem/quick_template.rb
-- lib/newgem/rubyforge.rb
+- lib/newgem/rubyforge-ext.rb
 - lib/newgem/support/tasks.rb
 - lib/newgem/tasks.rb
 - newgem_generators/install_website/USAGE