lre 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/lre

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__)+"/../lib")+"/lre.rb"
-
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__)+"/../lib")+"/lre.rb"
+
 LRE.from_cli!(ARGV[0])

data/lib/lre.rb

@@ -1,60 +1,60 @@
-require 'rake'
-require 'fattr'
-%w(file_reload rake_ext).each do |f|
-  require File.expand_path(File.dirname(__FILE__)) + "/lre/#{f}.rb"
-end
-
-module LRE
-  class << self
-    fattr(:watch_dirs) do
-      ["."]
-    end
-    def add_watch_dir(*ds)
-      [ds].flatten.each do |d|
-        self.watch_dirs << d
-      end
-    end
-    def load_config!
-      config_files = ["~/.lre","#{Dir.getwd}/.lre"]
-      config_files.each do |f|
-        load(f) if FileTest.exists?(f)
-      end
-    end
-    def start_irb!
-      return if @start_irb
-      require 'irb'
-      @start_irb = true
-      IRB.start
-    end
-    def from_cli!(f)
-      if f
-        load_config!
-        load(f)
-      else
-        start!
-      end
-    end
-    def start!
-      load_config!
-      FileReload.run!
-      
-      start_irb!
-    end
-    def stop!
-      FileReload.stop!
-    end
-    def watch(pattern,&b)
-      FileReload.watches[pattern] = b
-    end
-    def on_every_file(&b)
-      FileReload.on_every_file = b
-    end
-    def name(n=nil)
-      if n
-        FileReload.instance_name = n
-      else
-        FileReload.instance_name
-      end
-    end
-  end
+require 'rake'
+require 'fattr'
+%w(file_reload rake_ext watchr_ext).each do |f|
+  require File.expand_path(File.dirname(__FILE__)) + "/lre/#{f}.rb"
+end
+
+module LRE
+  class << self
+    fattr(:watch_dirs) do
+      ["."]
+    end
+    def add_watch_dir(*ds)
+      [ds].flatten.each do |d|
+        self.watch_dirs << d
+      end
+    end
+    def load_config!
+      config_files = ["~/.lre","#{Dir.getwd}/.lre"]
+      config_files.each do |f|
+        load(f) if FileTest.exists?(f)
+      end
+    end
+    def start_irb!
+      return if @start_irb
+      require 'irb'
+      @start_irb = true
+      IRB.start
+    end
+    def from_cli!(f)
+      if f
+        load_config!
+        load(f)
+      else
+        start!
+      end
+    end
+    def start!
+      load_config!
+      FileReload.run!
+      
+      start_irb!
+    end
+    def stop!
+      FileReload.stop!
+    end
+    def watch(pattern,&b)
+      FileReload.watches[pattern] = b
+    end
+    def on_every_file(&b)
+      FileReload.on_every_file = b
+    end
+    def name(n=nil)
+      if n
+        FileReload.instance_name = n
+      else
+        FileReload.instance_name
+      end
+    end
+  end
 end

data/lib/lre/file_reload.rb

