dirwatch 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04bb4ec76da56b4736d7ccf0c9583f709dbeb0b9
-  data.tar.gz: 84107c13caa70de8cca5aed46237fb5bf0ce44ad
+  metadata.gz: 40bd06bc200bd057ef3ad48503cf7e19dd1aafd7
+  data.tar.gz: b10dbed6c03ab779e4de93276f4ddee3337bd739
 SHA512:
-  metadata.gz: 7023ad4bbaa4a0eb26b33d287c407b4960cda38e2e886f1591bc192e537814f946fa5f4427135949e2c3260c1cd3aa29a7d7224d94e6065df03b843322ad351e
-  data.tar.gz: 33716412b5a6aecf540ca7164fc3a44084ef1aa03b33036c6ac3b467c1b3d10e50e404ff9ff05cc1130ad73f32314ea428cfc83810b87a02eb5b025ba992d5a3
+  metadata.gz: 665a9235f6b0de9be2d56b0740a885aff19364b94a0a63358ffa8a10efa11bf03375fd71a8b5865ab11ebd1881c750d028772d644d78859bdb05cf393c0b53bc
+  data.tar.gz: 90ce98ba02e520816b81af23e80ca09312ca9ef80ad7188252b4c0ee03c42569f4a82fe8e2b2742e338fe4b6fe5301fc4e13a00094bbe4b7ed5532d64d0d7b7c

data/bin/dirwatch

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'dirwatch'
+require_relative '../lib/dirwatch'
 
 Dirwatch.console.run ARGV

data/lib/dirwatch/executors.rb

@@ -48,7 +48,7 @@ module Dirwatch
       status = catch :exit do
         super
       end
-      exit status if status
+      exit status || 0
     rescue Dirwatch::UserFriendlyError => e
       $stderr.puts e.user_friendly_message
       exit 1

data/lib/dirwatch/extensions/blank.rb

@@ -0,0 +1,85 @@
+class Object
+  # An object is blank if it's false, empty, or a whitespace string.
+  # For example, +false+, '', '   ', +nil+, [], and {} are all blank.
+  def blank?
+    respond_to?(:empty?) ? !!empty? : !self
+  end
+
+  # An object is present if it's not blank.
+  def present?
+    !blank?
+  end
+
+  # Returns the receiver if it's present otherwise returns +nil+.
+  def presence
+    self if present?
+  end
+end
+
+class NilClass
+  # +nil+ is blank
+  def blank?
+    true
+  end
+end
+
+class FalseClass
+  # +false+ is blank
+  def blank?
+    true
+  end
+end
+
+class TrueClass
+  # +true+ is not blank
+  def blank?
+    false
+  end
+end
+
+class Array
+  # An array is blank if it's empty
+  alias blank? empty?
+end
+
+class Hash
+  # A hash is blank if it's empty
+  alias blank? empty?
+end
+
+class String
+  BLANK_RE = /\A[[:space:]]*\z/
+
+  # A string is blank if it's empty or contains whitespaces only:
+  #
+  #   ''.blank?       # => true
+  #   '   '.blank?    # => true
+  #   "\t\n\r".blank? # => true
+  #   ' blah '.blank? # => false
+  #
+  # Unicode whitespace is supported:
+  #
+  #   "\u00a0".blank? # => true
+  #
+  # @return [true, false]
+  def blank?
+    # The regexp that matches blank strings is expensive. For the case of empty
+    # strings we can speed up this method (~3.5x) with an empty? call. The
+    # penalty for the rest of strings is marginal.
+    empty? || BLANK_RE.match?(self)
+  end
+end
+
+class Numeric
+  # No number is blank
+  def blank?
+    false
+  end
+end
+
+class Time
+  # No Time is blank
+  def blank?
+    false
+  end
+end

data/lib/dirwatch/extensions/regexp.rb

@@ -0,0 +1,7 @@
+class Regexp
+  unless //.respond_to?(:match?)
+    def match? string, pos = 0
+      !!match(string, pos)
+    end
+  end
+end

data/lib/dirwatch/extensions.rb

@@ -0,0 +1,2 @@
+require_relative 'extensions/regexp'
+require_relative 'extensions/blank'

data/lib/dirwatch/settings/watch_setting.rb

@@ -3,9 +3,10 @@ require 'English' # for CHILD_STATUS
 module Dirwatch
   class Settings
     class WatchSetting
-      attr_reader :directory, :file_match, :interval, :scripts
+      attr_reader :key, :directory, :file_match, :interval, :scripts
 
-      def initialize directory:, file_match:, interval:, scripts:
+      def initialize key, directory:, file_match:, interval:, scripts:
+        self.key = key
         self.directory = directory
         self.file_match = file_match
         self.interval = interval
@@ -20,34 +21,49 @@ module Dirwatch
         Dir[files_path]
       end
 
-      def exec_scripts
+      def exec_scripts verbose
         @scripts.each do |script|
           if script =~ / & *\z/
+            puts "  Call #{script.inspect} in background" if verbose
             system script
           else
+            puts "  Call #{script.inspect} in foreground" if verbose
             output = `#{script}`
-            unless $CHILD_STATUS.successful?
+            unless $CHILD_STATUS.success?
               raise "The command \"#{script}\" failed with: #{output}"
             end
           end
         end
       end
 
+      def to_h
+        {
+          directory:  directory,
+          file_match: file_match,
+          interval:   interval,
+          scripts:    scripts,
+        }
+      end
+
       def to_s
-        variables = [:files_path, :interval, :scripts].map {|v| "#{v}=#{send(v).inspect}" }
-        "#<#{self.class} #{variables.join ' '}>"
+        "#<#{self.class} #{key}: #{to_h.map {|k, v| "#{k}=#{v.inspect}" }.join ' '}>"
       end
 
       private
 
+      def key= key
+        @key = key
+        raise InvalidValueError, 'key must be set' if @key.blank?
+      end
+
       def directory= directory
         @directory = directory
-        raise InvalidValueError, 'directory must be set' if @directory.nil? || @directory.empty?
+        raise InvalidValueError, 'directory must be set' if @directory.blank?
       end
 
       def file_match= file_match
         @file_match = file_match
-        raise InvalidValueError, 'file_match must be set' if @file_match.nil? || @file_match.empty?
+        raise InvalidValueError, 'file_match must be set' if @file_match.blank?
       end
 
       def interval= interval
@@ -58,8 +74,9 @@ module Dirwatch
       def scripts= scripts
         if scripts.is_a? String
           scripts = [scripts]
-        elsif !scripts.is_a?(Array) || scripts.any? {|s| !s.is_a? String }
-          raise InvalidValueError, "Script needs to be a string or a list of strings: #{scripts.inspect}"
+        elsif !scripts.is_a?(Array) || !scripts.all? {|s| s.is_a?(String) && s.present? }
+          raise InvalidValueError,
+            "Script needs to be a string or a list of strings: #{scripts.inspect}"
         end
         @scripts = scripts
       end

data/lib/dirwatch/settings.rb

@@ -30,8 +30,9 @@ module Dirwatch
       @watch_settings << watch_setting
     end
 
