Merge pull request #24 from prabhatdev/Alpha

Docker fixed.

Dockerfile

@@ -7,6 +7,12 @@ ADD loc.py /loc.py
 ADD make_bar_graph.py /make_bar_graph.py
 ADD colors.json /colors.json
 RUN pip install -r requirements.txt
-RUN npm install vega-lite vega-cli canvas
+
+ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
+
+RUN npm -g config set user root
+
+RUN npm install -g vega-lite vega-cli canvas
 
 ENTRYPOINT ["python", "/main.py"]
+

loc.py

@@ -30,9 +30,9 @@ class LinesOfCode:
             print(repo)
             self.getCommitStat(repo['node'], yearly_data)
             time.sleep(0.7)
-        print("\n\n")
+        # print("\n\n")
-        print(yearly_data)
+        # print(yearly_data)
-        print("here")
+        # print("here")
         graph = BarGraph(yearly_data)
         graph_file = graph.build_graph()
         self.pushChart()
@@ -89,28 +89,6 @@ class LinesOfCode:
             repo.update_file(contents.path, "Charts Added", data, contents.sha)
         except Exception as e:
             repo.create_file("charts/bar_graph.png", "Initial Commit", data)
-        print("pushed")
+        # print("pushed")
 
-# if __name__ == '__main__':
-#     try:
-#         g = Github(ghtoken)
-#         headers = {"Authorization": "Bearer " + ghtoken}
-#         user_data = run_query(userInfoQuery)  # Execute the query
-#         username = user_data["data"]["viewer"]["login"]
-#         id = user_data["data"]["viewer"]["id"]
-#         print("user {} id {}".format(username, id))
 
-#         getLoc()
-
-#         # repo = g.get_repo(f"{username}/{username}")
-#         # contents = repo.get_readme()
-#         # waka_stats = get_stats()
-#         # rdmd = decode_readme(contents.content)
-#         # new_readme = generate_new_readme(stats=waka_stats, readme=rdmd)
-#         # print(new_readme)
-#         # # if new_readme != rdmd:
-#         #     repo.update_file(path=contents.path, message='Updated with Dev Metrics',
-#         #                      content=new_readme, sha=contents.sha, branch='master')
-#         # print("Readme updated")
-#     except Exception as e:
-#         print("Exception Occurred" + str(e))

main.py

@@ -21,19 +21,19 @@ START_COMMENT = '<!--START_SECTION:waka-->'
 END_COMMENT = '<!--END_SECTION:waka-->'
 listReg = f"{START_COMMENT}[\\s\\S]+{END_COMMENT}"
 
-user = os.getenv('INPUT_USERNAME')
+user = 'y' if os.getenv('INPUT_USERNAME') is None else os.getenv('INPUT_USERNAME')
-waka_key = os.getenv('INPUT_WAKATIME_API_KEY')
+waka_key = 'y' if os.getenv('INPUT_WAKATIME_API_KEY') is None else os.getenv('INPUT_WAKATIME_API_KEY')
-ghtoken = os.getenv('INPUT_GH_TOKEN')
+ghtoken = 'y' if os.getenv('INPUT_GH_TOKEN') is None else os.getenv('INPUT_GH_TOKEN')
-showTimeZone = os.getenv('INPUT_SHOW_TIMEZONE')
+showTimeZone = 'y' if os.getenv('INPUT_SHOW_TIMEZONE') is None else os.getenv('INPUT_SHOW_TIMEZONE')
-showProjects = os.getenv('INPUT_SHOW_PROJECTS')
+showProjects = 'y' if os.getenv('INPUT_SHOW_PROJECTS') is None else os.getenv('INPUT_SHOW_PROJECTS')
-showEditors = os.getenv('INPUT_SHOW_EDITORS')
+showEditors = 'y' if os.getenv('INPUT_SHOW_EDITORS') is None else os.getenv('INPUT_SHOW_EDITORS')
-showOs = os.getenv('INPUT_SHOW_OS')
+showOs = 'y' if os.getenv('INPUT_SHOW_OS') is None else os.getenv('INPUT_SHOW_OS')
-showCommit = os.getenv('INPUT_SHOW_COMMIT')
+showCommit = 'y' if os.getenv('INPUT_SHOW_COMMIT') is None else os.getenv('INPUT_SHOW_COMMIT')
-showLanguage = os.getenv('INPUT_SHOW_LANGUAGE')
+showLanguage = 'y' if os.getenv('INPUT_SHOW_LANGUAGE') is None else os.getenv('INPUT_SHOW_LANGUAGE')
-show_loc = os.getenv('INPUT_SHOW_LINES_OF_CODE')
+show_loc = 'y' if os.getenv('INPUT_SHOW_LINES_OF_CODE') is None else os.getenv('INPUT_SHOW_LINES_OF_CODE')
 
-showLanguagePerRepo = os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO')
+showLanguagePerRepo = 'y' if os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO') is None else os.getenv('INPUT_SHOW_LANGUAGE_PER_REPO')
-showLocChart = os.getenv('INPUT_SHOW_LOC_CHART')
+showLocChart = 'y' if os.getenv('INPUT_SHOW_LOC_CHART') is None else os.getenv('INPUT_SHOW_LOC_CHART')
 show_waka_stats = 'y'
 # The GraphQL query to get commit data.
 userInfoQuery = """
@@ -93,7 +93,7 @@ def run_v3_api(query):
 repositoryListQuery = Template("""
 {
   user(login: "$username") {
-    repositories(orderBy: {field: CREATED_AT, direction: ASC}, last: 5, affiliations: [OWNER, COLLABORATOR, ORGANIZATION_MEMBER], isFork: false) {
+    repositories(orderBy: {field: CREATED_AT, direction: ASC}, last: 100, affiliations: [OWNER, COLLABORATOR, ORGANIZATION_MEMBER], isFork: false) {
       totalCount
       edges {
         node {
@@ -176,7 +176,7 @@ def generate_commit_list(tz):
     result = run_query(userInfoQuery)  # Execute the query
     username = result["data"]["viewer"]["login"]
     id = result["data"]["viewer"]["id"]
-    print("user {}".format(username))
+    # print("user {}".format(username))
 
     result = run_query(createContributedRepoQuery.substitute(username=username))
     nodes = result["data"]["user"]["repositoriesContributedTo"]["nodes"]
@@ -371,6 +371,11 @@ def get_stats():
     stats = ''
     repositoryList = run_query(repositoryListQuery.substitute(username=username, id=id))
 
+
+    if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']:
+        stats = stats + get_waka_time_stats()
+
+
     if showLanguagePerRepo.lower() in ['true', '1', 't', 'y', 'yes']:
         stats = stats + generate_language_per_repo(repositoryList) + '\n\n'
 
@@ -381,8 +386,6 @@ def get_stats():
         stats = stats + '![Chart not found](https://github.com/prabhatdev/prabhatdev/blob/master/charts/bar_graph.png) \n\n'
         # stats = stats + generate_language_per_repo(repositoryList) + '\n\n'
 
-    if show_waka_stats.lower() in ['true', '1', 't', 'y', 'yes']:
-        stats = stats + get_waka_time_stats()
 
     return stats
 
@@ -408,13 +411,13 @@ if __name__ == '__main__':
         user_data = run_query(userInfoQuery)  # Execute the query
         username = user_data["data"]["viewer"]["login"]
         id = user_data["data"]["viewer"]["id"]
-        print("user {} id {}".format(username, id))
+        # print("user {} id {}".format(username, id))
         repo = g.get_repo(f"{username}/{username}")
         contents = repo.get_readme()
         waka_stats = get_stats()
         rdmd = decode_readme(contents.content)
         new_readme = generate_new_readme(stats=waka_stats, readme=rdmd)
-        print(new_readme)
+        # print(new_readme)
         if new_readme != rdmd:
             repo.update_file(path=contents.path, message='Updated with Dev Metrics',
                              content=new_readme, sha=contents.sha, branch='master')

make_bar_graph.py

@@ -3,10 +3,7 @@ import pandas as pd
 import numpy as np
 import altair as alt
 import json
-
+import os
-alt.data_transformers.enable('data_server_proxied')
-
-
 # npm install vega-lite vega-cli canvas
 
 
@@ -38,8 +35,7 @@ class BarGraph:
                             top_languages[language] = 1
                         top_languages[language] += 1
 
-        print("here")
+        # print(self.yearly_data)
-        print(self.yearly_data)
 
         all_languages = list(top_languages.keys())
 
@@ -61,8 +57,7 @@ class BarGraph:
                 language_year.append(language_quarter)
             languages_all_loc[language] = language_year
 
-        print("here 2")
+        # print(languages_all_loc)
-        print(languages_all_loc)
 
         language_df = {}
 
@@ -81,7 +76,6 @@ class BarGraph:
 
         df = pd.concat(list(language_df.values()))
 
-        # print(df)
 
         chart = alt.Chart(df).mark_bar().encode(
 

package-lock.json

@@ -74,16 +74,6 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
-    "canvas": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz",
-      "integrity": "sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==",
-      "requires": {
-        "nan": "^2.14.0",
-        "node-pre-gyp": "^0.11.0",
-        "simple-get": "^3.0.3"
-      }
-    },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
@@ -899,16 +889,6 @@
       "resolved": "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.2.tgz",
       "integrity": "sha512-39h8/fZp4kDwSeDGIEoyEiIgtP3mgY3D08InD1Ldm0FntePpSe1tXzC1zcvoLe/+f7Qprl6Jfwux/ksOXvpj2w=="
     },
-    "vega-cli": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/vega-cli/-/vega-cli-5.13.0.tgz",
-      "integrity": "sha512-5gfN6JmZ4HqNr8gYdu2g+Nkh9MAcsUHJ6Bp1y67vxn9bs8LEWNk1t8vCGlt3BH2CjlyI7jLaF4NRw8bb2IhH8g==",
-      "requires": {
-        "canvas": "^2.6.1",
-        "vega": "5.13.0",
-        "yargs": "15"
-      }
-    },
     "vega-crossfilter": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.2.tgz",
@@ -1019,25 +999,6 @@
         "vega-util": "^1.13.2"
       }
     },
-    "vega-lite": {
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/vega-lite/-/vega-lite-4.14.0.tgz",
-      "integrity": "sha512-zWwmH3iX/U8xj4RsmpLkLFSVimNh3r/crbOk72MyolsB0v0TB3lRbsf1r5eJCdVPPSVEkE5TXwDYE+ygQ2kgbQ==",
-      "requires": {
-        "@types/clone": "~0.1.30",
-        "@types/fast-json-stable-stringify": "^2.0.0",
-        "array-flat-polyfill": "^1.0.1",
-        "clone": "~2.1.2",
-        "fast-deep-equal": "~3.1.3",
-        "fast-json-stable-stringify": "~2.1.0",
-        "json-stringify-pretty-compact": "~2.0.0",
-        "tslib": "~2.0.0",
-        "vega-event-selector": "~2.0.3",
-        "vega-expression": "~2.6.5",
-        "vega-util": "~1.14.1",
-        "yargs": "~15.4.1"
-      }
-    },
     "vega-loader": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.0.tgz",