@@ -1,83 +1,83 @@
-module FileReload
-  def self.method_missing(sym,*args,&b)
-    Base.instance.send(sym,*args,&b)
-  end
-  class Base
-    class << self
-      fattr(:instance) { new }
-    end
-    attr_accessor :script, :on_every_file, :instance_name
-    fattr(:threads) { [] }
-    def should_load?(f)
-      str = File.read(f)
-      if str =~ /--dontload({.+})?/
-        if !$1
-          false
-        else
-          n = $1[1..-2]
-          !(instance_name.to_s == n)
-        end
-      elsif str =~ /--onlyload{(.+)}/
-        $1 == instance_name.to_s
-      else
-        true
-      end
-    end
-    def process_file(f,&b)
-      if !FileTest.exists?(f)
-        puts "file doesn't exist #{f}"
-        return
-      end
-      if should_load?(f)
-        on_every_file[File.expand_path(f)] if on_every_file
-        puts "loading #{f}"
-        b[f]
-      else
-        puts "didn't load #{f}"
-      end
-      print ">"
-    rescue => exp
-      puts "error loading #{f}"
-      puts exp.message + "\n" + exp.backtrace.join("\n")
-    rescue SyntaxError => exp
-      puts "syntax error loading #{f}"
-      puts exp.message + "\n" + exp.backtrace.join("\n")
-    rescue RuntimeError => exp
-      puts "runtime error"
-      puts exp.message
-    end
-    def stop!
-      self.threads.each { |x| x.kill }
-      self.threads = []
-    end
-    fattr(:watches) do
-      res = {}
-      res[".*\.rb$"] = lambda do |f|
-        load f
-      end
-      res
-    end
-    def run!
-      require 'watchr'
-      require 'pathname'
-      self.script = Watchr::Script.new
-      watches.each do |file_match,proc|
-        script.watch(file_match) do |md|
-          f = md[0]
-          process_file(f,&proc)
-        end
-      end
-      
-      self.threads.each { |x| x.kill }
-      self.threads = []
-      
-      LRE.watch_dirs.uniq.each do |d|
-        c = Watchr::Controller.new(script, Watchr.handler.new)
-        c.base_path = d
-        puts "adding thread #{d}"
-        self.threads << Thread.new { c.run }
-      end
-    end
-  end
-end
-
+module FileReload
+  def self.method_missing(sym,*args,&b)
+    Base.instance.send(sym,*args,&b)
+  end
+  class Base
+    class << self
+      fattr(:instance) { new }
+    end
+    attr_accessor :script, :on_every_file, :instance_name
+    fattr(:threads) { [] }
+    def should_load?(f)
+      str = File.read(f)
+      if str =~ /--dontload({.+})?/
+        if !$1
+          false
+        else
+          n = $1[1..-2]
+          !(instance_name.to_s == n)
+        end
+      elsif str =~ /--onlyload{(.+)}/
+        $1 == instance_name.to_s
+      else
+        true
+      end
+    end
+    def process_file(f,&b)
+      if !FileTest.exists?(f)
+        puts "file doesn't exist #{f}"
+        return
+      end
+      if should_load?(f)
+        on_every_file[File.expand_path(f)] if on_every_file
+        puts "loading #{f}"
+        b[f]
+      else
+        puts "didn't load #{f}"
+      end
+      print ">"
+    rescue => exp
+      puts "error loading #{f}"
+      puts exp.message + "\n" + exp.backtrace.join("\n")
+    rescue SyntaxError => exp
+      puts "syntax error loading #{f}"
+      puts exp.message + "\n" + exp.backtrace.join("\n")
+    rescue RuntimeError => exp
+      puts "runtime error"
+      puts exp.message
+    end
+    def stop!
+      self.threads.each { |x| x.kill }
+      self.threads = []
+    end
+    fattr(:watches) do
+      res = {}
+      res[".*\.rb$"] = lambda do |f|
+        load f
+      end
+      res
+    end
+    def run!
+      require 'watchr'
+      require 'pathname'
+      self.script = Watchr::Script.new
+      watches.each do |file_match,proc|
+        script.watch(file_match) do |md|
+          f = md[0]
+          process_file(f,&proc)
+        end
+      end
+      
+      self.threads.each { |x| x.kill }
+      self.threads = []
+      
+      LRE.watch_dirs.uniq.each do |d|
+        c = Watchr::Controller.new(script, Watchr.handler.new)
+        c.base_path = d
+        puts "adding thread #{d}"
+        self.threads << Thread.new { c.run }
+      end
+    end
+  end
+end
+

data/lib/lre/rake_ext.rb

@@ -1,22 +1,22 @@
-require 'rake'
-module Rake
-  class Task
-    def actions=(x)
-      @actions = x
-    end
-  end
-end
-
-def gt(n)
-  t = Rake::Task[n]
-  #puts "action size #{t.actions.size}"
-  t.actions = t.actions[-1..-1] if t.actions.size > 1
-  t.invoke
-end
-
-def gte(n)
-  t = Rake::Task[n]
-  #puts "action size #{t.actions.size}"
-  t.actions = t.actions[-1..-1] if t.actions.size > 1
-  t.execute
+require 'rake'
+module Rake
+  class Task
+    def actions=(x)
+      @actions = x
+    end
+  end
+end
+
+def gt(n)
+  t = Rake::Task[n]
+  #puts "action size #{t.actions.size}"
+  t.actions = t.actions[-1..-1] if t.actions.size > 1
+  t.invoke
+end
+
+def gte(n)
+  t = Rake::Task[n]
+  #puts "action size #{t.actions.size}"
+  t.actions = t.actions[-1..-1] if t.actions.size > 1
+  t.execute
 end

data/lib/lre/watchr_ext.rb

@@ -0,0 +1,14 @@
+require 'watchr'
+
+Watchr::Controller.class_eval do
+  attr_accessor :base_path
+  def monitored_paths
+    p = base_path ? "#{base_path}/**/*" : "**/*"
+    paths = Dir[p].select do |path|
+      @script.patterns.any? {|p| path.match(p) }
+    end
+    paths.push(@script.path).compact!
+    paths.map {|path| Pathname(path).expand_path }
+  end
+end
+

data/lre.gemspec

@@ -1,91 +1,85 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{lre}
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["mharris717"]
-  s.date = %q{2011-10-19}
-  s.default_executable = %q{lre}
-  s.description = %q{lre}
-  s.email = %q{mharris717@gmail.com}
-  s.executables = ["lre"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/lre",
-    "lib/lre.rb",
-    "lib/lre/file_reload.rb",
-    "lib/lre/rake_ext.rb",
-    "lre.gemspec",
-    "spec/lre_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/test_dir/.lre",
-    "spec/test_dir/bar.rb",
-    "spec/test_dir/file.rb",
-    "spec/test_dir/foo.rb"
-  ]
-  s.homepage = %q{http://github.com/mharris717/lre}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{lre}
-  s.test_files = [
-    "spec/lre_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/test_dir/bar.rb",
-    "spec/test_dir/file.rb",
-    "spec/test_dir/foo.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fattr>, [">= 0"])
-      s.add_runtime_dependency(%q<watchr>, [">= 0"])
-      s.add_runtime_dependency(%q<mharris_ext>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<github-markup>, [">= 0"])
-      s.add_development_dependency(%q<rdiscount>, [">= 0"])
-    else
-      s.add_dependency(%q<fattr>, [">= 0"])
-      s.add_dependency(%q<watchr>, [">= 0"])
-      s.add_dependency(%q<mharris_ext>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<github-markup>, [">= 0"])
-      s.add_dependency(%q<rdiscount>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fattr>, [">= 0"])
-    s.add_dependency(%q<watchr>, [">= 0"])
-    s.add_dependency(%q<mharris_ext>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<github-markup>, [">= 0"])
-    s.add_dependency(%q<rdiscount>, [">= 0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: lre 0.3.1 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "lre"
+  s.version = "0.3.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["mharris717"]
+  s.date = "2014-04-29"
+  s.description = "lre"
+  s.email = "mharris717@gmail.com"
+  s.executables = ["lre"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/lre",
+    "lib/lre.rb",
+    "lib/lre/file_reload.rb",
+    "lib/lre/rake_ext.rb",
+    "lib/lre/watchr_ext.rb",
+    "lre.gemspec",
+    "spec/lre_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/test_dir/.lre",
+    "spec/test_dir/bar.rb",
+    "spec/test_dir/file.rb",
+    "spec/test_dir/foo.rb"
+  ]
+  s.homepage = "http://github.com/mharris717/lre"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "lre"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<fattr>, [">= 0"])
+      s.add_runtime_dependency(%q<watchr>, [">= 0"])
+      s.add_runtime_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_development_dependency(%q<github-markup>, [">= 0"])
+      s.add_development_dependency(%q<rdiscount>, [">= 0"])
+    else
+      s.add_dependency(%q<fattr>, [">= 0"])
+      s.add_dependency(%q<watchr>, [">= 0"])
+      s.add_dependency(%q<mharris_ext>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+      s.add_dependency(%q<github-markup>, [">= 0"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<fattr>, [">= 0"])
+    s.add_dependency(%q<watchr>, [">= 0"])
+    s.add_dependency(%q<mharris_ext>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+    s.add_dependency(%q<github-markup>, [">= 0"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
+  end
+end
+