salvage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d1b7febe57845675c6aca0feecf443fde713bd
-  data.tar.gz: 303d650630008c01dad6046dfefcd1c4d3ece77f
+  metadata.gz: 6f7c539b003da3e68ae758185a7fd867cd252f63
+  data.tar.gz: 7834bbdfe08146aff1bc663b7b64ee9305149c2b
 SHA512:
-  metadata.gz: 86056f2c7d5438c347b47b202a4f1af3c718230a5fc085443ada9aefa268bea4f8250c916042ee2e12c90ce81561d48808587cdbac59f523a99f669ff4851050
-  data.tar.gz: 4933cfe10e0b83169bee66e9350973d844e3a7358b5d1a6628bd79a9ab226acab20e58aa2bdbdc886cbd5856178eb844ea69e0fd29bad869ad2fc5a3408a47fd
+  metadata.gz: a19c1302f53fad638404857a5204d5d1b240b6684b7cd6e3132bdbacba299d1eb0300bc4cd029f3f6d569aec68599efd41ba8df949006cf320cb37052b9637fd
+  data.tar.gz: 394d1470444afd5ef1217a143cfa780a0c77b4e58f76421a5af1f30cbd49bace34be8a35e0cb43c9f51d2c9d0db958ca1d865d19963e4734793f5e37b947cb56

data/lib/salvage/gem_finder.rb

@@ -0,0 +1,19 @@
+module Salvage
+  class GemFinder
+
+    def initialize(base_path)
+      @base_path = base_path
+    end
+
+    def gem_dirs
+      search_glob = File.join(base_path, '*', '**', 'specifications')
+      Dir[search_glob].map{|dir| File.dirname(dir) }
+    end
+
+
+  private
+
+    attr_reader :base_path
+
+  end
+end

data/lib/salvage/rbenv.rb

@@ -0,0 +1,23 @@
+require 'salvage/gem_finder'
+require 'salvage/utils'
+
+module Salvage
+  class Rbenv
+
+    def initialize(rbenv_path = default_rbenv_path)
+      @finder = Salvage::GemFinder.new(rbenv_path)
+    end
+
+    def gem_dirs
+      @finder.gem_dirs
+    end
+
+
+  private
+
+    def default_rbenv_path
+      ENV['RBENV_ROOT'] || Salvage::Utils.home_dir('.rbenv')
+    end
+
+  end
+end

data/lib/salvage/rvm.rb

@@ -1,16 +1,20 @@
+require 'salvage/gem_finder'
+require 'salvage/utils'
+
 module Salvage
   class Rvm
+
     def initialize(rvm_path = default_rvm_path)
       @rvm_path = rvm_path
+      @finder = Salvage::GemFinder.new(gems_base)
     end
 
     def gem_dirs
-      search_glob = File.join(gems_base, '*', '**', 'specifications')
-      Dir[search_glob].map{|dir| File.dirname(dir) }
+      @finder.gem_dirs
     end
 
 
-    private
+  private
 
     attr_reader :rvm_path
 
@@ -19,7 +23,8 @@ module Salvage
     end
 
     def default_rvm_path
-      ENV['rvm_path']
+      ENV['rvm_path'] || Salvage::Utils.home_dir('.rvm')
     end
+
   end
 end

data/lib/salvage/server.rb

@@ -1,11 +1,12 @@
 require 'rubygems/server'
 require 'salvage/rvm'
+require 'salvage/rbenv'
 
 module Salvage
   class Server
 
     def initialize(port)
-      @server = Gem::Server.new rvm.gem_dirs, port, false
+      @server = Gem::Server.new(gem_dirs, port, false)
     end
 
     def run
@@ -17,9 +18,17 @@ module Salvage
 
     attr_accessor :server
 
+    def gem_dirs
+      rvm.gem_dirs + rbenv.gem_dirs
+    end
+
     def rvm
       @rvm ||= Salvage::Rvm.new
     end
 
+    def rbenv
+      @rbenv ||= Salvage::Rbenv.new
+    end
+
   end
 end

data/lib/salvage/utils.rb

@@ -0,0 +1,9 @@
+module Salvage
+  class Utils
+
+    def self.home_dir(relpath)
+      File.join(Dir.home(Etc.getpwuid.name), relpath)
+    end
+
+  end
+end

data/lib/salvage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salvage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pablo Brasero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Run a Rubygems server that provides gems installed in any RVM environment
+description: Run a Rubygems server that provides gems installed in any RVM/rbenv environment
   in the machine
 email: pablo@pablobm.com
 executables:
@@ -34,8 +34,11 @@ extra_rdoc_files: []
 files:
 - bin/salvage.rb
 - lib/salvage.rb
+- lib/salvage/gem_finder.rb
+- lib/salvage/rbenv.rb
 - lib/salvage/rvm.rb
 - lib/salvage/server.rb
+- lib/salvage/utils.rb
 - lib/salvage/version.rb
 homepage: https://rubygems.org/gems/salvage
 licenses:
@@ -62,4 +65,3 @@ signing_key:
 specification_version: 4
 summary: Make available gems installed in any of your Ruby environments
 test_files: []
-has_rdoc: