geminstaller 0.4.5 → 0.5.0

data/History.txt

@@ -1,3 +1,6 @@
+== 0.5.0 / 2009-02-03
+* change default processing order of gems from alpha-version-platform to be order found in file (last config file wins).  Fixes http://thewoolleyweb.lighthouseapp.com/projects/11580/tickets/15-provide-a-way-to-specify-gem-processing-order .  Thanks to Brian Jenkins for helping!
+
 == 0.4.5 / 2008-09-26
 * Re-release without Hoe as a dependency, since it snuck itself in as a dependency in 0.4.4
 

data/Manifest.txt

@@ -60,11 +60,14 @@ start_local_gem_server.sh
 test/test_all.rb
 test/test_all_smoketests.rb
 website/config.yaml
-website/metainfo.yaml
 website/src/analytics.page
+website/src/code/ci.virtual
+website/src/code/coverage/index.virtual
 website/src/code/index.page
+website/src/code/rdoc/index.virtual
 website/src/community/index.page
 website/src/community/links.page
+website/src/community/rubyforge.virtual
 website/src/default.css
 website/src/default.template
 website/src/documentation/documentation.page
@@ -73,3 +76,5 @@ website/src/documentation/tutorials.page
 website/src/download.page
 website/src/faq.page
 website/src/index.page
+website/src/metainfo
+website/src/webgen.css

data/Rakefile

@@ -23,7 +23,9 @@ IndependentHoe.new('geminstaller', GemInstaller.version) do |p|
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.clean_globs << 'coverage'
+  p.clean_globs << 'website/out'
   p.clean_globs << 'website/output'
+  p.clean_globs << '**/webgen.cache'
   p.extra_deps = []
 end
 
@@ -41,9 +43,9 @@ end
 
 task :coverage do
   rm_rf "coverage"
-  rm_rf "website/output/code/coverage"
-  sh "mkdir -p website/output/code"
-  sh "rcov -o website/output/code/coverage test/test_all.rb"
+  rm_rf "website/out/code/coverage"
+  sh "mkdir -p website/out/code"
+  sh "rcov -o website/out/code/coverage test/test_all.rb"
 end
 
 task :coverage_no_fail do
@@ -65,8 +67,8 @@ task :diff_manifest => :clean do
     next if path =~ /\.\/nbproject/
     next if path =~ /\.\/spec/
     next if path =~ /\.\/pkg/
-    next if path =~ /\.\/output/
-    next if path =~ /\.\/website\/output/
+    next if path =~ /\.\/out/
+    next if path =~ /\.\/website\/out/
     files << path[2..-1]
   end
   files = files.sort.join "\n"
@@ -82,15 +84,22 @@ end
 
 desc "Run Webgen to generate website"
 task :webgen do
-#  rm_rf "website/output"
-  sh "webgen -d website"
+  # rm_rf "website/out"
+  rm_rf "website/webgen.cache"
+  # Use webgen/RedCloth versions from GemInstaller config
+  # require 'geminstaller'
+  # GemInstaller.autogem
+  # ARGV.clear
+  # ARGV.concat(['-d','website'])
+  # load 'webgen'
+  sh 'webgen -d website'
 end
 
 desc "Move ri docs to website"
 task :website_rdocs => :docs do
-  rm_rf "website/output/code/rdoc"
-  sh "mkdir -p website/output/code/"
-  mv "doc", "website/output/code/rdoc"
+  rm_rf "website/out/code/rdoc"
+  sh "mkdir -p website/out/code/"
+  mv "doc", "website/out/code/rdoc"
 end
 
 desc "Generate website, including rdoc and coverage"
@@ -109,7 +118,7 @@ desc 'Upload website (should already be clean and generated)'
 task :upload_website do
   host = "thewoolleyman@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/geminstaller"
-  local_dir = 'website/output'
+  local_dir = 'website/out'
   sh %{rsync -av --delete --exclude=statsvn #{local_dir}/ #{host}:#{remote_dir}}
 end
 

data/TODO.txt

@@ -13,10 +13,10 @@
   * geminstaller_merb_example_app
   * geminstaller_rails_example_app
 * Update Rails tutorial link with link to example app
-================ 0.4.0 release ===================
+================ 0.6.0 release ===================
 * fix smoke tests on CI
 * Investigate error when installing and loading gem in same session (like rails preinitializer) - Not reproducible - fixed in >1.1.0???
-================ 0.5.0 release ===================
+================ 0.7.0 release ===================
 * If permission error, auto-install under writable_gem_home ~/gems/1.8 (configurable), Gem.clear_paths, set ENV['GEM_HOME'] and ENV['GEM_PATH'] to ENV['HOME']pathsepGem::ConfigMap[:ruby_version], and issue warning (saying in order to prevent warning, a) set gem_home and gem_path: in ~/.gemrc, b) invoke via sudo (only if command line), c) make (and keep) current Gem.dir writeable, or d) add geminstaller (and ruby?) to sudoers file (security hole).  Properties: "[no_]use_writable_gem_home" and "writable_gem_home".
 * For RubyGems >=1.0.1, look at using Gem::SourceInfoCache instead of SourceIndex or --list command
 * Move classes which are unused against current RubyGems into Legacy module.

data/geminstaller.yml

@@ -16,15 +16,18 @@ gems:
   version: '>= 0.7.0.1'
   platform: <%= RUBY_PLATFORM =~ /mswin/ ? 'mswin32' : 'ruby'%>
 - name: RedCloth
-  version: '>= 3.0.4'
+#  version: '= 3.0.4'
+  version: '= 4.0.4'
 - name: rspec
-  version: '>= 1.1.1'
+  version: '>= 1.1.12'
 - name: cmdparse
   version: '>= 2.0.2'
 - name: ruby-debug
   version: '>= 0.9.3'
 - name: webgen
-  version: '= 0.4.2'
+  version: '= 0.5.5'
+# - name: gettalong-webgen
+#   version: '>= 0.5.5.20081001'
 <% if RUBY_PLATFORM =~ /mswin/ %>
 - name: win32-process
   version: '>= 0.5.5'

data/lib/geminstaller/autogem.rb

@@ -32,8 +32,14 @@ module GemInstaller
       if GemInstaller::RubyGemsVersionChecker.matches?('< 0.9')
         require_gem(name, version)
       else
-        # TODO: check true/false result of gem method, print debug message if false (already loaded)
-        result = gem(name, version)
+        begin
+          result = gem(name, version)
+        rescue Gem::Exception => e
+          exception_message = e.message
+          exception_message.strip!
+          error_message = "Error: GemInstaller failed to actiate gem '#{name}', version '#{version}'.  This is probably because GemInstaller processes gems in order (was alphabetical prior to 0.5.0), and an earlier gem in your geminstaller.yml config already activated another version.  Use the 'gem dependency [-R]' command to track this down, and reorder/edit your config as necessary.  Original Gem::Exception was: '#{exception_message}'"
+          raise GemInstaller::GemInstallerError.new(error_message)
+        end
       end
     end
   end

data/lib/geminstaller/config.rb

@@ -51,7 +51,6 @@ module GemInstaller
           :fix_dependencies => fix_dependencies)
         gems << gem
       end
-      gems.sort!
       return gems
     end
 

data/lib/geminstaller/config_builder.rb

@@ -13,9 +13,10 @@ module GemInstaller
     def build_config
       @config_file_paths_array = @config_file_paths ? @config_file_paths.split(",") : @default_config_file_paths_array
       merged_defaults = {}
-      merged_gems = {}
+      merged_gems_in_order = []
+      merged_gems_by_key = {}
       file_found = false
-      @config_file_paths_array.each do |path|
+      @config_file_paths_array.reverse.each do |path| # reverse because last config files win
         if File.exists?(path)
           file_found = true
         else
@@ -34,15 +35,19 @@ module GemInstaller
         yaml = @yaml_loader.load(erb_result)
         merged_defaults.merge!(yaml['defaults']) unless yaml['defaults'].nil?
         next unless yaml['gems']
-        yaml['gems'].each do |gem|
-          gem_key = [gem['name'],gem['version'],gem['platform']].join('-')
-          merged_gems[gem_key] = gem
+        yaml['gems'].each do |new_gem|
+          gem_key = [new_gem['name'],new_gem['version'],new_gem['platform']].join('-')
+          existing_gem = merged_gems_by_key[gem_key]
+          unless existing_gem
+            merged_gems_in_order << new_gem
+            merged_gems_by_key[gem_key] = new_gem
+          end
         end
       end
       raise GemInstaller::MissingFileError.new("No config files found at any of these paths: #{@config_file_paths_array.join(', ')}") unless file_found
       merged_yaml = {}
       merged_yaml['defaults'] = merged_defaults
-      merged_yaml['gems'] = merged_gems.values
+      merged_yaml['gems'] = merged_gems_in_order
       config = GemInstaller::Config.new(merged_yaml)
       config
     end

data/lib/geminstaller/ruby_gem.rb

@@ -45,7 +45,7 @@ module GemInstaller
     def <=>(other)
       compare = @name <=> other.name
       return compare if compare != 0
-      compare = @version <=> other.version
+      compare = @version <=> other.version # TODO: this should use rubygems version comparison, not string comparison
       return compare if compare != 0
       return 0 if (@platform == nil && other.platform == nil)
       return @platform <=> other.platform

data/lib/geminstaller.rb

@@ -34,7 +34,7 @@ module GemInstaller
   end
 
   def self.version
-    "0.4.5"
+    "0.5.0"
   end
 
   def self.create_application(args = [], registry = nil)

data/test/test_all.rb

@@ -26,7 +26,7 @@ ARGV.concat(args)
 success = false
 begin
   require 'spec'
-  success = ::Spec::Runner::CommandLine.run(rspec_options)
+  success = ::Spec::Runner::CommandLine.run
 ensure
   GemInstaller::TestGemHome.reset
 end

data/website/config.yaml

@@ -1,2 +1,11 @@
 # Configuration file for webgen
 # Used to set the parameters of the plugins
