wwtd 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8fc6e436ea91aa67fd00cc6285d866e4e5350ae
-  data.tar.gz: 36e0bc7cc2f324b60772f343c889f66a6f1cfef4
+  metadata.gz: 31ec85abe62a348965669a72f3e66780513e4464
+  data.tar.gz: d385cb6dcc35c69d8a902144e11740487bfc3dcc
 SHA512:
-  metadata.gz: 220f889c7096aea1267d3122bff57a6dbd4f5c35e7d30e847c96472ebf1cf284a168ffc2097b9b18e078fbe8c3fc22bc98a92f52f41642eb3096be5741b5a87b
-  data.tar.gz: 31c06c72b004f3ad9e9efa5eaa7f7314ce45e86c78de4bcdf39c128cb419e3dd5364f57764a7d874b8267c5d2ffc0651119fc8bf074a33e46f0061dcc25a3e44
+  metadata.gz: d977fbdb37a688ef729aa6a44046f93dbc66f62dc5932564d37cebaff723d6e250dcc53cb7586307c472df1ff9592d4cfcb93f05998d068cdf0b11a2607570f6
+  data.tar.gz: 43c1c10ed25329f78fbd31a4f7cff1c5f5ab15139d77973a0144d312a3a69ffbff3c3e298bf20aff49804e0009f2a6c19ca451d59970dbd97d3b4039299f962f

data/lib/wwtd.rb

@@ -11,9 +11,10 @@ module WWTD
   DEFAULT_GEMFILE = "Gemfile"
   COMBINATORS = ["rvm", "gemfile", "env"]
   UNDERSTOOD = ["rvm", "gemfile", "matrix", "script", "bundler_args"]
+  INFO_MAX_CHARACTERS = 30
 
   class << self
-    def run(argv)
+    def run(argv=[])
       options = parse_options(argv)
 
       # Read actual .travis.yml
@@ -72,8 +73,12 @@ module WWTD
     end
 
     def config_info(matrix, config)
-      config = config.select { |k,v| matrix.map { |c| c[k] }.uniq.size > 1 }.sort
-      "#{config.map { |k,v| "#{k}: #{truncate(v, 30)}" }.join(", ")}"
+      config = config.select { |k,v| matrix.map { |c| c[k] }.uniq.size > 1 }.sort # find non-unique values aka interesting
+      maximum_value_lengths = Hash[config.map { |k,v| [k, matrix.map { |h| h[k].to_s.size }.max ] }] # find maximum value length for each key so we can align
+      config.map do |k, v|
+        value = truncate(v, INFO_MAX_CHARACTERS).ljust([INFO_MAX_CHARACTERS, maximum_value_lengths[k]].min)
+        "#{k}: #{value}"
+      end.join(" ") # truncate values that are too long
     end
 
     def tint(color, string)
@@ -119,17 +124,17 @@ module WWTD
     end
 
     def run_config(config, lock)
-      if gemfile = config["gemfile"]
-        ENV["BUNDLE_GEMFILE"] = gemfile
-      end
-      wants_bundle = gemfile || File.exist?(DEFAULT_GEMFILE)
+      with_clean_env do
+        Shellwords.split(config["env"] || "").each do |part|
+          name, value = part.split("=", 2)
+          ENV[name] = value
+        end
 
-      Shellwords.split(config["env"] || "").each do |part|
-        name, value = part.split("=", 2)
-        ENV[name] = value
-      end
+        if gemfile = config["gemfile"]
+          ENV["BUNDLE_GEMFILE"] = gemfile
+        end
+        wants_bundle = gemfile || File.exist?(DEFAULT_GEMFILE)
 
-      with_clean_env do
         switch_ruby = switch_ruby(config["rvm"])
 
         if wants_bundle
@@ -154,29 +159,29 @@ module WWTD
       if rvm_executable
         "rvm #{version} do "
       else
-        if rbenv_executable
-          switch_path(version, "rbenv")
-        elsif chruby?
-          switch_path(version, "chruby")
+        if ruby_root = ENV["RUBY_ROOT"] # chruby or RUBY_ROOT set
+          switch_path(File.dirname(ruby_root), version)
+        elsif rbenv_executable
+          rubies_root = cache_command("which rbenv").sub(%r{/(\.?rbenv)/.*}, "/\\1") + "/versions"
+          switch_path(rubies_root, version)
         else
-          "false # could not find ruby version changer # "
+          "false # could not find rvm, rbenv or RUBY_ROOT # "
         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 "
+    def switch_path(rubies_root, version)
+      extract_jruby_rbenv_options!(version)
+      if ruby_root = ruby_root(rubies_root, version)
+        gem_home = Dir["#{ruby_root}/lib/ruby/gems/*"].first
+        ENV["PATH"] = "#{ruby_root}/bin:#{ENV["PATH"]}"
+        ENV["GEM_HOME"] = gem_home
+        ""
       else
-        "false # could not find #{version} in #{changer} # "
+        "false # could not find #{version} in #{rubies_root} # "
       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
@@ -193,16 +198,8 @@ module WWTD
       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"
+    def ruby_root(root, version)
+      Dir.glob("#{root}/*").detect { |p| File.basename(p).start_with?(version) }
     end
 
     def cache(key)
@@ -217,9 +214,9 @@ module WWTD
     # set ruby-opts for jruby flavors
     def extract_jruby_rbenv_options!(version)
       if version.sub!("-d19", "")
-        "JRUBY_OPTS=--1.9 "
+        ENV["JRUBY_OPTS"] = "--1.9"
       elsif version.sub!("-d18", "")
-        "JRUBY_OPTS=--1.8 "
+        ENV["JRUBY_OPTS"] = "--1.8"
       end
     end
 

data/lib/wwtd/tasks.rb

@@ -1,10 +1,5 @@
 require "wwtd"
 
 task :wwtd do
-  block = lambda{ sh "wwtd" }
-  if defined?(Bundler)
-    Bundler.with_clean_env(&block)
-  else
-    block.call
-  end
+  exit 1 unless WWTD.run == 0
 end

data/lib/wwtd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser