vagrant-salt 0.3.2 → 0.4.0

data/scripts/tests/install-testsuite-deps.py

@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+'''
+    install-testsuite-deps.py
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Install the required dependencies to properly run the test-suite.
+
+    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :copyright: © 2013 by the SaltStack Team, see AUTHORS for more details.
+    :license: Apache 2.0, see LICENSE for more details.
+'''
+
+# Import python libs
+import re
+import sys
+import pprint
+import subprocess
+
+# Import bootstrap libs
+from bootstrap.ext.os_data import GRAINS
+
+
+COMMANDS = []
+if GRAINS['os'] == 'SmartOS':
+    COMMANDS.extend([
+        'pkgin up',
+        'pkgin -y in scmgit-base py27-pip',
+        'pip install unittest2'
+    ])
+elif GRAINS['os'] == 'openSUSE':
+    COMMANDS.extend([
+        'zypper --non-interactive addrepo --refresh http://download.opensuse.org/repositories'
+        '/devel:/languages:/python/{0}/devel:languages:python.repo'.format(
+            GRAINS['osrelease']
+        ),
+        'zypper --gpg-auto-import-keys --non-interactive refresh',
+        'zypper --non-interactive install --auto-agree-with-licenses git python-pip',
+        'pip install unittest2'
+    ])
+elif GRAINS['osfullname'].startswith('SUSE Linux Enterprise Server'):
+    match = re.search(
+        r'PATCHLEVEL(?:[\s]+)=(?:[\s]+)([0-9]+)',
+        open('/etc/SuSE-release').read()
+    )
+    #if not match:
+    #    print 'Failed to get the current patch level for:\n{0}'.format(
+    #        pprint.pformat(GRAINS)
+    #    )
+    COMMANDS.extend([
+        'zypper --non-interactive addrepo --refresh http://download.opensuse.org/repositories'
+        '/devel:/languages:/python/SLE_{0}{1}/devel:languages:python.repo'.format(
+            GRAINS['osrelease'],
+            match and '_SP{0}'.format(match.group(1)) or ''
+        ),
+        'zypper --gpg-auto-import-keys --non-interactive refresh',
+        'zypper --non-interactive install --auto-agree-with-licenses git python-pip',
+        'pip install unittest2'
+    ])
+elif GRAINS['os'] == 'Amazon':
+    COMMANDS.extend([
+        'rpm -Uvh --force http://mirrors.kernel.org/fedora-epel/6/'
+        '{0}/epel-release-6-8.noarch.rpm'.format(
+            GRAINS['cpuarch'] == 'i686' and 'i386' or GRAINS['cpuarch']
+        ),
+        'yum -y update',
+        'yum -y install python-pip --enablerepo=epel-testing',
+        'pip-python install unittest2'
+    ])
+elif GRAINS['os'] == 'Fedora':
+    COMMANDS.extend([
+        'yum -y update',
+        'yum -y install python-pip',
+        'pip-python install unittest2'
+    ])
+elif GRAINS['os_family'] == 'Debian':
+    COMMANDS.extend([
+        'apt-get update',
+        'apt-get install -y -o DPkg::Options::=--force-confold '
+        '-o Dpkg::Options::="--force-confdef" python-pip',
+        'pip install unittest2'
+    ])
+else:
+    print(
+        'Failed gather the proper commands to allow the tests suite to be '
+        'executed in this system.\nSystem Grains:\n{0}'.format(
+            pprint.pformat(GRAINS)
+        )
+    )
+    sys.exit(1)
+
+
+for command in COMMANDS:
+    print 'Executing {0!r}'.format(command)
+    process = subprocess.Popen(command, shell=True)
+    process.communicate()
+
+print('\nDONE\n')
+exit(0)

data/scripts/tests/runtests.py

@@ -0,0 +1,207 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+'''
+    test-bootstrap.py
+    ~~~~~~~~~~~~~~~~~
+
+    salt-bootstrap script unit-testing
+
+    :codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
+    :copyright: © 2013 by the SaltStack Team, see AUTHORS for more details.
+    :license: Apache 2.0, see LICENSE for more details.
+'''
+
+import os
+import pprint
+import shutil
+import optparse
+
+from bootstrap.unittesting import TestLoader, TextTestRunner
+from bootstrap.ext.os_data import GRAINS
+try:
+    from bootstrap.ext import console
+    width, height = console.getTerminalSize()
+    PNUM = width
+except:
+    PNUM = 70
+
+try:
+    import xmlrunner
+except ImportError:
+    xmlrunner = None
+
+
+TEST_DIR = os.path.abspath(os.path.dirname(__file__))
+XML_OUTPUT_DIR = os.environ.get(
+    'XML_TEST_REPORTS', os.path.join(TEST_DIR, 'xml-test-reports')
+)
+
+
+def print_header(header, sep='~', top=True, bottom=True, inline=False,
+                 centered=False):
+    '''
+    Allows some pretty printing of headers on the console, either with a
+    "ruler" on bottom and/or top, inline, centered, etc.
+    '''
+    if top and not inline:
+        print(sep * PNUM)
+
+    if centered and not inline:
+        fmt = u'{0:^{width}}'
+    elif inline and not centered:
+        fmt = u'{0:{sep}<{width}}'
+    elif inline and centered:
+        fmt = u'{0:{sep}^{width}}'
+    else:
+        fmt = u'{0}'
+    print(fmt.format(header, sep=sep, width=PNUM))
+
+    if bottom and not inline:
+        print(sep * PNUM)
+
+
+def run_suite(opts, path, display_name, suffix='[!_]*.py'):
+    '''
+    Execute a unit test suite
+    '''
+    loader = TestLoader()
+    if opts.name:
+        tests = tests = loader.loadTestsFromName(display_name)
+    else:
+        tests = loader.discover(path, suffix, TEST_DIR)
+
+    header = '{0} Tests'.format(display_name)
+    print_header('Starting {0}'.format(header))
+
+    if opts.xmlout:
+        if not os.path.isdir(XML_OUTPUT_DIR):
+            os.makedirs(XML_OUTPUT_DIR)
+        runner = xmlrunner.XMLTestRunner(
+            output=XML_OUTPUT_DIR,
+            verbosity=opts.verbosity
+        ).run(tests)
+    else:
+        runner = TextTestRunner(
+            verbosity=opts.verbosity
+        ).run(tests)
+    return runner.wasSuccessful()
+
+
+def run_integration_suite(opts, display_name, suffix='[!_]*.py'):
+    '''
+    Run an integration test suite
+    '''
+    path = os.path.join(TEST_DIR, 'bootstrap')
+    return run_suite(opts, path, display_name, suffix)
+
+
+def main():
+    parser = optparse.OptionParser()
+
+    test_selection_group = optparse.OptionGroup(
+        parser,
+        "Tests Selection",
+        "In case of no selection, all tests will be executed."
+    )
+    test_selection_group.add_option(
+        '-L', '--lint',
+        default=False,
+        action='store_true',
+        help='Run Lint tests'
+    )
+    test_selection_group.add_option(
+        '-U', '--usage',
+        default=False,
+        action='store_true',
+        help='Run Usage tests'
+    )
+    test_selection_group.add_option(
+        '-I', '--install',
+        default=False,
+        action='store_true',
+        help='Run Installation tests'
+    )
+    test_selection_group.add_option(
+        '-n', '--name',
+        action='append',
+        default=[],
+        help='Specific test to run'
+    )
+    parser.add_option_group(test_selection_group)
+
+    output_options_group = optparse.OptionGroup(parser, "Output Options")
+    output_options_group.add_option(
+        '-v',
+        '--verbose',
+        dest='verbosity',
+        default=1,
+        action='count',
+        help='Verbose test runner output'
+    )
+    output_options_group.add_option(
+        '-x',
+        '--xml',
+        dest='xmlout',
+        default=False,
+        action='store_true',
+        help='XML test runner output(Output directory: {0})'.format(
+            XML_OUTPUT_DIR
+        )
+    )
+    output_options_group.add_option(
+        '--no-clean',
+        default=False,
+        action='store_true',
+        help='Do not clean the XML output files before running.'
+    )
+    parser.add_option_group(output_options_group)
+
+    options, _ = parser.parse_args()
+
+    if options.xmlout and xmlrunner is None:
+        parser.error(
+            '\'--xml\' is not available. The xmlrunner library is not '
+            'installed.'
+        )
+    elif options.xmlout:
+        print(
+            'Generated XML reports will be stored on {0!r}'.format(
+                XML_OUTPUT_DIR
+            )
+        )
+
+    if not any((options.lint, options.usage, options.install, options.name)):
+        options.lint = True
+        options.usage = True
+        options.install = True
+
+    if not options.no_clean and os.path.isdir(XML_OUTPUT_DIR):
+        shutil.rmtree(XML_OUTPUT_DIR)
+
+    print 'Detected system grains:'
+    pprint.pprint(GRAINS)
+
+    overall_status = []
+
+    if options.name:
+        for name in options.name:
+            results = run_suite(options, '', name)
+            overall_status.append(results)
+    if options.lint:
+        status = run_integration_suite(options, 'Lint', "*lint.py")
+        overall_status.append(status)
+    if options.usage:
+        status = run_integration_suite(options, 'Usage', "*usage.py")
+        overall_status.append(status)
+    if options.install:
+        status = run_integration_suite(options, 'Installation', "*install.py")
+        overall_status.append(status)
+
+    if overall_status.count(False) > 0:
+        # We have some false results, the test-suite failed
+        parser.exit(1)
+
+    parser.exit(0)
+
+if __name__ == '__main__':
+    main()

