Merge pull request #1 from skygragon/master

sync

Author: make-bin

docs/commands.md

@@ -234,7 +234,9 @@ Display question details. With `-g`/`-l`/`-x`, the code template would be auto g
     * golang
     * java
     * javascript
+    * kotlin
     * mysql
+    * php
     * python
     * python3
     * ruby
@@ -465,7 +467,7 @@ Display version information.
 Short:
 
     $ leetcode version
-    2.6.1
+    2.6.2
 
 Verbose:
 
@@ -475,7 +477,7 @@ Verbose:
     | | ___  ___| |_  ___  ___   __| | ___
     | |/ _ \/ _ \ __|/ __|/ _ \ / _` |/ _ \
     | |  __/  __/ |_  (__| (_) | (_| |  __/
-    |_|\___|\___|\__|\___|\___/ \__,_|\___|  CLI v2.6.1
+    |_|\___|\___|\__|\___|\___/ \__,_|\___|  CLI v2.6.2
 
     [Environment]
     Node                 v8.1.4

docs/releases.md

@@ -2,6 +2,10 @@
 layout: default
 title: Release Notes
 ---
+# 2.6.2
+* `submit`
+	* fixes beta ratio issue
+
 # 2.6.1
 * `submit`
     * fixes 500 error on windows.

lib/commands/stat.js

@@ -104,7 +104,8 @@ function showGraph(problems) {
   for (let problem of problems)
     graph[problem.fid] = ICONS[problem.state] || ICONS.none;
 
-  let line = [sprintf(' %03s', 0)];
+  let rowNumFormat = ' %04s';
+  let line = [sprintf(rowNumFormat, 0)];
   for (let i = 1, n = graph.length; i <= n; ++i) {
     // padding before group
     if (i % 10 === 1) line.push(' ');
@@ -114,7 +115,7 @@ function showGraph(problems) {
     // time to start new row
     if (i % (10 * groups) === 0 || i === n) {
       log.info(line.join(' '));
-      line = [sprintf(' %03s', i)];
+      line = [sprintf(rowNumFormat, i)];
     }
   }
 

lib/commands/submit.js

@@ -76,7 +76,7 @@ cmd.handler = function(argv) {
 
           let ratio = 0.0;
           for (let score of scores) {
-            if (parseFloat(score[0]) > myRuntime)
+            if (parseFloat(score[0]) >= myRuntime)
               ratio += parseFloat(score[1]);
           }
 

lib/config.js

@@ -22,6 +22,7 @@ const DEFAULT_CONFIG = {
       'javascript',
       'kotlin',
       'mysql',
+      'php',
       'python',
       'python3',
       'ruby',

lib/helper.js

@@ -39,6 +39,7 @@ const LANGS = [
   {lang: 'javascript', ext: '.js',         style: 'c'},
   {lang: 'kotlin',     ext: '.kt',         style: 'c'},
   {lang: 'mysql',      ext: '.sql',        style: '--'},
+  {lang: 'php',        ext: '.php',        style: 'c'},
   {lang: 'python',     ext: '.py',         style: '#'},
   {lang: 'python3',    ext: '.py',         style: '#'},
   {lang: 'ruby',       ext: '.rb',         style: '#'},

lib/plugins/leetcode.js

@@ -261,7 +261,13 @@ function formatResult(result) {
     x.expected_answer = result.expected_output;
     x.stdout = result.std_output;
   } else {
-    x.stdout = util.inspect((result.code_output || []).join('\n'));
+    if (typeof(result.code_output) === 'string') {
+        x.stdout = util.inspect(result.code_output);
+    } else if (Array.isArray(result.code_output)) {
+        x.stdout = util.inspect(result.code_output.join('\n'));
+    } else {
+        x.stdout = util.inspect('');
+    }
   }
 
   // make sure we pass eveything!
@@ -336,7 +342,7 @@ plugin.getSubmission = function(submission, cb) {
     let re = body.match(/submissionCode:\s('[^']*')/);
     if (re) submission.code = eval(re[1]);
 
-    re = body.match(/distribution_formatted:\s('[^']+')/);
+    re = body.match(/runtimeDistributionFormatted:\s('[^']+')/);
     if (re) submission.distributionChart = JSON.parse(eval(re[1]));
     return cb(null, submission);
   });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "leetcode-cli",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "A cli tool to enjoy leetcode!",
   "preferGlobal": "true",
   "engines": {

test/test_helper.js

@@ -128,12 +128,13 @@ describe('helper', function() {
       assert.equal(h.langToExt('java'), '.java');
       assert.equal(h.langToExt('javascript'), '.js');
       assert.equal(h.langToExt('mysql'), '.sql');
+      assert.equal(h.langToExt('php'), '.php');
       assert.equal(h.langToExt('python'), '.py');
       assert.equal(h.langToExt('python3'), '.py');
       assert.equal(h.langToExt('ruby'), '.rb');
+      assert.equal(h.langToExt('rust'), '.rs');
       assert.equal(h.langToExt('scala'), '.scala');
       assert.equal(h.langToExt('swift'), '.swift');
-      assert.equal(h.langToExt('rust'), '.rs');
     });
   }); // #langToExt
 
@@ -146,13 +147,14 @@ describe('helper', function() {
       assert.equal(h.extToLang('../file.go'), 'golang');
       assert.equal(h.extToLang('file.java'), 'java');
       assert.equal(h.extToLang('c:/file.js'), 'javascript');
+      assert.equal(h.extToLang('~/leetcode/../file.sql'), 'mysql');
+      assert.equal(h.extToLang('~/leetcode/hello.php'), 'php');
       assert.equal(h.extToLang('c:/Users/skygragon/file.py'), 'python');
       assert.equal(h.extToLang('~/file.rb'), 'ruby');
+      assert.equal(h.extToLang('~/leetcode/file.rs'), 'rust');
       assert.equal(h.extToLang('/tmp/file.scala'), 'scala');
       assert.equal(h.extToLang('~/leetcode/file.swift'), 'swift');
-      assert.equal(h.extToLang('~/leetcode/../file.sql'), 'mysql');
       assert.equal(h.extToLang('/home/skygragon/file.dat'), 'unknown');
-      assert.equal(h.extToLang('~/leetcode/file.rs'), 'rust');
     });
   }); // #extToLang
 
@@ -170,9 +172,11 @@ describe('helper', function() {
       assert.deepEqual(h.langToCommentStyle('java'), C_STYLE);
       assert.deepEqual(h.langToCommentStyle('javascript'), C_STYLE);
       assert.deepEqual(h.langToCommentStyle('mysql'), SQL_STYLE);
+      assert.deepEqual(h.langToCommentStyle('php'), C_STYLE);
       assert.deepEqual(h.langToCommentStyle('python'), RUBY_STYLE);
       assert.deepEqual(h.langToCommentStyle('python3'), RUBY_STYLE);
       assert.deepEqual(h.langToCommentStyle('ruby'), RUBY_STYLE);
+      assert.deepEqual(h.langToCommentStyle('rust'), C_STYLE);
       assert.deepEqual(h.langToCommentStyle('scala'), C_STYLE);
       assert.deepEqual(h.langToCommentStyle('swift'), C_STYLE);
     });