vagrant-r10k 0.2.0 → 0.3.0

data/support/testrunner.py

@@ -0,0 +1,189 @@
+#!/usr/bin/env python
+
+import os
+from lxml import etree
+import datetime
+import json
+from fabric.operations import local
+from fabric.api import settings
+import shutil
+import commands
+from copy import deepcopy
+from dealer.git import git
+import sys
+import re
+from time import sleep
+
+out_dir = 'acceptance_results'
+
+def get_du(path):
+    """get disk usage for a given path"""
+    cmd = 'df %s | grep -v "^File" | head -1 | awk \'{print $3}\'' % path
+    res = int(commands.getoutput(cmd).strip())
+    return res
+
+def get_interfaces():
+    ifaces = {}
+    cmd = 'nmcli -t -f DEVICE,TYPE,STATE d'
+    res = commands.getoutput(cmd).strip()
+    if 'nmcli-CRITICAL' in res:
+        return {}
+    lines = res.split("\n")
+    for line in lines:
+        name, dev_type, state = line.split(':')
+        ifaces[name] = {'type': dev_type, 'state': state}
+    return ifaces
+
+def parse_junit(fname):
+    xml = etree.parse(fname)
+    root = xml.getroot()
+    suite = root.xpath('/testsuite')[0]
+    result = deepcopy(dict(suite.attrib))
+    result['tests'] = []
+    for test in root.xpath('/testsuite/testcase'):
+        t = deepcopy(dict(test.attrib))
+        t['success'] = True
+        t['fail_message'] = ''
+        failures = test.xpath('failure')
+        if len(failures) > 0:
+            t['success'] = False
+            t['fail_message'] = failures[0].attrib['message']
+        result['tests'].append(t)
+    return result
+
+def get_vboxinfo():
+    # this largely uses code from Vagrant -
+    # plugins/providers/virtualbox/driver/version_4_3.rb
+    res = {}
+    try:
+        res['hostonlyifs'] = get_vbox_hostonlyifs()
+    except:
+        print("ERROR: unable to get VirtualBox hostonlyifs")
+    try:
+        res['dhcpservers'] = get_vbox_dhcpservers()
+    except:
+        print("ERROR: unable to get VirtualBox dhcpservers")
+    return res
+
+def get_vbox_hostonlyifs():
+    ifnum = 0
+    out = commands.getoutput('VBoxManage list hostonlyifs')
+    ifs = out.split("\n\n")
+    result = {}
+    for iface in ifs:
+        lines = iface.split("\n")
+        data = {}
+        for line in lines:
+            line = line.strip()
+            if line == '':
+                continue
+            parts = line.split(' ', 1)
+            data[parts[0].strip().strip(':')] = parts[1].strip()
+        key = 'unknown_{n}'.format(n=ifnum)
+        ifnum += 1
+        for x in ['Name', 'VBoxNetworkName', 'GUID']:
+            if x in data:
+                key = data[x]
+                break
+        result[key] = data
+    return result
+
+def get_vbox_dhcpservers():
+    ifnum = 0
+    out = commands.getoutput('VBoxManage list dhcpservers')
+    ifs = out.split("\n\n")
+    result = {}
+    for iface in ifs:
+        lines = iface.split("\n")
+        data = {}
+        for line in lines:
+            line = line.strip()
+            if line == '':
+                continue
+            parts = line.split(' ', 1)
+            data[parts[0].strip().strip(':')] = parts[1].strip()
+        key = 'unknown_{n}'.format(n=ifnum)
+        ifnum += 1
+        if 'NetworkName' in data:
+            key = data['NetworkName']
+        result[key] = data
+    return result
+
+def do_test(num, testcmd):
+    data = {'num': num}
+    data['git_rev'] = git.revision
+    data['git_tag'] = git.tag
+
+    # output path and command to execute
+    outfile = '{o}/do_test_{n}.out'.format(n=num, o=out_dir)
+    data['outfile'] = outfile
+    cmd = testcmd + ' 2>&1 | tee ' + outfile + ' ; ( exit ${PIPESTATUS[0]} )'
+
+    print("################ BEGIN test {n} ###############################".format(n=num))
+    start_dt = datetime.datetime.now()
+    
+    # run the command, send stdout/stderr to console, capture exit code; do not die on non-0 exit
+    with settings(warn_only=True):
+        result = local(cmd, capture=False, shell='/bin/bash')
+    print("################ END test {n} ###############################".format(n=num))
+
+    # calculate duration
+    end_dt = datetime.datetime.now()
+    duration = (end_dt - start_dt).total_seconds()
+    print("Command exited {x} in {d} seconds".format(x=result.return_code, d=duration))
+
+    # update data
+    data['success'] = result.succeeded
+    data['return_code'] = result.return_code
+    data['duration'] = duration
+
+    # system state
+    du = get_du('/tmp/vagrant-r10k-spec')
+    data['tmp_disk_used_KB'] = du
+    data['interfaces'] = get_interfaces()
+
+    # VBox info
+    data['vboxinfo'] = get_vboxinfo()
+    
+    # JUnit
+    if os.path.exists('results.xml'):
+        fpath = '{o}/results_{n}.xml'.format(n=num, o=out_dir)
+        shutil.move('results.xml', fpath)
+        data['junit'] = parse_junit(fpath)
+        data['junit_path'] = fpath
+
+    json_path = '{o}/data_{n}.json'.format(n=num, o=out_dir)
+    with open(json_path, 'w') as fh:
+        fh.write(json.dumps(data))
+    print("\tData written to: {j}".format(j=json_path))
+
+def get_next_test_num(dirname):
+    file_re = re.compile('^data_(\d+)\.json$')
+    num = 0
+    for f in os.listdir(dirname):
+        m = file_re.match(f)
+        if not m:
+            continue
+        n = int(m.group(1))
+        if n > num:
+            num = n
+    return (num + 1)
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        sys.stderr.write("USAGE: testrunner.py <# to run>\n")
+        raise SystemExit(1)
+    
+    num_to_run = int(sys.argv[1])
+    
+    if not os.path.exists(out_dir):
+        os.mkdir(out_dir)
+
+    start_num = get_next_test_num(out_dir)
+
+    print("About to run {n} tests...".format(n=num_to_run))
+    for i in range(start_num, (start_num + num_to_run)):
+        print(">>>> Doing test {i}".format(i=i))
+        do_test(i, 'bundle exec rake --trace acceptance:virtualbox')
+        print(">>> Sleeping 30s between test runs")
+        sleep(30)

data/vagrant-r10k.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "r10k", "~> 1.2.1"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
 end

data/vagrant-spec.config.rb

@@ -0,0 +1,18 @@
+require 'pathname'
+require "vagrant-spec/acceptance"
+require 'rspec_junit_formatter'
+require 'rspec_matcher_num_times'
+
+Vagrant::Spec::Acceptance.configure do |c|
+  acceptance_dir = Pathname.new File.expand_path("../spec/acceptance", __FILE__)
+  c.component_paths = [acceptance_dir.to_s]
+  c.skeleton_paths = [(acceptance_dir + 'skeletons').to_s]
+  c.rspec_args_append = [
+    '--format',
+    'RspecJunitFormatter',
+    '--out',
+    'results.xml',
+  ]
+
+  c.provider ENV['VS_PROVIDER'], box: ENV['VS_BOX_PATH'], skeleton_path: c.skeleton_paths
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-r10k
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Antman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Vagrant middleware plugin to allow you to have just a Puppetfile and
@@ -60,25 +60,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .pullreview.yml
+- .rspec
+- .ruby-version
+- .travis.yml
 - CHANGES.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-r10k.rb
+- lib/vagrant-r10k/action/base.rb
+- lib/vagrant-r10k/action/deploy.rb
+- lib/vagrant-r10k/action/validate.rb
 - lib/vagrant-r10k/config.rb
-- lib/vagrant-r10k/modulegetter.rb
+- lib/vagrant-r10k/helpers.rb
 - lib/vagrant-r10k/plugin.rb
 - lib/vagrant-r10k/version.rb
+- spec/acceptance/skeletons/correct/Vagrantfile
+- spec/acceptance/skeletons/correct/gitcheck.sh
+- spec/acceptance/skeletons/correct/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/correct/puppet/Puppetfile
+- spec/acceptance/skeletons/correct/puppet/manifests/default.pp
+- spec/acceptance/skeletons/correct/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/could_not_resolve_host/Vagrantfile
+- spec/acceptance/skeletons/could_not_resolve_host/gitcheck.sh
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/Puppetfile
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/manifests/default.pp
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/different_mod_path/Vagrantfile
+- spec/acceptance/skeletons/different_mod_path/gitcheck.sh
+- spec/acceptance/skeletons/different_mod_path/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/different_mod_path/puppet/Puppetfile
+- spec/acceptance/skeletons/different_mod_path/puppet/manifests/default.pp
+- spec/acceptance/skeletons/different_mod_path/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/no_mod_path/Vagrantfile
+- spec/acceptance/skeletons/no_mod_path/gitcheck.sh
+- spec/acceptance/skeletons/no_mod_path/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/no_mod_path/puppet/Puppetfile
+- spec/acceptance/skeletons/no_mod_path/puppet/manifests/default.pp
+- spec/acceptance/skeletons/no_mod_path/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/no_puppet_dir/Vagrantfile
+- spec/acceptance/skeletons/no_puppet_dir/gitcheck.sh
+- spec/acceptance/skeletons/no_vagrant_r10k/Vagrantfile
+- spec/acceptance/skeletons/no_vagrant_r10k/gitcheck.sh
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/Puppetfile
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/manifests/default.pp
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/puppetfile_syntax_error/Vagrantfile
+- spec/acceptance/skeletons/puppetfile_syntax_error/gitcheck.sh
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/Puppetfile
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/manifests/default.pp
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/modules/.gitkeep
+- spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb
 - spec/spec_helper.rb
+- spec/unit/action_base_spec.rb
+- spec/unit/action_deploy_spec.rb
+- spec/unit/action_validate_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/modulegetter_spec.rb
+- spec/unit/helpers_spec.rb
+- spec/unit/plugin_spec.rb
 - spec/unit/shared_expectations.rb
 - spec/unit/sharedcontext.rb
+- support/testrunner.py
 - vagrant-r10k.gemspec
+- vagrant-spec.config.rb
 homepage: https://github.com/jantman/vagrant-r10k
 licenses:
 - Apache-2.0
@@ -89,23 +139,65 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Vagrant middleware plugin to retrieve puppet modules using r10k.
 test_files:
+- spec/acceptance/skeletons/correct/Vagrantfile
+- spec/acceptance/skeletons/correct/gitcheck.sh
+- spec/acceptance/skeletons/correct/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/correct/puppet/Puppetfile
+- spec/acceptance/skeletons/correct/puppet/manifests/default.pp
+- spec/acceptance/skeletons/correct/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/could_not_resolve_host/Vagrantfile
+- spec/acceptance/skeletons/could_not_resolve_host/gitcheck.sh
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/Puppetfile
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/manifests/default.pp
+- spec/acceptance/skeletons/could_not_resolve_host/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/different_mod_path/Vagrantfile
+- spec/acceptance/skeletons/different_mod_path/gitcheck.sh
+- spec/acceptance/skeletons/different_mod_path/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/different_mod_path/puppet/Puppetfile
+- spec/acceptance/skeletons/different_mod_path/puppet/manifests/default.pp
+- spec/acceptance/skeletons/different_mod_path/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/no_mod_path/Vagrantfile
+- spec/acceptance/skeletons/no_mod_path/gitcheck.sh
+- spec/acceptance/skeletons/no_mod_path/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/no_mod_path/puppet/Puppetfile
+- spec/acceptance/skeletons/no_mod_path/puppet/manifests/default.pp
+- spec/acceptance/skeletons/no_mod_path/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/no_puppet_dir/Vagrantfile
+- spec/acceptance/skeletons/no_puppet_dir/gitcheck.sh
+- spec/acceptance/skeletons/no_vagrant_r10k/Vagrantfile
+- spec/acceptance/skeletons/no_vagrant_r10k/gitcheck.sh
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/NOTmodules/.gitkeep
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/Puppetfile
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/manifests/default.pp
+- spec/acceptance/skeletons/no_vagrant_r10k/puppet/modules/.gitkeep
+- spec/acceptance/skeletons/puppetfile_syntax_error/Vagrantfile
+- spec/acceptance/skeletons/puppetfile_syntax_error/gitcheck.sh
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/Puppetfile
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/manifests/default.pp
+- spec/acceptance/skeletons/puppetfile_syntax_error/puppet/modules/.gitkeep
+- spec/acceptance/vagrant-r10k/vagrant-r10k_spec.rb
 - spec/spec_helper.rb
+- spec/unit/action_base_spec.rb
+- spec/unit/action_deploy_spec.rb
+- spec/unit/action_validate_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/modulegetter_spec.rb
+- spec/unit/helpers_spec.rb
+- spec/unit/plugin_spec.rb
 - spec/unit/shared_expectations.rb
 - spec/unit/sharedcontext.rb

data/lib/vagrant-r10k/modulegetter.rb

@@ -1,145 +0,0 @@
-require 'r10k/logging'
-require 'vagrant/errors'
-
-# this is an ugly monkeypatch, since we're running inside of Vagrant,
-# which has already defined logger but not with the debug1 and debug2 custom levels
-module Log4r
-  class Logger
-
-    def debug1(msg)
-      self.debug(msg)
-    end
-    def debug2(msg)
-      self.debug(msg)
-    end
-  end
-end
-
-# patch this so we can get programmatic access to the errors
-module R10K
-  class TaskRunner
-    def get_errors
-      @errors
-    end
-  end
-end
-
-module VagrantPlugins
-  module R10k
-    class Modulegetter
-      include R10K::Logging
-      def initialize(app, env)
-        @app = app
-      end
-
-      def call(env)
-        require 'r10k/puppetfile'
-        require 'r10k/task_runner'
-        require 'r10k/task/puppetfile'
-
-        @env = env
-        env_dir = @env[:root_path]
-
-        # since this plugin runs in a hackish way (to force it to be before puppet provisioner's
-        # config validation), check here that our config items are set, else bail out 
-        unset = Vagrant::Plugin::V2::Config::UNSET_VALUE
-        if @env[:machine].config.r10k.puppet_dir == unset or @env[:machine].config.r10k.puppetfile_path == unset
-          @env[:ui].detail "vagrant-r10k: puppet_dir and/or puppetfile_path not set in config; not running"
-          @app.call(env)
-          return
-        end
-
-        puppetfile_path = File.join(env_dir, @env[:machine].config.r10k.puppetfile_path)
-
-        module_path = nil
-        # override the default mechanism for building a module_path with the optional config argument
-        if @env[:machine].config.r10k.module_path != unset
-          module_path = @env[:machine].config.r10k.module_path
-        end
-
-        manifest_file = nil
-        manifests_path = nil
-        @env[:machine].config.vm.provisioners.each do |prov|
-          if prov.respond_to?(:type)
-            next if prov.type != :puppet
-          else
-            next if prov.name != :puppet
-          end
-          # if module_path has been set before, check if it fits to one defined in the provisioner config
-          if module_path != nil
-            if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path) 
-              @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; not running"
-              @app.call(env)
-              return
-            elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
-              @env[:ui].detail "vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; not running"
-              @app.call(env)
-              return
-            end
-          # no modulepath explict set in config, build one from the provisioner config
-          else
-            module_path = prov.config.module_path.is_a?(Array) ? prov.config.module_path[0] : prov.config.module_path
-            @env[:ui].info "vagrant-r10k: Building the r10k module path with puppet provisioner module_path \"#{module_path}\". (if module_path is an array, first element is used)"
-          end
-
-          manifest_file = File.join(env_dir, prov.config.manifest_file)
-          manifests_path = File.join(env_dir, prov.config.manifests_path[1])
-        end
-
-        # now join the module_path with the env_dir to have an absolute path
-        module_path = File.join(env_dir, module_path)
-        @env[:ui].info "vagrant-r10k: Beginning r10k deploy of puppet modules into #{module_path} using #{puppetfile_path}"
-
-        if ENV["VAGRANT_LOG"] == "debug"
-          R10K::Logging.level = 0
-        else
-          R10K::Logging.level = 3
-        end
-
-        if !File.file?(puppetfile_path)
-          raise ErrorWrapper.new(RuntimeError.new("Puppetfile at #{puppetfile_path} does not exist."))
-        end
-
-        # do the actual module buildout
-        runner = R10K::TaskRunner.new([])
-        begin
-          puppetfile = R10K::Puppetfile.new(File.join(env_dir, @env[:machine].config.r10k.puppet_dir), module_path, puppetfile_path)
-          task   = R10K::Task::Puppetfile::Sync.new(puppetfile)
-          runner.append_task task
-          runner.run
-        rescue SyntaxError => ex
-          @env[:ui].error "Invalid syntax in Puppetfile at #{puppetfile_path}"
-          raise ErrorWrapper.new(ex)
-        end
-        if !runner.succeeded?
-          runner.get_errors().each do |error|
-            raise ErrorWrapper.new(RuntimeError.new(error[1]))
-          end
-        end
-        @env[:ui].info "vagrant-r10k: Deploy finished"
-        @app.call(env)
-      end
-
-    end
-
-    class ErrorWrapper < ::Vagrant::Errors::VagrantError
-      attr_reader :original
-
-      def initialize(original)
-        @original = original
-      end
-
-      def to_s
-        "#{original.class}: #{original.to_s}"
-      end
-
-      private
-
-      def method_missing(fun, *args, &block)
-        original.send(fun, *args, &block)
-      end
-
-    end
-
-  end
-end