yap-shell 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31682029b9cbd355da08f48de73df26f18ac7e3
-  data.tar.gz: 11cac119d25dc8a0b19037c128cd7c08992449d1
+  metadata.gz: 6a1ba2e75f86000c31cb6cfaff1d70dd723b5fd3
+  data.tar.gz: 5f2e8e4895adadbaa8f17d467990c6364c717478
 SHA512:
-  metadata.gz: 73674732a59260cf427392a8cc6617bb0d78a602dc2c49f8c5a588d2e952805a0d0bb51fa086961a7d938d411f4c76f12874a44085a6748d5e4db06ae3c49ec8
-  data.tar.gz: fa6f4ee6f68e5c426a36ebe600be7a158cf3bfccc448694299af5cf4569a77753b13d735c87058489ad1740a27503c6381faee10369bce92f28829ba286b021e
+  metadata.gz: bb0bc319917d0aafde0fddeb14a8d269c8cd3c2419dbb8057c22c55277cfb1785d74da3d7953f1199a2148880cf0d2faf0e2c00606872aab11c86153e74301b3
+  data.tar.gz: 087b233e0a51f4b7c6e5becdd249a27c1adf36cd2e86c835079e4ab5b8bc77615d0c363ac0b8e76116e1adfe0edd8b8e19f3252310e201156470e9d773497d5d

data/bin/yap

@@ -1,32 +1,50 @@
 #!/usr/bin/env ruby
 
-file = __FILE__
-if File.symlink?(file)
-  file = File.readlink(file)
-end
+if ENV["YAP_SHELL"].nil?
+  # Start YAP with a pristine environment
+  env2keep = {
+    'PATH' => ENV['PATH'],
+    'HOME' => ENV['HOME'],
+    'RUBYOPT' => '-rubygems -EUTF-8',
+    'TREEFELL_OUT' => ENV['TREEFELL_OUT'],
+    'DEBUG' => ENV['DEBUG'],
+    'YAP_SHELL' => 'active'
+  }
+  env_params = env2keep.each_with_object([]) do |(key,value),arr|
+    next if value.nil?
+    arr << %|#{key}="#{value}"|
+  end.join(' ')
+  cmd = %|env -i #{env_params} #{$0}|
+  exec cmd
+else
+  file = __FILE__
+  if File.symlink?(file)
+    file = File.readlink(file)
+  end
 
-trap "SIGTSTP", "IGNORE"
-trap "SIGINT", "IGNORE"
-trap "SIGTTIN", "IGNORE"
-trap "SIGTTOU", "IGNORE"
+  trap "SIGTSTP", "IGNORE"
+  trap "SIGINT", "IGNORE"
+  trap "SIGTTIN", "IGNORE"
+  trap "SIGTTOU", "IGNORE"
 
-$LOAD_PATH.unshift File.dirname(file) + '/../lib'
+  $LOAD_PATH.unshift File.dirname(file) + '/../lib'
 
-ENV['TERM'] ||= 'linux'
+  ENV['TERM'] ||= 'linux'
 
-# Delete all RBENV/RVM environment variables
-# Once we're booted, we don't want them being inherited
-# by other child processes since those children cannot
-# modify Yap's ENV, only their own child env.
-ENV.keys.each do |key|
-  if key =~ /^(rbenv_|rvm_)/i
-    ENV.delete(key)
+  # Delete all RBENV/RVM environment variables
+  # Once we're booted, we don't want them being inherited
+  # by other child processes since those children cannot
+  # modify Yap's ENV, only their own child env.
+  ENV.keys.each do |key|
+    if key =~ /^(rbenv_|rvm_)/i
+      ENV.delete(key)
+    end
   end
-end
 
-require "term/ansicolor"
-require "pry"
-require "yap"
+  require "term/ansicolor"
+  require "pry"
+  require "yap"
 
-STDOUT.sync = true
-Yap.run_shell
+  STDOUT.sync = true
+  Yap.run_shell
+end

data/lib/yap/shell/version.rb

@@ -1,5 +1,5 @@
 module Yap
   module Shell
-    VERSION = "0.4.8"
+    VERSION = "0.4.9"
   end
 end

data/yap-shell.gemspec

@@ -28,11 +28,11 @@ Gem::Specification.new do |spec|
     |you just installed it for. For example, with rbenv I use the below
     |alias in my ~/.profile file:
     |
-    |    alias yap='env -i PATH=$PATH RUBYOPT="-rubygems -EUTF-8" HOME=$HOME sh -c "rbenv local 2.2.3 && yap"'
+    |    alias yap='rbenv local 2.2.3 && yap'
     |
     |If you are interested in tracing yap's execution you can add the DEBUG and TREEFELL_OUT options:
     |
-    |    alias yap-debug='env -i DEBUG=* TREEFELL_OUT=/tmp/yap-debug.log PATH=$PATH RUBYOPT="-rubygems -EUTF-8" HOME=$HOME sh -c "rbenv local 2.2.3 && yap"'
+    |    alias yap-debug='rbenv local 2.2.3 ; DEBUG=* TREEFELL_OUT=/tmp/yap-debug.log yap'
     |
     |Then, `source ~/.profile` or reload your shell. Now you can finally run:
     |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -231,17 +231,15 @@ post_install_message: "\nGreetings forward-thinking traveler!\n\nLet's waste no
   this is my beta's beta. Yap has many cool ideas. I dare\nsay some of those made
   it into this very release.\n\n\e[033mLastly\e[0m, create an alias to the yap executable
   using the ruby version\nyou just installed it for. For example, with rbenv I use
-  the below\nalias in my ~/.profile file:\n\n    alias yap='env -i PATH=$PATH RUBYOPT=\"-rubygems
-  -EUTF-8\" HOME=$HOME sh -c \"rbenv local 2.2.3 && yap\"'\n\nIf you are interested
-  in tracing yap's execution you can add the DEBUG and TREEFELL_OUT options:\n\n    alias
-  yap-debug='env -i DEBUG=* TREEFELL_OUT=/tmp/yap-debug.log PATH=$PATH RUBYOPT=\"-rubygems
-  -EUTF-8\" HOME=$HOME sh -c \"rbenv local 2.2.3 && yap\"'\n\nThen, `source ~/.profile`
-  or reload your shell. Now you can finally run:\n\n    yap\n\nYou know your tooling
-  better than me. If you need things to go a little\ndifferently than above you go
-  right ahead. If any questions arise don't\nhesitate to holler over at Github. I
-  may not always be home, but there will\nalways be a cozy textarea with dozens of
-  emoji friends waiting to hear your\nthoughts. All day. All night.\n\nUntil the next
-  update: Happy coding!\n\nSincerely,\n\n     \e[51mThe Lagniappe (Yap) Shell\e[0m\n\n\e[033mP.S.\e[0m
+  the below\nalias in my ~/.profile file:\n\n    alias yap='rbenv local 2.2.3 && yap'\n\nIf
+  you are interested in tracing yap's execution you can add the DEBUG and TREEFELL_OUT
+  options:\n\n    alias yap-debug='rbenv local 2.2.3 ; DEBUG=* TREEFELL_OUT=/tmp/yap-debug.log
+  yap'\n\nThen, `source ~/.profile` or reload your shell. Now you can finally run:\n\n
+  \   yap\n\nYou know your tooling better than me. If you need things to go a little\ndifferently
+  than above you go right ahead. If any questions arise don't\nhesitate to holler
+  over at Github. I may not always be home, but there will\nalways be a cozy textarea
+  with dozens of emoji friends waiting to hear your\nthoughts. All day. All night.\n\nUntil
+  the next update: Happy coding!\n\nSincerely,\n\n     \e[51mThe Lagniappe (Yap) Shell\e[0m\n\n\e[033mP.S.\e[0m
   If you have ideas for loading other than the hard-coded\nalias, do tell, right over
   here:\n\n     \e[1mhttp://github.com/zdennis/yap-shell/issues\e[0m\n\n\e[033mP.P.S.\e[0m
   OSX support? YES! Linux? I assume YES! Windows? Um...\n\n"