kitchen-ansible 0.45.1 → 0.45.2

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

@@ -1,72 +1,72 @@
-# -*- 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'
-
-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)
-          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'
+
+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)
+          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/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

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

@@ -1,69 +1,69 @@
-# -*- 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 Debian < Os
-          def update_packages_command
-            @config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
-          end
-
-          def ansible_debian_version
-            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
-              ''
-            else
-              "=#{@config[:ansible_version]}"
-            end
-          end
-
-          def install_command
-            <<-INSTALL
-
-            if [ ! $(which ansible) ]; then
-              #{update_packages_command}
-
-              ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
-              #{sudo_env('apt-get')} -y install apt-utils git
-
-              ## Fix debconf tty warning messages
-              export DEBIAN_FRONTEND=noninteractive
-
-              ## 13.10, 14.04 include add-apt-repository in software-properties-common
-              #{sudo_env('apt-get')} -y install software-properties-common
-
-              ## 10.04, 12.04 include add-apt-repository in
-              #{sudo_env('apt-get')} -y install python-software-properties
-
-              ## 10.04 version of add-apt-repository doesn't accept --yes
-              ## later versions require interaction from user, so we must specify --yes
-              ## First try with -y flag, else if it fails, try without.
-              ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
-              #{sudo_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
-              #{sudo_env('apt-get')} update
-              #{sudo_env('apt-get')} -y install ansible#{ansible_debian_version}
-            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 Debian < Os
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('apt-get')} update" : nil
+          end
+
+          def ansible_debian_version
+            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
+              ''
+            else
+              "=#{@config[:ansible_version]}"
+            end
+          end
+
+          def install_command
+            <<-INSTALL
+
+            if [ ! $(which ansible) ]; then
+              #{update_packages_command}
+
+              ## Install apt-utils to silence debconf warning: http://serverfault.com/q/358943/77156
+              #{sudo_env('apt-get')} -y install apt-utils git
+
+              ## Fix debconf tty warning messages
+              export DEBIAN_FRONTEND=noninteractive
+
+              ## 13.10, 14.04 include add-apt-repository in software-properties-common
+              #{sudo_env('apt-get')} -y install software-properties-common
+
+              ## 10.04, 12.04 include add-apt-repository in
+              #{sudo_env('apt-get')} -y install python-software-properties
+
+              ## 10.04 version of add-apt-repository doesn't accept --yes
+              ## later versions require interaction from user, so we must specify --yes
+              ## First try with -y flag, else if it fails, try without.
+              ## "add-apt-repository: error: no such option: -y" is returned but is ok to ignore, we just retry
+              #{sudo_env('add-apt-repository')} -y #{@config[:ansible_apt_repo]} || #{sudo_env('add-apt-repository')} #{@config[:ansible_apt_repo]}
+              #{sudo_env('apt-get')} update
+              #{sudo_env('apt-get')} -y install ansible#{ansible_debian_version}
+            fi
+            INSTALL
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,60 +1,60 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Michael Heap (<m@michaelheap.com>)
-#          Mark McKinstry
-#
-# 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 Fedora < Os
-          def install_command
-            <<-INSTALL
-
-            if [ ! $(which ansible) ]; then
-            #{redhat_yum_repo}
-            #{update_packages_command}
-            #{sudo_env('dnf')} -y install #{ansible_package_name} libselinux-python git python2-dnf
-            fi
-            INSTALL
-          end
-
-          def update_packages_command
-            @config[:update_package_repos] ? "#{sudo_env('dnf')} makecache" : nil
-          end
-
-          def ansible_package_name
-            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
-              "ansible"
-            else
-              "ansible#{@config[:ansible_version][0..2]}-#{@config[:ansible_version]}"
-            end
-          end
-
-          def redhat_yum_repo
-            if @config[:ansible_yum_repo]
-              <<-INSTALL
-              #{sudo_env('rpm')} -ivh #{@config[:ansible_yum_repo]}
-              INSTALL
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Michael Heap (<m@michaelheap.com>)
+#          Mark McKinstry
+#
+# 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 Fedora < Os
+          def install_command
+            <<-INSTALL
+
+            if [ ! $(which ansible) ]; then
+            #{redhat_yum_repo}
+            #{update_packages_command}
+            #{sudo_env('dnf')} -y install #{ansible_package_name} libselinux-python git python2-dnf
+            fi
+            INSTALL
+          end
+
+          def update_packages_command
+            @config[:update_package_repos] ? "#{sudo_env('dnf')} makecache" : nil
+          end
+
+          def ansible_package_name
+            if @config[:ansible_version] == 'latest' || @config[:ansible_version] == nil
+              "ansible"
+            else
+              "ansible#{@config[:ansible_version][0..2]}-#{@config[:ansible_version]}"
+            end
+          end
+
+          def redhat_yum_repo
+            if @config[:ansible_yum_repo]
+              <<-INSTALL
+              #{sudo_env('rpm')} -ivh #{@config[:ansible_yum_repo]}
+              INSTALL
+            end
+          end
+        end
+      end
+    end
+  end
+end