Develop

.gitignore

@@ -6,3 +6,4 @@ env
 /build/
 /dist/
 /*.egg-info/
+.idea

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install:
+  - "pip install -r requirements.txt"
+# command to run tests
+script: py.test -pep8

README.rst

@@ -4,6 +4,9 @@ Google App Engine virtual environment
 ``gaeenv`` (Google App Engine virtual environment) is a tool to integrate
 Google App Engine SDK into existing environments built by virtualenv_
 
+.. image:: https://travis-ci.org/soulnai/gaeenv.svg?branch=develop
+    :target: https://travis-ci.org/soulnai/gaeenv
+
 Install
 -------
 
@@ -55,6 +58,9 @@ Usage
 
 Basic
 ^^^^^
+Important note - if you are running gaeenv on Windows platform:
+    - make sure you are working in cygwin environment
+    - cygwin console should be started with Administrator privilegies (it's required for symlink creation in Windows) or you can change it in System Permissions for everyone
 
 Activate existing environment::
 
@@ -106,6 +112,9 @@ Install App Engine SDK "1.8.1"::
 
 Link all packages in requirements.txt into src/lib::
 
+    If you want to use in requirements.txt links like git+git://github.com/anglinb/python-crunchbase you should add egg name at the end of string.
+    I.e. git+git://github.com/anglinb/python-crunchbase#egg=crunchbase. It's required to make all links correct.
+
     $ . env/bin/activate
     (env)$ pip install -r requirements.txt
     (env)$ gaeenv install requirements -r requirements.txt

gaeenv/main.py

@@ -10,8 +10,6 @@
     :license: Apache 2.0, see LICENSE for more details.
 """
 
-gaeenv_version = '0.1.2'
-
 import sys
 import os
 import logging

gaeenv/requirements.py

@@ -2,68 +2,108 @@
 import re
 import sys
 import inspect
-import pkg_resources
+import pip
+import pip.req
+from types import NoneType
 
 from distutils.sysconfig import get_python_lib
 from utils import logger
 
 
+def winlink(source, link_name):
+    '''symlink(source, link_name)
+       Creates a symbolic link pointing to source named link_name'''
+
+    import ctypes
+    csl = ctypes.windll.kernel32.CreateSymbolicLinkW
+    csl.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
+    csl.restype = ctypes.c_ubyte
+
+    flags = 0
+    if source is not None and os.path.isdir(source):
+        flags = 1
+    if csl(link_name, source, flags) == 0:
+        raise ctypes.WinError()
+
+
 def list(req_file):
-	with open(req_file, 'r') as file:
-		requirements = [req for req in pkg_resources.parse_requirements(file.read())]
+    requirements = pip.req.parse_requirements(req_file)
 
-	for requirement in requirements:
-		print requirement
+    for requirement in requirements:
+        print requirement.req
 
 
 def link(req_file, lib_dir):
-        # read requirements file
-        with open(req_file, 'r') as file:
-                requirements = [req for req in pkg_resources.parse_requirements(file.read())]
-
-        # ensure all requirements are installed
-        has_missing_requirement = False
-        packages = []
-        for requirement in requirements:
-                try:
-                        packages.append(pkg_resources.get_provider(requirement))
-                except pkg_resources.DistributionNotFound:
-                        has_missing_requirement = True
-                        logger.error(' * Please install [%s]' % requirement)
-                except pkg_resources.VersionConflict:
-                        has_missing_requirement = True
-                        logger.error(' * Version don\'t match [%s] - create virtualenv or match the version' % requirement)
-
-        # if all requirements are found then create links to them all in the given libs dir
-        if not has_missing_requirement:
-                # create libs dir
-                if not os.path.exists(lib_dir):
-                        os.makedirs(lib_dir)
-
-                # create new package file in the given libs dir
-                with open(os.path.join(lib_dir, '__init__.py'), 'wb') as f:
-                        f.write((
-                                "# Auto generated by gaeenv\n"
-                                "import sys\n"
-                                "import os\n"
-                                "sys.path.insert(0, os.path.dirname(__file__))\n"))
-
-                for pkg in packages:
-                        pkg_path = os.path.join(pkg.location, pkg.key)
-                        sym_path = os.path.join(lib_dir, pkg.key)
-                        # check if we are dealing with a file or directory package
-                        is_file = (not os.path.exists(pkg_path) and os.path.exists(pkg_path + '.py'))
-
-                        # add extension if we are dealing with a file
-                        if is_file:
-                                pkg_path = pkg_path + '.py'
-                                sym_path = sym_path + '.py'
-
-                        if os.path.islink(sym_path):
-                                os.unlink(sym_path)
-
-                        if os.path.exists(sym_path):
-                                logger.error(' * Unable to link [%s] because a file already exists at [%s]' % (pkg, sym_path))
-                        else:
-                                logger.info(' * Linking [%s] in [%s]' % (pkg_path, sym_path))
-                                os.symlink(pkg_path, sym_path)
+    all_requirements_set = set(pip.req.parse_requirements(req_file) )
+    all_installed_packages__set = set(pip.get_installed_distributions())
+
+    ensure_packages_have_names(all_requirements_set)
+
+    dependencies = []
+
+    for package in all_installed_packages__set:
+        dependencies += package.requires()
+
+    for package in all_installed_packages__set:
+        for dependency in dependencies:
+            if dependency.key in package.key:
+                _create_symlink_for_package_content(package, lib_dir)
+
+    for package in all_installed_packages__set:
+        for requirement in all_requirements_set:
+            if requirement.req.key in package.key:
+                _create_symlink_for_package_content(package, lib_dir)
+
+def make_package_from_links_folder(lib_dir):
+    """Creates folder where symlinks will be stored. And adds __init__.py for it.
+    :param lib_dir: Path to folder where symlinks will be stored.
+    """
+    if not os.path.exists(lib_dir):
+        os.makedirs(lib_dir)
+
+    with open(os.path.join(lib_dir, '__init__.py'), 'wb') as f:
+        f.write((
+                "# Auto generated by gaeenv\n"
+                "import sys\n"
+                "import os\n"
+                "sys.path.insert(0, os.path.dirname(__file__))\n"))
+
+
+def get_package_folders_names(package):
+    return package._get_metadata("top_level.txt")
+
+
+def make_symlink(pkg_path, sym_path):
+    if os.name == 'nt':
+        winlink(pkg_path, sym_path)
+    else:
+        os.symlink(pkg_path, sym_path)
+
+
+def ensure_packages_have_names(all_requirements_set):
+    for requirement in all_requirements_set:
+        if requirement.req is None:
+            print("Requirement {} have not assigned package name and will not be linked. Please assign package name.")\
+                .format(str(requirement))
+            raise Exception("Linking interrupted!") 
+
+
+def _create_symlink_for_package_content(package, lib_dir):
+    package_folders = get_package_folders_names(package)
+    for folder_name in package_folders:
+        pkg_path = os.path.join(package.location, folder_name)
+        pkg_name = folder_name
+        is_file = (not os.path.exists(pkg_path) and os.path.exists(pkg_path + '.py'))
+        if is_file:
+            """
+            Check if item that we want to link is a folder or a file. So we can build right link to it.
+            """
+            pkg_path = pkg_path +'.py'
+            pkg_name = pkg_name + '.py'
+        if not os.path.exists(pkg_path):
+            continue
+        sym_path = os.path.join(lib_dir, pkg_name)
+        if os.path.exists(sym_path):
+            continue
+        print "Package {} linking into {}".format(str(pkg_path), str(sym_path))
+        make_symlink(str(pkg_path), sym_path)

gaeenv/sdk.py

@@ -10,85 +10,85 @@
 
 
 def install(env_dir, version=None):
-	"""
-	Install App Engine SDK
-	"""
-	# download SDK
-	zip_file = download(version)
-
-	lib_dir = os.path.join(env_dir, 'lib')
-
-	# make lib directory if it doesn't exist
-	if not os.path.exists(lib_dir):
-		os.makedirs(lib_dir)
-
-	# remove existing sdk if present
-	if os.path.exists(os.path.join(lib_dir, 'google_appengine')):
-		logger.debug(' * Removing existing SDK directory')
-		shutil.rmtree(os.path.join(lib_dir, 'google_appengine'))
-
-	# unzip SDK
-	logger.debug(" * Installing SDK to dir '{0}'".format(lib_dir))
-	with ZipFile(zip_file) as z:
-		z.extractall(lib_dir)
-
-	# change file mode for executable files
-	sdk_dir = os.path.join(lib_dir, 'google_appengine')
-	py_files = [ os.path.join(sdk_dir, f) for f in os.listdir(sdk_dir) if os.path.isfile(os.path.join(sdk_dir,f)) and f.endswith('.py') ]
-	for f in py_files:
-		st = os.stat(f)
-		os.chmod(f, st.st_mode | 0111)					
-
-	# remove temp zip file
-	logger.debug(" * Cleaning up".format(lib_dir))
-	os.remove(zip_file)
+    """
+    Install App Engine SDK
+    """
+    # download SDK
+    zip_file = download(version)
+
+    lib_dir = os.path.join(env_dir, 'lib')
+
+    # make lib directory if it doesn't exist
+    if not os.path.exists(lib_dir):
+        os.makedirs(lib_dir)
+
+    # remove existing sdk if present
+    if os.path.exists(os.path.join(lib_dir, 'google_appengine')):
+        logger.debug(' * Removing existing SDK directory')
+        shutil.rmtree(os.path.join(lib_dir, 'google_appengine'))
+
+    # unzip SDK
+    logger.debug(" * Installing SDK to dir '{0}'".format(lib_dir))
+    with ZipFile(zip_file) as z:
+        z.extractall(lib_dir)
+
+    # change file mode for executable files
+    sdk_dir = os.path.join(lib_dir, 'google_appengine')
+    py_files = [ os.path.join(sdk_dir, f) for f in os.listdir(sdk_dir) if os.path.isfile(os.path.join(sdk_dir,f)) and f.endswith('.py') ]
+    for f in py_files:
+        st = os.stat(f)
+        os.chmod(f, st.st_mode | 0111)
+
+    # remove temp zip file
+    logger.debug(" * Cleaning up".format(lib_dir))
+    os.remove(zip_file)
 
 def download(version=None):
-	"""
+    """
     Download App Engine SDK
     """
-	if not version:
-		lvt = get_latest_version()
-		version = '{0}.{1}.{2}'.format(*lvt)
+    if not version:
+        lvt = get_latest_version()
+        version = '{0}.{1}.{2}'.format(*lvt)
 
-	gae_url = 'http://googleappengine.googlecode.com/files/google_appengine_{0}.zip'.format(version)
+    gae_url = 'http://googleappengine.googlecode.com/files/google_appengine_{0}.zip'.format(version)
 
-	logger.debug(' * Starting SDK download for version %s' % version)
-	response = requests.get(gae_url)
-	response.raise_for_status()
+    logger.debug(' * Starting SDK download for version %s' % version)
+    response = requests.get(gae_url)
+    response.raise_for_status()
 
-	temp_dir = gettempdir()
-	temp_zip = os.path.join(temp_dir, 'google_appengine_%s.zip' % version)
-	writefile(temp_zip, response.content, encode=None)
-	return temp_zip
+    temp_dir = gettempdir()
+    temp_zip = os.path.join(temp_dir, 'google_appengine_%s.zip' % version)
+    writefile(temp_zip, response.content, encode=None)
+    return temp_zip
 
 def get_versions():
-	"""
-	Retrieves all available App Engine SDK get_versions
-	"""
-	response = requests.get('https://code.google.com/p/googleappengine/downloads/list?can=1&q=&colspec=Filename&num=2000')
-	response.raise_for_status()
+    """
+    Retrieves all available App Engine SDK get_versions
+    """
+    response = requests.get('https://code.google.com/p/googleappengine/downloads/list?can=1&q=&colspec=Filename&num=2000')
+    response.raise_for_status()
 
-	versions = []
-	for match in re.finditer(r'google_appengine_([0-9]+)\.([0-9]+)\.([0-9]+)\.zip', response.text):
-		versions.append((match.group(1),match.group(2),match.group(3)))
+    versions = []
+    for match in re.finditer(r'google_appengine_([0-9]+)\.([0-9]+)\.([0-9]+)\.zip', response.text):
+        versions.append((match.group(1),match.group(2),match.group(3)))
 
-	return sorted(set(versions), key=lambda tup: str(tup), reverse=True)
+    return sorted(set(versions), key=lambda tup: str(tup), reverse=True)
 
 __latest_version = None
 def get_latest_version():
-	"""
-	Retrieves the latest App Engine SDK version
-	"""
-	global __latest_version
-	if not __latest_version:
-		response = requests.get('https://code.google.com/p/googleappengine/downloads/list?can=2&q=&colspec=Filename')
-		response.raise_for_status()
-		
-		match = re.search(r'google_appengine_([0-9]+)\.([0-9]+)\.([0-9]+)\.zip', response.text)
-		if match:
-			__latest_version = (match.group(1),match.group(2),match.group(3))
-		else:
-			raise Exception('App Engine SDK version not found') 
-
-	return __latest_version
+    """
+    Retrieves the latest App Engine SDK version
+    """
+    global __latest_version
+    if not __latest_version:
+        response = requests.get('https://code.google.com/p/googleappengine/downloads/list?can=1&q=&colspec=Filename')
+        response.raise_for_status()
+
+        match = re.search(r'google_appengine_([0-9]+)\.([0-9]+)\.([0-9]+)\.zip', response.text)
+        if match:
+            __latest_version = (match.group(1),match.group(2),match.group(3))
+        else:
+            raise Exception('App Engine SDK version not found')
+
+    return __latest_version

gaeenv/tests/__init__.py

@@ -0,0 +1 @@
+__author__ = 'user'