distinguish between leap progress and capistrano progress

diff --git a/lib/leap_cli/log.rb b/lib/leap_cli/log.rb
index 58f1a1cb5197e9ca6cdc4cbd850174487211f7dd..a9676deef493d0090daccd18df5eda6249d30f02 100644 (file)
--- a/lib/leap_cli/log.rb
+++ b/lib/leap_cli/log.rb
@@ -43,9 +43,9 @@ def log2(message=nil, &block)
 end
 
 def progress(message)
-  log1(" * " + message)
+  log1("  = " + message)
 end
 
 def progress2(message)
-  log2(" * " + message)
+  log2("  = " + message)
 end

diff --git a/lib/leap_cli/util.rb b/lib/leap_cli/util.rb
index ba888912cb02e1648605108f6d1f409687e49d86..f1633877ac773520101049502bf5cb66ab600ed1 100644 (file)
--- a/lib/leap_cli/util.rb
+++ b/lib/leap_cli/util.rb
@@ -60,10 +60,11 @@ module LeapCli
       cmd = cmd + " 2>&1"
       output = `#{cmd}`
       unless $?.success?
-        log1(" * run: #{cmd}")
-        log1(" * FAILED: (exit #{$?}) #{output}")
+        progress("run: #{cmd}")
+        progress(Paint["FAILED", :red] + ": (exit #{$?.exitstatus}) #{output}")
+        bail!
       else
-        log2(" * run: #{cmd}")
+        progress2(Paint["ran",:green] + ": #{cmd}")
       end
       return output
     end
@@ -88,7 +89,7 @@ module LeapCli
       rescue NoMethodError
       rescue NameError
       end
-      assert! value, "* Error: Nothing set for #{conf_path}"
+      assert! value, "  = Error: Nothing set for #{conf_path}"
     end
 
     def assert_files_exist!(*files)