tldr 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9ae325a1d7b5c16b255bce28975b4e9c08bc23291932a02d91d02d46c247655
-  data.tar.gz: 0e92807c78187999ea26dba8f3ff48aa8ec6442b8884def3b7fc6b58db4127f0
+  metadata.gz: cd834ada0b427dab9478141f188df34e88af9eb650f1869110d16067783ed667
+  data.tar.gz: 0f474dd49db30970150fa8202335baa8ad753cfe8ce5c6e5867bc2d892b9124b
 SHA512:
-  metadata.gz: 79a8a3c45bc03731c80e5d7b00103d69efe4a1185c758fdecde1451864677af433126634a717dd912d7032556562cbe3894b1e7db75ab811412c1cc9097a457e
-  data.tar.gz: f27b99c4502b3a803d9c0507a1a9888715e8d203e1fc97bcd3284baa34afed4d9f55f2c5c06424c49645526c92534a54b52946867606a89b738dcb9c481a4c5d
+  metadata.gz: 95ad516ad60583d95d64c24b4c0706d34eaa468d304eef91f9224c1b3bdf6a81f39524f6323e19e28267cc05f37c603e5cc98eb705edbeb80076837ec3dc37a4
+  data.tar.gz: 6d275b09c8d73533df1d9836f6c19bb0e424519da4474bb17ac1f2b104d2e2a8e49d63fb7c7e359f01ebc216a9c5ffbf8237e72629ff4d376d97fa4c1a0fb1d9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.9.2]
+
+* Don't redundantly print out dotfile config values for re-run instructions
+
+## [0.9.1]
+
+* Correctly clear the screen between runs
+
 ## [0.9.0]
 
 * Add a `--watch` option that will spawn fswatch | xargs and clear the screen

data/README.md

@@ -170,6 +170,9 @@ of the configured load paths (`["test", "lib"]` by default) and then execute
 your tests each time a file is changed. To keep the output up-to-date and easy
 to scan, it will also clear your console before each run.
 
+Note that this feature requires you have
+[fswatch](https://github.com/emcrisostomo/fswatch) installed and on your `PATH`
+
 Here's what that might look like:
 
 ![tldr-watch](https://github.com/tendersearls/tldr/assets/79303/364f0e52-5596-49ce-a470-5eaeddd11f03)

data/lib/tldr/reporters/default.rb

@@ -121,7 +121,7 @@ class TLDR
           "#{index + 1}) #{describe(result.test, result.relevant_location)} #{result.failure? ? "failed" : "errored"}:",
           result.error.message.chomp,
           "\n  Re-run this test:",
-          "    #{tldr_command} #{@config.to_single_path_args(result.test.location.locator)}",
+          "    #{tldr_command} #{@config.to_single_path_args(result.test.location.locator, exclude_dotfile_matches: true)}\n",
           (TLDR.filter_backtrace(result.error.backtrace).join("\n") if @config.verbose)
         ].compact.reject(&:empty?).join("\n").strip
       end
@@ -160,7 +160,7 @@ class TLDR
         ].compact + failed_locators
         <<~MSG
           #{@icons.rock_on} Run the #{plural(unrun.size, "test")} that didn't finish:
-            #{tldr_command} #{@config.to_full_args(exclude: [:paths])} #{suggested_locators.join(" \\\n    ")}
+            #{tldr_command} #{@config.to_full_args(exclude: [:paths], exclude_dotfile_matches: true)} #{suggested_locators.join(" \\\n    ")}
         MSG
       end
 

data/lib/tldr/value/config.rb

@@ -142,14 +142,14 @@ class TLDR
       }.compact
     end
 
-    def to_full_args exclude: [], ensure_args: []
+    def to_full_args exclude: [], ensure_args: [], exclude_dotfile_matches: false
       argv = to_cli_argv(
-        CONFLAGS.keys -
-        exclude - [
+        CONFLAGS.keys - exclude - [
           (:seed unless seed_set_intentionally),
           :watch,
           :i_am_being_watched
-        ]
+        ],
+        exclude_dotfile_matches:
       )
 
       ensure_args.each do |arg|
@@ -159,19 +159,20 @@ class TLDR
       argv.join(" ")
     end
 
