Merge pull request #73 from igorshubovych/fix-random-options

Fix --random and --random-example options

Author: igorshubovych

lib/cache.js

@@ -61,7 +61,7 @@ function tryLoad(pages, index, done) {
   if (index >= pages.length) {
     done(new Error('Failed to load from cache'));
   }
-  var filepath = path.join(CACHE_FOLDER, pages[index]);
+  var filepath = path.join(CACHE_FOLDER, 'pages', pages[index]);
   fs.readFile(filepath, function(err, contents) {
     if (err) {
       tryLoad(pages, index + 1, done);

lib/platform.js

@@ -22,7 +22,7 @@ function getPreferredPlatform() {
 }
 
 function specific(command, os) {
-  return 'pages/' + os + '/' + command + '.md';
+  return os + '/' + command + '.md';
 }
 
 function resolve(command) {

lib/tldr.js

@@ -9,15 +9,6 @@ var render   = require('./render');
 var exit     = process.exit;
 
 
-function printPages(pages, singleColumn) {
-  var endOfLine = require('os').EOL;
-  var delimiter = ', ';
-  if (singleColumn) {
-    delimiter = endOfLine;
-  }
-  console.log('\n' + pages.map(pageName).join(delimiter));
-}
-
 exports.list = function(singleColumn) {
   cache.list(platform.getPreferredPlatformFolder(), function(err, pages) {
     if (err) {
@@ -48,23 +39,25 @@ exports.get = function(command) {
 };
 
 exports.random = function() {
-  cache.list(function(err, pages) {
+  cache.list(platform.getPreferredPlatformFolder(), function(err, pages) {
     if (err) {
       console.error(messages.emptyCache());
       exit(1);
     }
     var page = _.sample(pages);
+    console.log('PAGE', page);
     printBestPage([page]);
   });
 };
 
 exports.randomExample = function() {
-  cache.list(function(err, pages) {
+  cache.list(platform.getPreferredPlatformFolder(), function(err, pages) {
     if (err) {
       console.error(messages.emptyCache());
       exit(1);
     }
     var page = _.sample(pages);
+    console.log('PAGE', page);
     printBestPage([page], {randomExample: true});
   });
 };
@@ -97,6 +90,15 @@ exports.updateCache = function() {
   });
 };
 
+function printPages(pages, singleColumn) {
+  var endOfLine = require('os').EOL;
+  var delimiter = ', ';
+  if (singleColumn) {
+    delimiter = endOfLine;
+  }
+  console.log('\n' + pages.map(pageName).join(delimiter));
+}
+
 function printBestPage(pages, options) {
   cache.get(pages, function(err, content) {
     if (err) {

test/platform.spec.js

@@ -61,8 +61,8 @@ describe('Platform', function() {
     it('should resolve tar command with specific OS and common folder', function() {
       os.platform.onCall(0).returns('linux');
       platform.resolve('tar').should.eql([
-        'pages/linux/tar.md',
-        'pages/common/tar.md'
+        'linux/tar.md',
+        'common/tar.md'
       ]);
     });
   });