puppetbox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0b4270e3681f985ebb627e7126987337345963f
-  data.tar.gz: aa5f16dd84a2f10e25abe4e23c73a03082316fb6
+  metadata.gz: 466cebb037b7d3d05647c4c6edb2276cdc27cf20
+  data.tar.gz: d2b111a894e2acff93367e270e5b7291550d2c62
 SHA512:
-  metadata.gz: af4ca9d3108b2d81150d53ea25473f4a5ddb722e14a76814f37e433c698c073919d3fbcaf228044740040651342de8fcc7146a912dafa7e5387864c61d29df1e
-  data.tar.gz: fa61ab2481c0fb6d49681168eb44b9917c5320f244b0d130123a6a140d0e1916c795bd986f6e1e8fbc5cf23179b8f7f4ddbb97dfe8c785f7e5e5b1f2f72477b8
+  metadata.gz: be79a33ae71e23acb18c040028923f4057e30dadfba4aac33d64b9bc06a84e5cb29cd96efee3ebca5b3c75aa622ea980c1308cdd0a1892126994687f97086c21
+  data.tar.gz: dc4054fe17680fd977ac4f872491a73773780c45177bd5133ca54878376b045ad62688cb0ff2477f5ddb46065a9af3bed4353eaeaa52667614bf4403df654424

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in puppetbox.gemspec
-gem 'derelict', :git => 'https://github.com/GeoffWilliams/derelict', :ref => 'preserve_real_status'
 #gem 'vagrantomatic', :path => '/home/geoff/github/vagrantomatic'
 
 gemspec

data/lib/puppetbox/driver/vagrant.rb

@@ -6,48 +6,53 @@ require "puppetbox/logger"
 module PuppetBox
   module Driver
     class Vagrant
-      # fixme - seems abandoned, might need to make my own :(
-      # DEFAULT_VAGRANT_BOX = "puppetlabs/centos-7.2-64-puppet"
+      WORKING_DIR_VAGRANT = "vagrant"
       PUPPET_CODE_MOUNT   = "/etc/puppetlabs/code/environments/production"
 
       def node_name
         @name
       end
 
-#      def initialize(name, codedir, keep_vm:true, working_dir:nil, config:{'box'=> DEFAULT_VAGRANT_BOX}, logger: nil)
       def initialize(name, codedir, config, keep_vm:false, working_dir:nil, logger: nil)
 
         @name         = name
         @keep_vm      = keep_vm
-        @working_dir  = working_dir || File.join(Dir.home, '.puppetbox')
+        @working_dir  = File.join((working_dir || PuppetBox::WORKING_DIR), WORKING_DIR_VAGRANT)
         @config       = config
         @result       = Result.new
         @logger       = Logger.new(logger).logger
 
-        if ! @config.has_key?("box")
-          raise "Node #{node_name} must specify box"
-        end
+        # setup the instance
+        @vom = Vagrantomatic::Vagrantomatic.new(vagrant_vm_dir:@working_dir, logger:@logger)
+        @logger.debug("creating instance metadata for #{@name}")
+        @vm = @vom.instance(@name, config:@config)
+        @vm.add_shared_folder("#{codedir}:#{PUPPET_CODE_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}"
+        # 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
 
@@ -77,15 +82,17 @@ module PuppetBox
         # make sure working dir exists...
         FileUtils.mkdir_p(@working_dir)
 
-        vom = Vagrantomatic::Vagrantomatic.new(vagrant_vm_dir: @working_dir, logger: @logger)
+        # vom = Vagrantomatic::Vagrantomatic.new(vagrant_vm_dir:@working_dir, logger:@logger)
 
-        @logger.debug("reading instance metadata for #{@name}")
-        @vm = vom.instance(@name)
+        # @logger.debug("creating instance metadata for #{@name}")
+        # @vm = vom.instance(@name, config:@config)
 
-        @logger.debug("...setting instance config and saving")
-
-        @vm.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")
         started = @vm.start
       end
@@ -103,6 +110,10 @@ module PuppetBox
         @vm.reset
       end
 
+      def validate_config
+        @vm.validate_config
+      end
+
       # Test that a VM is operational and able to run puppet
       def self_test()
         status_code, messages = @vm.run("sudo -i puppet --version")

data/lib/puppetbox/puppetbox.rb

@@ -2,11 +2,14 @@ require "puppetbox/result_set"
 require "puppetbox/logger"
 require "puppetbox/nodeset"
 require "puppetbox/driver/vagrant"
+require "puppetbox/report"
 
 module PuppetBox
   class PuppetBox
 
-    def initialize(logger:nil, nodeset_file: nil)
+    WORKING_DIR = File.join(Dir.home, '.puppetbox')
+
+    def initialize(logger:nil, nodeset_file: nil, working_dir: nil)
       # The results of all tests on all driver instances
       @result_set = ResultSet.new
 
@@ -20,6 +23,8 @@ module PuppetBox
       # talk to use about nodes of particular name and puppetbox will sort out
       # the how and why of what this exactly should involve
       @nodeset = NodeSet.new(nodeset_file)
+
+      @working_dir = working_dir || WORKING_DIR
     end
 
 
@@ -70,8 +75,11 @@ module PuppetBox
             config,
             # "#{repo.tempdir}/etc/puppetlabs/code/environments/production",
             logger: @logger,
-
+            working_dir: @working_dir,
           )
