github-migration/master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'enhancements' of https://github.com/mislav/guard into mislav-enhancements

Browse Source
This commit is contained in:
Thibaud Guillaume-Gentil 2011-06-07 21:16:28 +02:00
commit 7360e4a8cd
6 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guard.gemspec
View File

@ -1,6 +1,5 @@
# -*- encoding: utf-8 -*-
$:.push File.expand_path('../lib', __FILE__)
require 'guard/version'
Kernel.load File.expand_path('../lib/guard/version.rb', __FILE__)
Gem::Specification.new do |s|
s.name = 'guard'
@ -8,9 +7,9 @@ Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.authors = ['Thibaud Guillaume-Gentil']
s.email = ['thibaud@thibaud.me']
s.homepage = 'http://rubygems.org/gems/guard'
s.summary = 'Guard keep an eye on your files modifications.'
s.description = 'Guard is a command line tool to easily handle events on files modifications.'
s.homepage = 'https://github.com/guard/guard'
s.summary = 'Guard keeps an eye on your file modifications'
s.description = 'Guard is a command line tool to easily handle events on file system modifications.'
s.required_rubygems_version = '>= 1.3.6'
s.rubyforge_project = 'guard'
@ -21,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency 'thor', '~> 0.14.6'
s.files = Dir.glob('{bin,images,lib}/**/*') + %w[LICENSE README.md]
s.files = Dir.glob('{bin,images,lib}/**/*') + %w[LICENSE README.md CHANGELOG.md]
s.executable = 'guard'
s.require_path = 'lib'
end

24
lib/guard.rb
View File

@ -81,15 +81,21 @@ module Guard
end
def get_guard_class(name)
try_to_load_gem(name)
self.const_get(self.constants.find { |klass_name| klass_name.to_s.downcase == name.to_s.downcase.gsub('-', '') })
rescue TypeError
UI.error "Could not find load find gem 'guard-#{name}' or find class Guard::#{name}"
end
def try_to_load_gem(name)
require "guard/#{name.to_s.downcase}"
rescue LoadError
try_require = false
const_name = name.to_s.downcase.gsub('-', '')
begin
require "guard/#{name.downcase}" if try_require
self.const_get(self.constants.find {|c| c.to_s.downcase == const_name })
rescue TypeError
unless try_require
try_require = true
retry
else
UI.error "Could not find class Guard::#{const_name.capitalize}"
end
rescue LoadError
UI.error "Could not load 'guard/#{name.downcase}' or find class Guard::#{const_name.capitalize}"
end
end
def locate_guard(name)

7
lib/guard/listeners/darwin.rb
View File

@ -23,10 +23,13 @@ module Guard
def self.usable?
require 'rb-fsevent'
if !defined?(FSEvent::VERSION) || Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.4.0')
if !defined?(FSEvent::VERSION) || (defined?(Gem::Version) &&
Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.4.0'))
UI.info "Please update rb-fsevent (>= 0.4.0)"
false
else
true
end
true
rescue LoadError
UI.info "Please install rb-fsevent gem for Mac OSX FSEvents support"
false

7
lib/guard/listeners/linux.rb
View File

@ -24,10 +24,13 @@ module Guard
def self.usable?
require 'rb-inotify'
if !defined?(INotify::VERSION) || Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.8.5')
if !defined?(INotify::VERSION) || (defined?(Gem::Version) &&
Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.8.5'))
UI.info "Please update rb-inotify (>= 0.8.5)"
false
else
true
end
true
rescue LoadError
UI.info "Please install rb-inotify gem for Linux inotify support"
false

2
lib/guard/version.rb
View File

@ -1,3 +1,3 @@
module Guard
VERSION = "0.4.0"
VERSION = "0.4.0" unless defined? VERSION
end

49
spec/guard_spec.rb
View File

@ -1,4 +1,5 @@
require 'spec_helper'
require 'guard/guard'
describe Guard do
@ -41,35 +42,41 @@ describe Guard do
end
describe ".get_guard_class" do
after do
[:Classname, :DashedClassName, :Inline].each do |const|
Guard.send(:remove_const, const) rescue nil
end
end
it "reports an error if the class is not found" do
::Guard::UI.should_receive(:error)
Guard.get_guard_class('notAGuardClass')
end
context 'with a nested Guard class' do
it "returns the Guard class when passed a Symbol" do
Guard.should_receive(:try_to_load_gem) { |classname|
classname.should == :classname
class Guard::Classname
end
}
Guard.get_guard_class(:classname).should == Guard::Classname
end
it "returns the Guard class when passed a String" do
Guard.should_receive(:try_to_load_gem) { |classname|
classname.should == 'classname'
it "resolves the Guard class from string" do
Guard.should_receive(:require) { |classname|
classname.should == 'guard/classname'
class Guard::Classname
end
}
Guard.get_guard_class('classname').should == Guard::Classname
end
it "resolves the Guard class from symbol" do
Guard.should_receive(:require) { |classname|
classname.should == 'guard/classname'
class Guard::Classname
end
}
Guard.get_guard_class(:classname).should == Guard::Classname
end
end
context 'with a name with dashes' do
it "returns the Guard class" do
Guard.should_receive(:try_to_load_gem) { |classname|
classname.should == 'dashed-class-name'
Guard.should_receive(:require) { |classname|
classname.should == 'guard/dashed-class-name'
class Guard::DashedClassName
end
}
@ -84,23 +91,11 @@ describe Guard do
end
end
Guard.should_not_receive(:require)
Guard.get_guard_class('inline').should == Guard::Inline
end
end
end
describe ".try_to_load_gem" do
class Guard::Classname
end
it "reports an error if the class is not found" do
Guard.get_guard_class('classname').should be_true
end
it "reports an error if the class is not found" do
Guard.get_guard_class(:classname).should be_true
end
end
describe ".locate_guard" do
it "returns the path of a Guard gem" do