Browse files

Added some missing files and updated the README.txt

  • Loading branch information...
1 parent d05a544 commit 5241eeafbede1861177e530a2dd771e921481a04 @dwighthubbard committed Aug 4, 2012
Showing with 15 additions and 8 deletions.
  1. +6 −0 README.txt
  2. +1 −0 hostlists/__init__.py
  3. +4 −4 hostlists/hostlists.py
  4. +4 −4 setup.py
View
6 README.txt
@@ -2,6 +2,12 @@ Description
sshmap is a python scriptable ssh multiplexer optimized for performing
parallel map operations via ssh.
+sshmap provides 3 python modules in order to operate:
+ sshmap - This module provides the multiprocessing ssh functionality
+ hostlists - This module handles hostlist expansion
+ hostlists_plugins - This module contains plugins that can be used
+ by the hostlists plugin to obtain lists of hosts.
+
Dependencies
sshmap uses one open source library.
View
1 hostlists/__init__.py
@@ -0,0 +1 @@
+from hostlists import *
View
8 hostlists/hostlists.py
@@ -31,10 +31,10 @@ def _get_plugins():
plugins=global_plugins
pluginlist=[]
for directory in sys.path:
- if os.path.isdir(os.path.join(directory,'hostlists/plugins')):
- templist=os.listdir(os.path.join(directory,'hostlists/plugins'))
+ if os.path.isdir(os.path.join(directory,'hostlists_plugins')):
+ templist=os.listdir(os.path.join(directory,'hostlists_plugins'))
for item in templist:
- pluginlist.append(os.path.join(os.path.join(directory,'hostlists/plugins'),item))
+ pluginlist.append(os.path.join(os.path.join(directory,'hostlists_plugins'),item))
pluginlist.sort()
# Create a dict mapping the plugin name to the plugin method
for item in pluginlist:
@@ -43,7 +43,7 @@ def _get_plugins():
mod=imp.load_module('hostlists_plugins_%s'% os.path.basename(item[:-3]),open(item),item,('.py','r',imp.PY_SOURCE))
if mod.name() not in plugins.keys():
plugins[mod.name().lower()]=mod
- return plugins
+ return plugins
def expand(range_list):
""" Expand a list of plugin:parameters into a list of hosts """
View
8 setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
import os
-from setuptools import setup
+from distutils.core import setup
"""
Copyright (c) 2012 Yahoo! Inc. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,14 +18,14 @@
setup(
name="sshmap",
- version="0.2.10",
+ version="0.2.28",
author="Dwight Hubbard",
author_email="dhubbard@yahoo-inc.com",
url="http://www.yahoo.com",
license="LICENSE.txt",
- packages=["sshmap"],
+ packages=["sshmap","hostlists","hostlists_plugins"],
scripts=["sshmap/sshmap.py"],
long_description=open('README.txt').read(),
- description="A SSH Multiplexer desgined to use ssh to perform map/reduce like operations",
+ description="A SSH Multiplexer designed to use ssh to perform map/reduce like operations",
requires=['paramiko'],
)

0 comments on commit 5241eea

Please sign in to comment.