vagrant-r10k 0.2.0 → 0.3.0

data/lib/vagrant-r10k/action/deploy.rb

@@ -0,0 +1,91 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module R10k
+    module Action
+      # run r10k deploy
+      class Deploy < Base
+
+        # determine if we should run, and get config
+        def call(env)
+          @logger.debug "vagrant::r10k::deploy called"
+
+          unless r10k_enabled?(env)
+            env[:ui].info "vagrant-r10k not configured; skipping"
+            return @app.call(env)
+          end
+
+          unless provision_enabled?(env)
+            env[:ui].info "provisioning disabled; skipping vagrant-r10k"
+            return @app.call(env)
+          end
+
+          # get our config
+          config = r10k_config(env)
+          if config.nil?
+            @logger.info "vagrant::r10k::deploy got nil configuration"
+            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k configuration error; cannot continue"))
+          end
+          @logger.debug("vagrant::r10k::deploy: env_dir_path=#{config[:env_dir_path]}")
+          @logger.debug("vagrant::r10k::deploy: puppetfile_path=#{config[:puppetfile_path]}")
+          @logger.debug("vagrant::r10k::deploy: module_path=#{config[:module_path]}")
+          @logger.debug("vagrant::r10k::deploy: manifests=#{config[:manifests]}")
+          @logger.debug("vagrant::r10k::deploy: manifest_file=#{config[:manifest_file]}")
+          @logger.debug("vagrant::r10k::deploy: puppet_dir=#{config[:puppet_dir]}")
+
+          deploy(env, config)
+
+          @app.call(env)
+        end
+
+        # run the actual r10k deploy
+        def deploy(env, config)
+          @logger.debug("vagrant::r10k::deploy.deploy called")
+          require 'r10k/task_runner'
+          require 'r10k/task/puppetfile'
+
+          env[:ui].info "vagrant-r10k: Beginning r10k deploy of puppet modules into #{config[:module_path]} using #{config[:puppetfile_path]}"
+
+          if ENV["VAGRANT_LOG"] == "debug"
+            R10K::Logging.level = 0
+          else
+            R10K::Logging.level = 3
+          end
+
+          unless File.file?(config[:puppetfile_path])
+            raise ErrorWrapper.new(RuntimeError.new("Puppetfile at #{config[:puppetfile_path]} does not exist."))
+          end
+
+          # do the actual module buildout
+          runner = R10K::TaskRunner.new([])
+          begin
+            puppetfile = get_puppetfile(config)
+            @logger.debug("vagrant-r10k: creating Puppetfile::Sync task")
+            task   = R10K::Task::Puppetfile::Sync.new(puppetfile)
+            @logger.debug("vagrant-r10k: appending task to runner queue")
+            runner.append_task task
+            @logger.debug("vagrant-r10k: running sync task")
+            runner.run
+            @logger.debug("vagrant-r10k: sync task complete")
+          rescue Exception => ex
+            @env[:ui].error "Invalid syntax in Puppetfile at #{config[:puppetfile_path]}"
+            raise ErrorWrapper.new(ex)
+          end
+          unless runner.succeeded?
+            runner.get_errors().each do |error|
+              if error[1].message.include?("fatal: unable to access") and error[1].message.include?("Could not resolve host")
+                # if we can't resolve the host, the error should include how to skip provisioning
+                @logger.debug("vagrant-r10k: caught 'Could not resolve host' error")
+                raise ErrorWrapper.new(RuntimeError.new(error[1].message + "\n\nIf you don't have connectivity to the host, running 'vagrant up --no-provision' will skip r10k deploy and all provisioning."))
+              else
+                raise ErrorWrapper.new(RuntimeError.new(error[1]))
+              end
+            end
+          end
+          @env[:ui].info "vagrant-r10k: Deploy finished"
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-r10k/action/validate.rb

@@ -0,0 +1,46 @@
+require_relative 'base'
+
+module VagrantPlugins
+  module R10k
+    module Action
+      # action to validate config pre-deploy
+      class Validate < Base
+
+        # validate configuration pre-deploy
+        def call(env)
+          @logger.debug "vagrant::r10k::validate called"
+
+          unless r10k_enabled?(env)
+            env[:ui].info "vagrant-r10k not configured; skipping"
+            return @app.call(env)
+          end
+
+          unless provision_enabled?(env)
+            env[:ui].info "provisioning disabled; skipping vagrant-r10k"
+            return @app.call(env)
+          end
+
+          config = r10k_config(env)
+          if config.nil?
+            @logger.info "vagrant::r10k::deploy got nil configuration"
+            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k configuration error; cannot continue"))
+          end
+
+          puppetfile = get_puppetfile(config)
+
+          # validate puppetfile
+          @logger.debug "vagrant::r10k::validate: validating Puppetfile at #{config[:puppetfile_path]}"
+          begin
+            puppetfile.load
+          rescue Exception => ex
+            @env[:ui].error "Invalid syntax in Puppetfile at #{config[:puppetfile_path]}"
+            raise ErrorWrapper.new(ex)
+          end
+
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

data/lib/vagrant-r10k/config.rb

@@ -1,17 +1,25 @@
+require "log4r"
+
 module VagrantPlugins
   module R10k
+    # vagrant-r10k plugin configuration
     class Config < Vagrant.plugin('2', :config)
       attr_accessor :puppet_dir
       attr_accessor :puppetfile_path
       attr_accessor :module_path
 
+      # initialize config
       def initialize
         @puppet_dir = UNSET_VALUE
         @puppetfile_path = UNSET_VALUE
         @module_path = UNSET_VALUE
+        @logger = Log4r::Logger.new("vagrant::r10k::config")
+        @logger.debug("vagrant-r10k-config: initialize")
       end
 
+      # validate configuration
       def validate(machine)
+        @logger.debug("vagrant-r10k-config: validate")
         errors = _detected_errors
 
         return {} if puppet_dir == UNSET_VALUE and puppetfile_path == UNSET_VALUE
@@ -22,7 +30,7 @@ module VagrantPlugins
         end
 
         puppet_dir_path = File.join(machine.env.root_path, puppet_dir)
-        errors << "puppet_dir directory '#{puppet_dir_path}' does not exist" if !File.directory?(puppet_dir_path)
+        errors << "puppet_dir directory '#{puppet_dir_path}' does not exist" unless File.directory?(puppet_dir_path)
 
         if puppetfile_path == UNSET_VALUE
           errors << "config.r10k.puppetfile_path must be set"
@@ -30,13 +38,14 @@ module VagrantPlugins
         end
 
         puppetfile = File.join(machine.env.root_path, puppetfile_path)
-        errors << "puppetfile '#{puppetfile}' does not exist" if !File.file?(puppetfile)
+        errors << "puppetfile '#{puppetfile}' does not exist" unless File.file?(puppetfile)
 
         if module_path != UNSET_VALUE
           module_path_path = File.join(machine.env.root_path, module_path)
-          errors << "module_path directory '#{module_path_path}' does not exist" if !File.directory?(module_path_path)
+          errors << "module_path directory '#{module_path_path}' does not exist" unless File.directory?(module_path_path)
         end
-        
+
+        @logger.debug("vagrant-r10k-config: END validate")
         { "vagrant-r10k" => errors }
       end
 

data/lib/vagrant-r10k/helpers.rb

