salvage 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7c539b003da3e68ae758185a7fd867cd252f63
-  data.tar.gz: 7834bbdfe08146aff1bc663b7b64ee9305149c2b
+  metadata.gz: 1fdd5683e823fb4ec343978b0e1e1df3f7372bd1
+  data.tar.gz: 13a9325a6ec9efec6b7c566fa7c061baa21db8dc
 SHA512:
-  metadata.gz: a19c1302f53fad638404857a5204d5d1b240b6684b7cd6e3132bdbacba299d1eb0300bc4cd029f3f6d569aec68599efd41ba8df949006cf320cb37052b9637fd
-  data.tar.gz: 394d1470444afd5ef1217a143cfa780a0c77b4e58f76421a5af1f30cbd49bace34be8a35e0cb43c9f51d2c9d0db958ca1d865d19963e4734793f5e37b947cb56
+  metadata.gz: 7633407a6c775f123afec9494a9371563f5229a7385c3199c0c3804fc65c9d3f6c8c3b2d3fdc8254364c43d682255f5f753f294090ed80946ef28488eacbc581
+  data.tar.gz: c60f40626870999efb11e31af7e705f7da7ef83ac87275b09956f819be77c3eaf4229b08a31eb757dd8760c3d006757ec50f2db0d2c84ad740a86f84e656eeb3

data/lib/salvage/ruby_install.rb

@@ -0,0 +1,26 @@
+require 'salvage/gem_finder'
+require 'salvage/utils'
+
+module Salvage
+  class RubyInstall
+
+    def initialize(rubies_paths = default_rubies_paths)
+      @finders = rubies_paths.map{|path| Salvage::GemFinder.new(path) }
+    end
+
+    def gem_dirs
+      @finders.map{|f| f.gem_dirs }.flatten
+    end
+
+  private
+
+    def default_rubies_paths
+      Salvage::Utils.envvar_to_array(ENV['RUBIES']) + [
+        Salvage::Utils.home_dir('.rubies'),
+        Salvage::Utils.home_dir('.gem'),
+        '/opt',
+      ]
+    end
+
+  end
+end

data/lib/salvage/server.rb

@@ -1,6 +1,7 @@
 require 'rubygems/server'
 require 'salvage/rvm'
 require 'salvage/rbenv'
+require 'salvage/ruby_install'
 
 module Salvage
   class Server
@@ -14,12 +15,12 @@ module Salvage
     end
 
 
-    private
+  private
 
     attr_accessor :server
 
     def gem_dirs
-      rvm.gem_dirs + rbenv.gem_dirs
+      rvm.gem_dirs + rbenv.gem_dirs + ruby_install.gem_dirs
     end
 
     def rvm
@@ -30,5 +31,9 @@ module Salvage
       @rbenv ||= Salvage::Rbenv.new
     end
 
+    def ruby_install
+      @ruby_install ||= Salvage::RubyInstall.new
+    end
+
   end
 end

data/lib/salvage/utils.rb

@@ -5,5 +5,10 @@ module Salvage
       File.join(Dir.home(Etc.getpwuid.name), relpath)
     end
 
+    def self.envvar_to_array(value)
+      paths = value.to_s =~ %r{^\((.*)\)$} ? $~[1] : ''
+      paths.split(' ')
+    end
+
   end
 end

data/lib/salvage/version.rb

@@ -1,5 +1,5 @@
 module Salvage
   module Version
-    STRING = '0.2.0'
+    STRING = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salvage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,16 +16,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Run a Rubygems server that provides gems installed in any RVM/rbenv environment
-  in the machine
+        version: '10'
+description: Run a Rubygems server that provides gems installed in any RVM/rbenv/etc
+  environment in the machine
 email: pablo@pablobm.com
 executables:
 - salvage.rb
@@ -36,6 +36,7 @@ files:
 - lib/salvage.rb
 - lib/salvage/gem_finder.rb
 - lib/salvage/rbenv.rb
+- lib/salvage/ruby_install.rb
 - lib/salvage/rvm.rb
 - lib/salvage/server.rb
 - lib/salvage/utils.rb