simple-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe1d22e8204e5a34ef9b543d0357d17dc7c5b5b
-  data.tar.gz: 7211fa7d521310ea21a4646327fe78845e274412
+  metadata.gz: b7533ba5ce80d0d6f173f3bc5cc071ff22590977
+  data.tar.gz: 2e416315dbb0addf9eedaa7e84fc0cebaf17dfbc
 SHA512:
-  metadata.gz: d3917ea01b33fff5dd5826c69334fe9138bd97c9fccabf4877d70b0a9406bdde6d485354ebfdbcf204e2b4e30142ebc16f5d199648127b0445e25594ecde9367
-  data.tar.gz: aa8fa6cd5c1af25df3596c95411fcaa5449e3c3aaf3f15da7f62bf4ca886d7592b1f28533beb116d1e490bbe130e7f5faea93f188f1012975a569c95296242ab
+  metadata.gz: 552c4c85dd75a898b035b53bfc67d2d74b3e1f37569099d7fb6ec88e61827272d23f28a0252bf30bf674d817b64040f1c25e3606baf31860a2ae0c73eb2e6768
+  data.tar.gz: b58f646e7a7aefe93c66731d228e2f14dfe2266112da195041e0f13f580c4d22b9ce280a3b8eb0dc3809306d97151e69ac7fe5065bf3774bdaa5c51bd948cc08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-cli (0.2.1)
+    simple-cli (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/simple/cli/helpers.rb

@@ -50,21 +50,20 @@ module Simple::CLI::Helpers
     end
 
     def sh
-      STDERR.puts "> #{self}"
+      ::Simple::CLI.logger.info "> #{self}"
       stdout_str, @process_status = Open3.capture2(*@args, binmode: true)
       stdout_str
     end
 
     def run
-      STDERR.puts "> #{self}"
-      rv = if @args.length > 1
-             system to_s
-           else
-             system @args.first
-           end
-
+      ::Simple::CLI.logger.info "> #{self}"
+      if @args.length > 1
+        system to_s
+      else
+        system @args.first
+      end
+    ensure
       @process_status = $?
-      rv
     end
 
     def success?

data/lib/simple/cli/logger/colored_logger.rb

@@ -84,14 +84,16 @@ module Simple::CLI::Logger::ColoredLogger
     if log_level < Logger::INFO
       padding = " " * (90 - msg_length) if msg_length < 90
       msg = "#{msg}#{padding}"
-
-      source = caller[2]
-      source.gsub!( Dir.getwd, "." )
-      source.gsub!( File.expand_path("~"), "~" )
-
-      msg = "#{msg}from #{source}"
+      msg = "#{msg}from #{source_from_caller}"
     end
 
     STDERR.puts msg
   end
+
+  # The heuristic used to determine the caller is not perfect, but should
+  # do well in most cases.
+  def source_from_caller
+    source = caller.find { |loc| !loc.include? "/simple-cli/lib/simple/cli" }
+    source || caller[2]
+  end
 end

data/lib/simple/cli/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module CLI
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - radiospiel