multirb 0.0.3 → 0.0.5

data/README.md

@@ -1,6 +1,6 @@
 # multirb
 
-Runs an IRB-esque prompt (but it's NOT really IRB!) over multiple Rubies using RVM.
+Runs an IRB-esque prompt (but it's NOT really IRB!) over multiple Rubies using RVM or RBENV.
 
 ![Screencast](http://s3.cooperpress.com.s3.amazonaws.com/multirb.gif)
 
@@ -18,7 +18,7 @@ Install with:
 
     $ gem install multirb
 
-You also need a complete, working [RVM](https://rvm.io/) installation. Feel free to submit pull requests to make this auto detect other Ruby version managers, such as rbenv.
+You also need a complete, working [RVM](https://rvm.io/) or [RBENV](https://github.com/sstephenson/rbenv/) installation. Feel free to submit pull requests to make this auto detect other Ruby version managers.
 
 Note: multirb works fine from MRI Ruby 1.9 and JRuby 1.7.x but has not been tested elsewhere yet.
 
@@ -44,10 +44,13 @@ Currently specifies jruby, 1.8.7, 1.9.2, 1.9.3, and 2.0.0 as 'all versions'; 1.8
 
 ## Versions
 
-0.0.4 (forthcoming):
+0.0.5 (current gem release):
+ * fixes a Ruby version detection bug triggered by interpolation (found by dalton)
+
+0.0.4:
  * rbenv support
 
-0.0.3 (CURRENT GEM RELEASE):
+0.0.3:
  * acts nicely when using Ctrl+D to exit rather than raising a needless error
  * uses Ruby 2.0.0-rc2 as a default
 

data/lib/multirb.rb

@@ -5,8 +5,10 @@ require 'readline'
 require 'tempfile'
 
 module Multirb
-  ALL_VERSIONS = %w{jruby 1.8.7 1.9.2 1.9.3 2.0.0-rc2}
-  DEFAULT_VERSIONS = %w{1.8.7 1.9.3 2.0.0-rc2}
+  ALL_VERSIONS = %w{1.8.7 1.9.2 1.9.3 2.0.0 jruby}
+  DEFAULT_VERSIONS = %w{1.8.7 1.9.3 2.0.0}
+
+  RBENV_INSTALLED_VERSIONS = `rbenv versions`.split("\n").map { |version| version.delete('*').strip.split.first } if ENV['PATH']['.rbenv']
 
   def read_lines
     lines = []
@@ -27,7 +29,7 @@ module Multirb
     case lines.last
     when /\#\s?all$/
       ALL_VERSIONS
-    when /\#\s?(.+)$/
+    when /\#\s?([^"']+)$/
       [*$1.strip.split(',').map(&:strip)]
     else
       defaults
@@ -60,7 +62,42 @@ module Multirb
     f
   end
 
-  def run_code(filename, version)
+  def run_code(*args)
+    case installed_ruby_version_manager
+    when :rvm
+      run_rvm(*args)
+    when :rbenv
+      run_rbenv(*args)
+    when :none
+      raise "You don't have either RVM or RBENV installed"
+    end
+  end
+
+  private
+
+  def installed_ruby_version_manager
+    @installed_version ||= begin
+      return :rvm if ENV['PATH']['.rvm']
+      return :rbenv if ENV['PATH']['.rbenv']
+      :none
+    end
+    @installed_manager
+  end
+
+  def run_rvm(filename, version)
     `rvm #{version} exec ruby #{filename}`
   end
-end
+
+  def run_rbenv(filename, version)
+    `/bin/sh -c "RBENV_VERSION=#{rbenv_version(version)} ~/.rbenv/shims/ruby #{filename}"`
+  rescue ArgumentError => e # Rescue when version is not installed and print a message
+    e.message
+  end
+
+  def rbenv_version(wanted_version)
+    rbenv_version = RBENV_INSTALLED_VERSIONS.select {|version| version.match(/^#{wanted_version}/) }.last
+    # raise error if there is not such version installed
+    raise ArgumentError.new("version not installed") unless rbenv_version
+    rbenv_version
+  end
+end

data/lib/multirb/version.rb

@@ -1,3 +1,3 @@
 module Multirb
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/multirb.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Multirb::VERSION
   gem.authors       = ["Peter Cooper"]
   gem.email         = ["git@peterc.org"]
-  gem.description   = %{Run Ruby code over multiple implementations/versions using RVM from a IRB-esque prompt}
-  gem.summary       = %{Run Ruby code over multiple implementations/versions using RVM from a IRB-esque prompt}
+  gem.description   = %{Run Ruby code over multiple implementations/versions using RVM or RBENV from a IRB-esque prompt}
+  gem.summary       = %{Run Ruby code over multiple implementations/versions using RVM or RBENV from a IRB-esque prompt}
   gem.homepage      = "https://github.com/peterc/multirb"
 
   gem.files         = `git ls-files`.split($/)

data/test/test_multirb.rb

@@ -25,5 +25,6 @@ describe Multirb do
     determine_versions(['2 + 2 #all', '5 + 5'], %w{1.9.2}).must_equal %w{1.9.2}
     determine_versions(['2 + 2 # 1.9.2,1.9.3,2.0.0']).must_equal %w{1.9.2 1.9.3 2.0.0}
     determine_versions(['2 + 2 # 1.9.2, 1.9.3, 2.0.0']).must_equal %w{1.9.2 1.9.3 2.0.0}
+    determine_versions(['2 + 2 "#{1.9}" blah blah']).must_equal DEFAULT_VERSIONS
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multirb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies: []
-description: Run Ruby code over multiple implementations/versions using RVM from a
-  IRB-esque prompt
+description: Run Ruby code over multiple implementations/versions using RVM or RBENV
+  from a IRB-esque prompt
 email:
 - git@peterc.org
 executables:
@@ -53,7 +53,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Run Ruby code over multiple implementations/versions using RVM from a IRB-esque
-  prompt
+summary: Run Ruby code over multiple implementations/versions using RVM or RBENV from
+  a IRB-esque prompt
 test_files:
 - test/test_multirb.rb