Skip to content

Moderate changes and improvements; please review and, if appropriate, merge. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pprince wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Moderate changes and improvements; please review and, if appropriate, merge. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b05e164
Commit the initial meat of my improvement.
pprince Jan 20, 2014
3dfc754
Correct an incorrect comment.
pprince Jan 20, 2014
903ea58
Add check for .gem inside venv.
pprince Jan 20, 2014
66e4135
Add CONTRIBUTORS file.
pprince Jan 20, 2014
8784f18
Bump version.
pprince Jan 20, 2014
fc7e968
Fix bugs.
pprince Jan 20, 2014
afe21e2
Add Bundler support.
pprince Jan 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

Originally by and Copyright (C) 2012 Rachid Belaid
--------------------------------------------------

... with contributions and inspiration from the community, including:

Paul A. Prince <paul@littlebluetech.com> (2014)

2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name='virtualenvwrapper.gem',
version='0.1',
version='0.2',
description='Plugin for virtualenvwrapper to automatically '
'encapsulate inside the virtual environment'
'any gems installed when the venv is activated',
Expand Down
70 changes: 59 additions & 11 deletions virtualenvwrapper/gem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,72 @@

log = logging.getLogger(__name__)


def post_activate_source(args):
return """
#patch to wrap gems inside the virtual env
export _OLD_GEM_HOME="$GEM_HOME"
export _OLD_GEM_PATH="$GEM_PATH"
export GEM_HOME="$VIRTUAL_ENV/lib/gems"
export GEM_PATH=""
PATH="$GEM_HOME/bin:$PATH"
export PATH
if [ -e "${VIRTUAL_ENV}/.gem" ]; then

"""
if [ -n "${GEM_HOME+x}" ]; then
export _OLD_GEM_HOME="$GEM_HOME"
fi
export GEM_HOME=$VIRTUAL_ENV

if [ -n "${GEM_PATH+x}" ]; then
export _OLD_GEM_PATH="$GEM_PATH"
fi
export GEM_PATH=""

if [ -n "${BUNDLE_HOME+x}" ]; then
export _OLD_BUNDLE_HOME="$BUNDLE_HOME"
fi
export BUNDLE_HOME="$GEM_HOME"

if [ -n "${BUNDLE_BIN+x}" ]; then
export _OLD_BUNDLE_BIN="$BUNDLE_BIN"
fi
export BUNDLE_BIN="${GEM_HOME}/bin"

fi

"""


def pre_deactivate_source(args):
return """
#restore the value before entering the venv
export GEM_HOME="$_OLD_GEM_HOME"
export GEM_PATH="$GEM_PATH"
if [ -e "${VIRTUAL_ENV}/.gem" ]; then

if [ -n "${_OLD_GEM_HOME+x}" ]; then
GEM_HOME="$_OLD_GEM_HOME"
export GEM_HOME
unset _OLD_GEM_HOME
else
unset GEM_HOME
fi

if [ -n "${_OLD_GEM_PATH+x}" ]; then
GEM_PATH="$_OLD_GEM_PATH"
export GEM_PATH
unset _OLD_GEM_PATH
else
unset GEM_PATH
fi

if [ -n "${_OLD_BUNDLE_HOME+x}" ]; then
BUNDLE_HOME="$_OLD_BUNDLE_HOME"
export BUNDLE_HOME
unset _OLD_BUNDLE_HOME
else
unset BUNDLE_HOME
fi

if [ -n "${_OLD_BUNDLE_BIN+x}" ]; then
BUNDLE_BIN="$_OLD_BUNDLE_BIN"
export BUNDLE_BIN
unset _OLD_BUNDLE_BIN
else
unset BUNDLE_BIN
fi

fi

"""