-    def add_from_config watch_setting, defaults, directory
+    def add_from_config key, watch_setting, defaults, directory
       add WatchSetting.new(
+        key,
         directory:  directory,
         file_match: watch_setting[:file_match] || defaults[:file_match],
         interval:   watch_setting[:interval]   || defaults[:interval],
@@ -53,8 +54,8 @@ module Dirwatch
           watch_data[key] = watch_setting
         end
       end
-      watch_data.each do |_key, watch_setting|
-        add_from_config watch_setting, defaults, directory
+      watch_data.each do |key, watch_setting|
+        add_from_config key, watch_setting, defaults, directory
       end
     end
   end

data/lib/dirwatch/version.rb

@@ -1,3 +1,3 @@
 module Dirwatch
-  VERSION = Gem::Version.new '0.0.2'
+  VERSION = Gem::Version.new '0.0.3'
 end

data/lib/dirwatch/watcher.rb

@@ -46,14 +46,13 @@ module Dirwatch
 
     def run interval, watch_settings
       change_times = []
-      loop do
-        break if @stop
+      until @stop
         watch_settings.each.with_index do |ws, i|
           change_time = ws.files.map {|f| File.ctime f }.max
-          if change_time != change_times[i]
-            change_times[i] = change_time
-            ws.exec_scripts
-          end
+          next if change_time == change_times[i]
+          puts "Changed: #{ws.key}" if options.verbose
+          change_times[i] = change_time
+          ws.exec_scripts options.verbose
         end
 
         break if @stop

data/lib/dirwatch.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require_relative 'dirwatch/extensions'
 require_relative 'dirwatch/executors'
 require_relative 'dirwatch/options'
 require_relative 'dirwatch/errors'

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/CHANGELOG.md

@@ -1,6 +1,30 @@
 Changelog
 =========
 
+Not released (2017-11-13)
+-------------------------
+
+API modifications:
+ * parser/current: update for 2.3.5 release. (whitequark)
+
+v2.4.0.1 (2017-11-13)
+---------------------
+
+API modifications:
+ * parser/current: update for 2.3.4 release. (whitequark)
+ * parser/current: update for Ruby 2.1.10 and 2.2.7. (Koichi ITO)
+
+Features implemented:
+ * Allow rescue/else/ensure inside do/end blocks. [Feature #12906] (Ilya Bylich)
+ * ruby25.y: branch parser. (Ilya Bylich)
+
+Bugs fixed:
+ * Source::Comment::Associator: skip -*- magic comments -*-. (Denis Defreyne)
+ * lexer.rl: "- 5": allow whitespace after tUNARY_NUM. (whitequark)
+ * *ruby*.y, Builders::Default: "+5": don't lose location of the "+". (whitequark)
+ * ruby-rewrite: allow passing paths to --load. (whitequark)
+ * builders/default: "def x; else; end": don't crash. (whitequark)
+
 v2.4.0.0 (2017-02-07)
 ---------------------
 
@@ -41,9 +65,6 @@ Bugs fixed:
  * ruby24.y: "x = raise y rescue nil": bind rescue tighter than =. (whitequark)
  * Builders::Default: "begin; else; 1; end": fix a crash. (whitequark)
 
-v2.3.1.4 (2016-09-19)
----------------------
-
 v2.3.1.3 (2016-09-17)
 ---------------------
 
@@ -116,9 +137,6 @@ v2.3.0.5 (2016-02-12)
 Bugs fixed:
  * lexer.rl: "%Q{\あ}": fix encoding of UTF-8 noop escapes. (whitequark)
 
-v2.3.0.4 (2016-02-09)
----------------------
-
 v2.3.0.3 (2016-02-06)
 ---------------------
 
@@ -132,9 +150,6 @@ Bugs fixed:
  * Add :csend to Parser::Meta::NODE_TYPES (Markus Schirp)
  * lexer/dedenter: "\<\<x\n  y\\n  z\nx": don't dedent after escaped newline. (whitequark)
 
-v2.4.0.0 (2016-01-16)
----------------------
-
 v2.3.0.1 (2016-01-14)
 ---------------------
 
@@ -264,9 +279,6 @@ v2.2.2.1 (2015-04-18)
 Bugs fixed:
  * builders/default: don't falsely diagnose multiline regexps (fixes #190). (whitequark)
 
-v2.2.2.0 (2015-04-15)
----------------------
-
 v2.2.0.4 (2015-04-15)
 ---------------------
 
@@ -274,12 +286,6 @@ Features implemented:
  * Add Parser::Source::Map#node. (whitequark)
  * Add Parser::Source::Comment.associate_locations. (kubicle)
 
-v2.2.0.3 (2015-02-13)
----------------------
-
-v2.2.0.2 (2015-01-09)
----------------------
-
 v2.2.0.1 (2014-12-27)
 ---------------------
 
@@ -471,9 +477,6 @@ Bugs fixed:
  * lexer.rl: "->*{}": tLAMBEG at expr_beg (fixes #103). (Peter Zotov)
  * Source::Rewriter: apply actions in the insertion order. (Josh Cheek)
 
-v2.0.0.pre6 (2013-08-02)
-------------------------
-
 v2.0.0.pre5 (2013-07-31)
 ------------------------
 
@@ -559,9 +562,6 @@ Features implemented:
 Bugs fixed:
  * Don't treat byte order mark as an identifier (closes #91). (Peter Zotov)
 
-v2.0.0.pre1 (2013-07-04)
-------------------------
-
 v2.0.0.beta10 (2013-07-02)
 --------------------------
 
@@ -767,9 +767,6 @@ Bugs fixed:
  * ruby18.y, ruby19.y: BEGIN{} does not introduce a scope. (Peter Zotov)
  * lexer.rl: improve whitespace handling. (Peter Zotov)
 
-v0.9.1 (2013-04-15)
--------------------
-
 v0.9.0 (2013-04-15)
 -------------------
 

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/Rakefile

@@ -3,6 +3,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rake/clean'
+require 'date'
 
 task :default => [:test]
 
@@ -27,17 +28,20 @@ GENERATED_FILES = %w(lib/parser/lexer.rb
                      lib/parser/ruby22.rb
                      lib/parser/ruby23.rb
                      lib/parser/ruby24.rb
+                     lib/parser/ruby25.rb
                      lib/parser/macruby.rb
                      lib/parser/rubymotion.rb)
 
 CLEAN.include(GENERATED_FILES)
 
+ENCODING_COMMENT = "# -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-\n"
+
 desc 'Generate the Ragel lexer and Racc parser.'
 task :generate => GENERATED_FILES do
   Rake::Task[:ragel_check].invoke
   GENERATED_FILES.each do |filename|
     content = File.read(filename)
-    content = "# -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-\n" + content
+    content = ENCODING_COMMENT + content unless content.start_with?(ENCODING_COMMENT)
 
     File.open(filename, 'w') do |io|
       io.write content
@@ -98,7 +102,7 @@ task :changelog do
       date = Date.parse(date)
 
       current_version = "#{$1} (#{date})" if version =~ /(v[\d\w.]+)/
-      current_version = "v#{Parser::VERSION} (#{date})" \
+      current_version = "Not released (#{date})" \
         if version =~ /(^| |\/)#{Regexp.escape branch}$/
 
       next if current_version.nil?
@@ -121,6 +125,7 @@ task :changelog do
     io.puts
 
     changelog.each do |version, commits|
+      next if commits.empty?
       io.puts version
       io.puts '-' * version.length
       io.puts

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/doc/AST_FORMAT.md

@@ -626,15 +626,6 @@ Format:
 "@a += 1"
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"a += 1"
-s(:lasgn, :a, s(:call, s(:lvar, :a), :+, s(:int, 1)))
-
-"@a += 1"
-s(:iasgn, :@a, s(:call, s(:ivar, :@a), :+, s(:int, 1)))
-~~~
-
 #### Method binary operator-assignment
 
 Format:
@@ -655,15 +646,6 @@ Format:
  ~~~~~~~~~~~~~ expression (op-asgn)
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@a.b += 1"
-s(:op_asgn2, s(:ivar, :@a), :b=, :+, s(:int, 1))
-
-"@a[0, 1] += 1"
-s(:op_asgn1, s(:ivar, :@a), s(:arglist, s(:int, 0), s(:int, 1)), :+, s(:int, 1))
-~~~
-
 ### Logical operator-assignment
 
 Logical operator-assignment features the same "incomplete assignments" and "incomplete calls" as [multiple assignment](#assignment-1).
@@ -684,15 +666,6 @@ Format:
  ~~~~~~~ expression
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@a ||= 1"
-s(:op_asgn_or, s(:ivar, :@a), s(:ivasgn, :@a, s(:int, 1)))
-
-"a &&= 1"
-s(:op_asgn_and, s(:lvar, :a), s(:lvasgn, :a, s(:int, 1)))
-~~~
-
 #### Method logical operator-assignment
 
 Format:
@@ -721,16 +694,6 @@ Format:
 
 ~~~
 
-Ruby_parser output for reference:
-~~~
-"@foo.bar &&= 1"
-s(:op_asgn2, s(:ivar, :@foo), :bar=, :"&&", s(:int, 1))
-
-"@foo[0] ||= 1"
-s(:op_asgn1, s(:ivar, :@foo), s(:arglist, s(:int, 0)), :"||", s(:int, 1))
-
-~~~
-
 ## Class and module definition
 
 ### Module
@@ -1135,6 +1098,7 @@ Format:
 ### To superclass
 
 Format of super with arguments:
+
 ~~~
 (super (lvar :a))
 "super a"
@@ -1150,6 +1114,7 @@ Format of super with arguments:
 ~~~
 
 Format of super without arguments (**z**ero-arity):
+
 ~~~
 (zsuper)
 "super"

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/lib/parser/all.rb

@@ -5,3 +5,4 @@ require 'parser/ruby21'
 require 'parser/ruby22'
 require 'parser/ruby23'
 require 'parser/ruby24'
+require 'parser/ruby25'

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/lib/parser/builders/default.rb

@@ -120,11 +120,18 @@ module Parser
     end
     private :numeric
 
-    def negate(uminus_t, numeric)
+    def unary_num(unary_t, numeric)
       value, = *numeric
-      operator_loc = loc(uminus_t)
+      operator_loc = loc(unary_t)
 
-      numeric.updated(nil, [ -value ],
+      case value(unary_t)
+      when '+'
+        value = +value
+      when '-'
+        value = -value
+      end
+
+      numeric.updated(nil, [ value ],
         :location =>
           Source::Map::Operator.new(
             operator_loc,
@@ -878,7 +885,7 @@ module Parser
 
     def not_op(not_t, begin_t=nil, receiver=nil, end_t=nil)
       if @parser.version == 18
-        n(:not, [ receiver ],
+        n(:not, [ check_condition(receiver) ],
           unary_op_map(not_t, receiver))
       else
         if receiver.nil?
@@ -888,7 +895,7 @@ module Parser
             nil_node, :'!'
           ], send_unary_op_map(not_t, nil_node))
         else
-          n(:send, [ receiver, :'!' ],
+          n(:send, [ check_condition(receiver), :'!' ],
             send_map(nil, nil, not_t, begin_t, [receiver], end_t))
         end
       end
@@ -1097,6 +1104,8 @@ module Parser
       when :masgn
         if @parser.version <= 23
           diagnostic :error, :masgn_as_condition, nil, cond.loc.expression
+        else
+          cond
         end
 
       when :begin
@@ -1271,6 +1280,10 @@ module Parser
       if begin_t.nil? || end_t.nil?
         if parts.any?
           expr_l = join_exprs(parts.first, parts.last)
+        elsif !begin_t.nil?
+          expr_l = loc(begin_t)
+        elsif !end_t.nil?
+          expr_l = loc(end_t)
         end
       else
         expr_l = loc(begin_t).join(loc(end_t))

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/lib/parser/current.rb

@@ -37,7 +37,7 @@ module Parser
     CurrentRuby = Ruby20
 
   when /^2\.1\./
-    current_version = '2.1.8'
+    current_version = '2.1.10'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby21', current_version
     end
@@ -46,7 +46,7 @@ module Parser
     CurrentRuby = Ruby21
 
   when /^2\.2\./
-    current_version = '2.2.6'
+    current_version = '2.2.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby22', current_version
     end
@@ -55,7 +55,7 @@ module Parser
     CurrentRuby = Ruby22
 
   when /^2\.3\./
-    current_version = '2.3.3'
+    current_version = '2.3.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby23', current_version
     end
@@ -72,6 +72,15 @@ module Parser
     require 'parser/ruby24'
     CurrentRuby = Ruby24
 
+  when /^2\.5\./
+    current_version = '2.5.0'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby25', current_version
+    end
+
+    require 'parser/ruby25'
+    CurrentRuby = Ruby25
+
   else # :nocov:
     # Keep this in sync with released Ruby.
     warn_syntax_deviation 'parser/ruby24', '2.4.x'

data/vendor/bundle/ruby/2.3.0/gems/{parser-2.4.0.0 → parser-2.4.0.2}/lib/parser/lexer/literal.rb

@@ -187,7 +187,7 @@ module Parser
       @buffer_s ||= ts
       @buffer_e = te
 
-      @buffer += string
+      @buffer << string
     end
 
     def flush_string