geminstaller 0.2.3 → 0.2.4

data/.loadpath

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+</loadpath>

data/History.txt

@@ -1,5 +1,10 @@
 == 0.x.y / yyyy-mm-dd
 
+== 0.2.4 / 2007-10-21
+* Look for config file at config/geminstaller.yml as well as geminstaller.yml
+* Make startup message ('Installing Gems...') debug level instead of info
+* Add custom descriptive error if user gets access permission error when installing a gem
+
 == 0.2.3 / 2007-08-03
 * remove Autogem#process_gem debug statement
 * Don't reset test_gem_home in test_gem_home_spec, shaves about 18 seconds off suite

data/Manifest.txt

@@ -1,3 +1,4 @@
+.loadpath
 COPYING
 History.txt
 LICENSE
@@ -6,6 +7,7 @@ README.txt
 Rakefile
 TODO.txt
 bin/geminstaller
+ci/cruisecontrol
 geminstaller.yml
 lib/geminstaller.rb
 lib/geminstaller/application.rb
@@ -26,6 +28,7 @@ lib/geminstaller/gem_list_checker.rb
 lib/geminstaller/gem_runner_proxy.rb
 lib/geminstaller/gem_source_index_proxy.rb
 lib/geminstaller/gem_spec_manager.rb
+lib/geminstaller/geminstaller_access_error.rb
 lib/geminstaller/geminstaller_error.rb
 lib/geminstaller/hoe_extensions.rb
 lib/geminstaller/install_processor.rb
@@ -51,6 +54,7 @@ start_local_gem_server.sh
 test/test_all.rb
 website/config.yaml
 website/metainfo.yaml
+website/src/analytics.page
 website/src/code/index.page
 website/src/community/index.page
 website/src/community/links.page

data/TODO.txt

@@ -1,14 +1,14 @@
+=============== Unfiled =============
+* Dynamically detect posix platform and check if gem repo is completely writeable.  Ignorable prompt?
 * Figure out how to suppress webrick messages from embedded gem server
 * Allow array or eval'able string of gems to be passed as --gems arg or instead of args
 * Add @options[:gems], should be parsed from command line
 =============== 0.2.6
-* Understand environment.rb vs boot.rb.  Add doc references.
-* Catch permission errors, and print descriptive instructions on how to handle sudo.  "Uh Oh!  A gem installation failed because it did not have permission to write to the filesystem.  If you want to have automated GemInstaller goodness, you'll have to fix this.  Don't worry, it's easy!  You have three basic choices: ..."
+* Understand environment.rb vs boot.rb (bottom line: env is not processed before Initializer, so can't be used to load rails gems).  Add doc references.
 * docs - clean up sudo section.  Should be clearer about sudoers entry, and make sure that NOPASSWD is the last entry.
 * Faq - mention sudo
 * Faq - mention Zed's questions
 * design - dependency management is good.  Maven got it right, if not for the jelly...
-* search for config/geminstaller.yml by default
 * Investigate gem_plugin.  Plugin for mongrel???
 ================ 0.2.8 release ===================
 * Rename API: deprecate 'autogem' and rename to 'loadgems'; change current 'run' to 'install'; add new 'run' which automatically calls both 'install' and 'gem', add 'no-loadgems' option (only applicable when invoked programatically) to supress automatic 'loadgems

data/ci/cruisecontrol

@@ -0,0 +1,50 @@
+CRUISECONTROL_DIR=/home/woolley/workspace/geminstaller_ci
+CRUISECONTROL_CMD=$CRUISECONTROL_DIR/cruise
+PIDFILE=/tmp/cruisecontrol.pid
+
+if [ "$CRUISECONTROL_USER" = "" ] ; then
+  CRUISECONTROL_USER=cruisecontrol
+fi
+
+if [ "$JAVA_HOME" = "" ] ; then
+  export JAVA_HOME=/usr/java/jdk
+fi
+export PATH=$PATH:$JAVA_HOME/bin
+
+case "$1" in
+  start)
+    echo -n "Starting CruiseControl"
+    cd $CRUISECONTROL_DIR
+    start-stop-daemon --start --pidfile $PIDFILE --make-pidfile --user $CRUISECONTROL_USER --chuid $CRUISECONTROL_USER --chdir /home/woolley/workspace/geminstaller_ci --exec $CRUISECONTROL_CMD -- start  >> /var/log/cruisecontrol/cruisecontrol.log 2>&1 &
+    echo "."
+    ;;
+  stop)
+    echo "Stopping CruiseControl"
+    PARPID=`cat $PIDFILE`
+    if [ "$PARPID" = "" ] ; then
+      echo "No pidfile found for cruisecontrol, nothing to stop"
+      exit 1
+    fi
+    start-stop-daemon --stop --quiet --pidfile $PIDFILE
+    echo "."
+    CHILDPIDS=`ps -ea -o "pid ppid args" | grep -v grep | grep "${PARPID}" | grep -v "^ ${PARPID}" | \
+      sed -e 's/^  *//' -e 's/ .*//'`
+    if [ "${CHILDPIDS}" != "" ]; then
+      echo "Killing child processes: $CHILDPIDS"
+      kill -9 ${CHILDPIDS}
+      echo "Done killing child processes."
+    else
+      echo "No child processes killed."
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 2
+    $0 start
+    ;;
+  *)
+        echo "Usage: /etc/init.d/cruisecontrol {start|stop|restart}"
+        exit 1
+esac
+
+exit 0