+
+          # immediately validate the configuration to allow us to fail-fast
+          di.validate_config
         else
           raise "PuppetBox only supports driver: 'vagrant' at the moment (requested: #{driver})"
         end
@@ -123,29 +131,16 @@ module PuppetBox
 
     # Print all results to STDOUT
     def print_results
-      # print the report summary
-      indent = "  "
-      puts "\n\n\nSummary\n======="
-      summary.each { |node, class_results|
-        puts node
-        if class_results.class == String
-          puts "#{indent}#{class_results}"
-        else
-          class_results.each { |puppet_class, passed|
-            line = "#{indent}#{puppet_class}: #{passed ? "OK": "FAILED"}"
-            if passed
-              puts line.green
-            else
-              puts line.red
-            end
-          }
-        end
-      }
-
-      puts "Overall acceptance testing result #{overall}"
+      Report::print(@result_set)
     end
 
+    def result_set
+      @result_set
+    end
 
+    def passed?
+      @result_set.passed?
+    end
 
     # Run puppet using `driver_instance` to execute
     def run_puppet(driver_instance, puppet_classes, logger:nil, reset_after_run:true)
@@ -153,32 +148,29 @@ module PuppetBox
       logger = logger || @logger
       logger.debug("#{driver_instance.node_name} running test for #{puppet_classes}")
       puppet_classes = Array(puppet_classes)
-      results = ResultSet.new
+
       if driver_instance.open
         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|
-            if results.class_size(driver_instance.node_name) > 0 and reset_after_run
+            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
             driver_instance.run_puppet_x2(puppet_class)
-            results.save(driver_instance.node_name, puppet_class, driver_instance.result)
+            @result_set.save(driver_instance.node_name, puppet_class, driver_instance.result)
           }
           logger.debug("#{driver_instance.node_name} test completed, closing instance")
-          driver_instance.close
         else
-          driver_instance.close
           raise "#{driver_instance.node_name} self test failed, unable to continue"
         end
       else
-        driver_instance.close
         raise "#{driver_instance.node_name} failed to start, unable to continue"
       end
 
-      results
+      driver_instance.close
     end
 
   end

data/lib/puppetbox/report.rb

@@ -1,27 +1,27 @@
+require 'colorize'
 module PuppetBox
   module Report
-    def self.printstuff(stream=$STDOUT)
+    def self.pretty_status(passed)
+      passed ? 'OK'.green: 'FAILED'.red
+    end
+
+    def self.print(result_set, stream=$stdout)
       # print the report summary
       indent = "  "
       stream.puts "\n\n\nSummary\n======="
-      summary.each { |node, class_results|
-        puts node
+      result_set.results.each { |node, class_results|
+        stream.puts node
         if class_results.class == String
           stream.puts "#{indent}#{class_results}"
         else
-          class_results.each { |puppet_class, passed|
-            line = "#{indent}#{puppet_class}: #{passed ? "OK": "FAILED"}"
-            if passed
-              stream.puts line.green
-            else
-              stream.puts line.red
-            end
+          class_results.each { |puppet_class, result|
+            stream.puts "#{indent}#{puppet_class}: #{pretty_status(result.passed?)}"
           }
         end
       }
 
-      stream.puts "OVERALL STATUS #{overall}"
-      overall
+      stream.puts "\n\nOVERALL STATUS: #{pretty_status(result_set.passed?)}"
     end
+
   end
 end

data/lib/puppetbox/result.rb

@@ -46,7 +46,6 @@ module PuppetBox
     def passed?
       passed = nil
       @report.each { |r|
-        puts "...REPORT"
         if passed == nil
           passed = (r[:status] == PS_OK)
         else

data/lib/puppetbox/result_set.rb

@@ -27,6 +27,7 @@ module PuppetBox
     end
 
     def passed?
+      ! @results.empty? and
       @results.map { |node_name, class_results_hash|
         class_results_hash.map { |class_name, class_results|
           class_results.passed?
@@ -34,7 +35,7 @@ module PuppetBox
       }.all?
     end
 
-    def data
+    def results
       @results
     end
 
@@ -59,7 +60,7 @@ module PuppetBox
     def test_size
       @results.map {|node_name, classes|
         classes.size
-      }.reduce(:+)
+      }.reduce(:+) || 0
     end
 
 

data/lib/puppetbox/version.rb

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

data/puppetbox.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_dependency "vagrantomatic", "0.2.1"
+  spec.add_dependency "vagrantomatic", "0.3.2"
+  spec.add_dependency "colorize"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - geoff@geoffwilliams.me.uk