rerun 0.5.4 → 0.5.5

data/README.md

@@ -59,7 +59,7 @@ Rackup can also be used to launch a Rack server, so let's try that:
 --dir directory to watch (default = ".")
 
 --pattern glob to match inside directory. This uses the Ruby Dir glob style -- see <http://www.ruby-doc.org/core/classes/Dir.html#M002322> for details. 
-By default it watches .rb, .erb, .js, .css, and .ru files.
+By default it watches these files: `rb,js,css,scss,sass,erb,html,haml,ru`.
 
 Also --version and --help.
 

data/Rakefile

@@ -1,15 +1,15 @@
 require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 task :default => [:spec]
 task :test => :spec
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
+RSpec::Core::RakeTask.new('spec') do |t|
   ENV['ENV'] = "test"
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.pattern = 'spec/**/*_spec.rb'
   t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 

data/lib/rerun.rb

@@ -1,144 +1,16 @@
-require "system"
-require "watcher"
-require "osxwatcher"
-require "fswatcher"
+here = File.expand_path(File.dirname(__FILE__))
+$: << here unless $:.include?(here)
+
+require "rerun/system"
+require "rerun/runner"
+require "rerun/watcher"
+require "rerun/osxwatcher"
+require "rerun/fswatcher"
 
 # todo: make sure this works in non-Mac environments (also Macs without growlnotify)
 module Rerun
   
-  DEFAULT_PATTERN = "**/*.{rb,js,css,erb,ru}"
-    
-  class Runner
-
-    include System
-
-    def initialize(run_command, options = {})
-      @run_command, @options = run_command, options
-      @run_command = "ruby #{@run_command}" if @run_command.split(' ').first =~ /\.rb$/
-    end
-    
-    def restart
-      @restarting = true
-      stop
-      start
-      @restarting = false
-    end
-
-    def dir
-      @options[:dir] || "."
-    end
-    
-    def pattern
-      @options[:pattern] || DEFAULT_PATTERN
-    end
-
-    def start
-      if windows?
-        raise "Sorry, Rerun does not work on Windows."
-      end
-
-      if (!@already_running)
-        taglines = [
-          "To infinity... and beyond!",
-          "Charge!",
-          ]
-        notify "Launched", taglines[rand(taglines.size)]
-        @already_running = true
-      else
-        taglines = [
-          "Here we go again!",
-          "Once more unto the breach, dear friends, once more!", 
-        ]
-        notify "Restarted", taglines[rand(taglines.size)]
-      end
-
-      @pid = Kernel.fork do
-        begin
-          # Signal.trap("INT") { exit }
-          exec(@run_command)
-        rescue => e
-          puts e
-          exit
-        end
-      end
-      Process.detach(@pid) # so if the child exits, it dies
-
-      Signal.trap("INT") do  # INT = control-C
-         stop # first stop the child
-         exit
-       end
-
-      begin
-        sleep 2
-      rescue Interrupt => e
-        # in case someone hits control-C immediately
-        stop
-        exit
-      end
-
-      unless running?
-        notify "Launch Failed", "See console for error output"
-        @already_running = false
-      end
-
-      unless @watcher
-        watcher_class = mac? ? OSXWatcher : FSWatcher
-        # watcher_class = FSWatcher
-      
-        watcher = watcher_class.new do
-          restart unless @restarting
-        end
-        puts "Watching #{dir}/#{pattern}"
-        watcher.add_directory(dir, pattern)
-        watcher.sleep_time = 1
-        watcher.start
-        @watcher = watcher
-      end
-
-    end
-    
-    def join
-      @watcher.join
-    end
-
-    def running?
-      signal(0)
-    end
-
-    def signal(signal)
-      Process.kill(signal, @pid)
-      true
-    rescue
-      false
-    end
-
-    def stop
-      if @pid && (@pid != 0)
-        notify "Stopped", "All good things must come to an end." unless @restarting
-        signal("KILL") && Process.wait(@pid)
-      end
-    rescue => e
-      false
-    end
-
-    def git_head_changed?
-      old_git_head = @git_head
-      read_git_head
-      @git_head and old_git_head and @git_head != old_git_head
-    end
-
-    def read_git_head
-      git_head_file = File.join(dir, '.git', 'HEAD')
-      @git_head = File.exists?(git_head_file) && File.read(git_head_file)
-    end
-
-    def notify(title, body)
-      growl title, body
-      puts
-      puts "#{Time.now.strftime("%T")} - #{app_name} #{title}"
-    end
-    
-  end
+  DEFAULT_PATTERN = "**/*.{rb,js,css,scss,sass,erb,html,haml,ru}"
 
 end  
 

data/lib/{fswatcher.rb → rerun/fswatcher.rb}

@@ -1,4 +1,4 @@
-require 'watcher'
+require 'rerun/watcher'
 
 module Rerun
   class FSWatcher < Watcher

data/lib/{osxwatcher.rb → rerun/osxwatcher.rb}

@@ -1,9 +1,8 @@
-require "system"
-require "watcher"
+require "rerun/system"
+require "rerun/watcher"
 
 #TODO: make it notice deleted files natively, rather than passing to 'examine'
 #TODO: use http://github.com/spicycode/fsevent
-require "watcher"
 module Rerun
   class OSXWatcher < Rerun::Watcher
     attr_reader :last_check, :valid_extensions

data/lib/rerun/runner.rb

@@ -0,0 +1,133 @@
+module Rerun
+  class Runner
+
+    include System
+
+    def initialize(run_command, options = {})
+      @run_command, @options = run_command, options
+      @run_command = "ruby #{@run_command}" if @run_command.split(' ').first =~ /\.rb$/
+    end
+
+    def restart
+      @restarting = true
+      stop
+      start
+      @restarting = false
+    end
+
+    def dir
+      @options[:dir] || "."
+    end
+
+    def pattern
+      @options[:pattern] || DEFAULT_PATTERN
+    end
+
+    def start
+      if windows?
+        raise "Sorry, Rerun does not work on Windows."
+      end
+
+      if (!@already_running)
+        taglines = [
+          "To infinity... and beyond!",
+          "Charge!",
+        ]
+        notify "Launched", taglines[rand(taglines.size)]
+        @already_running = true
+      else
+        taglines = [
+          "Here we go again!",
+          "Once more unto the breach, dear friends, once more!",
+        ]
+        notify "Restarted", taglines[rand(taglines.size)]
+      end
+
+      @pid = Kernel.fork do
+        begin
+          # Signal.trap("INT") { exit }
+          exec(@run_command)
+        rescue => e
+          puts e
+          exit
+        end
+      end
+      Process.detach(@pid) # so if the child exits, it dies
+
+      Signal.trap("INT") do  # INT = control-C
+        stop # first stop the child
+        exit
+      end
+
+      begin
+        sleep 2
+      rescue Interrupt => e
+        # in case someone hits control-C immediately
+        stop
+        exit
+      end
+
+      unless running?
+        notify "Launch Failed", "See console for error output"
+        @already_running = false
+      end
+
+      unless @watcher
+        watcher_class = osx_foundation? ? OSXWatcher : FSWatcher
+        # watcher_class = FSWatcher
+
+        watcher = watcher_class.new do
+          restart unless @restarting
+        end
+        puts "Watching #{dir}/#{pattern}"
+        watcher.add_directory(dir, pattern)
+        watcher.sleep_time = 1
+        watcher.start
+        @watcher = watcher
+      end
+
+    end
+
+    def join
+      @watcher.join
+    end
+
+    def running?
+      signal(0)
+    end
+
+    def signal(signal)
+      Process.kill(signal, @pid)
+      true
+    rescue
+      false
+    end
+
+    def stop
+      if @pid && (@pid != 0)
+        notify "Stopped", "All good things must come to an end." unless @restarting
+        signal("KILL") && Process.wait(@pid)
+      end
+    rescue => e
+      false
+    end
+
+    def git_head_changed?
+      old_git_head = @git_head
+      read_git_head
+      @git_head and old_git_head and @git_head != old_git_head
+    end
+
+    def read_git_head
+      git_head_file = File.join(dir, '.git', 'HEAD')
+      @git_head = File.exists?(git_head_file) && File.read(git_head_file)
+    end
+
+    def notify(title, body)
+      growl title, body
+      puts
+      puts "#{Time.now.strftime("%T")} - #{app_name} #{title}"
+    end
+
+  end
+end

data/lib/rerun/system.rb