data/lib/geminstaller/application.rb

@@ -99,7 +99,7 @@ module GemInstaller
         message += gem_info 
         message += ", " if index + 1 < gems.size
       end
-      @output_filter.geminstaller_output(:info,message + "\n")
+      @output_filter.geminstaller_output(:debug,message + "\n")
     end
   end
 end

data/lib/geminstaller/arg_parser.rb

@@ -19,6 +19,8 @@ module GemInstaller
       @options[:geminstaller_output] = [:error,:install,:info]
       @options[:rubygems_output] = [:stderr]
       @output = ""
+      @unparsed_geminstaller_output_flags = nil
+      @unparsed_rubygems_output_flags = nil
       opts = OptionParser.new do |opts|
         opts.banner = "Usage: geminstaller [options]"
 

data/lib/geminstaller/config_builder.rb

@@ -4,23 +4,27 @@ require File.expand_path("#{dir}/requires.rb")
 module GemInstaller
   class ConfigBuilder
     attr_reader :config_file_paths_array
-    attr_writer :file_reader
-    attr_writer :yaml_loader
-    attr_writer :config_file_paths
+    attr_writer :file_reader, :yaml_loader, :config_file_paths, :output_filter
     
-    def self.default_config_file_path
-      'geminstaller.yml'
+    def initialize(default_config_file_paths_array = ['geminstaller.yml','config/geminstaller.yml'])
+      @default_config_file_paths_array = default_config_file_paths_array
     end
-
+    
     def build_config
-      @config_file_paths ||= GemInstaller::ConfigBuilder.default_config_file_path
-      @config_file_paths_array = @config_file_paths.split(",")
+      @config_file_paths_array = @config_file_paths ? @config_file_paths.split(",") : @default_config_file_paths_array
       merged_defaults = {}
       merged_gems = {}
+      file_found = false
       @config_file_paths_array.each do |path|
+        if File.exists?(path)
+          file_found = true
+        else
+          next
+        end
         file_contents = @file_reader.read(path)
         next unless file_contents
         next if file_contents.empty?
