Adjust to 0.94.0 (#18)

* Remove variant selection
Yethal · Jun 2, 2024 · 6dfaeee · 6dfaeee
1 parent 5c19c1e
commit 6dfaeee
Show file tree

Hide file tree

Showing 30 changed files with 44 additions and 129 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -19,7 +19,7 @@ nu_plugins:
   - nu_plugin_inc
   - nu_plugin_query
   - nu_plugin_formats
-min_glibc_version: '2.29'
+  - nu_plugin_polars
 config_urls:
   - name: config.nu
     url: "https://raw.githubusercontent.com/nushell/nushell/{{ _nushell_version }}/crates/nu-utils/src/sample_config/default_config.nu"

diff --git a/molecule/banner/molecule.yml b/molecule/banner/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/banner/verify.yml b/molecule/banner/verify.yml
@@ -6,6 +6,7 @@
   vars:
     nu_users:
       - ansible
+    nushell_binary_path: /usr/local/bin
   tasks:
     - name: Include default assertions
       ansible.builtin.include_tasks: "../common/{{ file }}.yml"
@@ -43,7 +44,7 @@
       loop: "{{ nu_users }}"
 
     - name: Run nushell command to check for config errors
-      ansible.builtin.command: "nu -n -c 'nu-check /home/{{ item[0] }}/{{ nushell_config_path }}/{{ item[1] }}'"
+      ansible.builtin.command: "/usr/local/bin/nu -n -c 'nu-check /home/{{ item[0] }}/{{ nushell_config_path }}/{{ item[1] }}'"
       changed_when: false
       register: check_output
       failed_when: check_output.stdout != 'true'

diff --git a/molecule/common/binary.yml b/molecule/common/binary.yml
@@ -1,7 +1,7 @@
 ---
 - name: Get nushell install path
   ansible.builtin.stat:
-    path: "{{ nushell_binary_path }}/nu"
+    path: "/usr/local/bin/nu"
     get_attributes: false
     get_checksum: false
     get_mime: false

diff --git a/molecule/common/plugins.yml b/molecule/common/plugins.yml
@@ -2,7 +2,7 @@
 - name: Get list of registered plugins
   ansible.builtin.shell: # noqa command-instead-of-shell
     cmd: "version|get installed_plugins|split row ','|str trim|to json"
-    executable: "{{ nushell_binary_path }}/nu"
+    executable: "/usr/local/bin/nu"
   become_user: "{{ item }}"
   become: true
   register: installed_plugins

diff --git a/molecule/common/profile.yml b/molecule/common/profile.yml
@@ -2,7 +2,7 @@
 - name: Assert nu was not added to .profile
   ansible.builtin.lineinfile:
     path: "/home/{{ item }}/.profile"
-    line: "{{ nushell_binary_path }}/nu -l"
+    line: "/usr/local/bin/nu -l"
     state: absent
   check_mode: true
   register: profile

diff --git a/molecule/common/shell.yml b/molecule/common/shell.yml
@@ -2,7 +2,7 @@
 - name: Assert nushell is not added to /etc/shells
   ansible.builtin.lineinfile:
     path: /etc/shells
-    line: "{{ nushell_binary_path }}/nu"
+    line: "/usr/local/bin/nu"
     state: absent
   check_mode: yes
   register: shells
@@ -18,7 +18,7 @@
 
 - name: Assert nushell is not set as default shell of the user
   ansible.builtin.assert:
-    that: item.shell != "{{ nushell_binary_path }}/nu"
+    that: item.shell != "/usr/local/bin/nu"
     quiet: true
   loop: "{{ user_stats.results }}"
   loop_control:

diff --git a/molecule/common/variant.yml b/molecule/common/variant.yml
@@ -2,7 +2,7 @@
 - name: Get list of features
   ansible.builtin.shell: # noqa command-instead-of-shell
     cmd: "version|get features"
-    executable: "{{ nushell_binary_path }}/nu"
+    executable: "/usr/local/bin/nu"
   become_user: "{{ item }}"
   become: true
   register: features

diff --git a/molecule/default-shell/molecule.yml b/molecule/default-shell/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/default-shell/verify.yml b/molecule/default-shell/verify.yml
@@ -29,7 +29,7 @@
 
     - name: Assert nushell is set as default shell of users
       ansible.builtin.assert:
-        that: item.shell == "{{ nushell_binary_path }}/nu"
+        that: item.shell == "/usr/local/bin/nu"
         quiet: true
       loop: "{{ user_stats.results }}"
       loop_control:

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/full/converge.yml b/molecule/full/converge.yml
diff --git a/molecule/full/molecule.yml b/molecule/full/molecule.yml
diff --git a/molecule/full/verify.yml b/molecule/full/verify.yml
diff --git a/molecule/macos/molecule.yml b/molecule/macos/molecule.yml
@@ -12,6 +12,6 @@ platforms:
   - name: instance
 provisioner:
   name: ansible
-  log: false
+  log: true
 verifier:
   name: ansible
diff --git a/molecule/macos/verify.yml b/molecule/macos/verify.yml
@@ -27,7 +27,7 @@
 
     - name: Assert nushell is set as default shell of users
       ansible.builtin.assert:
-        that: item.shell == "{{ nushell_binary_path }}/nu"
+        that: item.shell == "/usr/local/bin/nu"
         quiet: true
       loop: "{{ user_stats.results }}"
       loop_control:
@@ -36,7 +36,7 @@
     - name: Assert nu was added to .zprofile
       ansible.builtin.lineinfile:
         path: "/home/{{ item }}/.zprofile"
-        line: "{{ nushell_binary_path }}/nu -l"
+        line: "/usr/local/bin/nu -l"
         state: present
       check_mode: true
       register: profile

diff --git a/molecule/no-configs/molecule.yml b/molecule/no-configs/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/no-plugins/molecule.yml b/molecule/no-plugins/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/no-plugins/verify.yml b/molecule/no-plugins/verify.yml
@@ -22,7 +22,7 @@
     - name: Get list of registered plugins
       ansible.builtin.shell: # noqa command-instead-of-shell
         cmd: "version|to json"
-        executable: "{{ nushell_binary_path }}/nu"
+        executable: "/usr/local/bin/nu"
       become_user: "{{ item }}"
       become: true
       register: installed_plugins

diff --git a/molecule/plugin-subset/molecule.yml b/molecule/plugin-subset/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/plugin-subset/verify.yml b/molecule/plugin-subset/verify.yml
@@ -22,7 +22,7 @@
     - name: Get list of registered plugins
       ansible.builtin.shell: # noqa command-instead-of-shell
         cmd: "version|get installed_plugins|split row ','|str trim|to json"
-        executable: "{{ nushell_binary_path }}/nu"
+        executable: "/usr/local/bin/nu"
       become: true
       become_user: "{{ item }}"
       register: installed_plugins

diff --git a/molecule/profile/molecule.yml b/molecule/profile/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/profile/verify.yml b/molecule/profile/verify.yml
@@ -23,7 +23,7 @@
     - name: Assert nu was added to .profile
       ansible.builtin.lineinfile:
         path: "/home/{{ item }}/.profile"
-        line: "{{ nushell_binary_path }}/nu -l"
+        line: "/usr/local/bin/nu -l"
         state: present
       check_mode: true
       register: profile

diff --git a/molecule/specific-version/molecule.yml b/molecule/specific-version/molecule.yml
@@ -6,7 +6,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest"
     command: ""
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
@@ -18,7 +18,7 @@ platforms:
     cgroupns_mode: host
 provisioner:
   name: ansible
-  log: false
+  log: true
   playbooks:
     prepare: ../common/prepare.yml
 verifier:

diff --git a/molecule/specific-version/verify.yml b/molecule/specific-version/verify.yml
@@ -24,7 +24,7 @@
     - name: Get nushell version
       ansible.builtin.shell: # noqa command-instead-of-shell
         cmd: "version|get version"
-        executable: "{{ nushell_binary_path }}/nu"
+        executable: "/usr/local/bin/nu"
       register: version_to_check
       changed_when: false
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+requests==2.31.0 # https://github.com/ansible-community/molecule-plugins/issues/256
 ansible
 yamllint
 ansible-lint

diff --git a/tasks/configs.yml b/tasks/configs.yml
@@ -133,7 +133,7 @@
   ansible.builtin.lineinfile:
     path: "{{ item.homedir }}/{{ nushell_config_path }}/env.nu"
     regexp: "^.*PROMPT_INDICATOR.*$"
-    line: "{{ '$env.' if '0.83.0' is version(_nushell_version, '<=') else 'let-env ' }}PROMPT_INDICATOR = '({{ inventory_hostname }})〉'"
+    line: "{{ '$env.' if _nushell_version is version('0.83.0', '>=') else 'let-env ' }}PROMPT_INDICATOR = '({{ inventory_hostname }})〉'"
     validate: "{{ nushell_binary_path }}/nu -n -c 'source %s; $env'"
   when: add_hostname_to_prompt|bool
   loop: "{{ home_dirs }}"