guard 2.7.0 → 2.7.1

data/lib/guard/jobs/pry_wrapper.rb.orig

@@ -1,293 +0,0 @@
-require "guard/commands/all"
-require "guard/commands/change"
-require "guard/commands/notification"
-require "guard/commands/pause"
-require "guard/commands/reload"
-require "guard/commands/scope"
-require "guard/commands/show"
-
-require "guard/jobs/base"
-
-module Guard
-  module Jobs
-    class TerminalSettings
-      def initialize
-        @settings = nil
-        @works = ::Guard::Sheller.run("hash", "stty") || false
-      end
-
-      def restore
-        return unless configurable? && @settings
-        ::Guard::Sheller.run("stty #{ @setting } 2>#{ DEV_NULL }")
-      end
-
-      def save
-        return unless configurable?
-        @settings = ::Guard::Sheller.stdout("stty -g 2>#{ DEV_NULL }").chomp
-      end
-
-      def echo
-        return unless configurable?
-        ::Guard::Sheller.run("stty echo 2>#{ DEV_NULL }")
-      end
-
-      def configurable?
-        @works
-      end
-    end
-
-    class PryWrapper < Base
-      # The default Ruby script to configure Guard Pry if the option `:guard_rc`
-      # is not defined.
-      GUARD_RC = "~/.guardrc"
-
-      # The default Guard Pry history file if the option `:history_file` is not
-      # defined.
-      HISTORY_FILE = "~/.guard_history"
-
-      # List of shortcuts for each interactor command
-      SHORTCUTS = {
-        help:         "h",
-        all:          "a",
-        reload:       "r",
-        change:       "c",
-        show:         "s",
-        scope:        "o",
-        notification: "n",
-        pause:        "p",
-        exit:         "e",
-        quit:         "q"
-      }
-
-      def initialize(options)
-        @mutex = Mutex.new
-        @thread = nil
-        @terminal_settings = TerminalSettings.new
-
-        _setup(options)
-      end
-
-      def foreground
-        ::Guard::UI.debug "Start interactor"
-        @terminal_settings.save
-
-        _start_pry
-        @thread.join
-        thread = @thread
-        thread.nil? ? :stopped : :exit
-      ensure
-        ::Guard::UI.reset_line
-        ::Guard::UI.debug "Interactor was stopped or killed"
-        @terminal_settings.restore
-      end
-
-      def background
-        _kill_pry
-      end
-
-      def handle_interrupt
-        thread = @thread
-        fail Interrupt unless thread
-        thread.raise Interrupt
-      end
-
-      private
-
-      attr_reader :thread
-
-      def _start_pry
-        @mutex.synchronize do
-          unless @thread
-            @thread = Thread.new { Pry.start }
-            @thread.join(0.5) # give pry a chance to start
-          end
-        end
-      end
-
-      def _kill_pry
-        @mutex.synchronize do
-          unless @thread.nil?
-            @thread.kill
-            @thread = nil # set to nil so we know we were killed
-          end
-        end
-      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)
-
-        _add_hooks
-
-        Guard::Commands::All.import
-        Guard::Commands::Change.import
-        Guard::Commands::Notification.import
-        Guard::Commands::Pause.import
-        Guard::Commands::Reload.import
-        Guard::Commands::Show.import
-        Guard::Commands::Scope.import
-
-        _setup_commands
-        _configure_prompt
-      end
-
-      # Add Pry hooks:
-      #
-      # * Load `~/.guardrc` within each new Pry session.
-      # * Load project's `.guardrc` within each new Pry session.
-      # * Restore prompt after each evaluation.
-      #
-      def _add_hooks
-        _add_load_guard_rc_hook
-        _add_load_project_guard_rc_hook
-        _add_restore_visibility_hook if @terminal_settings.configurable?
-      end
-
-      # Add a `when_started` hook that loads a global .guardrc if it exists.
-      #
-      def _add_load_guard_rc_hook
-        Pry.config.hooks.add_hook :when_started, :load_guard_rc do
-          (self.class.options[:guard_rc] || GUARD_RC).tap do |p|
-            load p if File.exist?(File.expand_path(p))
-          end
-        end
-      end
-
-      # Add a `when_started` hook that loads a project .guardrc if it exists.
-      #
-      def _add_load_project_guard_rc_hook
-        Pry.config.hooks.add_hook :when_started, :load_project_guard_rc do
-          project_guard_rc = Dir.pwd + "/.guardrc"
-          load project_guard_rc if File.exist?(project_guard_rc)
-        end
-      end
-
-      # 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
-          @terminal_settings.echo
-        end
-      end
-
-      def _setup_commands
-        _replace_reset_command
-        _create_run_all_command
-        _create_command_aliases
-        _create_guard_commands
-        _create_group_commands
-      end
-
-      # Replaces reset defined inside of Pry with a reset that
-      # instead restarts guard.
-      #
-      def _replace_reset_command
-        Pry.commands.command "reset", "Reset the Guard to a clean state." do
-          output.puts "Guard reset."
-          exec "guard"
-        end
-      end
-
-      # Creates a command that triggers the `:run_all` action
-      # when the command is empty (just pressing enter on the
-      # beginning of a line).
-      #
-      def _create_run_all_command
-        Pry.commands.block_command(/^$/, "Hit enter to run all") do
-          Pry.run_command "all"
-        end
-      end
-
-      # Creates command aliases for the commands: `help`, `reload`, `change`,
-      # `scope`, `notification`, `pause`, `exit` and `quit`, which will be the
-      # first letter of the command.
-      #
-      def _create_command_aliases
-        SHORTCUTS.each do |command, shortcut|
-          Pry.commands.alias_command shortcut, command.to_s
-        end
-      end
-
-      # Create a shorthand command to run the `:run_all`
-      # action on a specific Guard plugin. For example,
-      # when guard-rspec is available, then a command
-      # `rspec` is created that runs `all rspec`.
-      #
-      def _create_guard_commands
-        ::Guard.plugins.each do |guard_plugin|
-          cmd = "Run all #{ guard_plugin.title }"
-          Pry.commands.create_command guard_plugin.name, cmd do
-            group "Guard"
-
-            def process
-              Pry.run_command "all #{ match }"
-            end
-          end
-        end
-      end
-
-      # Create a shorthand command to run the `:run_all`
-      # action on a specific Guard group. For example,
-      # when you have a group `frontend`, then a command
-      # `frontend` is created that runs `all frontend`.
-      #
-      def _create_group_commands
-        ::Guard.groups.each do |group|
-          next if group.name == :default
-
-          cmd = "Run all #{ group.title }"
-          Pry.commands.create_command group.name.to_s, cmd  do
-            group "Guard"
-
-            def process
-              Pry.run_command "all #{ match }"
-            end
-          end
-        end
-      end
-
-      # Configures the pry prompt to see `guard` instead of
-      # `pry`.
-      #
-      def _configure_prompt
-        Pry.config.prompt = [_prompt(">"), _prompt("*")]
-      end
-
-      # Returns the plugins scope, or the groups scope ready for display in the
-      # prompt.
-      #
-      def _scope_for_prompt
-        scope_name = [:plugins, :groups].detect do |name|
-          ! ::Guard.scope[name].empty?
-        end
-        scope_name ? "#{_join_scope_for_prompt(scope_name)} " : ""
-      end
-
-      # Joins the scope corresponding to the given scope name with commas.
-      #
-      def _join_scope_for_prompt(scope_name)
-        ::Guard.scope[scope_name].map(&:title).join(",")
-      end
-
-      # Returns a proc that will return itself a string ending with the given
-      # `ending_char` when called.
-      #
-      def _prompt(ending_char)
-        proc do |target_self, nest_level, pry|
-          history = pry.input_array.size
-          process = ::Guard.listener.paused? ? "pause" : "guard"
-          level   = ":#{ nest_level }" unless nest_level.zero?
-
-          "[#{ history }] #{ _scope_for_prompt }#{ process }"\
-            "(#{ _clip_name(target_self) })#{ level }#{ ending_char } "
-        end
-      end
-
-      def _clip_name(target)
-        Pry.view_clip(target)
-      end
-    end
-  end
-end

