wwtd 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902e3bea674a41f89c7265296c4370f04ced88e5
-  data.tar.gz: 0d5de8487adefaa0fe776e19513326fcd2f055bd
+  metadata.gz: a8fc6e436ea91aa67fd00cc6285d866e4e5350ae
+  data.tar.gz: 36e0bc7cc2f324b60772f343c889f66a6f1cfef4
 SHA512:
-  metadata.gz: 225fa6f7e3d78d6e86279a28ca31f71fae88e0bd6e8c82760d6a0be619037fdc67e9176ca7b44acb5c5a1246c6427531584786b464b0180c766c83aaff682043
-  data.tar.gz: 299e85348fd2dc56e71088f7378c6dc8ed39cbead8a257790c1c2afa251d5edcee44501507d5dcaf2b899e2f8dabaf1e6fb8af9517bd22940f3bd09f329ac8bf
+  metadata.gz: 220f889c7096aea1267d3122bff57a6dbd4f5c35e7d30e847c96472ebf1cf284a168ffc2097b9b18e078fbe8c3fc22bc98a92f52f41642eb3096be5741b5a87b
+  data.tar.gz: 31c06c72b004f3ad9e9efa5eaa7f7314ce45e86c78de4bcdf39c128cb419e3dd5364f57764a7d874b8267c5d2ffc0651119fc8bf074a33e46f0061dcc25a3e44

data.tar.gz.sig

@@ -1,3 +1 @@
-^�j�JB,_R�BFk�	��a�M�����XD�g#
��8U,ST�`y7ޣ���#@.����oq����(ɚ��R�9�Ґ|�Ś�
-�5��yg�*����j����NP�� ��+�~>ż��K*
-��(i��Ax�0p��ţ�8�+
�:��?��5�~tJ�_>��^�^�[)e��MZ"<^�g`1/�#!EC��Ua�x�
�M��gdPF�~�El+{j�hr`�7�АfE>)�筼i��Wq)�M�o�Z
+�'��<��D�8���#x�Y�xl|�ʐ��/|T��}�*x2/��q�8K�-��H1��b��rįN<7���O�i�:Bz�E�����8ٓ��;�$��	y7-�0�I�BFA|��9�K$\[?�7)p�������>������rU�%2��Ί����Ufm�?ئ""W�7���""R�F;�S'W50�0F;�����1�zl����VT�|G(�lR�ܲ{���fN�6��i�GV��r�x7�Bl�Hw���

data/lib/wwtd.rb

@@ -130,26 +130,106 @@ module WWTD
       end
 
       with_clean_env do
-        rvm = "rvm #{ruby_version(config["rvm"])} do " if config["rvm"]
+        switch_ruby = switch_ruby(config["rvm"])
 
         if wants_bundle
           flock("#{lock}/#{config["rvm"] || "rvm"}") do
             default_bundler_args = "--deployment --path #{Dir.pwd}/vendor/bundle" if committed?("#{gemfile || DEFAULT_GEMFILE}.lock")
-            bundle_command = "#{rvm}bundle install #{config["bundler_args"] || default_bundler_args}"
+            bundle_command = "#{switch_ruby}bundle install #{config["bundler_args"] || default_bundler_args}"
             return false unless sh "#{bundle_command.strip} --quiet"
           end
         end
 
         default_command = (wants_bundle ? "bundle exec rake" : "rake")
         command = config["script"] || default_command
-        command = "#{rvm}#{command}"
+        command = "#{switch_ruby}#{command}"
 
         sh(command)
       end
     end
 
+    def switch_ruby(version)
+      return unless version
+      version = normalize_ruby_version(version)
+      if rvm_executable
+        "rvm #{version} do "
+      else
+        if rbenv_executable
+          switch_path(version, "rbenv")
+        elsif chruby?
+          switch_path(version, "chruby")
+        else
+          "false # could not find ruby version changer # "
+        end
+      end
+    end
+
+    def switch_path(version, changer)
+      prefix = extract_jruby_rbenv_options!(version)
+      if bin_path = send("#{changer}_bin_path", version)
+        "#{prefix}PATH=#{bin_path}:$PATH "
+      else
+        "false # could not find #{version} in #{changer} # "
+      end
+    end
+
+    def chruby?
+      ENV["RUBY_ROOT"] # chruby is a shell function not available from inside ruby
+    end
+
+    def rvm_executable
+      cache_command("which rvm")
+    end
+
+    def rbenv_executable
+      cache_command("which rbenv")
+    end
+
+    def cache_command(command)
+      cache(command) do
+        if result = capture(command)
+          result.strip
+        end
+      end
+    end
+
+    def chruby_bin_path(version)
+      found_version_path = Dir.glob("#{ENV['RUBY_ROOT']}/../*").detect { |p| File.basename(p).include?(version) }
+      "#{found_version_path}/bin" if found_version_path
+    end
+
+    def rbenv_bin_path(version)
+      known_version = capture("rbenv versions | grep #{version}")
+      known_version = known_version.split("\n").last[2..-1].split(" ")[0]
+      rbenv_root = rbenv_executable.sub(%r{/(\.?rbenv)/.*}, "/\\1")
+      "#{rbenv_root}/versions/#{known_version}/bin"
+    end
+
+    def cache(key)
+      @cache ||= {}
+      if @cache.key?(key)
+        @cache[key]
+      else
+        @cache[key] = yield
+      end
+    end
+
+    # set ruby-opts for jruby flavors
+    def extract_jruby_rbenv_options!(version)
+      if version.sub!("-d19", "")
+        "JRUBY_OPTS=--1.9 "
+      elsif version.sub!("-d18", "")
+        "JRUBY_OPTS=--1.8 "
+      end
+    end
+
+    def capture(command)
+      result = `#{command}`
+      $?.success? ? result : nil
+    end
+
     # Taken from https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/script/rvm.rb
-    def ruby_version(rvm)
+    def normalize_ruby_version(rvm)
       rvm.to_s.
         gsub(/-(\d{2})mode$/, '-d\1').
         gsub(/^rbx$/, 'rbx-weekly-d18').

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Michael Grosser
@@ -29,7 +29,7 @@ cert_chain:
   y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
   ycwMXfl0
   -----END CERTIFICATE-----
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Travis simulator so you do not need to wait for the build