yap-shell 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9694f89f2c9e5c706fd5366e9d9cd3d3030137f
-  data.tar.gz: 45d092310b1f1a1aba4f0c50a356393c123798b5
+  metadata.gz: 4cc89c28c4f112f3ff1abef087ca640c1adaa5b4
+  data.tar.gz: bf3879fbceac69355832fa42e082510898d0b739
 SHA512:
-  metadata.gz: d6cacce91721d91e0aab0a805f22d1b01e006c7de639f4f779f0ae8e2b7c00e48144ab608f43aa8fe686d1720d768f2d1ee47217a659d010c668459d42f7bbb9
-  data.tar.gz: ef3856b79228091b42dbbbe1b8ea1ef5618c63031433ce40a34549125283f0faaab5ba8e180b67676578e4c0e6a49b88112dd69ee00203bfff7236c2ee30d6be
+  metadata.gz: b473a1906ba0a6476ecd08dae4434f450e89f157b459ce45af5d69db6a0b311eaab8fba10cfd893c9fd4f41442f8e89836d31e71bdc440b8f657e9881251c262
+  data.tar.gz: 1eb6e01f677f55f4b3203e513b6b2f51334a2546876804f863cbf96c2ec9a27f17b41efc30b04754dbc4f8fed96ad615c3b74f0ce6813a53954b7e5918347bbc

data/bin/yap

@@ -12,6 +12,20 @@ trap "SIGTTOU", "IGNORE"
 
 $LOAD_PATH.unshift File.dirname(file) + '/../lib'
 
+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)
+  end
+end
+
+require "term/ansicolor"
+require "pry"
 require "yap"
 
 STDOUT.sync = true

data/lib/yap/configuration.rb

@@ -18,7 +18,8 @@ module Yap
       ]
 
       @rcfiles = [
-        "#{ENV['HOME']}/.yaprc"
+        "#{ENV['HOME']}/.yaprc",
+        yap_path.join("yaprc")
       ]
     end
 

data/lib/yap/shell/version.rb

@@ -1,5 +1,5 @@
 module Yap
   module Shell
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   end
 end

data/lib/yap/shell.rb

@@ -102,7 +102,6 @@ module Yap
           @world.editor.puts "^C"
           retry
         rescue Exception => ex
-          require 'pry'
           binding.pry unless ex.is_a?(SystemExit)
         end
       end

data/rcfiles/.yaprc

@@ -1,36 +1,15 @@
 #!/usr/bin/ruby
 
-# ENV["PATH"] = "/Applications/Postgres.app/Contents/MacOS/bin:/usr/local/share/npm/bin/:/usr/local/heroku/bin:/Users/zdennis/.bin:/Users/zdennis/.rvm/gems/ruby-2.1.5/bin:/Users/zdennis/.rvm/gems/ruby-2.1.5@global/bin:/Users/zdennis/.rvm/rubies/ruby-2.1.5/bin:/usr/local/bin:/usr/local/sbin:/Users/zdennis/bin:/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/CrossPack-AVR/bin:/private/tmp/.tidbits/bin:/Users/zdennis/source/playground/AdobeAir/AdobeAIRSDK/bin:/Users/zdennis/.rvm/bin:/Users/zdennis/Downloads/adt-bundle-mac-x86_64-20130219/sdk/tools/:/Users/zdennis/.rvm/bin"
-# ENV["GEM_HOME"] = "/Users/zdennis/.rvm/gems/ruby-2.1.5:/Users/zdennis/.rvm/gems/ruby-2.1.5@global"
-
-# This is only necessary when starting yap from another shell as it inherits that shell's
-# environment.
-keys2keep = %w(COLORFGBG DISPLAY EDITOR HOME LANG LOGNAME MAIL PATH PS1 PWD SHELL SHLVL SSH_AUTH_SOCK SUDO_COMMAND SUDO_GID SUDO_UID SUDO_USER TERM USER USERNAME _ __CF_USER_TEXT_ENCODING)
-world.env.keys.sort.each do |key|
-  unless keys2keep.include?(key)
-    world.env.delete(key)
-  end
-end
-
 world.env["PATH"] = [
   world.env["HOME"] + "/.rbenv/shims",
   "/usr/local/bin",
   world.env["PATH"]
 ].join(":")
 
-world.env.delete("RBENV_DIR")
-world.env.delete("RBENV_DIR")
-world.env.delete("RBENV_HOOK_PATH")
-world.env.delete("RBENV_ROOT")
-world.env.delete("RBENV_VERSION")
-
 require 'chronic'
 require 'term/ansicolor'
 require 'terminfo'
 
-env.delete("BUNDLE_GEMFILE")
-env.delete("BUNDLE_BIN_PATH")
-
 # Resize history to be infinite
 infinity = 1 / 0.0
 world.history.resize(infinity)

data/yap-shell.gemspec

@@ -28,7 +28,7 @@ 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="rbenv local 2.2.3 && rbenv exec yap"
+    |    alias yap='env -i PATH=$PATH RUBYOPT="-rubygems -EUTF-8" HOME=$HOME sh -c "rbenv local 2.2.3 && yap"'
     |
     |Then, `source ~/.profile` or reload your shell. Now you can finally run:
     |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yap-shell
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Zach Dennis
@@ -231,15 +231,16 @@ 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=\"rbenv local 2.2.3 &&
-  rbenv exec 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
+  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\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"
 rdoc_options: []
 require_paths: