puppetbox 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 466cebb037b7d3d05647c4c6edb2276cdc27cf20
-  data.tar.gz: d2b111a894e2acff93367e270e5b7291550d2c62
+  metadata.gz: 393f46fa2e8abcca2e2fd278c4c4732af09ba444
+  data.tar.gz: 7dc52e48c12005dff1122fa6f900064f86b8bf16
 SHA512:
-  metadata.gz: be79a33ae71e23acb18c040028923f4057e30dadfba4aac33d64b9bc06a84e5cb29cd96efee3ebca5b3c75aa622ea980c1308cdd0a1892126994687f97086c21
-  data.tar.gz: dc4054fe17680fd977ac4f872491a73773780c45177bd5133ca54878376b045ad62688cb0ff2477f5ddb46065a9af3bed4353eaeaa52667614bf4403df654424
+  metadata.gz: cb725f0228784ae8560c4f0de5a7bad886a1fa7a205c8c9185f9431240e8ffe3f98b5335d01c6bb3064b56d7200feddab0683bdfb7683ea673504a2a889e6938
+  data.tar.gz: 45bae316cd000af9dc4f5b4a7936bdd10c58d56037181b80305148e0afec2387aa8e53d262710a550d37ac7ce61ce0fc3eb4d3c717316207e2cf835446095ebd

data/lib/puppetbox/driver/vagrant.rb

@@ -6,8 +6,9 @@ require "puppetbox/logger"
 module PuppetBox
   module Driver
     class Vagrant
-      WORKING_DIR_VAGRANT = "vagrant"
-      PUPPET_CODE_MOUNT   = "/etc/puppetlabs/code/environments/production"
+      WORKING_DIR_VAGRANT   = "vagrant"
+      PUPPET_CODE_MOUNT     = "/etc/puppetlabs/code/environments/production"
+      SPEC_ACCEPTANCE_MOUNT = "spec/acceptance:/acceptance"
 
       def node_name
         @name
@@ -26,33 +27,13 @@ module PuppetBox
         @vom = Vagrantomatic::Vagrantomatic.new(vagrant_vm_dir:@working_dir, logger:@logger)
         @logger.debug("creating instance metadata for #{@name}")
         @vm = @vom.instance(@name, config:@config)
+
+        # the code under test
         @vm.add_shared_folder("#{codedir}:#{PUPPET_CODE_MOUNT}")
 
+        # ./spec/acceptance directory
+        @vm.add_shared_folder(SPEC_ACCEPTANCE_MOUNT)
 
-        # if ! @config.has_key?("box")
-        #   raise "Node #{node_name} must specify box"
-        # end
-
-        # Add the code dir to the config has so that it will automatically become
-        # a shared folder when the VM boots
-
-        # can't use dig() might not be ruby 2.3
-        # if @config.has_key?("folders")
-        #   @config["folders"] = Array(@config["folders"])
-        #
-        #   # all paths must be fully qualified.  If we were asked to do a relative path, change
-        #   # it to the current directory since that's probably what the user wanted.  Not right?
-        #   # user supply correct path!
-        #   @config["folders"] = @config["folders"].map { |folder|
-        #     if ! folder.start_with? '/'
-        #       folder = "#{Dir.pwd}/#{folder}"
-        #     end
-        #     folder
-        #   }
-        # else
-        #   @config["folders"] = []
-        # end
-        # @config["folders"] << "#{codedir}:#{PUPPET_CODE_MOUNT}"
         @logger.debug "instance #{name} initialised"
       end
 
@@ -81,16 +62,6 @@ module PuppetBox
       def open()
         # make sure working dir exists...
         FileUtils.mkdir_p(@working_dir)
-
-        # vom = Vagrantomatic::Vagrantomatic.new(vagrant_vm_dir:@working_dir, logger:@logger)
-
-        # @logger.debug("creating instance metadata for #{@name}")
-        # @vm = vom.instance(@name, config:@config)
-
-        # obtain 'fixed' metadata from instance
-        # @config = @vm.config
-        # add in our mandatory shared folder
-        # @vm.add_shared_folder("#{codedir}:#{PUPPET_CODE_MOUNT}")
         @vm.save
 
         @logger.debug("Instance saved and ready for starting")
@@ -101,7 +72,7 @@ module PuppetBox
       # anything on SSH...)
       def close()
         if ! @keep_vm
-          @logger.info("Closing #{@node_name}")
+          @logger.info("Closing #{@name}")
           @vm.purge
         end
       end

data/lib/puppetbox/driver.rb

@@ -1,20 +1,6 @@
 module PuppetBox
-  # New drivers must implement the methods in this class (via ductyping)
   class Driver
-    # def initialize(name, keep_vm=true)
-    # end
-    #
-    # def self.open()
-    # end
-    #
-    # def self.close()
-    # end
-    #
-    # def self.selftest()
-    # end
-    #
-    # def self.puppet_apply_x2(puppet_class)
-    # end
+
   end
 
 end

data/lib/puppetbox/nodeset.rb

@@ -55,27 +55,5 @@ module PuppetBox
       end
     end
 
-    #
-    #
-    #   if nodeset["hosts"][node.name].has_key?('config') and nodeset_yaml["HOSTS"][node.name].has_key?('driver')
-    #     test.classes.each { |puppet_class|
-    #       logger.info "Acceptance testing #{node.name} #{puppet_class.name}"
-    #       summary[node.name][puppet_class.name] = pb.provision_and_test(
-    #         nodeset_yaml["HOSTS"][node.name]["driver"],
-    #         node.name,
-    #         puppet_class.name,
-    #         nodeset_yaml["HOSTS"][node.name]['config'],
-    #         @repo,
-    #       )
-    #
-    #       overall &= ! summary[node.name][puppet_class.name]
-    #     }
-    #   else
-    #     message = "onceover-nodes.yaml missing `config` or `driver` element for #{node.name} (tests skipped)"
-    #     summary[node.name] = message
-    #     overall = false
-    #   end
-    # end
-
   end
 end

data/lib/puppetbox/puppetbox.rb

@@ -32,11 +32,7 @@ module PuppetBox
     def enqueue_test(node_name, run_from, puppet_class)
       instantiate_driver(node_name, run_from)
       @testsuite[node_name]["classes"] << puppet_class
-      #  get_driver_instance(driver_name, host)
-      # node_name
-      # puppet_class.name,
-      # nodeset_yaml["HOSTS"][node.name]['config'],
-      # @repo,
+
     end
 
     def run_testsuite
@@ -89,47 +85,10 @@ module PuppetBox
           "classes"  => [],
         }
       end
-
-      # di
-      # result = ::PuppetBox.run_puppet(di, puppet_class)
-
-      # indent = "  "
-      # if result.passed
-      #   logger.info("#{indent}#{host}:#{puppet_class} --> PASSED")
-      # else
-      #   logger.error("#{indent}#{host}:#{puppet_class} --> FAILED")
-      #   # since we stop running on failure, the error messages will be in the
-      #   # last element of the result.messages array (tada!)
-      #   messages = result.messages
-      #   messages[-1].each { |line|
-      #     # puts "XXXXXXX #{line}"
-      #     logger.error "#{indent}#{host} - #{line}"
-      #   }
-      #   #   puts "size of result messages #{result.messages.size}"
-      #   #   puts "size of result messages #{result.messages[0].size}"
-      #   #   run.each { |message_arr|
-      #   #     puts message_arr
-      #   #     #message_arr.each { |line|
-      #   #   #    puts line
-      #   #   #  }
-      #   #     # require 'pry'
-      #   #     # binding.pry
-      #   #     #puts "messages size"
-      #   #     #puts messages.size
-      #   #   #  messages.each { |message|
-      #   #       # messages from the puppet run are avaiable in a nested array of run
-      #   #       # and then lines so lets print each one out indended from the host so
-      #   #       # we can see what's what
-      #   #   #    logger.error("#{host}       #{message}")
-      #   #   #  }
-      #   #   }
-      #   # }
-      # end
-      # result.passed
     end
 
-
-    # Print all results to STDOUT
+    # Print a summary of *all* results to STDOUT.  Does not include the error(s)
+    # if any - these would have been printed after each individual test ran
     def print_results
       Report::print(@result_set)
     end
@@ -153,14 +112,22 @@ module PuppetBox
         logger.debug("#{driver_instance.node_name} started")
         if driver_instance.self_test
           logger.debug("#{driver_instance.node_name} self_test OK, running puppet")
-          puppet_classes.each{ |puppet_class|
+          puppet_classes.each { |puppet_class|
             if @result_set.class_size(driver_instance.node_name) > 0 and reset_after_run
               # purge and reboot the vm - this will save approximately 1 second
               # per class on the self-test which we now know will succeed
               driver_instance.reset
             end
+            logger.info("running test #{driver_instance.node_name} - #{puppet_class}")
             driver_instance.run_puppet_x2(puppet_class)
             @result_set.save(driver_instance.node_name, puppet_class, driver_instance.result)
+
+            Report::log_test_result_or_errors(
+              @logger,
+              driver_instance.node_name,
+              puppet_class,
+              driver_instance.result,
+            )
           }
           logger.debug("#{driver_instance.node_name} test completed, closing instance")
         else

data/lib/puppetbox/report.rb

@@ -23,5 +23,25 @@ module PuppetBox
       stream.puts "\n\nOVERALL STATUS: #{pretty_status(result_set.passed?)}"
     end
 
+
+    # Print an individual test's result or if it failed, it's errors.
+    def self.log_test_result_or_errors(logger, node_name, puppet_class, result)
+      indent = "  "
+      tag = "#{indent}#{node_name} - #{puppet_class}"
+      logger.info("#{tag}: #{pretty_status(result.passed?)}")
+      if ! result.passed?
+        # since we stop running on failure, the error messages will be in the
+        # last element of the result.messages array (tada!)
+        messages = result.messages
+        if messages.empty?
+          logger.error "#{tag} - no output available"
+        else
+          messages[-1].each { |line|
+            logger.error "#{tag} - #{line}"
+          }
+        end
+      end
+    end
+
   end
 end

data/lib/puppetbox/result.rb

@@ -18,12 +18,18 @@ module PuppetBox
       @report = []
     end
 
+    # Puppet exit codes:
     # 0: The run succeeded with no changes or failures; the system was already in the desired state.
     # 1: The run failed, or wasn't attempted due to another run already in progress.
     # 2: The run succeeded, and some resources were changed.
     # 4: The run succeeded, and some resources failed.
     # 6: The run succeeded, and included both changes and failures.
     def save(status_code, messages)
+
+      # messages will usually be an array of output - one per line, but it might
+      # not be and everthing expects to be so just turn it into one if it isn't
+      # already...
+      messages = Array(messages)
       status = PS_ERROR
       if @report.empty?
         # first run

data/lib/puppetbox/version.rb

@@ -1,3 +1,3 @@
 module PuppetBox
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/puppetbox.rb

@@ -1,6 +1,4 @@
 require "puppetbox/version"
-
 module PuppetBox
 
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetbox
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Geoff Williams