[WIP] Significant Refactor

defaults/main.yml

@@ -1,9 +1,7 @@
 ---
 rust_c_compiler_package: gcc
-rust_addtl_system_packages: []
-rust_code_completion: true
+rust_user_path: "/home/{{ rust_user }}/.cargo/bin:/home/{{ rust_user }}/.local/bin:/usr/local/bin/:/usr/bin:/bin"
 
-rust_user_path: "/home/{{ rust_user }}/.local/bin:/home/{{ rust_user }}/.cargo/bin:/usr/local/bin/:/usr/bin:/bin"
-
-rust_install_racer: false
-rust_install_rls: false
+rustup_components: []
+rustup_default_toolchain: stable
+rustup_toolchains: [stable]

meta/main.yml

@@ -3,6 +3,7 @@ galaxy_info:
   name: rust-dev
   author: Naftuli Kay
   description: Install and configure a Rust development environment on a system.
+  src: naftulikay.rust-dev
 
   license: MIT
 
@@ -12,9 +13,7 @@ galaxy_info:
     - name: EL
       versions: [7]
     - name: Ubuntu
-      versions: [trusty, xenial]
-    - name: elementary OS
-      versions: [loki]
+      versions: [bionic, trusty, xenial]
 
   galaxy_tags: [rust,rust-lang]
 

tasks/discover/rust.yml

@@ -7,11 +7,13 @@
   register: rust_user_home_check
 
 - name: set rust user home
-  set_fact: rust_user_home="{{ rust_user_home_check.stdout_lines | first }}"
+  set_fact:
+    rust_user_home: "{{ rust_user_home_check.stdout_lines | first }}"
 
 - name: check if rustup is installed
-  command: ls "{{ rust_user_home }}/.rustup"
+  command: "{{ rust_user_home }}/.cargo/bin/rustup --version"
   register: rustup_check
+  become: true
   become_user: "{{ rust_user }}"
   changed_when: false
   failed_when: false

tasks/main.yml

@@ -3,26 +3,8 @@
   fail: msg="rust_user is not defined or empty, it must be set."
   when: (rust_user is not defined) or (not rust_user)
 
-# load per-os and per distro variables
-- name: load ubuntu distribution variables
-  include_vars: ubuntu/common.yml
-  when: is_ubuntu_derivative
-
-- name: load ubuntu distribution release variables
-  include_vars: |-
-    {%- if is_ubuntu_trusty_derivative -%}
-      ubuntu/trusty.yml
-    {%- elif is_ubuntu_xenial_derivative -%}
-      ubuntu/xenial.yml
-    {%- endif -%}
-  when: is_ubuntu_derivative and (is_ubuntu_trusty_derivative or is_ubuntu_xenial_derivative)
-
-- name: load redhat distribution variables
-  include_vars: redhat/common.yml
-  when: is_redhat_derivative
-
-- name: load redhat distribution release variables
-  include_vars: redhat/rhel7.yml
+- name: load rhel variables
+  include_vars: redhat.yml
   when: is_redhat_derivative
 
 - name: discover rust facts
@@ -31,6 +13,7 @@
 - name: install utility packages
   include_tasks: utility-packages.yml
 
+# FIXME this is bad, just stdout -> sh -c 
 - name: fetch rustup installer
   get_url:
     url: https://sh.rustup.rs
@@ -92,17 +75,7 @@
 
 
 - name: install c compiler
-  package: name="{{ rust_c_compiler_package }}" state=present
+  package:
+    name: "{{ rust_c_compiler_package }}"
+    state=: present
   become: true
-
-- name: install additional system packages
-  package: name="{{ item }}" state=present
-  with_items: "{{ rust_addtl_system_packages }}"
-  become: true
-
-- name: remove temp installer
-  file: name="{{ rustup_tmp_installer }}" state=absent
-
-- name: install code completion tools
-  include_tasks: code-completion.yml
-  when:  rust_code_completion | default(true) | bool

tasks/utility-packages.yml

@@ -4,25 +4,21 @@
   when: is_ubuntu_derivative
   become: true
 
-- name: install git
-  package: name=git state=present
-  become: true
-
-- name: install curl
-  package: name="{{ curl_package_name }}" state=present
-  become: true
-
-- name: install rsync
-  package: name="{{ rsync_package_name }}" state=present
-  become: true
-
-- name: install ssh client
-  package: name="{{ ssh_package_name }}" state=present
+- name: install build utilities
+  package:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - "{{ curl_package_name }}"
+    - "{{ rsync_package_name }}"
+    - "{{ ssh_package_name }}"
   become: true
 
 # install python required packages on trusty
 - name: install python SSL support packages
-  package: name="{{ item }}" state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
     - ca-certificates
     - python-dev