-    def to_single_path_args path
+    def to_single_path_args path, exclude_dotfile_matches: false
       argv = to_cli_argv(CONFLAGS.keys - [
         :seed, :parallel, :names, :fail_fast, :paths, :prepend_paths,
         :no_prepend, :exclude_paths, :watch, :i_am_being_watched
-      ])
+      ], exclude_dotfile_matches:)
 
       (argv + [stringify(:paths, path)]).join(" ")
     end
 
     private
 
-    def to_cli_argv options = CONFLAGS.keys
+    def to_cli_argv options = CONFLAGS.keys, exclude_dotfile_matches:
       defaults = Config.build_defaults(cli_defaults: true)
+      defaults = defaults.merge(dotfile_args) if exclude_dotfile_matches
       options.map { |key|
         flag = CONFLAGS[key]
 
@@ -239,23 +240,28 @@ class TLDR
     end
 
     def merge_dotfile_args args
-      return args if args[:no_dotfile] || !File.exist?(".tldr.yml")
-      require "yaml"
-
-      dotfile_args = YAML.load_file(".tldr.yml").transform_keys { |k| k.to_sym }
-      # Since we don't have shell expansion, we have to glob any paths ourselves
-      if dotfile_args.key?(:paths)
-        dotfile_args[:paths] = dotfile_args[:paths].flat_map { |path| Dir[path] }
-      end
-      # The argv parser normally does this:
-      if dotfile_args.key?(:reporter)
-        dotfile_args[:reporter] = Kernel.const_get(dotfile_args[:reporter])
-      end
-      if (invalid_args = dotfile_args.except(*CONFIG_ATTRIBUTES)).any?
-        raise Error, "Invalid keys in .tldr.yml file: #{invalid_args.keys.join(", ")}"
-      end
+      return args if args[:no_dotfile]
 
       dotfile_args.merge(args)
     end
+
+    def dotfile_args
+      return {} unless File.exist?(".tldr.yml")
+
+      require "yaml"
+      @dotfile_args ||= YAML.load_file(".tldr.yml").transform_keys { |k| k.to_sym }.tap do |dotfile_args|
+        # Since we don't have shell expansion, we have to glob any paths ourselves
+        if dotfile_args.key?(:paths)
+          dotfile_args[:paths] = dotfile_args[:paths].flat_map { |path| Dir[path] }
+        end
+        # The argv parser normally does this:
+        if dotfile_args.key?(:reporter)
+          dotfile_args[:reporter] = Kernel.const_get(dotfile_args[:reporter])
+        end
+        if (invalid_args = dotfile_args.except(*CONFIG_ATTRIBUTES)).any?
+          raise Error, "Invalid keys in .tldr.yml file: #{invalid_args.keys.join(", ")}"
+        end
+      end
+    end
   end
 end

data/lib/tldr/version.rb

@@ -1,3 +1,3 @@
 class TLDR
-  VERSION = "0.9.0"
+  VERSION = "0.9.2"
 end

data/lib/tldr/watcher.rb

@@ -2,10 +2,17 @@ class TLDR
   class Watcher
     def watch config
       require_fs_watch!
-      command = "fswatch -o #{config.load_paths.reverse.join(" ")} | xargs -n1 -I{} #{tldr_command} #{config.to_full_args}"
+      tldr_command = "#{"bundle exec " if defined?(Bundler)}tldr #{config.to_full_args(ensure_args: ["--i-am-being-watched"])}"
+      command = "fswatch -o #{config.load_paths.reverse.join(" ")} | xargs -n1 -I{} #{tldr_command}"
 
-      puts <<~MSG
-        Watching #{config.load_paths.map(&:inspect).join(", ")} for changes...
+      print <<~MSG.chomp
+        Waiting for changes in --load-path directories: #{config.load_paths.map(&:inspect).join(", ")}
+
+        When a file changes, TLDR will run this command:
+
+        $ #{tldr_command}
+
+        Watching...
       MSG
 
       exec command
@@ -24,9 +31,5 @@ class TLDR
       MSG
       exit 1
     end
-
-    def tldr_command
-      "#{"bundle exec " if defined?(Bundler)}tldr"
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tldr
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Justin Searls