guard 2.0.0.pre.2 → 2.0.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1709251bb5d838ee4ba64f96f0ebf53ffb0db45e
-  data.tar.gz: e3fd375d5c4edcc27e6fb8b6f7f621b92a0bb391
+  metadata.gz: 97231e4fc0839c1025501eaf13e0577f9f53c002
+  data.tar.gz: 07f0d463dd0a08e1aa4480ecbada67db32035e37
 SHA512:
-  metadata.gz: 4221c9dc78e4340460d672762382978dc500672d29e48e12cfb307f49255e6ddbfd747f874433e7b520ab59c01d0066222dd8f0dd6b31bf8d782f9d75444e38b
-  data.tar.gz: a96d8688bcd5bad8058cbc38f4173eeb62d118d428ddd55ed9a7f7e90aeeeacb4fdbe066ca725b6bb0ecd5ea67b3b4f5dd9017d5658990349b01a5984328b466
+  metadata.gz: 6647423b6451e4dd2ccb864240a4a881bf86a20bd1673d547c4f0fdd1285a25004e2604390c8480c60fa60a1fa0a4b436629755665a0f1ef25365c1a9d368d65
+  data.tar.gz: 969be72dd8aeb2eca0f55255fa24e886a7b4cfd4cd31059ec1e26cca2075233c6e9d35f886fea10eae68f88e61cd6b03f0413ff736cb1071f5cf71d0102e91fc

data/lib/guard.rb

@@ -27,7 +27,7 @@ module Guard
   extend Setuper
 
   class << self
-    attr_accessor :evaluator, :interactor, :runner, :listener, :lock, :scope, :running
+    attr_accessor :interactor, :runner, :listener, :lock, :scope, :running
 
     # Smart accessor for retrieving specific plugins at once.
     #

data/lib/guard/interactor.rb

@@ -269,7 +269,7 @@ module Guard
     #
     def _scope_for_prompt
       [:plugins, :groups].each do |scope_name|
-        return _join_scope(scope_name) unless ::Guard.scope[scope_name].empty?
+        return _join_scope_for_prompt(scope_name) unless ::Guard.scope[scope_name].empty?
       end
 
       ''

data/lib/guard/setuper.rb

@@ -38,11 +38,11 @@ module Guard
     # @return [Guard] the Guard singleton
     #
     def setup(opts = {})
+      _reset_lazy_accessors
       @running   = true
       @lock      = Mutex.new
       @opts      = opts
       @watchdirs = [Dir.pwd]
-      @evaluator = ::Guard::Guardfile::Evaluator.new(opts)
       @runner    = ::Guard::Runner.new
 
       if options.watchdir
@@ -69,6 +69,12 @@ module Guard
       self
     end
 
+    # Lazy initializer for Guardfile evaluator
+    #
+    def evaluator
+      @evaluator ||= ::Guard::Guardfile::Evaluator.new(@opts || {})
+    end
+
     # Lazy initializer for Guard's options hash
     #
     def options
@@ -134,6 +140,11 @@ module Guard
 
     private
 
+    def _reset_lazy_accessors
+      @options   = nil
+      @evaluator = nil
+    end
+
     # Sets up various debug behaviors:
     #
     # * Abort threads on exception;

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.0.0.pre.2'
+  VERSION = '2.0.0.pre.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
+  version: 2.0.0.pre.3
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor