kitchen-yansible 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb73139c75620c5c92d78df37b224b96f5d2468e74f5bb4a516d166a35d22e95
-  data.tar.gz: 3a4eaf08a8cb70f7f5635081043f703c71e7dd6dbc85a4f52da8555908cd9332
+  metadata.gz: 4416424c143f371bb9a09f4a072dc06f8445ee90dc08ad75e4189c3805ef4abb
+  data.tar.gz: 4f0cbde92dcd94e3a2acb9072d89668c646ce122833d79f57790bd5edeef798f
 SHA512:
-  metadata.gz: 1cb3eeae8473bbe539e760e4e21d256a2313ad6463447e81a7c824e660c1eb6de77ddd1c73d2593da6a34a23e0ddf431876d1d7359a01a09f9d9e67d63a89438
-  data.tar.gz: 132931eef1a7fd804de015855a11acfd8cf6ab85cd8da387e9e97a648686923f715162c28855dbb854edb8a1f5f82f9912277b531f8ee527fdc3f513f5eefa14
+  metadata.gz: fa8709f257d27ec5af58216a8e036fc776dbf9e9a5b2d112b8d2c472644a8ce9e68e81282c0ff586fc13f25d6267669d6c6a536b6ad3e2c6120a50bf6a47690e
+  data.tar.gz: 27f6c33a53aebc7886e02f5a650ff294fe02d6838d6008a2f72c0fa32ee83e7d26208f4516489f0e3c26d9e8abbfccb3bc0abeab7c26eb32b7d55bf937e1d197

data/kitchen-yansible.gemspec

@@ -37,20 +37,21 @@ Gem::Specification.new do |s|
 = Yet Another Ansible Test Kitchen Provisioner
 ---
 == Features
-- Local and remote execution using single provisioner
-  - Local Ansible sandbox configuration using Virtualenv
-  - Local execution using Ansible from PATH
-  - Remote Ansible installation via Pip and Virtualenv
-- Dependency management
-  - Path based
-  - Git repositories
-- Drivers
-  - Docker
-  - Vagrant
-- Platforms
-  - RHEL-based - CentOS, Fedora, Amazon Linux, Oracle Linux
-  - Debian-based - Debian, Ubuntu
-  - Windows via PS Remoting (Local executor only)
+* Local and remote execution using single provisioner
+  * Local Ansible sandbox configuration using Virtualenv
+  * Local execution using Ansible from PATH
+  * Remote Ansible installation via Pip and Virtualenv
+* Dependency management
+  * Path based
+  * Git repositories
+* Drivers
+  * Docker
+  * Vagrant
+* Platforms
+  * RHEL-based - CentOS, Fedora, Amazon Linux, Oracle Linux
+  * Debian-based - Debian, Ubuntu
+  * Windows via PS Remoting (Local executor only)
+  * MacOS Catalina 10.15.3
 
 EOF
 

data/lib/kitchen-yansible/tools/install.rb

@@ -24,6 +24,7 @@ require 'kitchen-yansible/tools/install/fedora'
 require 'kitchen-yansible/tools/install/amazon'
 require 'kitchen-yansible/tools/install/debian'
 require 'kitchen-yansible/tools/install/windows'
+require 'kitchen-yansible/tools/install/darwin'
 
 module Kitchen
   module Yansible
@@ -56,14 +57,14 @@ module Kitchen
             return Amazon.new(config, platform)
           # when 'suse', 'opensuse', 'sles'
           #   return Suse.new(platform, config)
-          # when 'darwin', 'mac', 'macos', 'macosx'
-          #   return Darwin.new(platform, config)
+           when 'darwin', 'mac', 'macos', 'macosx'
+             return Darwin.new(config, platform)
           # when 'alpine'
-          #   return Alpine.new(platform, config)
+          #   return Alpine.new(config, platform)
           # when 'openbsd'
-          #   return Openbsd.new(platform, config)
+          #   return Openbsd.new(config, platform)
           # when 'freebsd'
-          #   return Freebsd.new(platform, config)
+          #   return Freebsd.new(config, platform)
           when /.*windows.*/
             return Windows.new(config, platform)
           else

data/lib/kitchen-yansible/tools/install/amazon.rb

@@ -34,6 +34,11 @@ module Kitchen
                 #{package_manager} -q info ${package} 2>/dev/null|grep installed &>/dev/null || #{install_package} ${package}
               }
 
+              installPackageExtras () {
+                package=$1
+                #{package_manager} -q info ${package} 2>/dev/null|grep installed &>/dev/null || #{sudo('amazon-linux-extras')} install -y ${package}
+              }
+
               preInstall () {
                 RHEL_VERSION=$(test -f /etc/system-release-cpe && awk -F':' '{print $5}' /etc/system-release-cpe || echo '0')
                 RHEL_DISTR=$(test -f /etc/system-release-cpe && awk -F':' '{print $3}' /etc/system-release-cpe || echo '0')
@@ -52,10 +57,12 @@ module Kitchen
                 esac
 
                 if [[ ${RHEL_VERSION} -eq 7 ]]; then
-                  echo \"Installing Ruby via Amazon Extras repository\"
-                  RUBY_PACKAGE=$(#{sudo('amazon-linux-extras')} list|grep 'ruby\\([0-9\\.]\\+\\)\\?\\.'|sort -r|head -n1|awk '{print $2}')
-                  #{sudo('amazon-linux-extras')} install -y ${RUBY_PACKAGE}
-                  #{package_manager} install -y rubygem-rdoc
+                  #{command_exists("ruby")} || {
+                    echo \"Installing Ruby via Amazon Extras repository\"
+                    RUBY_PACKAGE=$(#{sudo('amazon-linux-extras')} list|grep 'ruby\\([0-9\\.]\\+\\)\\?\\.'|sort -r|head -n1|awk '{print $2}')
+                    installPackageExtras ${RUBY_PACKAGE}
+                    installPackage rubygem-rdoc
+                  }
                 fi
               }
             """

data/lib/kitchen-yansible/tools/install/darwin.rb

@@ -0,0 +1,179 @@
+# Author: Eugene Akhmetkhanov <axmetishe+github@gmail.com>
+# Date: 27-02-2020
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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 Yansible
+    module Tools
+      class Install
+        class Darwin < Install
+          def search_alternatives
+            """
+              searchAlternatives() {
+                binaryCmd=$1
+                test -n \"${2}\" && installPrefix=\"${2}\" || installPrefix=#{BINARY_DEFAULT_PREFIX}
+                #{command_exists("${binaryCmd}")} || {
+                  alternateCmd=$(ls -1A ${installPrefix}/${binaryCmd}*|sort -r|head -n1)
+                  test -n \"${alternateCmd}\" && {
+                    echo \"Attempt to install '${alternateCmd}' as an alternative.\"
+                    #{sudo('ln')} -sf \"${alternateCmd}\" #{BINARY_DEFAULT_PREFIX}/${binaryCmd}
+                  }
+                }
+              }
+            """
+          end
+
+          def preinstall_command
+            """
+              #{update_path}
+
+              preInstall () {
+                updatePath
+              }
+            """
+          end
+
+          def install_python
+            """
+              installPython () {
+                PYTHON_CMD='/usr/bin/python3'
+                #{command_exists("${PYTHON_CMD}")} || {
+                  PYTHON_CMD='/usr/bin/python'
+                }
+                grep 'ANSIBLE_PYTHON_INTERPRETER' ~/.profile &> /dev/null || {
+                  echo \"ANSIBLE_PYTHON_INTERPRETER=${PYTHON_CMD}\" >> ~/.profile
+                  echo 'export ANSIBLE_PYTHON_INTERPRETER' >> ~/.profile
+                }
+                #{sudo('grep')} ANSIBLE_PYTHON_INTERPRETER /etc/sudoers.d/ansible &> /dev/null || {
+                  #{sudo('echo')} 'Defaults    env_keep += \"ANSIBLE_PYTHON_INTERPRETER\"' | #{sudo('tee')} -a /etc/sudoers.d/ansible
+                }
+
+                source ~/.profile
+              }
+            """
+          end
+
+          def install_ruby
+            """
+              installRuby () {
+                searchAlternatives ruby
+                echo 'Install Busser'
+                #{sudo('gem')} list | grep busser || {
+                  #{sudo('gem')} install busser
+                }
+                test -d /opt/chef/embedded/bin || {
+                  #{sudo('mkdir')} -p /opt/chef/embedded/bin
+                }
+                echo 'Making links for Chef'
+                for binary in ruby gem busser; do
+                  test -L /opt/chef/embedded/bin/${binary} || {
+                    #{sudo('ln')} -sf $(command -v ${binary}) /opt/chef/embedded/bin/${binary}
+                  }
+                done
+              }
+            """
+          end
+
+          def install_virtualenv
+            """
+              installVirtualenv () {
+                echo 'Checking Virtualenv installation.'
+
+                ${ANSIBLE_PYTHON_INTERPRETER} -c 'help(\"modules\")'|grep ' pip ' &>/dev/null || {
+                  ${ANSIBLE_PYTHON_INTERPRETER} -m ensurepip
+                }
+                ${ANSIBLE_PYTHON_INTERPRETER} -m pip list|grep 'virtualenv' &>/dev/null || {
+                  ${ANSIBLE_PYTHON_INTERPRETER} -m pip install --user virtualenv
+                }
+              }
+            """
+          end
+
+          def update_path
+            """
+              updatePath () {
+                #{sudo('grep')} secure_path /etc/sudoers.d/ansible &> /dev/null || {
+                  #{sudo('echo')} 'Defaults    secure_path = /usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' | #{sudo('tee')} -a /etc/sudoers.d/ansible
+                }
+
+                grep 'PATH=/usr/local/bin:$PATH' ~/.profile &> /dev/null || {
+                  echo 'PATH=/usr/local/bin:$PATH' >> ~/.profile
+                  echo 'export PATH' >> ~/.profile
+                }
+                source ~/.profile
+              }
+            """
+          end
+
+          def install_ansible_pip(sandbox_path)
+            """
+              installAnsiblePip () {
+                echo \"Installing Ansible via Pip\"
+                VENV_MODULE=virtualenv
+                echo ${ANSIBLE_PYTHON_INTERPRETER} | grep 3 &>/dev/null && {
+                  VENV_MODULE=venv
+                }
+                test -f #{sandbox_path}/venv/bin/pip || {
+                  mkdir -p #{sandbox_path}
+                  ${ANSIBLE_PYTHON_INTERPRETER} -m ${VENV_MODULE} #{sandbox_path}/venv
+                  #{sandbox_path}/venv/bin/pip install $PIP_ARGS --upgrade pip setuptools
+                }
+                #{sandbox_path}/venv/bin/pip install $PIP_ARGS #{pip_required_packages.join(' ')}
+
+                #{ansible_alternatives(BINARY_INSTALL_PREFIX, sandbox_path)}
+              }
+            """
+          end
+
+          def ansible_alternatives(install_prefix, sandbox_path)
+            """
+              #{command_exists("#{sandbox_path}/venv/bin/ansible")} && {
+                ansibleCommands=( \\
+                  ansible \\
+                  ansible-config \\
+                  ansible-connection \\
+                  ansible-console \\
+                  ansible-doc \\
+                  ansible-galaxy \\
+                  ansible-inventory \\
+                  ansible-playbook \\
+                  ansible-pull \\
+                  ansible-test \\
+                  ansible-vault \\
+                )
+                for ansibleCommand in \"${ansibleCommands[@]}\"; do
+                  #{sudo('ln -sf')} #{sandbox_path}/venv/bin/${ansibleCommand} #{install_prefix}/${ansibleCommand}
+                done
+              } || {
+                echo '===> Ansible is not installed, exiting now. <==='
+                exit 1
+              }
+
+              echo 'Check alternatives validity'
+              #{command_exists("#{install_prefix}/ansible")} || {
+                echo '===> Ansible alternative is incorrectly installed, exiting now. <==='
+                exit 1
+              }
+            """
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kitchen-yansible/version.rb

@@ -20,6 +20,6 @@
 
 module Kitchen
   module Yansible
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

data/lib/kitchen/provisioner/yansible.rb

@@ -69,7 +69,7 @@ module Kitchen
         if @config[:remote_executor]
           if windows_os?
             message = unindent(<<-MSG)
-  
+
               ===============================================================================
                We can't use Windows platform with remote installation.
                Abandon ship!
@@ -89,7 +89,7 @@ module Kitchen
           else
             if RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
               message = unindent(<<-MSG)
-  
+
                 ===============================================================================
                  We can't use Windows platform as a Host system for sandboxing.
                  Abandon ship!
@@ -118,7 +118,7 @@ module Kitchen
                   )
                 else
                   message = unindent(<<-MSG)
-  
+
                     ===============================================================================
                      Couldn't find virtualenv binary for sandboxing.
                      Please make sure execution host has Python and VirtualEnv packages installed.
@@ -189,10 +189,14 @@ module Kitchen
           info("Execute Ansible remotely.")
 
           command_env_script = []
+          if %w(darwin mac macos macosx).include? detect_platform
+            command_env_script.push('source ~/.profile')
+          end
+
           command_env.each {|k,v| command_env_script.push(shell_env_var(k, v))}
 
           """
-            #{command_env_script.join(' ')}; #{command} #{command_args.join(' ')}
+            #{command_env_script.join('; ')}; #{command} #{command_args.join(' ')}
           """
         else
           info("Execute Ansible locally.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-yansible
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eugene Akhmetkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -42,20 +42,21 @@ description: |+
   = Yet Another Ansible Test Kitchen Provisioner
   ---
   == Features
-  - Local and remote execution using single provisioner
-    - Local Ansible sandbox configuration using Virtualenv
-    - Local execution using Ansible from PATH
-    - Remote Ansible installation via Pip and Virtualenv
-  - Dependency management
-    - Path based
-    - Git repositories
-  - Drivers
-    - Docker
-    - Vagrant
-  - Platforms
-    - RHEL-based - CentOS, Fedora, Amazon Linux, Oracle Linux
-    - Debian-based - Debian, Ubuntu
-    - Windows via PS Remoting (Local executor only)
+  * Local and remote execution using single provisioner
+    * Local Ansible sandbox configuration using Virtualenv
+    * Local execution using Ansible from PATH
+    * Remote Ansible installation via Pip and Virtualenv
+  * Dependency management
+    * Path based
+    * Git repositories
+  * Drivers
+    * Docker
+    * Vagrant
+  * Platforms
+    * RHEL-based - CentOS, Fedora, Amazon Linux, Oracle Linux
+    * Debian-based - Debian, Ubuntu
+    * Windows via PS Remoting (Local executor only)
+    * MacOS Catalina 10.15.3
 
 email:
 - axmetishe+github@gmail.com
@@ -69,6 +70,7 @@ files:
 - lib/kitchen-yansible/tools/files.rb
 - lib/kitchen-yansible/tools/install.rb
 - lib/kitchen-yansible/tools/install/amazon.rb
+- lib/kitchen-yansible/tools/install/darwin.rb
 - lib/kitchen-yansible/tools/install/debian.rb
 - lib/kitchen-yansible/tools/install/fedora.rb
 - lib/kitchen-yansible/tools/install/rhel.rb