From 8bc3e5f130d895cbd0f28316cee65aceefa48d7b Mon Sep 17 00:00:00 2001
From: Fabien Franzen <info@atelierfabien.be>
Date: Fri, 19 Sep 2008 15:11:53 +0200
Subject: [PATCH] Small fixups

---
 Rakefile                        | 2 +-
 bin/minigem                     | 1 -
 lib/minigems.rb                 | 2 +-
 lib/minigems/executable_wrapper | 6 +++++-
 lib/minigems/script_helper.rb   | 8 +++++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index 1e25957..b739063 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,7 +15,7 @@ GEM_EMAIL  = "info@atelierfabien.be"
 
 GEM_NAME    = "minigems"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Gem::MiniGems::VERSION || "0.0.1") + PKG_BUILD
+GEM_VERSION = (Gem::MiniGems::VERSION || "0.9.0") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
diff --git a/bin/minigem b/bin/minigem
index ce62b3f..1877e55 100644
--- a/bin/minigem
+++ b/bin/minigem
@@ -9,7 +9,6 @@ if ARGV.empty? || %w[-H --help].detect { |o| ARGV.index(o) }
   program = File.basename($0)
   puts "Usage:"
   puts "  #{program} setup"
-  puts "  #{program} remove"
   puts "  #{program} prepare GEMNAME [GEMNAME ...]"
   puts "  #{program} revert  GEMNAME [GEMNAME ...]"
   puts "  #{program} install GEMNAME [GEMNAME ...] [options] -- --build-flags [options]"
diff --git a/lib/minigems.rb b/lib/minigems.rb
index 9ceb892..b59ad4e 100644
--- a/lib/minigems.rb
+++ b/lib/minigems.rb
@@ -1,6 +1,6 @@
 module Gem
   module MiniGems
-    VERSION = "0.0.1"
+    VERSION = "0.9.0"
     
     # The next line needs to be kept exactly as shown; it's being replaced
     # during minigems installation.
diff --git a/lib/minigems/executable_wrapper b/lib/minigems/executable_wrapper
index e582152..bec1505 100644
--- a/lib/minigems/executable_wrapper
+++ b/lib/minigems/executable_wrapper
@@ -5,7 +5,11 @@ SHEBANG
 # The application 'EXECUTABLE_NAME' is installed as part of a gem (GEM_NAME),
 # and this file is here to facilitate running it.
 
-require 'GEM_MODE'
+begin
+  require 'GEM_MODE'
+rescue LoadError 
+  require 'rubygems'
+end
 
 version = ">= 0"
 
diff --git a/lib/minigems/script_helper.rb b/lib/minigems/script_helper.rb
index 8976d31..d5f399d 100644
--- a/lib/minigems/script_helper.rb
+++ b/lib/minigems/script_helper.rb
@@ -116,14 +116,16 @@ def remove_minigems!
         if File.exists?(install_path = File.join(Gem::ConfigMap[:sitelibdir], 'minigems.rb'))
           if FileUtils.rm(install_path)
             puts "Succesfully removed #{install_path}"
-          else
-            puts "Could not remove #{install_path} (try sudo)"
+            return
           end
         end
+      rescue => e
+        puts e.message
+        puts "Could not remove #{install_path} (try sudo)"
       end
       
       def interpolate_wrapper(gem_name, executable_name, mode = 'minigems')
-        @template_code ||= File.read(File.join(minigems_path, 'lib', 'minigems', 'executable_wrapper'))
+        @template_code ||= File.read(File.join(minigems_path, 'lib', 'minigems', 'executable_wrapper'))        
         vars = { 'GEM_NAME' => gem_name, 'EXECUTABLE_NAME' => executable_name }
         vars['SHEBANG'] = "#!/usr/bin/env " + Gem::ConfigMap[:ruby_install_name]
         vars['GEM_MODE'] = mode