@@ -0,0 +1,63 @@
+module Rerun
+  module System
+
+    def mac?
+      # puts "RUBY_PLATFORM=#{RUBY_PLATFORM}"
+      RUBY_PLATFORM =~ /darwin/i
+    end
+
+    def osx_foundation?      
+      mac? and begin
+        if $osx_foundation.nil?
+          require 'osx/foundation'
+          OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
+          $osx_foundation = true
+        end
+        $osx_foundation
+      rescue LoadError
+        $osx_foundation = false
+      end        
+    end
+
+    def windows?
+       RUBY_PLATFORM =~ /mswin/i
+    end
+
+    def linux?
+       RUBY_PLATFORM =~ /linux/i
+    end
+
+    # do we have growl or not?
+    def growl?
+      mac? && (growlcmd != "")
+    end
+
+    def growlcmd
+      `which growlnotify`.chomp
+    end
+    
+    def app_name
+      # todo: make sure this works in non-Mac and non-Unix environments
+      File.expand_path(".").gsub(/^.*\//, '').capitalize
+    end
+
+    def icon
+      libdir = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}/lib"
+      $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
+
+      rails_sig_file = File.expand_path(".")+"/config/boot.rb" 
+      return "#{libdir}/../icons/rails_red_sml.png" if File.exists? rails_sig_file
+      return nil
+    end
+
+    def growl(title, body, background = true)
+      if growl?
+        icon_str = ("--image \"#{icon}\"" if icon)
+        s = "#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\" #{icon_str}"
+        s += " &" if background
+        `#{s}`
+      end
+    end
+    
+  end
+end

data/rerun.gemspec

@@ -3,8 +3,8 @@ $spec = Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rerun'
-  s.version = '0.5.4'
-  s.date = '2010-11-20'
+  s.version = '0.5.5'
+  s.date = '2011-05-14'
 
   s.description = "Restarts your app when a file changes"
   s.summary     = "Launches an app, and restarts it whenever the filesystem changes."
@@ -18,11 +18,14 @@ $spec = Gem::Specification.new do |s|
     Rakefile
     rerun.gemspec
     bin/rerun
+    icons/rails_grn_sml.png
+    icons/rails_red_sml.png
     lib/rerun.rb
-    lib/fswatcher.rb
-    lib/osxwatcher.rb
-    lib/system.rb
-    lib/watcher.rb
+    lib/rerun/fswatcher.rb
+    lib/rerun/osxwatcher.rb
+    lib/rerun/runner.rb
+    lib/rerun/system.rb
+    lib/rerun/watcher.rb
   ]
   s.executables = ['rerun']
   s.test_files = s.files.select {|path| path =~ /^spec\/.*_spec.rb/}

metadata

@@ -1,73 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rerun
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 4
-  version: 0.5.4
+version: !ruby/object:Gem::Version
+  version: 0.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-20 00:00:00 -08:00
-default_executable: 
+date: 2011-05-14 00:00:00.000000000Z
 dependencies: []
-
 description: Restarts your app when a file changes
 email: alex@stinky.com
-executables: 
+executables:
 - rerun
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - LICENSE
 - Rakefile
 - rerun.gemspec
 - bin/rerun
+- icons/rails_grn_sml.png
+- icons/rails_red_sml.png
 - lib/rerun.rb
-- lib/fswatcher.rb
-- lib/osxwatcher.rb
-- lib/system.rb
-- lib/watcher.rb
-has_rdoc: true
+- lib/rerun/fswatcher.rb
+- lib/rerun/osxwatcher.rb
+- lib/rerun/runner.rb
+- lib/rerun/system.rb
+- lib/rerun/watcher.rb
 homepage: http://github.com/alexch/rerun/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: pivotalrb
-rubygems_version: 1.3.7
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 2
 summary: Launches an app, and restarts it whenever the filesystem changes.
 test_files: []
-

data/lib/system.rb

@@ -1,48 +0,0 @@
-def mac?
-  RUBY_PLATFORM =~ /darwin/i && !$osx_foundation_failed_to_load
-end
-
-def windows?
-   RUBY_PLATFORM =~ /mswin/i
-end
-
-def linux?
-   RUBY_PLATFORM =~ /linux/i
-end
-
-if mac?
-  begin
-    require 'osx/foundation'
-    OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
-  rescue LoadError
-    $osx_foundation_failed_to_load = true
-  end
-end
-
-module Rerun
-  module System
-
-    # do we have growl or not?
-    def growl?
-      mac? && (growlcmd != "")
-    end
-
-    def growlcmd
-      `which growlnotify`.chomp
-    end
-    
-    def app_name
-      # todo: make sure this works in non-Mac and non-Unix environments
-      File.expand_path(".").gsub(/^.*\//, '').capitalize
-    end
-
-    def growl(title, body, background = true)
-      if growl?
-        s = "#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\""
-        s += " &" if background
-        `#{s}`
-      end
-    end
-    
-  end
-end