rails_gem_install 0.3.1 → 0.3.2

data/.document

@@ -1,4 +1,5 @@
 README.rdoc
+CHANGES.rdoc
 lib/**/*.rb
 bin/*
 features/**/*.feature

data/CHANGES.rdoc

@@ -0,0 +1,8 @@
+== 0.3.2
+
+* Fixed non-root gem install issues on FreeBSD.
+* Fixed non-root gem install issues on Mac OS X.
+
+== 0.3.1
+
+* Initial public release.

data/Rakefile

@@ -49,5 +49,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rails_gem_install #{version}"
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('CHANGES*')
+  rdoc.rdoc_files.include('LICENSE*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bin/rails_gem_install

@@ -2,6 +2,12 @@
 
 ENV['RAILS_ENV'] ||= 'production'
 
+# On FreeBSD platforms, if we are not running as root it all gem installs will
+# fail unless we tell it to do a user install via the environment.
+if (RUBY_PLATFORM) =~ /freebsd/i && (Process.euid != 0)
+  ENV['RB_USER_INSTALL'] ||= '1'
+end
+
 require 'rubygems'
 require 'rails_gem_install'
 

data/lib/rails_gem_install/rails.rb

@@ -40,6 +40,19 @@ module Rails
       # first.
       require 'rails/gem_dependency'
 
+      # On Mac OS X, if we are not running as root, we have to ensure that
+      # all the gem install commands are passed the --user-install option
+      # otherwise they will fail to install. We do this by monkey-patching
+      # the Rails::GemDependency class we're using.
+      if (RUBY_PLATFORM =~ /darwin/i) && (Process.euid != 0)
+        Rails::GemDependency.class_eval do
+          alias :install_command_without_user_install :install_command
+          def install_command
+            install_command_without_user_install << "--user-install"
+          end
+        end
+      end
+
       puts "[Ensuring config.gem gems are all installed]"
       config = self.new
       cmds = File.readlines("config/environment.rb")

data/lib/rails_gem_install/rails_gem_installer.rb

@@ -49,6 +49,13 @@ class RailsGemInstaller
     if gemspec[:version]
       cmd << " --version '#{gemspec[:version]}'"
     end
+
+    # On Mac OS X, if we're not root we need to explicitly tell gem
+    # to do a user install.
+    if (RUBY_PLATFORM =~ /darwin/i) && (Process.euid != 0)
+      cmd << " --user-install"
+    end
+
     puts cmd
     system cmd
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Scott W. Bradley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 -07:00
+date: 2010-07-19 00:00:00 -07:00
 default_executable: rails_gem_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGES.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile