Merge pull request #8 from PhoenicisOrg/master

Merge master

Author: ImperatorS79

.eslintrc.yml

@@ -1,21 +1,68 @@
+---
+extends:
+  - eslint:recommended
+
+env:
+  nashorn: true
+
 rules:
-  indent: 4
-  
+  valid-jsdoc: 2
+  comma-spacing:
+    - 2
+    - {before: false, after: true}
+  keyword-spacing:
+    - 2
+    - {before: true, after: true}
+  space-before-function-paren:
+    - 2
+    - {anonymous: always, named: never, asyncArrow: always}
+  no-trailing-spaces: 2
+  indent:
+    - 2
+    - 4
+    - {SwitchCase: 1, ArrayExpression: first}
+
 globals:
-  include: true
+  include: false
+  TYPE_ID: false
+  CATEGORY_ID: false
+  APPLICATION_ID: false
+  # java
+  Bean: false
   # files
-  mkdir: true
-  fileExists: true
-  cat: true
-  cp: true
-  getFileSize: true
-  fileName: true
-  lns: true
-  remove: true
-  touch: true
-  writeToFile: true
-  createTempFile: true
+  mkdir: false
+  fileExists: false
+  cat: false
+  cp: false
+  getFileSize: false
+  fileName: false
+  lns: false
+  remove: false
+  touch: false
+  tr: false
+  writeToFile: false
+  createTempFile: false
+  # classes
+  AppResource: false
+  CabExtract: false
+  Checksum: false
+  Downloader: false
+  Extractor: false
+  Resource: false
+  SetupWizard: false
+  Wine: false
+  WineShortcut: false
+  # quick scripts
+  CustomInstallerScript: false
+  InstallerScript: false
+  LocalInstallerScript: false
+  OnlineInstallerScript: false
+  QuickScript: false
+  SteamScript: false
+  UplayScript: false
+  ZipScript: false
   # wine
-  LATEST_DEVELOPMENT_VERSION: true
-  LATEST_STABLE_VERSION: true
-  LATEST_STAGING_VERSION: true
+  LATEST_DEVELOPMENT_VERSION: false
+  LATEST_STABLE_VERSION: false
+  LATEST_STAGING_VERSION: false
+  WINE_PREFIX_DIR: false

.gitignore

@@ -0,0 +1 @@
+/.idea/

.travis.yml

@@ -1,13 +1,36 @@
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y python-jsonschema python-pil gettext
+# avoid double builds on pull requests
+branches:
+  only:
+    master
 
-script:
-  - python ./validate.py
+matrix:
+  include:
+    - stage: Update translations
+      before_install:
+        - sudo apt-get -qq update
+        - sudo apt-get install -y python-jsonschema python-pil gettext
+      script:
+        - python ./validate.py
+      after_success:
+        # push translation updates only for master (PR changes must be committed to master before they are taken into account)
+        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./i18n/push_translations.sh; fi
 
-after_success:
-  # push translation updates only for master (PR changes must be committed to master before they are taken into account)
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./i18n/push_translations.sh; fi
+    # Update JSDoc
+    - stage: Update JSDoc
+      script:
+        # push JSDoc updates only for master (PR changes must be committed to master before they are taken into account)
+        - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./push_jsdoc.sh; fi
+
+    # Check GitHub Pages
+    - stage: Check GitHub Pages
+      os: linux
+      language: ruby
+      rvm:
+        - 2.1
+      before_install: cd docs
+      script:
+        - bundle exec jekyll build
+        - bundle exec htmlproofer ./_site --only-4xx --check-favicon --check-html --assume-extension --file-ignore=/jsdoc/
 
 env:
   global:

Applications/Accessories/7-zip/Online/script.js

@@ -1,12 +1,12 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 new OnlineInstallerScript()
-    .name("7-zip")                       
-    .editor("Igor Pavlov")                               
-    .applicationHomepage("http://www.7-zip.org/")  
-    .author("ImperatorS79")                     
-    .url("http://www.7-zip.org/a/7z1604.exe")                       
-    .checksum("dd1cb1163c5572951c9cd27f5a8dd550b33c58a4")                       
-    .category("Accessories")                           
-    .executable("7zFM.exe")                  
-    .go(); 
+    .name("7-zip")
+    .editor("Igor Pavlov")
+    .applicationHomepage("http://www.7-zip.org/")
+    .author("ImperatorS79")
+    .url("https://www.7-zip.org/a/7z1801.exe")
+    .checksum("d56bca4973b1d1aa5915c41dce318b077ce8b5b2")
+    .category("Accessories")
+    .executable("7zFM.exe")
+    .go();

Applications/Accessories/7-zip/Online/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Accessories/7-zip/application.json

@@ -1,4 +1,5 @@
 {
 	"name":	"7-zip",
+	"id":	"7zip",
 	"description": "7-Zip is a file archiver with a high compression ratio. 7-Zip is open source software. Most of the source code is under the GNU LGPL license. The unRAR code is under a mixed license: GNU LGPL + unRAR restrictions. You can use 7-Zip on any computer, including a computer in a commercial organization. You don't need to register or pay for 7-Zip."
 }

Applications/Accessories/ImgBurn/Online/script.js

@@ -1,12 +1,12 @@
- include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 new OnlineInstallerScript()
-    .name("ImgBurn")                       
-    .editor("Lightning UK!")                               
-    .applicationHomepage("http://www.imgburn.com/")  
-    .author("ImperatorS79")                     
-    .url("http://download.imgburn.com/SetupImgBurn_2.5.8.0.exe")                       
-    .checksum("6fc013ed5944b13efc54648699ea80f304e37ad0")                      
-    .category("Accessories")                           
-    .executable("ImgBurn.exe")                  
-    .go(); 
+    .name("ImgBurn")
+    .editor("Lightning UK!")
+    .applicationHomepage("http://www.imgburn.com/")
+    .author("ImperatorS79")
+    .url("http://download.imgburn.com/SetupImgBurn_2.5.8.0.exe")
+    .checksum("6fc013ed5944b13efc54648699ea80f304e37ad0")
+    .category("Accessories")
+    .executable("ImgBurn.exe")
+    .go();

Applications/Accessories/ImgBurn/Online/script.json

@@ -1,5 +1,6 @@
 {
 	"scriptName": "Online",
+	"id": "online",
 	"compatibleOperatingSystems": ["MACOSX", "LINUX"],
 	"testingOperatingSystems": [],
 	"free": true,

Applications/Accessories/ImgBurn/application.json

@@ -1,4 +1,5 @@
 {
 	"name":	"ImgBurn",
+	"id":	"img_burn",
 	"description": "ImgBurn is a lightweight CD / DVD / HD DVD / Blu-ray burning application."
 } 

Applications/Accessories/Soundplant/Online/script.js

@@ -1,15 +1,15 @@
-include(["Engines", "Wine", "QuickScript", "OnlineInstallerScript"]);
+include(["engines", "wine", "quick_script", "online_installer_script"]);
 
 new OnlineInstallerScript()
-    .name("Soundplant")                       
-    .editor("Marcel Blum")                               
-    .applicationHomepage("http://soundplant.org/")  
-    .author("ImperatorS79")                     
-    .url("http://soundplant.org/downloads/Soundplant45_Win_setup.exe")                       
-    .checksum("df17f942189618219cd504beee1be0712f4e4e4e")                       
-    .category("Accessories")                           
+    .name("Soundplant")
+    .editor("Marcel Blum")
+    .applicationHomepage("http://soundplant.org/")
+    .author("ImperatorS79")
+    .url("http://soundplant.org/downloads/Soundplant45_Win_setup.exe")
+    .checksum("df17f942189618219cd504beee1be0712f4e4e4e")
+    .category("Accessories")
     .executable("Soundplant45.exe")
-    .preInstall(function (wine, wizard) {
+    .preInstall(function (wine/*, wizard*/) {
         wine.windowsVersion("win7");
     })
-    .go(); 
+    .go();