@@ -0,0 +1,174 @@
+require 'r10k/logging'
+require 'log4r'
+
+# 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
+  # 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
+  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
+  # patch this so we can get programmatic access to the errors
+  class TaskRunner
+    def get_errors
+      @errors
+    end
+  end
+end
+
+module VagrantPlugins
+  module R10k
+    # General-use vagrant-r10k helper methosd
+    module Helpers
+
+      # Determine if r10k.puppet_dir and r10k.puppetfile_path are in config
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [Boolean]
+      def r10k_enabled?(env)
+        unset = Vagrant::Plugin::V2::Config::UNSET_VALUE
+        if env[:machine].config.r10k.puppet_dir == unset or env[:machine].config.r10k.puppetfile_path == unset
+          return false
+        end
+        return true
+      end
+
+      # Determine if --no-provision was specified
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [Boolean]
+      def provision_enabled?(env)
+        env.fetch(:provision_enabled, true)
+      end
+
+      # Get the root directory for the environment
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [String]
+      def env_dir(env)
+        env[:root_path]
+      end
+
+      # Get the Puppetfile path from config
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [File]
+      def puppetfile_path(env)
+        File.join(env_dir(env), env[:machine].config.r10k.puppetfile_path)
+      end
+
+      # Get the Puppet provisioner from config
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return something
+      def puppet_provisioner(env)
+        provider = 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
+          provider = prov
+        end
+        provider
+      end
+
+      # Get the r10k config
+      #
+      # @param [Vagrant::Environment] env
+      #
+      # @return [Hash]
+      def r10k_config(env)
+        ret = { :manifests => nil, :module_path => nil, :manifest_file => nil }
+        ret[:env_dir_path] = env_dir(env)
+        ret[:puppetfile_path] = puppetfile_path(env)
+        prov = puppet_provisioner(env)
+        return nil if prov.nil?
+        ret[:module_path] = module_path(env, prov, ret[:env_dir_path])
+        return nil if ret[:module_path].nil?
+        ret[:manifest_file] = File.join(ret[:env_dir_path], prov.config.manifest_file)
+        ret[:manifests] = File.join(ret[:env_dir_path], prov.config.manifests_path[1])
+        ret[:puppet_dir] = File.join(ret[:env_dir_path], env[:machine].config.r10k.puppet_dir)
+        ret
+      end
+
+      # Get the module path
+      #
+      # @param [Vagrant::Environment] env
+      # @param [something] prov
+      #
+      # @return [File] or [nil]
+      def module_path(env, prov, env_dir_path)
+        unset = Vagrant::Plugin::V2::Config::UNSET_VALUE
+        # if module_path has been set before, check if it fits to one defined in the provisioner config
+        if env[:machine].config.r10k.module_path != unset
+          module_path = env[:machine].config.r10k.module_path
+          if prov.config.module_path.is_a?(Array) and ! prov.config.module_path.include?(module_path)
+            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not within the ones defined in puppet provisioner; please correct this condition"))
+          elsif ! prov.config.module_path.is_a?(Array) and prov.config.module_path != module_path
+            raise ErrorWrapper.new(RuntimeError.new("vagrant-r10k: module_path \"#{module_path}\" is not the same as in puppet provisioner; please correct this condition"))
+          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
+          # TODO - raise here instead of returning nil later
+          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
+
+        return nil if module_path.nil?
+
+        # now join the module_path with the env_dir to have an absolute path
+        File.join(env_dir_path, module_path)
+      end
+
+      # Get a Puppetfile for the specified path
+      #
+      # @param [Hash] config
+      #
+      # @return [R10K::Puppetfile]
+      def get_puppetfile(config)
+        require 'r10k/puppetfile'
+        R10K::Puppetfile.new(config[:puppet_dir], config[:module_path], config[:puppetfile_path])
+      end
+
+      # wrapper to create VagrantErrors
+      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
+end

data/lib/vagrant-r10k/plugin.rb

@@ -1,3 +1,4 @@
+# :nocov:
 begin
   require "vagrant"
 rescue LoadError
@@ -7,9 +8,12 @@ end
 if Vagrant::VERSION < "1.2.0"
   raise "The Vagrant r10k plugin is only compatible with Vagrant 1.2+"
 end
+# :nocov:
 
-require "vagrant-r10k/version"
-require "vagrant-r10k/modulegetter"
+require_relative "version"
+require_relative "action/base"
+require_relative "action/validate"
+require_relative "action/deploy"
 
 module VagrantPlugins
   module R10k
@@ -17,9 +21,11 @@ module VagrantPlugins
       name "vagrant-r10k"
       description "Retrieve puppet modules based on a Puppetfile"
 
-      action_hook "vagrant-r10k" do |hook|
-        hook.before Vagrant::Action::Builtin::Provision, Modulegetter
-        hook.before Vagrant::Action::Builtin::ConfigValidate, Modulegetter
+      [:machine_action_up, :machine_action_reload, :machine_action_provision].each do |action|
+        action_hook('vagrant-r10k', action) do |hook|
+          hook.after(Vagrant::Action::Builtin::ConfigValidate, Action::Base.validate)
+          hook.before(Vagrant::Action::Builtin::Provision, Action::Base.deploy)
+        end
       end
 
       config "r10k" do

data/lib/vagrant-r10k/version.rb

@@ -1,5 +1,6 @@
 module VagrantPlugins
+  # hold version number constant
   module R10k
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/spec/acceptance/skeletons/correct/Vagrantfile

@@ -0,0 +1,21 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+#require 'vagrant-vmware-workstation'
+puts ENV
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "vagrantr10kspec"
+  config.vm.network "private_network", type: "dhcp"
+
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = "puppet"
+  config.r10k.puppetfile_path = "puppet/Puppetfile"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end

