guard 2.16.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6028e51f5d1af8b50a11ed0b2d222b513aa4ee844b6ae881abae85914b91be2f
-  data.tar.gz: '09661a90820c8821a148d7091eaca9e2307826450ec4e5785e397a7bbba04836'
+  metadata.gz: 9bc4f16fcb5313bd7482ee1968c9292198956a24f44d0a20622313ef50ea840f
+  data.tar.gz: 86448d1f2f36026d02dab3da8d0ba6ed1a9fcc0219708ed2f61e1e9a857e60bd
 SHA512:
-  metadata.gz: 53ee842c043a00283654646d3a47cc57962f80e12ec171ecf61666bd65d2d5b23dc29e788ed25f72861db03fc9185905e34fd3b877ac6a3be3637fbf9f1400f1
-  data.tar.gz: 6dcdbe28398673c04ad1a62127d83e913cc019afdbb2927ea0807abf0baf4f68882957f656801e86d951798ad543ec8cda99e2e26f7225041f4840c771e35448
+  metadata.gz: 2ad2f478c89e07aca1e113acffc7efcf556818962186b0b853353eb1e32470e821d43b3d5aab7c3313c5028ce717b05a78c5e394db67a60d0f7251c3e56ca19a
+  data.tar.gz: 7f2565eded7d35d4b143c164600c3e8f606f15cf307890455cdadd5dd980820faa3967f4fb30e620fbce85f92ce7c1dbe4163460eb77074f5a5137c21325ec01

data/README.md

@@ -1,6 +1,10 @@
 # Guard
 
-**IMPORTANT: [Ruby 2.1 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2016/03/30/ruby-2-1-9-released/) Please upgrade to Ruby >=2.3 or >=2.2.9 before installing Guard! To install for older versions, update Bundler at least 1.12: `gem update bundler` and Bundler should correctly resolve to earlier gems for your given Ruby version.**
+**IMPORTANT: Please upgrade to Ruby >= 2.4 before installing Guard! To install for older versions, update Bundler at least 1.12: `gem update bundler` and Bundler should correctly resolve to earlier gems for your given Ruby version.**
+
+- [Ruby 2.1 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2016/03/30/ruby-2-1-9-released/)
+- [Ruby 2.2 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2018/06/20/support-of-ruby-2-2-has-ended/)
+- [Ruby 2.3 is officially outdated and unsupported!](https://www.ruby-lang.org/en/news/2019/03/31/support-of-ruby-2-3-has-ended/)
 
 :exclamation: Guard is currently accepting more maintainers. Please [read this](https://github.com/guard/guard/wiki/Maintainers) if you're interested in joining the team.
 
@@ -32,7 +36,7 @@ Before you file an issue, make sure you have read the _[known issues](#issues)_
 * File system changes handled by our awesome [Listen](https://github.com/guard/listen) gem.
 * Support for visual system notifications.
 * Huge eco-system with [more than 300](https://rubygems.org/search?query=guard-) Guard plugins.
-* Tested against the latest Ruby 2.3.x, 2.4.x, 2.5.x, 2.6.x, JRuby & Rubinius. See [`.travis-ci.yml`](https://github.com/guard/guard/blob/master/.travis.yml) for the exact versions.
+* Tested against the latest Ruby 2.4.x, 2.5.x, 2.6.x, JRuby & Rubinius. See [`.travis-ci.yml`](https://github.com/guard/guard/blob/master/.travis.yml) for the exact versions.
 
 ## Screencast
 
@@ -151,6 +155,23 @@ Before reporting a problem, please read how to [File an issue](https://github.co
 ## Development / Contributing
 
 See the [Contributing Guide](https://github.com/guard/guard/blob/master/CONTRIBUTING.md#development).
+
+## Releasing
+
+### Prerequisites
+
+* You must have commit rights to the GitHub repository.
+* You must have push rights for rubygems.org.
+
+### How to release
+
+1. Determine which would be the correct next version number according to [semver](http://semver.org/).
+1. Update the version in `./lib/guard/version.rb`.
+1. Commit the version in a single commit, the message should be "Bump VERSION to X.Y.Z".
+1. Push and open a pull request.
+1. Once CI is green, merge the pull request.
+1. Pull the changes locally and run `bundle exec rake release:full`; this will tag, push to GitHub, publish to rubygems.org, and publish the [release notes](https://github.com/guard/guard/releases) .
+
 ### Author
 
 [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](https://twitter.com/thibaudgg))

data/lib/guard/commander.rb

@@ -53,8 +53,8 @@ module Guard
     end
 
     def stop
-      listener.stop
-      interactor.background
+      listener&.stop
+      interactor&.background
       UI.debug "Guard stops all plugins"
       Runner.new.run(:stop)
       Notifier.disconnect

data/lib/guard/jobs/pry_wrapper.rb

@@ -40,11 +40,21 @@ module Guard
     class PryWrapper < Base
       # The default Ruby script to configure Guard Pry if the option `:guard_rc`
       # is not defined.
-      GUARD_RC = "~/.guardrc"
+
+      GUARD_RC = if ENV["XDG_CONFIG_HOME"] && File.exist?(ENV["XDG_CONFIG_HOME"] + "/guard/guardrc")
+                   ENV["XDG_CONFIG_HOME"] + "/guard/guardrc"
+                 else
+                   "~/.guardrc"
+                 end
 
       # The default Guard Pry history file if the option `:history_file` is not
       # defined.
-      HISTORY_FILE = "~/.guard_history"
+
+      HISTORY_FILE = if ENV["XDG_DATA_HOME"] && File.exist?(ENV["XDG_DATA_HOME"] + "/guard/history")
+                       ENV["XDG_DATA_HOME"] + "/guard/history"
+                     else
+                       "~/.guard_history"
+                     end
 
       # List of shortcuts for each interactor command
       SHORTCUTS = {
@@ -95,6 +105,14 @@ module Guard
 
       attr_reader :thread
 
+      def _pry_config
+        Pry.config
+      end
+
+      def _pry_commands
+        Pry.commands
+      end
+
       def _switch_to_pry
         th = nil
         @mutex.synchronize do
@@ -125,11 +143,10 @@ module Guard
       end
 
       def _setup(options)
-        Pry.config.should_load_rc = false
-        Pry.config.should_load_local_rc = false
-        history_file_path = options[:history_file] || HISTORY_FILE
-        Pry.config.history.file = File.expand_path(history_file_path)
+        _pry_config.should_load_rc = false
+        _pry_config.should_load_local_rc = false
 
+        _configure_history_file(options[:history_file] || HISTORY_FILE)
         _add_hooks(options)
 
         Commands::All.import
@@ -144,6 +161,17 @@ module Guard
         _configure_prompt
       end
 
+      def _configure_history_file(history_file)
+        history_file_path = File.expand_path(history_file)
+
+        # Pry >= 0.13
+        if _pry_config.respond_to?(:history_file=)
+          _pry_config.history_file = history_file_path
+        else
+          _pry_config.history.file = history_file_path
+        end
+      end
+
       # Add Pry hooks:
       #
       # * Load `~/.guardrc` within each new Pry session.
@@ -159,7 +187,7 @@ module Guard
       # Add a `when_started` hook that loads a global .guardrc if it exists.
       #
       def _add_load_guard_rc_hook(guard_rc)
-        Pry.config.hooks.add_hook :when_started, :load_guard_rc do
+        _pry_config.hooks.add_hook :when_started, :load_guard_rc do
           guard_rc.expand_path.tap { |p| load p if p.exist? }
         end
       end
@@ -167,7 +195,7 @@ module Guard
       # Add a `when_started` hook that loads a project .guardrc if it exists.
       #
       def _add_load_project_guard_rc_hook(guard_rc)
-        Pry.config.hooks.add_hook :when_started, :load_project_guard_rc do
+        _pry_config.hooks.add_hook :when_started, :load_project_guard_rc do
           load guard_rc if guard_rc.exist?
         end
       end
@@ -175,7 +203,7 @@ module Guard
       # Add a `after_eval` hook that restores visibility after a command is
       # eval.
       def _add_restore_visibility_hook
-        Pry.config.hooks.add_hook :after_eval, :restore_visibility do
+        _pry_config.hooks.add_hook :after_eval, :restore_visibility do
           @terminal_settings.echo
         end
       end
@@ -192,7 +220,7 @@ module Guard
       # instead restarts guard.
       #
       def _replace_reset_command
-        Pry.commands.command "reset", "Reset the Guard to a clean state." do
+        _pry_commands.command "reset", "Reset the Guard to a clean state." do
           output.puts "Guard reset."
           exec "guard"
         end
@@ -203,7 +231,7 @@ module Guard
       # beginning of a line).
       #
       def _create_run_all_command
-        Pry.commands.block_command(/^$/, "Hit enter to run all") do
+        _pry_commands.block_command(/^$/, "Hit enter to run all") do
           Pry.run_command "all"
         end
       end
@@ -214,7 +242,7 @@ module Guard
       #
       def _create_command_aliases
         SHORTCUTS.each do |command, shortcut|
-          Pry.commands.alias_command shortcut, command.to_s
+          _pry_commands.alias_command shortcut, command.to_s
         end
       end
 
@@ -225,8 +253,8 @@ module Guard
       #
       def _create_guard_commands
         Guard.state.session.plugins.all.each do |guard_plugin|
-          cmd = "Run all #{ guard_plugin.title }"
-          Pry.commands.create_command guard_plugin.name, cmd do
+          cmd = "Run all #{guard_plugin.title}"
+          _pry_commands.create_command guard_plugin.name, cmd do
             group "Guard"
 
             def process
@@ -245,8 +273,8 @@ module Guard
         Guard.state.session.groups.all.each do |group|
           next if group.name == :default
 
-          cmd = "Run all #{ group.title }"
-          Pry.commands.create_command group.name.to_s, cmd do
+          cmd = "Run all #{group.title}"
+          _pry_commands.create_command group.name.to_s, cmd do
             group "Guard"
 
             def process
@@ -260,7 +288,15 @@ module Guard
       # `pry`.
       #
       def _configure_prompt
-        Pry.config.prompt = [_prompt(">"), _prompt("*")]
+        prompt_procs = [_prompt(">"), _prompt("*")]
+        prompt =
+          if Pry::Prompt.is_a?(Class)
+            Pry::Prompt.new("Guard", "Guard Pry prompt", prompt_procs)
+          else
+            prompt_procs
+          end
+
+        _pry_config.prompt = prompt
       end
 
       # Returns the plugins scope, or the groups scope ready for display in the
@@ -289,12 +325,11 @@ module Guard
       end
 
       def _history(pry)
-        # https://github.com/pry/pry/blob/5bf2585d0a49a4a3666a9eae80ee31153e3ffcf4/CHANGELOG.md#v0120-november-5-2018
-        if Gem::Version.new(Pry::VERSION) < Gem::Version.new("0.12.0")
-          return pry.input_array.size
+        if pry.respond_to?(:input_ring)
+          pry.input_ring.size
+        else
+          pry.input_array.size
         end
-
-        pry.input_ring.size
       end
     end
   end

data/lib/guard/plugin_util.rb

@@ -59,7 +59,7 @@ module Guard
         klass.new(options.delete(:watchers), options)
       else
         begin
-          klass.new(options)
+          klass.new(**options)
         rescue ArgumentError => e
           fail "Failed to call #{klass}.new(options): #{e}"
         end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.16.0"
+  VERSION = "2.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: lumberjack
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications