kitchen-puppet 0.0.16 → 0.0.17

data/kitchen-puppet.gemspec

@@ -1,29 +1,29 @@
-# encoding: utf-8
-
-$:.unshift File.expand_path('../lib', __FILE__)
-require 'kitchen-puppet/version'
-
-Gem::Specification.new do |s|
-  s.name          = "kitchen-puppet"
-  s.version       = Kitchen::Puppet::VERSION
-  s.authors       = ["Neill Turner"]
-  s.email         = ["neillwturner@gmail.com"]
-  s.homepage      = "https://github.com/neillturner/kitchen-puppet"
-  s.summary       = "puppet provisioner for test-kitchen"
-  candidates = Dir.glob("{lib}/**/*") +  ['README.md', 'provisioner_options.md', 'kitchen-puppet.gemspec']
-  s.files = candidates.sort
-  s.platform      = Gem::Platform::RUBY
-  s.require_paths = ['lib']
-  s.rubyforge_project = '[none]'
-  s.description = <<-EOF
-== DESCRIPTION:
-
-Puppet Provisioner for Test Kitchen
-
-== FEATURES:
-
-Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet
-
-EOF
-
-end
+# encoding: utf-8
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'kitchen-puppet/version'
+
+Gem::Specification.new do |s|
+  s.name          = 'kitchen-puppet'
+  s.version       = Kitchen::Puppet::VERSION
+  s.authors       = ['Neill Turner']
+  s.email         = ['neillwturner@gmail.com']
+  s.homepage      = 'https://github.com/neillturner/kitchen-puppet'
+  s.summary       = 'puppet provisioner for test-kitchen'
+  candidates = Dir.glob('{lib}/**/*') +  ['README.md', 'provisioner_options.md', 'kitchen-puppet.gemspec']
+  s.files = candidates.sort
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ['lib']
+  s.rubyforge_project = '[none]'
+  s.description = <<-EOF
+== DESCRIPTION:
+
+Puppet Provisioner for Test Kitchen
+
+== FEATURES:
+
+Supports puppet apply, puppet agent, hiera, hiera-eyaml, custom facts, librarian-puppet
+
+EOF
+
+end

data/lib/kitchen/provisioner/puppet/librarian.rb

@@ -1,83 +1,78 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
-#
-# Copyright (C) 2013, Fletcher Nichol, Neill Turner
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'kitchen/errors'
-require 'kitchen/logging'
-
-module Kitchen
-
-  module Provisioner
-
-    module Puppet
-
-      # Puppet module resolver that uses Librarian-Puppet and a Puppetfile to
-      # calculate # dependencies.
-      #
-       class Librarian
-
-        include Logging
-
-
-        def initialize(puppetfile, path, logger = Kitchen.logger)
-          @puppetfile   = puppetfile
-          @path       = path
-          @logger     = logger
-        end
-
-        def self.load!(logger = Kitchen.logger)
-          load_librarian!(logger)
-        end
-
-        def resolve
-          version = ::Librarian::Puppet::VERSION
-          info("Resolving module dependencies with Librarian-Puppet #{version}...")
-          debug("Using Puppetfile from #{puppetfile}")
-
-          env = ::Librarian::Puppet::Environment.new(
-            :project_path => File.dirname(puppetfile))
-          env.config_db.local["path"] = path
-          ::Librarian::Action::Resolve.new(env).run
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        attr_reader :puppetfile, :path, :logger
-
-        def self.load_librarian!(logger)
-          first_load = require 'librarian/puppet'
-          require 'librarian/puppet/environment'
-          require 'librarian/action/resolve'
-          require 'librarian/action/install'
-
-          version = ::Librarian::Puppet::VERSION
-          if first_load
-            logger.debug("Librarian-Puppet #{version} library loaded")
-          else
-            logger.debug("Librarian-Puppet #{version} previously loaded")
-          end
-        rescue LoadError => e
-          logger.fatal("The `librarian-puppet' gem is missing and must be installed" +
-            " or cannot be properly activated. Run" +
-            " `gem install librarian-puppet` or add the following to your" +
-            " Gemfile if you are using Bundler: `gem 'librarian-puppet'`.")
-          raise UserError,
-            "Could not load or activate Librarian-Puppet (#{e.message})"
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>)
+#
+# Copyright (C) 2013, Fletcher Nichol, Neill Turner
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'kitchen/errors'
+require 'kitchen/logging'
+
+module Kitchen
+  module Provisioner
+    module Puppet
+      # Puppet module resolver that uses Librarian-Puppet and a Puppetfile to
+      # calculate # dependencies.
+      #
+      class Librarian
+        include Logging
+
+        def initialize(puppetfile, path, logger = Kitchen.logger)
+          @puppetfile   = puppetfile
+          @path       = path
+          @logger     = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_librarian!(logger)
+        end
+
+        def resolve
+          version = ::Librarian::Puppet::VERSION
+          info("Resolving module dependencies with Librarian-Puppet #{version}...")
+          debug("Using Puppetfile from #{puppetfile}")
+
+          env = ::Librarian::Puppet::Environment.new(
+            project_path: File.dirname(puppetfile))
+          env.config_db.local['path'] = path
+          ::Librarian::Action::Resolve.new(env).run
+          ::Librarian::Action::Install.new(env).run
+        end
+
+        attr_reader :puppetfile, :path, :logger
+
+        def self.load_librarian!(logger)
+          first_load = require 'librarian/puppet'
+          require 'librarian/puppet/environment'
+          require 'librarian/action/resolve'
+          require 'librarian/action/install'
+
+          version = ::Librarian::Puppet::VERSION
+          if first_load
+            logger.debug("Librarian-Puppet #{version} library loaded")
+          else
+            logger.debug("Librarian-Puppet #{version} previously loaded")
+          end
+        rescue LoadError => e
+          logger.fatal("The `librarian-puppet' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install librarian-puppet` or add the following to your' \
+            " Gemfile if you are using Bundler: `gem 'librarian-puppet'`.")
+          raise UserError,
+                "Could not load or activate Librarian-Puppet (#{e.message})"
+        end
+      end
+    end
+  end
+end