Remove --verbose argument

Since the compiler output is less verbose, this argument is no longer
necessary. Also, warnings were being hidden unless the argument was
provided.

Resolves #51

Author: ethul

README.md

@@ -134,10 +134,6 @@ Files added to the `.psci` file with the `:m` command. Glob syntax is supported.
 
 Files added to the `.psci` file with the `:f` command. Glob syntax is supported.
 
-## Command line arguments
-
-The `--verbose` argument will display the output during the `psc` command. For example `gulp --verbose`.
-
 ## Full example
 
 This example will make and bundle the code, run tests, and produce a `.psci` file and documentation for a project using the common `bower_components`/`src` file layout.

package.json

@@ -18,7 +18,7 @@
     "test:run": "node test.js | tap-spec",
     "test": "npm run-script build && npm run-script test:run",
     "build": "npm run-script build:compile && npm run-script build:docs && npm run-script build:package",
-    "build:compile": "./node_modules/.bin/pulp build",
+    "build:compile": "./node_modules/.bin/pulp build -o build",
     "build:docs": "./node_modules/.bin/pulp docs",
     "build:package": "./node_modules/.bin/webpack --progress --colors --profile --bail",
     "build:json": "./node_modules/.bin/webpack --progress --colors --profile --bail --json > index.json",
@@ -35,7 +35,6 @@
     "glob": "^5.0.5",
     "gulp-util": "^3.0.4",
     "logalot": "^2.1.0",
-    "minimist": "^1.1.1",
     "resolve-bin": "^0.3.0",
     "which": "^1.0.9"
   },
@@ -45,7 +44,6 @@
     "gulp-plumber": "^1.0.0",
     "json-loader": "^0.5.1",
     "pulp": "^4.3.0",
-    "rewire": "^2.3.1",
     "run-sequence": "^1.0.2",
     "tap-spec": "^2.2.2",
     "tape": "^3.5.0",

src/GulpPurescript/ChildProcess.js

@@ -21,8 +21,10 @@ function spawnFn(command, args, errback, callback) {
     });
 
     process.on('close', function(code){
-      if (code !== 0) errback(new Error(Buffer.concat([stdout, stderr]).toString()))();
-      else callback(stdout.toString())();
+      var result = Buffer.concat([stdout, stderr]).toString();
+
+      if (code !== 0) errback(new Error(result))();
+      else callback(result)();
     });
   };
 }

src/GulpPurescript/Minimist.js

@@ -185,7 +185,7 @@ instance isForeignFormat :: IsForeign Format where
                                       "markdown" -> Right Markdown
                                       "etags" -> Right ETags
                                       "ctags" -> Right CTags
-                                      a -> Left $ TypeMismatch "Format" a)
+                                      b -> Left $ TypeMismatch "Format" b)
 
 class CommandLineOption a where
   opt :: String -> NullOrUndefined a -> Array String

src/GulpPurescript/Minimist.purs

@@ -4,8 +4,4 @@
 
 var cwd = process.cwd();
 
-var argv = process.argv.slice(2);
-
 exports.cwd = cwd;
-
-exports.argv = argv;

src/GulpPurescript/Options.purs

@@ -22,7 +22,7 @@ import Data.Foreign (Foreign())
 import Data.Foreign.Class (IsForeign, read, readProp)
 import Data.Foreign.NullOrUndefined (runNullOrUndefined)
 import Data.Maybe (Maybe(Just), maybe, fromMaybe)
-import Data.String (joinWith)
+import Data.String (joinWith, null)
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested (tuple2)
 
@@ -31,7 +31,6 @@ import GulpPurescript.ChildProcess (ChildProcess(), spawn)
 import GulpPurescript.Glob (Glob(), globAll)
 import GulpPurescript.GulpUtil (File(), mkFile, mkPluginError)
 import GulpPurescript.Logalot (Logalot(), info)
-import GulpPurescript.Minimist (minimist)
 import GulpPurescript.OS (OS(), Platform(Win32), platform)
 import GulpPurescript.Options (Psci(..), pscOptions, pscBundleOptions, pscDocsOptions)
 import GulpPurescript.Package (Pkg(), Package(..), package)
@@ -40,11 +39,6 @@ import GulpPurescript.ResolveBin (ResolveBin(), resolveBin)
 import GulpPurescript.Stream (Stream(), ReadableStream(), mkReadableStreamFromAff)
 import GulpPurescript.Which (Which(), which)
 
-newtype Argv = Argv { verbose :: Boolean }
-
-instance isForeignArgv :: IsForeign Argv where
-  read obj = (\a -> Argv { verbose: a }) <$> readProp "verbose" obj
-
 type Effects eff =
   ( cp :: ChildProcess
   , glob :: Glob
@@ -77,12 +71,8 @@ pscBundleCommand = "psc-bundle"
 
 pscDocsCommand = "psc-docs"
 
-isVerbose = maybe false (\(Argv a) -> a.verbose) (minimist argv)
-
 foreign import cwd :: String
 
-foreign import argv :: Array String
-
 throwPluginError :: forall eff. String -> Aff (Effects eff) _
 throwPluginError msg = liftEff (flip mkPluginError msg <$> (maybe "" (\(Package a) -> a.name))
                                                        <$> package) >>= throwError
@@ -115,9 +105,9 @@ psc opts = mkReadableStreamFromAff $ do
   output <- either (throwPluginError <<< show)
                    (execute pscCommand)
                    (pscOptions opts)
-  if isVerbose
-    then liftEff $ info $ pscCommand ++ "\n" ++ output
-    else pure unit
+  if null output
+     then pure unit
+     else liftEff $ info $ pscCommand ++ "\n" ++ output
 
 pscBundle :: forall eff. Foreign -> Eff (Effects eff) (ReadableStream File)
 pscBundle opts = mkReadableStreamFromAff (either (throwPluginError <<< show) run (pscBundleOptions opts))

src/GulpPurescript/Plugin.js

@@ -10,23 +10,11 @@ var gulp = require('gulp');
 
 var through2 = require('through2');
 
-var rewire = require('rewire');
-
 var purescript = require('./');
 
 test('psc - basic', function(t){
   t.plan(1);
 
-  var purescript = rewire('./');
-
-  var mock = {
-    success: function(){
-      t.fail('Should not get a log message');
-    }
-  };
-
-  purescript.__set__('logalot', mock);
-
   var fixture = 'Fixture1.purs';
 
   var stream = purescript.psc({src: fixture});