Merge pull request #901 from IgorKlopov/patch-1

Full verbosity, helps troubleshooting

script/bootstrap.py

@@ -4,8 +4,9 @@ import argparse
 import os
 import sys
 
-from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL
-from lib.util import execute, scoped_cwd, enable_verbose_execute
+from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, \
+                       enable_verbose_mode, is_verbose_mode
+from lib.util import execute_stdout, scoped_cwd
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@@ -19,7 +20,7 @@ def main():
 
   args = parse_args()
   if args.verbose:
-    enable_verbose_execute()
+    enable_verbose_mode()
   update_submodules()
   update_node_modules('.')
   update_atom_modules('spec')
@@ -49,19 +50,22 @@ def parse_args():
 
 
 def update_submodules():
-  execute(['git', 'submodule', 'sync'])
-  execute(['git', 'submodule', 'update', '--init', '--recursive'])
+  execute_stdout(['git', 'submodule', 'sync'])
+  execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
 
 
 def bootstrap_brightray(url):
   bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap')
-  execute([sys.executable, bootstrap, '--commit', LIBCHROMIUMCONTENT_COMMIT,
-           url])
+  execute_stdout([sys.executable, bootstrap, '--commit',
+                  LIBCHROMIUMCONTENT_COMMIT, url])
 
 
 def update_node_modules(dirname):
   with scoped_cwd(dirname):
-    execute([NPM, 'install'])
+    if is_verbose_mode():
+      execute_stdout([NPM, 'install', '--verbose'])
+    else:
+      execute_stdout([NPM, 'install'])
 
 
 def update_atom_modules(dirname):
@@ -70,20 +74,20 @@ def update_atom_modules(dirname):
     if sys.platform in ['win32', 'cygwin']:
       apm = os.path.join(SOURCE_ROOT, 'node_modules', 'atom-package-manager',
                          'bin', 'apm.cmd')
-    execute([apm, 'install'])
+    execute_stdout([apm, 'install'])
 
 
 def update_win32_python():
   with scoped_cwd(VENDOR_DIR):
     if not os.path.exists('python_26'):
-      execute(['git', 'clone', PYTHON_26_URL])
+      execute_stdout(['git', 'clone', PYTHON_26_URL])
 
 
 def install_runas():
   # TODO This is needed by the tools/win/register_msdia80_dll.js, should move
   # this to a better place.
   with scoped_cwd(os.path.join(SOURCE_ROOT, 'tools', 'win')):
-    execute([NPM, 'install', 'runas'])
+    execute_stdout([NPM, 'install', 'runas'])
 
 
 def create_chrome_version_h():
@@ -112,7 +116,7 @@ def touch_config_gypi():
 
 def update_atom_shell():
   update = os.path.join(SOURCE_ROOT, 'script', 'update.py')
-  execute([sys.executable, update])
+  execute_stdout([sys.executable, update])
 
 
 if __name__ == '__main__':

script/lib/config.py

@@ -23,3 +23,13 @@ TARGET_PLATFORM = {
   'linux2': 'linux',
   'win32': 'win32',
 }[sys.platform]
+
+verbose_mode = False
+
+def enable_verbose_mode():
+  print 'Running in verbose mode'
+  global verbose_mode
+  verbose_mode = True
+
+def is_verbose_mode():
+  return verbose_mode

script/lib/util.py

@@ -12,7 +12,7 @@ import urllib2
 import os
 import zipfile
 
-verbose_mode = False
+from config import is_verbose_mode
 
 def tempdir(prefix=''):
   directory = tempfile.mkdtemp(prefix=prefix)
@@ -20,12 +20,6 @@ def tempdir(prefix=''):
   return directory
 
 
-def enable_verbose_execute():
-  print 'Running in verbose mode'
-  global verbose_mode
-  verbose_mode = True
-
-
 @contextlib.contextmanager
 def scoped_cwd(path):
   cwd = os.getcwd()
@@ -132,9 +126,11 @@ def safe_mkdir(path):
 
 
 def execute(argv):
+  if is_verbose_mode():
+    print ' '.join(argv)
   try:
     output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
-    if verbose_mode:
+    if is_verbose_mode():
       print output
     return output
   except subprocess.CalledProcessError as e:
@@ -142,6 +138,18 @@ def execute(argv):
     raise e
 
 
+def execute_stdout(argv):
+  if is_verbose_mode():
+    print ' '.join(argv)
+    try:
+      subprocess.check_call(argv)
+    except subprocess.CalledProcessError as e:
+      print e.output
+      raise e
+  else:
+    execute(argv)
+
+
 def get_atom_shell_version():
   return subprocess.check_output(['git', 'describe', '--tags']).strip()