kitchen-ansible 0.48.7 → 0.48.8

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

@@ -1,78 +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 Ansible
-      # Ansible module resolver that uses Librarian-Ansible and a Ansiblefile to
-      # calculate # dependencies.
-      #
-      class Librarian
-        include Logging
-
-        def initialize(ansiblefile, path, logger = Kitchen.logger)
-          @ansiblefile   = ansiblefile
-          @path       = path
-          @logger     = logger
-        end
-
-        def self.load!(logger = Kitchen.logger)
-          load_librarian!(logger)
-        end
-
-        def resolve
-          version = ::Librarian::Ansible::VERSION
-          info("Resolving role dependencies with Librarian-Ansible #{version}...")
-          debug("Using Ansiblefile from #{ansiblefile}")
-
-          env = ::Librarian::Ansible::Environment.new(
-            project_path: File.dirname(ansiblefile))
-          env.config_db.local['path'] = path
-          ::Librarian::Action::Resolve.new(env).run
-          ::Librarian::Action::Install.new(env).run
-        end
-
-        attr_reader :ansiblefile, :path, :logger
-
-        def self.load_librarian!(logger)
-          first_load = require 'librarian/ansible'
-          require 'librarian/ansible/environment'
-          require 'librarian/action/resolve'
-          require 'librarian/action/install'
-
-          version = ::Librarian::Ansible::VERSION
-          if first_load
-            logger.debug("Librarian-Ansible #{version} library loaded")
-          else
-            logger.debug("Librarian-Ansible #{version} previously loaded")
-          end
-        rescue LoadError => e
-          logger.fatal("The `librarian-ansible' gem is missing and must be installed" \
-            ' or cannot be properly activated. Run' \
-            ' `gem install librarian-ansible` or add the following to your' \
-            " Gemfile if you are using Bundler: `gem 'librarian-ansible'`.")
-          raise UserError,
-                "Could not load or activate Librarian-Ansible (#{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 Ansible
+      # Ansible module resolver that uses Librarian-Ansible and a Ansiblefile to
+      # calculate # dependencies.
+      #
+      class Librarian
+        include Logging
+
+        def initialize(ansiblefile, path, logger = Kitchen.logger)
+          @ansiblefile   = ansiblefile
+          @path       = path
+          @logger     = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_librarian!(logger)
+        end
+
+        def resolve
+          version = ::Librarian::Ansible::VERSION
+          info("Resolving role dependencies with Librarian-Ansible #{version}...")
+          debug("Using Ansiblefile from #{ansiblefile}")
+
+          env = ::Librarian::Ansible::Environment.new(
+            project_path: File.dirname(ansiblefile))
+          env.config_db.local['path'] = path
+          ::Librarian::Action::Resolve.new(env).run
+          ::Librarian::Action::Install.new(env).run
+        end
+
+        attr_reader :ansiblefile, :path, :logger
+
+        def self.load_librarian!(logger)
+          first_load = require 'librarian/ansible'
+          require 'librarian/ansible/environment'
+          require 'librarian/action/resolve'
+          require 'librarian/action/install'
+
+          version = ::Librarian::Ansible::VERSION
+          if first_load
+            logger.debug("Librarian-Ansible #{version} library loaded")
+          else
+            logger.debug("Librarian-Ansible #{version} previously loaded")
+          end
+        rescue LoadError => e
+          logger.fatal("The `librarian-ansible' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install librarian-ansible` or add the following to your' \
+            " Gemfile if you are using Bundler: `gem 'librarian-ansible'`.")
+          raise UserError,
+                "Could not load or activate Librarian-Ansible (#{e.message})"
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ansible/os.rb

@@ -1,81 +1,84 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Michael Heap (<m@michaelheap.com>)
-#
-# Copyright (C) 2015 Michael Heap
-#
-# 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 'json'
-require 'kitchen/provisioner/ansible/os/debian'
-require 'kitchen/provisioner/ansible/os/redhat'
-require 'kitchen/provisioner/ansible/os/fedora'
-require 'kitchen/provisioner/ansible/os/amazon'
-require 'kitchen/provisioner/ansible/os/suse'
-require 'kitchen/provisioner/ansible/os/darwin'
-require 'kitchen/provisioner/ansible/os/alpine'
-require 'kitchen/provisioner/ansible/os/openbsd'
-
-module Kitchen
-  module Provisioner
-    module Ansible
-      class Os
-        attr_accessor :name
-
-        def initialize(name, config)
-          @config = config
-          @name = name
-        end
-
-        def self.make(platform, config)
-          return nil if platform == ''
-
-          case platform
-          when 'debian', 'ubuntu'
-            return Debian.new(platform, config)
-          when 'redhat', 'centos'
-            return Redhat.new(platform, config)
-          when 'fedora'
-            return Fedora.new(platform, config)
-          when 'amazon'
-            return Amazon.new(platform, config)
-          when 'suse', 'opensuse', 'sles'
-            return Suse.new(platform, config)
-          when 'darwin', 'mac', 'macos', 'macosx'
-            return Darwin.new(platform, config)
-          when 'alpine'
-            return Alpine.new(platform, config)
-          when 'openbsd'
-            return Openbsd.new(platform, config)
-          end
-
-          nil
-        end
-
-        # Helpers
-        def sudo_env(pm)
-          s = @config[:https_proxy] ? "https_proxy=#{@config[:https_proxy]}" : nil
-          p = @config[:http_proxy] ? "http_proxy=#{@config[:http_proxy]}" : nil
-          n = @config[:no_proxy] ? "no_proxy=#{@config[:no_proxy]}" : nil
-          p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
-        end
-
-        # Taken from https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/base.rb
-        def sudo(script)
-          @config[:sudo] ? "#{@config[:sudo_command]} #{script}" : script
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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 'json'
+require 'kitchen/provisioner/ansible/os/debian'
+require 'kitchen/provisioner/ansible/os/redhat'
+require 'kitchen/provisioner/ansible/os/fedora'
+require 'kitchen/provisioner/ansible/os/amazon'
+require 'kitchen/provisioner/ansible/os/suse'
+require 'kitchen/provisioner/ansible/os/darwin'
+require 'kitchen/provisioner/ansible/os/alpine'
+require 'kitchen/provisioner/ansible/os/openbsd'
+require 'kitchen/provisioner/ansible/os/freebsd'
+
+module Kitchen
+  module Provisioner
+    module Ansible
+      class Os
+        attr_accessor :name
+
+        def initialize(name, config)
+          @config = config
+          @name = name
+        end
+
+        def self.make(platform, config)
+          return nil if platform == ''
+
+          case platform
+          when 'debian', 'ubuntu'
+            return Debian.new(platform, config)
+          when 'redhat', 'centos'
+            return Redhat.new(platform, config)
+          when 'fedora'
+            return Fedora.new(platform, config)
+          when 'amazon'
+            return Amazon.new(platform, config)
+          when 'suse', 'opensuse', 'sles'
+            return Suse.new(platform, config)
+          when 'darwin', 'mac', 'macos', 'macosx'
+            return Darwin.new(platform, config)
+          when 'alpine'
+            return Alpine.new(platform, config)
+          when 'openbsd'
+            return Openbsd.new(platform, config)
+          when 'freebsd'
+            return Freebsd.new(platform, config)
+          end
+
+          nil
+        end
+
+        # Helpers
+        def sudo_env(pm)
+          s = @config[:https_proxy] ? "https_proxy=#{@config[:https_proxy]}" : nil
+          p = @config[:http_proxy] ? "http_proxy=#{@config[:http_proxy]}" : nil
+          n = @config[:no_proxy] ? "no_proxy=#{@config[:no_proxy]}" : nil
+          p || s ? "#{sudo('env')} #{p} #{s} #{n} #{pm}" : "#{sudo(pm)}"
+        end
+
+        # Taken from https://github.com/test-kitchen/test-kitchen/blob/master/lib/kitchen/provisioner/base.rb
+        def sudo(script)
+          @config[:sudo] ? "#{@config[:sudo_command]} #{script}" : script
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ansible/os/alpine.rb

@@ -1,42 +1,42 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Martin Etmajer (<martin@etmajer.com>)
-#
-# Copyright (C) 2016 Martin Etmajer
-#
-# 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.
-#
-
-module Kitchen
-  module Provisioner
-    module Ansible
-      class Os
-        class Alpine < Os
-          def update_packages_command
-            @config[:update_package_repos] ? "#{sudo_env('apk')} update" : nil
-          end
-
-          def install_command
-            <<-INSTALL
-
-            if [ ! $(which ansible) ]; then
-              #{update_packages_command}
-              #{sudo_env('apk')} add ansible git
-            fi
-            INSTALL
-          end
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Martin Etmajer (<martin@etmajer.com>)
+#
+# Copyright (C) 2016 Martin Etmajer
+#
+# 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.
+#
+
+module Kitchen
+  module Provisioner
+    module Ansible
+      class Os
+        class Alpine < Os
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('apk')} update" : nil
+          end
+
+          def install_command
+            <<-INSTALL
+
+            if [ ! $(which ansible) ]; then
+              #{update_packages_command}
+              #{sudo_env('apk')} add ansible git
+            fi
+            INSTALL
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/ansible/os/amazon.rb

@@ -1,42 +1,42 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Michael Heap (<m@michaelheap.com>)
-#
-# Copyright (C) 2015 Michael Heap
-#
-# 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.
-#
-
-module Kitchen
-  module Provisioner
-    module Ansible
-      class Os
-        class Amazon < Redhat
-          def install_command
-            <<-INSTALL
-
-            if [ ! $(which ansible) ]; then
-              #{install_epel_repo}
-              #{sudo_env('yum-config-manager')} --enable epel/x86_64
-              #{sudo_env('yum')} -y install #{ansible_package_name} git
-              #{sudo_env('alternatives')} --set python /usr/bin/python2.6
-              #{sudo_env('yum')} clean all
-              #{sudo_env('yum')} install yum-python26 -y
-            fi
-            INSTALL
-          end
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#
+# Copyright (C) 2015 Michael Heap
+#
+# 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.
+#
+
+module Kitchen
+  module Provisioner
+    module Ansible
+      class Os
+        class Amazon < Redhat
+          def install_command
+            <<-INSTALL
+
+            if [ ! $(which ansible) ]; then
+              #{install_epel_repo}
+              #{sudo_env('yum-config-manager')} --enable epel/x86_64
+              #{sudo_env('yum')} -y install #{ansible_package_name} git
+              #{sudo_env('alternatives')} --set python /usr/bin/python2.6
+              #{sudo_env('yum')} clean all
+              #{sudo_env('yum')} install yum-python26 -y
+            fi
+            INSTALL
+          end
+        end
+      end
+    end
+  end
+end