data/templates/locales/en.yml

@@ -0,0 +1,14 @@
+en:
+  salt:
+    missing_key: |-
+      You must include both public and private keys.
+    must_accept_keys: |-
+      You must accept keys when running highstate with master!
+    accept_key_no_minion: |-
+      You must install the minion to accept keys on master!
+    accept_key_no_master: |-
+      You must install the master to accept minion keys!
+    not_received_minion_key: |-
+      Salt Master did not receive minion key.
+    bootstrap_failed: |-
+      Bootstrap script failed, see /var/log/bootstrap-salt.log on VM.

data/vagrant-salt.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "vagrant-salt"
-  s.version     = "0.3.2"
+  s.version     = "0.4.0"
   s.authors     = ["Alec Koumjian", "Kiall Mac Innes", "Pedro Algarvio"]
   s.email       = ["akoumjian@gmail.com", "kiall@managedit.ie", "pedro@algarvio.me"]
   s.homepage    = "https://github.com/saltstack/salty-vagrant"
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "templates"]
 
   s.add_runtime_dependency "vagrant"
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alec Koumjian
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-03 00:00:00 -08:00
+date: 2013-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,17 +49,49 @@ files:
 - README.rst
 - Rakefile
 - example/.gitignore
-- example/Vagrantfile
-- example/salt/key/KEYPAIR_GOES_HERE
-- example/salt/minion.conf
-- example/salt/roots/pillar/top.sls
-- example/salt/roots/salt/top.sls
+- example/complete/Vagrantfile
+- example/complete/salt/custom-bootstrap-salt.sh
+- example/complete/salt/key/master.pem
+- example/complete/salt/key/master.pub
+- example/complete/salt/key/minion.pem
+- example/complete/salt/key/minion.pub
+- example/complete/salt/master
+- example/complete/salt/minion
+- example/complete/salt/roots/pillar/top.sls
+- example/complete/salt/roots/salt/nginx.sls
+- example/complete/salt/roots/salt/top.sls
+- example/masterless/Vagrantfile
+- example/masterless/salt/minion
+- example/masterless/salt/roots/pillar/top.sls
+- example/masterless/salt/roots/salt/nginx.sls
+- example/masterless/salt/roots/salt/top.sls
 - lib/vagrant-salt.rb
+- lib/vagrant-salt/config.rb
+- lib/vagrant-salt/errors.rb
+- lib/vagrant-salt/plugin.rb
 - lib/vagrant-salt/provisioner.rb
-- lib/vagrant_init.rb
+- lib/vagrant-salt/version.rb
+- templates/locales/en.yml
 - vagrant-salt.gemspec
+- scripts/.travis.yml
+- scripts/ChangeLog
+- scripts/LICENSE
 - scripts/README.rst
 - scripts/bootstrap-salt-minion.sh
+- scripts/bootstrap-salt.sh
+- scripts/salt-bootstrap.sh
+- scripts/tests/README.rst
+- scripts/tests/bootstrap/__init__.py
+- scripts/tests/bootstrap/ext/__init__.py
+- scripts/tests/bootstrap/ext/console.py
+- scripts/tests/bootstrap/ext/os_data.py
+- scripts/tests/bootstrap/test_install.py
+- scripts/tests/bootstrap/test_lint.py
+- scripts/tests/bootstrap/test_usage.py
+- scripts/tests/bootstrap/unittesting.py
+- scripts/tests/ext/checkbashisms
+- scripts/tests/install-testsuite-deps.py
+- scripts/tests/runtests.py
 has_rdoc: true
 homepage: https://github.com/saltstack/salty-vagrant
 licenses: []
@@ -69,6 +101,7 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- templates
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="

data/example/Vagrantfile

@@ -1,26 +0,0 @@
-# require "../lib/vagrant-salt"
-
-Vagrant::Config.run do |config|
-  ## Chose your base box
-  config.vm.box = "precise64"
-
-  ## For masterless, mount your salt file root
-  config.vm.share_folder "salt_file_root", "/srv", "salt/roots/"
-
-
-  ## Use all the defaults:
-  config.vm.provision :salt do |salt|
-    salt.run_highstate = false
-
-    ## Optional Settings:
-    # salt.minion_config = "salt/minion.conf"
-    # salt.temp_config_dir = "/existing/folder/on/basebox/"
-    # salt.salt_install_type = "git"
-    # salt.salt_install_args = "develop"
-
-    ## If you have a remote master setup, you can add
-    ## your preseeded minion key
-    # salt.minion_key = "salt/key/minion.pem"
-    # salt.minion_pub = "salt/key/minion.pub"
-  end
-end