Merge 9b4e947 into 31a4956

.gitignore

@@ -14,16 +14,7 @@ bundle
 Gemfile.lock
 bin/fsevent_watch_guard
 Makefile
-
 .guard_result
 coverage/
-
-## MAC OS
-.DS_Store
-.Trashes
-.com.apple.timemachine.supported
-.fseventsd
-Desktop DB
-Desktop DF
-
 .ruby-version
+.tm_properties

.travis.yml

@@ -1,22 +1,21 @@
 language: ruby
 bundler_args: --without development
 rvm:
+  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
   - jruby-19mode
-  - jruby-head
   - rbx-19mode
-  - rbx-head
+  - ruby-head
+  - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-head
 notifications:
   recipients:
     - thibaud@thibaud.me
     - remy@rymai.me
     - michi@netzpiraten.ch
     - maher@sallam.me
-  irc: "irc.freenode.org#guard"
+  irc: 'irc.freenode.org#guard'

.yardopts

@@ -2,9 +2,9 @@
 --readme README.md
 --markup markdown
 --markup-provider redcarpet
---private
---protected
 --output-dir ./doc
+--protected
+--private
 lib/**/*.rb
 -
 CHANGELOG.md

CHANGELOG.md

@@ -1,7 +1,31 @@
+## git master
+
+### Removals & deprecations
+
+- Remove `Guard::Guardfile.duplicate_definitions?`. ([@rymai][])
+- Deprecate `Guard.get_guard_class(name, fail_gracefully)` in favor of `Guard::PluginUtil.new(name).plugin_class(:fail_gracefully => fail_gracefully)`. ([@rymai][])
+- Deprecate `Guard.locate_guard(name)` in favor of `Guard::PluginUtil.new(name).plugin_location`. ([@rymai][])
+- Deprecate `Guard.guard_gem_names` in favor of `Guard::PluginUtil.plugin_names`. ([@rymai][])
+- Deprecate `Guard::Guard` in favor of `Guard::Plugin`. ([@rymai][])
+- Deprecate `Guard::Dsl.evaluate_guardfile(options)` in favor of `Guard::Guardfile::Evaluator.new(options).evaluate_guardfile`. ([@rymai][])
+- Deprecate `Guard::Guardfile.create_guardfile(options)` in favor of `Guard::Guardfile::Generator.new(options).create_guardfile`. ([@rymai][])
+- Deprecate `Guard::Guardfile.initialize_template(plugin_name)` in favor of `Guard::Guardfile::Generator.new.initialize_template(plugin_name)`. ([@rymai][])
+- Deprecate `Guard::Guardfile.initialize_all_templates` in favor of `Guard::Guardfile::Generator.new.initialize_all_templates`. ([@rymai][])
+
+### Improvements
+
+- New `#title` method for `Guard::Group` & `Guard::Plugin`. ([@rymai][])
+- Rename `Guard::Hook` to `Guard::Plugin::Hooker`. ([@rymai][])
+- New `Guard::Plugin::Base` module common to `Guard::Guard` (deprecated) & `Guard::Plugin`. ([@rymai][])
+- New `Guard::PluginUtil` that contains useful methods to find and instantiate Guard plugins. ([@rymai][])
+- Move setup stuff into a new `Guard::Setuper` module. ([@rymai][])
+- Move deprecation stuff inside a new `Guard::Deprecator` class. ([@rymai][])
+
 ## 1.8.0 - 20 April, 2013
 
 ### Improvements
 
+- Listen 1.0.0 support. ([@thibaudgg][])
 - [#416][] Support .guardrc file on the folder from which Guard is executed as well. ([@Nerian][])
 - Display an info message when a plugin throws `:task_has_failed`. ([@rymai][])
 - Ensure compatibility with new Listen's API. ([@rymai][])
@@ -56,10 +80,10 @@
 
 ### New features
 
-- Allow the Guard scope to be defined from the `Guardfile` with the `scope` DSL method. ([@netzpirat][])
+- Allow the Guard scope to be defined from the `Guardfile` with the `scope` Dsl method. ([@netzpirat][])
 - [#378][] Scope plugins and groups from CLI and interactor. ([@netzpirat][])
 - [#369][] Allow Guard plugins to specify their template location. ([@schmurfy][])
-- [#364][] Add `ignore!` and `filter!` DSL methods. ([@tarsolya][])
+- [#364][] Add `ignore!` and `filter!` Dsl methods. ([@tarsolya][])
 - [#362][] Add interactor options `:history_file` and `:guard_rc`. ([@netzpirat][])
 
 ### Improvements
@@ -287,7 +311,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### Improvements
 
-- Add `interactor` to DSL to allow switching Guard interaction implementation. ([@netzpirat][])
+- Add `interactor` to Dsl to allow switching Guard interaction implementation. ([@netzpirat][])
 - Add quit action to the interactor. ([@Maher4Ever][])
 
 ## 0.9.1 - December 19, 2011
@@ -418,7 +442,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### New features
 
-- [#130][] Add `ignore_paths` method to DSL. ([@ianwhite][])
+- [#130][] Add `ignore_paths` method to Dsl. ([@ianwhite][])
 - [#128][] Users can add additional settings to `~/.guard.rb` that augment the existing Guardfile. ([@tpope][])
 
 ## 0.6.2 - August 17, 2011
@@ -514,7 +538,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### New features
 
-- [#73][] Allow DSL's `group` method to accept a Symbol as group name. ([@johnbintz][])
+- [#73][] Allow Dsl's `group` method to accept a Symbol as group name. ([@johnbintz][])
 - [#51][] Allow options (like `:priority`) to be passed through to the Notifier. ([@indirect][] and [@netzpirat][])
 
 ### Improvement
@@ -589,15 +613,15 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 ### New features
 
 - The whole directory is now watched during `run_on_change` to detect new files modifications. ([@thibaudgg][])
-- [#26][] New DSL method: `group` allows you to group several guards. New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat][])
+- [#26][] New Dsl method: `group` allows you to group several guards. New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat][])
 - `watch` patterns are now more strict: strings are matched with `String#==`, `Regexp` are matched with `Regexp#match`. ([@rymai][])
 - A deprecation warning is displayed if your `Guardfile` contains `String` that look like `Regexp` (bad!). ([@rymai][])
 - It's now possible to return an `Enumerable` in the `watch` optional blocks in the `Guardfile`. ([@rymai][])
 
 ### New specs
 
 - `Guard::Watcher`. ([@rymai][])
-- [#13][] `Guard::Dsl`. ([@oliamb][])
+- [#13][] `Guard::DSL`. ([@oliamb][])
 
 ## 0.2.2 - October 25, 2010
 

Guardfile

@@ -1,10 +1,13 @@
 scope :group => :specs
 
 group :specs do
-  guard :rspec, :cli => '--fail-fast --format doc' do
+  guard :rspec, :keep_failed => false, :cli => '--fail-fast --format doc' do
     watch(%r{^spec/.+_spec\.rb$})
     watch(%r{^lib/(.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
-    watch('spec/spec_helper.rb')             { "spec" }
+    watch('lib/guard/notifier.rb')           { 'spec/guard/notifiers' }
+    watch('lib/guard/interactor.rb')         { 'spec/guard/commands' }
+    watch(%r{^lib/guard/(guard|plugin).rb$}) { 'spec/guard/plugin' }
+    watch('spec/spec_helper.rb')             { 'spec' }
   end
 end
 

Rakefile

@@ -3,37 +3,3 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
-
-require 'rbconfig'
-namespace(:spec) do
-  if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i
-    desc "Run all specs on multiple ruby versions (requires pik)"
-    task(:portability) do
-      %w[187 192 161].each do |version|
-         system "cmd /c echo -----------#{version}------------ & " +
-           "pik use #{version} & " +
-           "bundle install & " +
-           "bundle exec rspec spec"
-      end
-    end
-  else
-    desc "Run all specs on multiple ruby versions (requires rvm)"
-    task(:portability) do
-      %w(1.8.7 1.9.2 1.9.3 jruby ree rbx).each do |version|
-        system <<-BASH
-          bash -c 'source ~/.rvm/scripts/rvm;
-                   rvm #{version};
-                   ruby_version_string_size=`ruby -v | wc -m`
-                   echo;
-                   for ((c=1; c<$ruby_version_string_size; c++)); do echo -n "="; done
-                   echo;
-                   echo "`ruby -v`";
-                   for ((c=1; c<$ruby_version_string_size; c++)); do echo -n "="; done
-                   echo;
-                   RBXOPT="-Xrbc.db" bundle install;
-                   RBXOPT="-Xrbc.db" bundle exec rspec spec -f doc 2>&1;'
-        BASH
-      end
-    end
-  end
-end

guard.gemspec

@@ -1,25 +1,21 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require "guard/version"
+# encoding: utf-8
+Kernel.load File.expand_path('../lib/guard/version.rb', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'guard'
   s.version     = Guard::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Thibaud Guillaume-Gentil']
-  s.email       = ['thibaud@thibaud.me']
-  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.author      = 'Thibaud Guillaume-Gentil'
+  s.email       = 'thibaud@thibaud.me'
+  s.homepage    = 'https://github.com/guard/guard'
 
-  s.required_rubygems_version = '>= 1.3.6'
-  s.rubyforge_project = 'guard'
-
-  s.add_dependency 'thor',       '>= 0.14.6'
-  s.add_dependency 'listen',     '>= 1.0.0'
-  s.add_dependency 'pry',        '>= 0.9.10'
-  s.add_dependency 'lumberjack', '>= 1.0.2'
-  s.add_dependency 'formatador', '>= 0.2.4'
+  s.add_runtime_dependency 'thor',       '>= 0.14.6'
+  s.add_runtime_dependency 'listen',     '>= 1.0.0'
+  s.add_runtime_dependency 'pry',        '>= 0.9.10'
+  s.add_runtime_dependency 'lumberjack', '>= 1.0.2'
+  s.add_runtime_dependency 'formatador', '>= 0.2.4'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rspec',   '~> 2.13.0'