+default_meta_info:
+  Page:
+    blocks:
+      default: {pipeline: tags,redcloth,blocks}
+  Template:
+    blocks:
+      default: {pipeline: tags,redcloth,blocks}
+tag.menu.show_current_subtree_only: true
+tag.menu.nested: false

data/website/src/code/ci.virtual

@@ -0,0 +1,5 @@
+ci.html:
+  title: CI
+  url: http://ci.thewoolleyweb.com
+  in_menu: true
+  sort_info: 20

data/website/src/code/coverage/index.virtual

@@ -0,0 +1,5 @@
+index.html:
+  title: Coverage
+  url: index.html
+  in_menu: true
+  sort_info: 40

data/website/src/code/index.page

@@ -1,7 +1,6 @@
 ---
 title: Design
 ---
-<span id="release_process"/>
 h1. Design Notes
 
 These are some notes on the underlying design of GemInstaller, and the current state of development:
@@ -30,6 +29,7 @@ These are some notes on the underlying design of GemInstaller, and the current s
 * One of my motivations for creating GemInstaller was as an exercise to help me learn Ruby better.  If you see me doing anything obviously dumb or inefficient in the code or design, please let me know. Some of them I already know about, but haven't fixed, most I'm probably not aware of :)
 
 <span id="rubygems_compatibility"/>
+
 h1. Maintaining forward and backward compatibility with multiple RubyGems versions
 
 * I've put a lot of effort into ensuring that GemInstaller works with older versions of RubyGems, and run automated tests against several recent versions on Continuous Integration.
@@ -47,6 +47,7 @@ h1. Maintaining forward and backward compatibility with multiple RubyGems versio
 ** The "<code>prefer_binary_platform</code> config property":../documentation/documentation.html#prefer_binary_platform_config_property no longer applies, and has no effect.
 
 <span id="release_process"/>
+
 h1. Release Process
 
 Yeah, it's too manual.  Notes for improvement below.
@@ -73,13 +74,14 @@ Here's the improvements I need to make to the release process:
 * Rake task to automatically tag and release latest build from CI and tag
 
 <span id="rubygems_upgrade_process"/>
+
 h1. Rubygems Upgrade Process
 
 Process to test against new rubygems release.
 
-<pre>
+<pre><code>
 svn export http://rubygems.rubyforge.org/svn/tags/REL_X_Y_Z spec/fixture/rubygems_dist/rubygems-X.Y.Z
-</pre>
+</code></pre>
 
 * add spec/fixture/rubygems_dist/rubytems-X.Y.Z
 * checkin

data/website/src/code/rdoc/index.virtual

@@ -0,0 +1,6 @@
+index.html:
+  title: Rdoc
+  url: index.html
+  in_menu: true
+  sort_info: 30
+

data/website/src/community/rubyforge.virtual

@@ -0,0 +1,4 @@
+rubyforge.html:
+  title: Rubyforge
+  url: http://rubyforge.org/projects/geminstaller
+  in_menu: true

data/website/src/default.css

@@ -7,17 +7,19 @@ font:90% Verdana,Tahoma,Arial,sans-serif;
 margin:0;
 padding:0;
 text-align:center;
-}s
+}
 
 a {
-color:#505050;
+color:#3A5FCD;
 font-weight:bold;
-text-decoration:none;
+}
+
+a:visited {
+color:#551A8B;
 }
 
 a:hover {
 color:#808080;
-text-decoration:underline;
 }
 
 p {
@@ -25,7 +27,7 @@ line-height:1.5em;
 margin:0 0 15px;
 }
 
-code,pre {
+code {
 font-size:1.3em;
 }
 
@@ -165,4 +167,9 @@ font-weight:bold;
 }
 
 
+/* START webgen horizontal menu style */
+.webgen-menu-horiz ul { display: block; }
+.webgen-menu-horiz li { display: inline; }
+/* STOP webgen horizontal menu style */
+
 /*** End of file ***/

data/website/src/default.template

@@ -1,4 +1,4 @@
---- content, html
+--- pipeline:tags,blocks
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{lang:}">
@@ -9,7 +9,6 @@
     <meta name="author" content="Chad Woolley / Original design by Andreas Viklund - http://andreasviklund.com" />
     <meta name="generator" content="webgen - http://webgen.rubyforge.org" />
     <link rel="stylesheet" href="{relocatable: default.css}" type="text/css" media="screen" />
-    <link rel="stylesheet" href="{resource: webgen-css}" type="text/css" media="screen" />
     <title>{title:}</title>
   </head>
 
@@ -24,20 +23,20 @@
       </div>
 
       <div id="navigation">
-          {menu: {menuStyle: horizontal}}
+          {menu:}
       </div>
 
       <div id="wrap">
 
         <div id="content">
-          {block:}
+          <webgen:block name="content" />
         </div>
 
       </div>
     </div>
 
     <div id="footer">&copy; 2008 Chad Woolley | Generated by <a href="http://webgen.rubyforge.org">webgen</a></div>
-    {includeFile: {filename: analytics.page, escapeHTML: false, processOutput: false}}
+    {include_file: {filename: src/analytics.page, escape_html: false, process_output: false}}
 
   </body>
 </html>