data/lib/guard/plugin_util.rb.orig

@@ -1,178 +0,0 @@
-require "guard/ui"
-
-module Guard
-  # This class contains useful methods to:
-  #
-  # * Fetch all the Guard plugins names;
-  # * Initialize a plugin, get its location;
-  # * Return its class name;
-  # * Add its template to the Guardfile.
-  #
-  class PluginUtil
-    ERROR_NO_GUARD_OR_CLASS = "Could not load 'guard/%s' or'\
-    ' find class Guard::%s"
-
-    INFO_ADDED_GUARD_TO_GUARDFILE = "%s guard added to Guardfile,"\
-      " feel free to edit it"
-
-    attr_accessor :name
-
-    # Returns a list of Guard plugin Gem names installed locally.
-    #
-    # @return [Array<String>] a list of Guard plugin gem names
-    #
-    def self.plugin_names
-      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create("1.8.0")
-        Gem::Specification.find_all.select do |x|
-          if x.name =~ /^guard-/
-            true
-          elsif x.name != "guard"
-
-            guard_plugin_path = File.join(
-              x.full_gem_path,
-              "lib/guard/#{ x.name }.rb"
-            )
-
-            File.exist?(guard_plugin_path)
-          end
-        end
-      else
-        ::Guard::UI.deprecation \
-          "Rubygems version prior to 1.8.0 are no longer supported"\
-          " and may not work"
-
-        Gem.source_index.find_name(/^guard-/)
-      end.map { |x| x.name.sub(/^guard-/, "") }.uniq
-    end
-
-    # Initializes a new `Guard::PluginUtil` object.
-    #
-    # @param [String] name the name of the Guard plugin
-    #
-    def initialize(name)
-      @name = name.to_s.sub(/^guard-/, "")
-    end
-
-    # Initializes a new `Guard::Plugin` with the given `options` hash. This
-    # methods handles plugins that inherit from the deprecated `Guard::Guard`
-    # class as well as plugins that inherit from `Guard::Plugin`.
-    #
-    # @see Guard::Plugin
-    # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
-    # upgrade for Guard 2.0
-    #
-    # @return [Guard::Plugin] the initialized plugin
-    # @return [Guard::Guard] the initialized plugin. This return type is
-    #   deprecated and the plugin's maintainer should update it to be
-    #   compatible with Guard 2.0. For more information on how to upgrade for
-    #   Guard 2.0, please head over to:
-    #   https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0
-    #
-    def initialize_plugin(options)
-      if plugin_class.superclass.to_s == "Guard::Guard"
-        plugin_class.new(options.delete(:watchers), options)
-      else
-        plugin_class.new(options)
-      end
-    end
-
-    # Locates a path to a Guard plugin gem.
-    #
-    # @return [String] the full path to the plugin gem
-    #
-    def plugin_location
-      @plugin_location ||= begin
-        if Gem::Version.create(Gem::VERSION) >= Gem::Version.create("1.8.0")
-          Gem::Specification.find_by_name("guard-#{ name }").full_gem_path
-        else
-          Gem.source_index.find_name("guard-#{ name }").last.full_gem_path
-        end
-      end
-    rescue
-      ::Guard::UI.error "Could not find 'guard-#{ name }' gem path."
-    end
-
-    # Tries to load the Guard plugin main class. This transforms the supplied
-    # plugin name into a class name:
-    #
-    # * `guardname` will become `Guard::Guardname`
-    # * `dashed-guard-name` will become `Guard::DashedGuardName`
-    # * `underscore_guard_name` will become `Guard::UnderscoreGuardName`
-    #
-    # When no class is found with the strict case sensitive rules, another
-    # try is made to locate the class without matching case:
-    #
-    # * `rspec` will find a class `Guard::RSpec`
-    #
-    # @option options [Boolean] fail_gracefully whether error messages should
-    # not be printed
-    #
-    # @return [Class, nil] the loaded class
-    #
-    def plugin_class(options = {})
-      options = { fail_gracefully: false }.merge(options)
-
-      try_require = false
-      begin
-        require "guard/#{ name.downcase }" if try_require
-
-        @plugin_class ||= ::Guard.const_get(_plugin_constant)
-      rescue TypeError => error
-        if try_require
-          ::Guard::UI.error "Could not find class Guard::#{ _constant_name }"
-          ::Guard::UI.error error.backtrace.join("\n")
-        else
-          try_require = true
-          retry
-        end
-      rescue LoadError => error
-        unless options[:fail_gracefully]
-          UI.error ERROR_NO_GUARD_OR_CLASS % [name.downcase, _constant_name]
-          UI.error error.backtrace.join("\n")
-        end
-      end
-    end
-
-    # Adds a plugin's template to the Guardfile.
-    #
-    def add_to_guardfile
-      if ::Guard.evaluator.guardfile_include?(name)
-        ::Guard::UI.info "Guardfile already includes #{ name } guard"
-      else
-        content = File.read("Guardfile")
-        File.open("Guardfile", "wb") do |f|
-          f.puts(content)
-          f.puts("")
-          f.puts(plugin_class.template(plugin_location))
-        end
-
-        UI.info INFO_ADDED_GUARD_TO_GUARDFILE % name
-      end
-    end
-
-    private
-
-    # Returns the constant for the current plugin.
-    #
-    # @example Returns the constant for a plugin
-    #   > Guard::PluginUtil.new('rspec').send(:_plugin_constant)
-    #   => Guard::RSpec
-    #
-    def _plugin_constant
-      @_plugin_constant ||= ::Guard.constants.detect do |c|
-        c.to_s.downcase == _constant_name.downcase
-      end
-    end
-
-    # Guesses the most probable name for the current plugin based on its name.
-    #
-    # @example Returns the most probable name for a plugin
-    #   > Guard::PluginUtil.new('rspec').send(:_constant_name)
-    #   => "Rspec"
-    #
-    def _constant_name
-      @_constant_name ||= name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.
-        gsub(/(?:^|[_-])(.)/) { $1.upcase }
-    end
-  end
-end