From aac0b2992912f5df22b8fa0bcd77e2e2fec45364 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 9 Feb 2018 01:23:02 +0200
Subject: [PATCH] Dump only "platform, board and framework" by default when
 processing environment

---
 platformio/builder/tools/pioplatform.py |  2 +-
 platformio/builder/tools/pioupload.py   |  8 ++++----
 platformio/commands/run.py              | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py
index cebdc116..38da971e 100644
--- a/platformio/builder/tools/pioplatform.py
+++ b/platformio/builder/tools/pioplatform.py
@@ -99,7 +99,7 @@ def LoadPioPlatform(env, variables):
 
 
 def PrintConfiguration(env):  # pylint: disable=too-many-branches
-    platform_data = ["Platform: %s ::" % env.PioPlatform().title]
+    platform_data = ["Platform: %s >" % env.PioPlatform().title]
     system_data = ["System:"]
     mcu = env.subst("$BOARD_MCU")
     f_cpu = env.subst("$BOARD_F_CPU")
diff --git a/platformio/builder/tools/pioupload.py b/platformio/builder/tools/pioupload.py
index 9b745dac..ff7af319 100644
--- a/platformio/builder/tools/pioupload.py
+++ b/platformio/builder/tools/pioupload.py
@@ -215,12 +215,12 @@ def CheckUploadSize(_, target, source, env):  # pylint: disable=W0613,W0621
 
 def PrintUploadInfo(env):
     configured = env.subst("$UPLOAD_PROTOCOL")
-    available = []
+    available = [configured] if configured else []
     if "BOARD" in env:
-        available = env.BoardConfig().get("upload", {}).get(
-            "protocols", [configured])
+        available.extend(env.BoardConfig().get("upload", {}).get(
+            "protocols", []))
     if available:
-        print "Available: %s" % ", ".join(available)
+        print "Available: %s" % ", ".join(sorted(available))
     if configured:
         print "Configured: upload_protocol = %s" % configured
 
diff --git a/platformio/commands/run.py b/platformio/commands/run.py
index f2b12c4c..fb185e8b 100644
--- a/platformio/commands/run.py
+++ b/platformio/commands/run.py
@@ -124,6 +124,8 @@ def cli(ctx, environment, target, upload_port, project_dir, silent, verbose,
 
 class EnvironmentProcessor(object):
 
+    DEFAULT_DUMP_OPTIONS = ("platform", "framework", "board")
+
     KNOWN_OPTIONS = ("platform", "framework", "board", "board_mcu",
                      "board_f_cpu", "board_f_flash", "board_flash_mode",
                      "build_flags", "src_build_flags", "build_unflags",
@@ -176,19 +178,19 @@ class EnvironmentProcessor(object):
     def process(self):
         terminal_width, _ = click.get_terminal_size()
         start_time = time()
+        env_dump = []
 
         for k, v in self.options.items():
             self.options[k] = self.options[k].strip()
+            if self.verbose or k in self.DEFAULT_DUMP_OPTIONS:
+                env_dump.append(
+                    "%s: %s" % (k, ", ".join(util.parse_conf_multi_values(v))))
 
         if not self.silent:
             click.echo("[%s] Processing %s (%s)" %
                        (datetime.now().strftime("%c"),
                         click.style(self.name, fg="cyan", bold=True),
-                        "; ".join([
-                            "%s: %s" %
-                            (k, ", ".join(util.parse_conf_multi_values(v)))
-                            for k, v in self.options.items()
-                        ])))
+                        "; ".join(env_dump)))
             click.secho("-" * terminal_width, bold=True)
 
         self.options = self._validate_options(self.options)