Merge pull request #66 from Heshdude/master

Phase II improvements to Installer Generator and Installers

Author: agentmilindu

.github/workflows/deploy.yml

@@ -15,6 +15,8 @@ jobs:
         uses: technote-space/get-diff-action@v1
       - name: Generate installers
         run: pip install toml && python generate.py ${{ env.GIT_DIFF }}
+      - name: Minify generated installers
+        run: ./minify.sh ${{ env.GIT_DIFF }}
       - name: Archive Production Artifact
         uses: actions/upload-artifact@master
         with:
@@ -46,5 +48,5 @@ jobs:
           PROJECT_ID: installer-to
           APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
         with:
-          args: rsync -r installers gs://installer-to.appspot.com/installers
+          args: rsync -r installers gs://installer-to.appspot.com/
           cli: gsutil

.github/workflows/dockerimage.yml

@@ -19,4 +19,4 @@ jobs:
     - uses: actions/checkout@v2
     - uses: technote-space/get-diff-action@v1
     - name: Get the list of modified files only
-      run: pip install toml && python generate.py ${{ env.GIT_DIFF }} && docker build -t shellspec . && docker run -v $PWD:/app shellspec bash -c "cd /app && ./test.sh ${{ env.GIT_DIFF }}"
+      run: pip install toml pytablewriter && python generate.py ${{ env.GIT_DIFF }} && docker build -t shellspec . && docker run -v $PWD:/app shellspec bash -c "cd /app && ./test.sh ${{ env.GIT_DIFF }}"

README.md

@@ -15,15 +15,20 @@ Try,
 ```
 curl https://installer.to/git | bash
 ```
-
+__
 This will install Git on your machine!
 
 ## Tools list
-
-| Tool    	| Apt-get 	| Yum 	| DNF 	| Apk   | URL |
-|---------	|---------	|-----	|-----	|-----	| --------|
-| Git     	| 👍  	    | 👍  	| 👍	  | 👍	  |  https://installer.to/git  |
-| Docker  	| 👍      	| 👍 	| WIP 	| WIP 	| https://installer.to/docker  |
-| Kubectl 	| 👍       	| WIP 	| WIP 	| WIP  	| https://installer.to/kubectl |
-| NVM     	| WIP       | WIP 	| WIP 	| WIP  	| https://installer.to/nvm |
-| Docker Compose     	| 👍       | 👍 	| WIP 	| WIP  	| https://installer.to/docker-compose |
+<!-- beginning of tools list -->
+|  Tool  |Apt|Yum|Packman|APK|DNF|CURL|            URL             |
+|--------|---|---|-------|---|---|----|----------------------------|
+|Git     |Yes|Yes|Yes    |Yes|Yes|No  |https://installer.to/git    |
+|Hello   |Yes|Yes|Yes    |Yes|Yes|Yes |https://installer.to/hello  |
+|NodeJS  |Yes|Yes|No     |Yes|Yes|No  |https://installer.to/node   |
+|Python 3|Yes|Yes|Yes    |Yes|Yes|No  |https://installer.to/python3|
+|Nginx   |Yes|Yes|Yes    |Yes|Yes|No  |https://installer.to/nginx  |
+|gCloud  |No |No |No     |No |No |Yes |https://installer.to/gcloud |
+|Docker  |Yes|Yes|No     |No |No |No  |https://installer.to/docker |
+|Fabric  |No |No |No     |No |No |Yes |https://installer.to/hlf    |
+
+<!-- end of tools list -->

generate.py

@@ -3,6 +3,8 @@
 import os
 import logging
 import errno
+import pytablewriter
+import re
 
 methods = {
    "curl": "$CURL",
@@ -13,6 +15,63 @@
    "pacman": "$PACMAN",
    "git": "$GIT"
 }
+def update_readme(summary):
+    writer = pytablewriter.MarkdownTableWriter()
+    writer.headers = ["Tool", "Apt", "Yum", "Packman", "APK", "DNF", "CURL", "URL"]
+    value_matrix = []
+    for tool_shortname in summary:
+        tool = summary[tool_shortname]
+        name = tool['name']
+        installers = tool['installers']
+        apt = "Yes" if "apt" in installers else "No"
+        yum = "Yes" if "yum" in installers else "No"
+        pacman = "Yes" if "pacman" in installers else "No"
+        apk = "Yes" if "apk" in installers else "No"
+        dnf = "Yes" if "dnf" in installers else "No"
+        curl = "Yes" if "curl" in installers else "No"
+        url = "https://installer.to/"+tool_shortname
+        value_matrix.append([name, apt, yum, pacman, apk, dnf, curl, url])
+    print(value_matrix)
+    writer.value_matrix = value_matrix
+    table_md = writer.dumps()
+    try:
+        with open("./README.md", "r+") as readme_md:
+            readme = readme_md.read()
+            beggining = "<!-- beginning of tools list -->"
+            end = "<!-- end of tools list -->"
+            regex = r""+beggining+"\n(.*)\n"+end
+            readme = re.sub(regex, beggining+"\n"+table_md+"\n"+end, readme, flags=re.S)
+            readme_md.seek(0)  # sets  point at the beginning of the file
+            readme_md.truncate()  # Clear previous content
+            readme_md.write(readme)
+            readme_md.close()
+    except Error as e:
+        print(e)
+
+
+def update_summary(name, shortname, description, installers):
+    try:
+        with open("./installers.toml", "r+") as installer_summary:
+            summaary = installer_summary.read()
+            print (summaary)
+            parsed_summary_toml = toml.loads(summaary)
+            print (parsed_summary_toml)
+            if shortname not in parsed_summary_toml:
+                parsed_summary_toml[shortname] = {}
+            parsed_summary_toml[shortname]['name'] = name
+            parsed_summary_toml[shortname]['name'] = name
+            parsed_summary_toml[shortname]['description'] = description
+            parsed_summary_toml[shortname]['installers'] = ",".join(installers)
+            print (parsed_summary_toml)
+            installer_summary.seek(0)  # sets  point at the beginning of the file
+            installer_summary.truncate()  # Clear previous content
+            installer_summary.write(toml.dumps(parsed_summary_toml))
+            installer_summary.close()
+
+            update_readme(parsed_summary_toml)
+    except IOError as e:
+        print ("Error", e)
+        pass
 
 def get_method_case(method):
    if method in methods:
@@ -22,11 +81,16 @@ def get_method_case(method):
       exit(1)
 
 def parse_line(line):
-    line = line.replace('@sudo', '$SUDO')
+    line = line\
+        .replace('@sudo', '$SUDO')\
+        .replace('@log', 'info')\
+        .replace('@info', 'info')\
+        .replace('@warn', 'warn')\
+        .replace('@error', 'error')
     return line
 
 def generate(path):
-
+   installer_methods = [ ]
    installer_toml_path = path+"/installer.toml"
    installer_sh_path = path+"/installer.sh"
 
@@ -37,14 +101,14 @@ def generate(path):
 
       installer_sh.write("""#!/bin/sh
       
-CURL_CMD=$(which curl) # curl tool
-YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
-DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
-APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
-PACMAN_CMD=$(which pacman) # pacman package manager for ArchLinux
-APK_CMD=$(which apk) # apk package manager for Alpine
-GIT_CMD=$(which git) # to build from source pulling from git
-SUDO_CMD=$(which sudo) # check if sudo command is there
+CURL_CMD=$(which curl) 
+YUM_CMD=$(which yum) 
+DNF_CMD=$(which dnf) 
+APT_GET_CMD=$(which apt-get) 
+PACMAN_CMD=$(which pacman) 
+APK_CMD=$(which apk) 
+GIT_CMD=$(which git) 
+SUDO_CMD=$(which sudo) 
 
 USER="$(id -un 2>/dev/null || true)"
 SUDO=''
@@ -60,11 +124,33 @@ def generate(path):
 	fi
 fi
 
+RESET='\033[0m'
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+log () {
+ echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"
+}
+info () {
+ log "$GREEN INFO$RESET $1"
+}
+warn () {
+ log "$YELLOW WARN$RESET $1"
+}
+error () {
+ log "$RED ERROR$RESET $1"
+}
+
 """)
 
       seperator = "if"
 
       for section in parsed_toml:
+         if not isinstance(parsed_toml[section], dict):
+            continue
+         if parsed_toml[section]['sh'] is  "":
+            continue
+         installer_methods.append(section)
          lines = parsed_toml[section]['sh']
          installer_sh.write(seperator+" "+get_method_case(section))
          for line in lines.split("\n"):
@@ -80,6 +166,8 @@ def generate(path):
       """.strip())
 
       installer_sh.close()
+      update_summary(parsed_toml['name'], parsed_toml['shortname'], parsed_toml['description'], installer_methods)
+      print("installer_methods",installer_methods)
 
    except IOError as x:
       if x.errno == errno.EACCES:

installers.toml

@@ -0,0 +1,38 @@
+[git]
+name = "Git"
+installers = "apt,yum,pacman,dnf,apk"
+description = "Git SVM"
+
+[hello]
+name = "Hello"
+installers = "apt,yum,pacman,apk,dnf,curl"
+description = "This is just a sample tool"
+
+[node]
+name = "NodeJS"
+installers = "apt,yum,dnf,apk"
+
+[python3]
+name = "Python 3"
+description = "Python 3"
+installers = "apt,yum,pacman,apk,dnf"
+
+[nginx]
+name = "Nginx"
+description = "Nginx server"
+installers = "apt,yum,pacman,apk,dnf"
+
+[gcloud]
+name = "gCloud"
+description = "CLI tool of GCP"
+installers = "curl"
+
+[docker]
+name = "Docker"
+description = "Docker"
+installers = "apt,yum"
+
+[hlf]
+name = "Fabric"
+description = "Hyperledger Fabric"
+installers = "curl"

installers/docker/installer.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
-
-CURL_CMD=$(which curl) # curl tool
-YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
-DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
-APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
-PACMAN_CMD=$(which pacman) # pacman package manager for ArchLinux
-APK_CMD=$(which apk) # apk package manager for Alpine
-GIT_CMD=$(which git) # to build from source pulling from git
-SUDO_CMD=$(which sudo) # check if sudo command is there
+      
+CURL_CMD=$(which curl) 
+YUM_CMD=$(which yum) 
+DNF_CMD=$(which dnf) 
+APT_GET_CMD=$(which apt-get) 
+PACMAN_CMD=$(which pacman) 
+APK_CMD=$(which apk) 
+GIT_CMD=$(which git) 
+SUDO_CMD=$(which sudo) 
 
 USER="$(id -un 2>/dev/null || true)"
 SUDO=''
@@ -23,43 +23,37 @@ if [ "$USER" != 'root' ]; then
 	fi
 fi
 
+RESET=''
+RED=''
+GREEN=''
+YELLOW=''
+log () {
+ echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"
+}
+info () {
+ log "$GREEN INFO$RESET $1"
+}
+warn () {
+ log "$YELLOW WARN$RESET $1"
+}
+error () {
+ log "$RED ERROR$RESET $1"
+}
+
 if [ ! -z $APT_GET_CMD ]; then
    $SUDO apt-get update
-   $SUDO apt-get install \
-    apt-transport-https \
-    ca-certificates \
-    curl \
-    gnupg-agent \
-    software-properties-common
-
-  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-
-  $SUDO add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-
-  $SUDO apt-get update
-
-  $SUDO apt-get install docker-ce docker-ce-cli containerd.io
-
+   $SUDO apt-get install apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common
+   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+   $SUDO add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+   $SUDO apt-get update
+   $SUDO apt-get install docker-ce docker-ce-cli containerd.io
+   
 elif [ ! -z $YUM_CMD ]; then
    $SUDO yum install -y yum-utils
-   $SUDO yum-config-manager \
-   		--add-repo \
-		https://download.docker.com/linux/centos/docker-ce.repo
+   $SUDO yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
    $SUDO yum install docker-ce docker-ce-cli containerd.io
-
-# elif [ ! -z $PACMAN_CMD ]; then
-#    pacman -Sy git
-
-# elif [ ! -z $DNF_CMD ]; then
-#    $SUDO dnf install git
-
-# elif [ ! -z $APK_CMD ]; then
-#    $SUDO apk add git
-
+   
 else
    echo "Couldn't install package"
    exit 1;
-fi 
+fi

installers/docker/installer.toml

@@ -1,3 +1,7 @@
+name = "Docker"
+shortname = "docker"
+description = "Docker"
+
 [apt]
 sh = """
 @sudo apt-get update