Pistos-emerge-gem 0.3.4 → 0.3.5

data/README

@@ -34,3 +34,8 @@ emerge-gem works by using the Rubygems system/library to find gem sources and
 dependencies, and to automatically create wrapper ebuilds for them.  It then
 issues an emerge command.  By default, it uses the local overlay.  Use --help
 for CLI switches you can use to specify directories.
+
+You should also note that if you have installed a gem via Portage in the past,
+and later upgraded it with Rubygems, emerge will complain about file collisions
+if you have collision-protect enabled in your /etc/make.conf.  To deal with this,
+uninstall the gem using Rubygems first.

data/lib/emerge-gem.rb

@@ -7,6 +7,7 @@ class EmergeGem
   def print_usage_and_exit
     puts "#{$0} [options] <gem name> [gem name...] [-- <emerge options>]"
     puts "    -h --help              show usage"
+    puts "    --no-emerge            don't actually execute any emerge commands"
     puts "    --portage-base-dir     (default /usr/local/portage)"
     puts "    --portage-path         relative to portage base dir (default dev-ruby)"
     puts "    --verbose              print more details about work being done"
@@ -27,12 +28,15 @@ class EmergeGem
         collecting_emerge_options = true
       when '-h', '--help'
         print_usage_and_exit
+      when '--no-emerge'
+        @no_emerge = true
       when '--portage-base-dir'
         portage_base_dir = arg
       when '--portage-path'
         portage_path = arg
       when '-v', '--verbose'
         @verbose = true
+        puts "(verbose mode)"
       else
         if collecting_emerge_options
           @emerge_options << arg
@@ -49,8 +53,8 @@ class EmergeGem
     @ebuild_dest ||= "#{portage_base_dir}/#{portage_path}"
 
     @eix_installed = system( 'which eix > /dev/null' )
-    if @verbose && @eix_installed
-      puts "eix detected"
+    if @eix_installed
+      inform "eix detected"
     end
   end
 
@@ -64,18 +68,20 @@ class EmergeGem
 
   def check_local_gems
     @gems.each do |gem|
-      next  if ! EmergeGem.gem_installed?( gem ) || ! eix_installed
-      if @verbose; puts "#{gem} gem installed"; end
+      inform "Checking installation of #{gem}"
+      next  if ! EmergeGem.gem_installed?( gem ) || ! @eix_installed
+      inform "#{gem} gem installed"
 
-      puts "(checking if #{gem} has been installed with Portage)"
       next  if EmergeGem.package_installed? gem
-      if @verbose; puts "#{gem} package not installed with Portage"; end
+      inform "#{gem} package not installed with Portage"
 
       puts "#{gem} seems to be installed via gem and not Portage."
       puts "Uninstall the #{gem} gem before emerging?  [y/n]"
       answer = $stdin.gets.strip
       if answer =~ /^y/i
         shell "gem uninstall #{gem}"
+      else
+        puts "(not uninstalling #{gem} gem)"
       end
     end
   end
@@ -90,19 +96,19 @@ class EmergeGem
 
   def gather_ebuilds
     @ebuilds = {}
-    while @gems.any?
-      next_package = @gems.shift
+    gems = @gems.dup
+    while gems.any?
+      next_package = gems.shift
 
       if ! @ebuilds[ next_package ]
-        puts "Gathering info about #{next_package}..."
+        inform "Gathering info about #{next_package} gem..."
         @ebuilds[ next_package ] = Ebuild.create_from_spec_lookup( next_package )
-      else
-        puts "(already know about #{next_package})"
       end
 
       @ebuilds[ next_package ].spec.dependencies.each do |dependency|
         next  if @ebuilds[ dependency.name ]
-        puts "Need to lookup dependency #{dependency.name}"
+        inform "  Looking up dependency #{dependency.name}"
+        gems.push dependency.name
         @gems.push dependency.name
       end
     end
@@ -110,7 +116,7 @@ class EmergeGem
 
   def write_ebuilds
     @ebuilds.each do |name, ebuild|
-      puts "Writing out #{ebuild.filename}"
+      inform "Writing out #{ebuild.filename}"
       ebuild.write @ebuild_dest
     end
   end
@@ -123,7 +129,12 @@ class EmergeGem
 
   def emerge
     ebuild_names = @ebuilds.values.map { |e| e.name }.join( ' ' )
-    shell "emerge #{@emerge_options.join( ' ' )} #{ebuild_names}"
+    command = "emerge #{@emerge_options.join( ' ' )} #{ebuild_names}"
+    if @no_emerge
+      puts "(would execute: #{command})"
+    else
+      shell command
+    end
   end
 
   def shell( command )
@@ -131,5 +142,10 @@ class EmergeGem
     system( command ) or
       exit $?
   end
+
+  def inform( message )
+    return  if ! @verbose
+    puts message
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Pistos-emerge-gem
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Pistos