+        @output_filter.geminstaller_output(:debug,"Found GemInstaller config file at: #{File.expand_path(path)}\n")        
         file_contents_erb = ERB.new(%{#{file_contents}})
         yaml = @yaml_loader.load(file_contents_erb.result)
         merged_defaults.merge!(yaml['defaults']) unless yaml['defaults'].nil?
@@ -30,6 +34,7 @@ module GemInstaller
           merged_gems[gem_key] = gem
         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

data/lib/geminstaller/dependency_injector.rb

@@ -43,6 +43,7 @@ module GemInstaller
       @config_builder = GemInstaller::ConfigBuilder.new
       @config_builder.file_reader = @file_reader
       @config_builder.yaml_loader = @yaml_loader
+      @config_builder.output_filter = @output_filter
 
       @gem_source_index = Gem::SourceIndex.new
       @gem_source_index_proxy = GemInstaller::GemSourceIndexProxy.new

data/lib/geminstaller/gem_runner_proxy.rb

@@ -35,8 +35,19 @@ module GemInstaller
     end
         
     def raise_error_with_output(exit_error, args, listener)
-      descriptive_exit_message = exit_error.descriptive_exit_message(exit_error.message, 'gem', args, listener)
-      raise exit_error.class.new(descriptive_exit_message)
+      error_class = exit_error.class
+      error_message = exit_error.message
+      gem_command_output = listener.read!
+      if gem_command_output.join('') =~ /Errno::EACCES/
+        error_message = access_error_message + "\n" + error_message
+        error_class = GemInstaller::GemInstallerAccessError
+      end      
+      descriptive_exit_message = exit_error.descriptive_exit_message(error_message, 'gem', args, gem_command_output)
+      raise error_class.new(descriptive_exit_message)
+    end
+    
+    def access_error_message
+      "You don't have permission to install a gem.\nThis is not a problem with GemInstaller.\nYou probably want use the --sudo option or run GemInstaller as sudo,\nor install your gems to a non-root-owned location.\nSee http://geminstaller.rubyforge.org/documentation/documentation.html#dealing_with_sudo\n"
     end
   end
 end

data/lib/geminstaller/geminstaller_access_error.rb

@@ -0,0 +1,4 @@
+module GemInstaller
+  class GemInstallerAccessError < GemInstaller::GemInstallerError
+  end
+end

data/lib/geminstaller/geminstaller_error.rb

@@ -1,12 +1,12 @@
 module GemInstaller
   class GemInstallerError < RuntimeError
-    def descriptive_exit_message(message, command, args, listener)
+    def descriptive_exit_message(message, command, args, gem_command_output)
       args_string = args.join(" ")
       descriptive_exit_message = "\n=========================================================\n"
       descriptive_exit_message += "#{message}\n"
       descriptive_exit_message += "Gem command was:\n  #{command} #{args_string}\n\n"
       descriptive_exit_message += "Gem command output was:\n"
-      descriptive_exit_message += listener.read!.join("\n")
+      descriptive_exit_message += gem_command_output.join("\n")
       descriptive_exit_message += "\n=========================================================\n\n"
     end
   end

data/lib/geminstaller/requires.rb

@@ -60,6 +60,7 @@ require File.expand_path("#{dir}/gem_runner_proxy")
 require File.expand_path("#{dir}/gem_source_index_proxy")
 require File.expand_path("#{dir}/gem_spec_manager")
 require File.expand_path("#{dir}/geminstaller_error")
+require File.expand_path("#{dir}/geminstaller_access_error")
 require File.expand_path("#{dir}/install_processor")
 require File.expand_path("#{dir}/missing_dependency_finder")
 require File.expand_path("#{dir}/missing_file_error")

data/lib/geminstaller.rb

@@ -29,7 +29,7 @@ module GemInstaller
   end
 
   def self.version
-    "0.2.3"
+    "0.2.4"
   end
 
   def self.create_application(args = [], registry = nil)

data/website/src/analytics.page

@@ -0,0 +1,6 @@
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+_uacct = "UA-2845076-1";
+urchinTracker();
+</script>

data/website/src/default.template

@@ -37,5 +37,7 @@
     </div>
 
     <div id="footer">&copy; 2007 Chad Woolley | Generated by <a href="http://webgen.rubyforge.org">webgen</a></div>
+    {includeFile: {filename: analytics.page, escapeHTML: false, processOutput: false}}
+
   </body>
 </html>

data/website/src/documentation/index.page

@@ -21,7 +21,7 @@ gems:
 
 h2. Using GemInstaller with Ruby on Rails
 
-* Create geminstaller.yml in the RAILS_ROOT/config directory.  Include entries for your Rails version, and any other gems your app needs (Note: If you are too lazy to make your config file manually, or don't know what gems you need, see the tutorial on "Bootstrapping your GemInstaller Config with the <code>--print-rogue-gems</code> option":tutorials#bootstrapping_your_geminstaller_config):
+* Create geminstaller.yml in the RAILS_ROOT/config directory.  Include entries for your Rails version, and any other gems your app needs (Note: If you are too lazy to make your config file manually, or don't know what gems you need, see the tutorial on "Bootstrapping your GemInstaller Config with the <code>--print-rogue-gems</code> option":tutorials.html#bootstrapping_your_geminstaller_config):
 
     <pre>
 \---

data/website/src/index.page

@@ -34,12 +34,16 @@ GemInstaller was created by "Chad Woolley":http://www.thewoolleyweb.com.
 
 h2(#known_bugs). Known Bugs
 
-Currently (as of version 0.2.3), the only _major_ known bug is related to auto-installing the Rails or Mongrel gems via boot.rb during startup of Mongrel or Webrick.  The simple workaround is to run GemInstaller manually or just restart Rails anytime GemInstaller auto-installs a Rails/Mongrel gem upgrade during app startup.  For Rails and other deployable apps, you can also "run GemInstaller from Capistrano":documentation/tutorials.html#running_geminstaller_from_capistrano to avoid this problem in demo/production environments.  Researching and fixing this problem is a top priority.  I bet there's another bug or twoo, so please "report them if you find them":http://rubyforge.org/tracker/?group_id=1902!
+Currently (as of version 0.2.4), the only _major_ known bug is related to auto-installing the Rails or Mongrel gems via boot.rb during startup of Mongrel or Webrick.  The simple workaround is to run GemInstaller manually or just restart Rails anytime GemInstaller auto-installs a Rails/Mongrel gem upgrade during app startup.  For Rails and other deployable apps, you can also "run GemInstaller from Capistrano":documentation/tutorials.html#running_geminstaller_from_capistrano to avoid this problem in demo/production environments.  Researching and fixing this problem is a top priority.  I bet there's another bug or twoo, so please "report them if you find them":http://rubyforge.org/tracker/?group_id=1902!
 
 There's also some leakage of gem doc warning messages even if you turn down --rubygems-output, but these can be ignored (these same messages show up when installing gems manually).  This should be fixed soon.
 
 h2(#history). History
 
+* 0.2.4
+** Look for config file at config/geminstaller.yml as well as geminstaller.yml
+** make startup message ('Installing Gems...') debug level instead of info
+** Add custom descriptive error if user gets access permission error when installing a gem
 * 0.2.3 - Fix debug statement left in, upgrade rspec, improvements to test suite
 * 0.2.2 - Fix performance problems with autogem command (don't manually recurse dependencies, gem method does it already)
 * 0.2.1 - RubyGems release 0.9.3 had some major refactoring done to the internals, which broke GemInstaller 0.2.0.  GemInstaller 0.2.1 is a patch release to fix this.  I did limited testing on 0.9.3 and 0.9.0.  Please let me know if anything is broken on any version of RubyGems.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: geminstaller
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2007-09-03 00:00:00 -07:00
+  version: 0.2.4
+date: 2007-10-21 00:00:00 -07:00
 summary: GemInstaller provides automated management of RubyGems.
 require_paths: 
 - lib
@@ -29,6 +29,7 @@ post_install_message:
 authors: 
 - Chad Woolley
 files: 
+- .loadpath
 - COPYING
 - History.txt
 - LICENSE
@@ -37,6 +38,7 @@ files:
 - Rakefile
 - TODO.txt
 - bin/geminstaller
+- ci/cruisecontrol
 - geminstaller.yml
 - lib/geminstaller.rb
 - lib/geminstaller/application.rb
@@ -57,6 +59,7 @@ files:
 - lib/geminstaller/gem_runner_proxy.rb
 - lib/geminstaller/gem_source_index_proxy.rb
 - lib/geminstaller/gem_spec_manager.rb
+- lib/geminstaller/geminstaller_access_error.rb
 - lib/geminstaller/geminstaller_error.rb
 - lib/geminstaller/hoe_extensions.rb
 - lib/geminstaller/install_processor.rb
@@ -82,6 +85,7 @@ files:
 - test/test_all.rb
 - website/config.yaml
 - website/metainfo.yaml
+- website/src/analytics.page
 - website/src/code/index.page
 - website/src/community/index.page
 - website/src/community/links.page
@@ -95,10 +99,14 @@ files:
 - website/src/index.page
 test_files: 
 - test/test_all.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- TODO.txt
 executables: 
 - geminstaller
 extensions: []