data/spec/acceptance/skeletons/correct/gitcheck.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# helper script to determine if a git clone is checked out to a
+# PR, tag, or branch, and then output some information about the status
+if [ $# -gt 0 ]; then
+    cd $1
+fi
+origin=$(git remote show -n origin | grep 'Fetch URL:' | awk '{print $3}')
+if tmp=$(git status | grep "refs/pull/origin"); then
+    foo=$(echo "$tmp" | awk '{print $4}' | awk -F / '{print $4}')
+    echo "PR: ${foo} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif tagname=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null); then
+    echo "tag: ${tagname} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif git symbolic-ref -q HEAD &>/dev/null; then
+    branch_name=$(git symbolic-ref -q HEAD)
+    branch_name=${branch_name##refs/heads/}
+    branch_name=${branch_name:-HEAD}
+    echo "branch: ${branch_name} @ $(git rev-parse HEAD) (origin: ${origin})"
+else
+    echo "sha: $(git rev-parse HEAD) (origin: ${origin})"
+fi

data/spec/acceptance/skeletons/correct/puppet/Puppetfile

@@ -0,0 +1,12 @@
+# This is currently a noop but will be supported in the future.
+forge 'forge.puppetlabs.com'
+
+# v1.0.1 -> cdb8d7a186846b49326cec1cfb4623bd77529b04
+mod 'reviewboard',
+  :git => 'https://github.com/jantman/puppet-reviewboard.git',
+  :ref => 'v1.0.1'
+
+# 0.1.0 -> 3a504b5f66ebe1853bda4ee065fce18118958d84
+mod 'nodemeister',
+  :git => 'https://github.com/jantman/puppet-nodemeister.git',
+  :ref => '0.1.0'

data/spec/acceptance/skeletons/correct/puppet/manifests/default.pp

@@ -0,0 +1 @@
+notify {'vagrant-r10k puppet run': }

data/spec/acceptance/skeletons/could_not_resolve_host/Vagrantfile

@@ -0,0 +1,21 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+#require 'vagrant-vmware-workstation'
+puts ENV
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "vagrantr10kspec"
+  config.vm.network "private_network", type: "dhcp"
+
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = "puppet"
+  config.r10k.puppetfile_path = "puppet/Puppetfile"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end

data/spec/acceptance/skeletons/could_not_resolve_host/gitcheck.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# helper script to determine if a git clone is checked out to a
+# PR, tag, or branch, and then output some information about the status
+if [ $# -gt 0 ]; then
+    cd $1
+fi
+origin=$(git remote show -n origin | grep 'Fetch URL:' | awk '{print $3}')
+if tmp=$(git status | grep "refs/pull/origin"); then
+    foo=$(echo "$tmp" | awk '{print $4}' | awk -F / '{print $4}')
+    echo "PR: ${foo} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif tagname=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null); then
+    echo "tag: ${tagname} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif git symbolic-ref -q HEAD &>/dev/null; then
+    branch_name=$(git symbolic-ref -q HEAD)
+    branch_name=${branch_name##refs/heads/}
+    branch_name=${branch_name:-HEAD}
+    echo "branch: ${branch_name} @ $(git rev-parse HEAD) (origin: ${origin})"
+else
+    echo "sha: $(git rev-parse HEAD) (origin: ${origin})"
+fi

data/spec/acceptance/skeletons/could_not_resolve_host/puppet/Puppetfile

@@ -0,0 +1,7 @@
+# This is currently a noop but will be supported in the future.
+forge 'forge.puppetlabs.com'
+
+# v1.0.1 -> cdb8d7a186846b49326cec1cfb4623bd77529b04
+mod 'reviewboard',
+  :git => 'https://invalidhost.jasonantman.com/jantman/puppet-reviewboard.git',
+  :ref => 'v1.0.1'

data/spec/acceptance/skeletons/could_not_resolve_host/puppet/manifests/default.pp

@@ -0,0 +1 @@
+notify {'vagrant-r10k puppet run': }

data/spec/acceptance/skeletons/different_mod_path/Vagrantfile

@@ -0,0 +1,19 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "vagrantr10kspec"
+  config.vm.network "private_network", type: "dhcp"
+
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = "puppet"
+  config.r10k.puppetfile_path = "puppet/Puppetfile"
+  config.r10k.module_path = "puppet/NOTmodules"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+    puppet.module_path = "puppet/modules"
+  end
+end

data/spec/acceptance/skeletons/different_mod_path/gitcheck.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# helper script to determine if a git clone is checked out to a
+# PR, tag, or branch, and then output some information about the status
+if [ $# -gt 0 ]; then
+    cd $1
+fi
+origin=$(git remote show -n origin | grep 'Fetch URL:' | awk '{print $3}')
+if tmp=$(git status | grep "refs/pull/origin"); then
+    foo=$(echo "$tmp" | awk '{print $4}' | awk -F / '{print $4}')
+    echo "PR: ${foo} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif tagname=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null); then
+    echo "tag: ${tagname} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif git symbolic-ref -q HEAD &>/dev/null; then
+    branch_name=$(git symbolic-ref -q HEAD)
+    branch_name=${branch_name##refs/heads/}
+    branch_name=${branch_name:-HEAD}
+    echo "branch: ${branch_name} @ $(git rev-parse HEAD) (origin: ${origin})"
+else
+    echo "sha: $(git rev-parse HEAD) (origin: ${origin})"
+fi

data/spec/acceptance/skeletons/different_mod_path/puppet/Puppetfile

@@ -0,0 +1,12 @@
+# This is currently a noop but will be supported in the future.
+forge 'forge.puppetlabs.com'
+
+# v1.0.1 -> cdb8d7a186846b49326cec1cfb4623bd77529b04
+mod 'reviewboard',
+  :git => 'https://github.com/jantman/puppet-reviewboard.git',
+  :ref => 'v1.0.1'
+
+# 0.1.0 -> 3a504b5f66ebe1853bda4ee065fce18118958d84
+mod 'nodemeister',
+  :git => 'https://github.com/jantman/puppet-nodemeister.git',
+  :ref => '0.1.0'

data/spec/acceptance/skeletons/different_mod_path/puppet/manifests/default.pp

@@ -0,0 +1 @@
+notify {'vagrant-r10k puppet run': }

data/spec/acceptance/skeletons/no_mod_path/Vagrantfile

@@ -0,0 +1,17 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.box = "vagrantr10kspec"
+  config.vm.network "private_network", type: "dhcp"
+
+  # r10k plugin to deploy puppet modules
+  config.r10k.puppet_dir = "puppet"
+  config.r10k.puppetfile_path = "puppet/Puppetfile"
+
+  # Provision the machine with the appliction
+  config.vm.provision "puppet" do |puppet|
+    puppet.manifests_path = "puppet/manifests"
+    puppet.manifest_file  = "default.pp"
+  end
+end

data/spec/acceptance/skeletons/no_mod_path/gitcheck.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# helper script to determine if a git clone is checked out to a
+# PR, tag, or branch, and then output some information about the status
+if [ $# -gt 0 ]; then
+    cd $1
+fi
+origin=$(git remote show -n origin | grep 'Fetch URL:' | awk '{print $3}')
+if tmp=$(git status | grep "refs/pull/origin"); then
+    foo=$(echo "$tmp" | awk '{print $4}' | awk -F / '{print $4}')
+    echo "PR: ${foo} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif tagname=$(git describe --exact-match --tags $(git log -n1 --pretty='%h') 2>/dev/null); then
+    echo "tag: ${tagname} @ $(git rev-parse HEAD) (origin: ${origin})"
+elif git symbolic-ref -q HEAD &>/dev/null; then
+    branch_name=$(git symbolic-ref -q HEAD)
+    branch_name=${branch_name##refs/heads/}
+    branch_name=${branch_name:-HEAD}
+    echo "branch: ${branch_name} @ $(git rev-parse HEAD) (origin: ${origin})"
+else
+    echo "sha: $(git rev-parse HEAD) (origin: ${origin})"
+fi

data/spec/acceptance/skeletons/no_mod_path/puppet/Puppetfile

@@ -0,0 +1,12 @@
+# This is currently a noop but will be supported in the future.
+forge 'forge.puppetlabs.com'
+
+# v1.0.1 -> cdb8d7a186846b49326cec1cfb4623bd77529b04
+mod 'reviewboard',
+  :git => 'https://github.com/jantman/puppet-reviewboard.git',
+  :ref => 'v1.0.1'
+
+# 0.1.0 -> 3a504b5f66ebe1853bda4ee065fce18118958d84
+mod 'nodemeister',
+  :git => 'https://github.com/jantman/puppet-nodemeister.git',
+  :ref => '0.1.0'

data/spec/acceptance/skeletons/no_mod_path/puppet/manifests/default.pp

@@ -0,0 +1 @@
+notify {'vagrant-r10k puppet run': }