guard 2.12.9 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405dd41ca5e1687db6ca44dbafd373d8f25a5f8b
-  data.tar.gz: 7a4551f85bf89de5387332ac326e5b0c6443d8b6
+  metadata.gz: 0c6b3428b071bd5e34a0b9a05235d5814f7fe190
+  data.tar.gz: 19dae3ff061b4d697789e01dcfd3a4558047672e
 SHA512:
-  metadata.gz: 57305dd135f3abe025f1062c274079ec31430d9c544d8dee92064f22798721d73a86d947f01b7df35ca98593d2a62a63b29ecc556ed34e4a79563b82aa0049dd
-  data.tar.gz: e2d5aa2c3c0ff95b72e8382872dd53da7e72057709189ec0629f1a86935aeb9a546857063274bb2bf12e8bf377036c77043b6fcdf8a6117d542f187f1fa929d1
+  metadata.gz: f539620c78fa10c40df9b8fb11bab2519772b6f2ad1c3839c964f1e2efda97e0ab10397baa591dc036552b30c77ef91e05e1901912db83a55527a01798070eb9
+  data.tar.gz: f234c272662f566f641a3fb684d010291c809630e5b4fc6ee6fc7bb8b0a0e1c2a859e64c5d6b892b8ed1d447287bc71fe3488d1846f3874bd498599ab6a6ea59

data/bin/guard

@@ -2,31 +2,114 @@
 
 require "pathname"
 
-default = Pathname(ENV.fetch("BUNDLE_GEMFILE", "Gemfile"))
-relative_to_binstub = Pathname(__FILE__).realpath + "../../Gemfile"
-gemfile = [default, relative_to_binstub].detect(&:exist?)
-
-if gemfile && !ENV["RUBYGEMS_GEMDEPS"]
-  ENV["BUNDLE_GEMFILE"] = gemfile.to_s
-  require "rubygems"
-  require "bundler/setup"
-else
-  require "rubygems"
-end
+class GuardReloader
+  class Config
+    def using_rubygems?
+      ENV["RUBYGEMS_GEMDEPS"]
+    end
+
+    def setup_rubygems_for_deps
+      require "rubygems"
+    end
+
+    def current_bundler_gemfile
+      ENV["BUNDLE_GEMFILE"]
+    end
+
+    def using_bundler?
+      ENV["BUNDLE_GEMFILE"]
+    end
+
+    def setup_bundler_env(gemfile)
+      ENV["BUNDLE_GEMFILE"] = gemfile
+    end
+
+    def setup_bundler
+      require "rubygems"
+      require "bundler/setup"
+    end
+
+    def program_path
+      Pathname(__FILE__)
+    end
+
+    def program_arguments
+      ARGV
+    end
+
+    def windows?
+      Gem.win_platform?
+    end
+
+    def default_system_ruby
+      RbConfig.ruby
+    end
+
+    def exit_with(code)
+      exit(code)
+    end
+
+    def spawn_with(*args)
+      spawn(*args)
+    end
+
+    def wait_ignoring_interrupts(pid)
+      Process.wait2(pid)[1].exitstatus
+    rescue Interrupt
+      retry
+    rescue Errno::ECHILD
+      1
+    end
+
+    def exist?(path)
+      path.exist?
+    end
+
+    def guard_core_path
+      Gem.bin_path("guard", "_guard-core")
+    end
+  end
+
+  attr_reader :config
+  def initialize(config)
+    @config = config
+  end
+
+  def setup
+    return config.setup_bundler if config.using_bundler?
+    return config.setup_rubygems_for_deps if config.using_rubygems?
+
+    # No dependency management detected - check if binstubbed by bundler
+    relative_to_binstub = config.program_path + "../../Gemfile"
+    if config.exist?(relative_to_binstub)
+      config.setup_bundler_env(relative_to_binstub.to_s)
+      config.setup_bundler
+      return
+    end
+
+    unless config.exist?(Pathname("Gemfile"))
+      # Running guard with bare ruby here - it's up to the user
+      # to setup/install missing deps
+      return
+    end
+
+    STDERR.puts "Warning: you have a Gemfile, but you're not using"\
+      " bundler or RUBYGEMS_GEMDEPS"
+  end
 
-def ignore_interrupts(*args)
-  args.unshift(RbConfig.ruby) if Gem.win_platform?
-  pid = spawn(*args)
-  begin
-    Process.wait(pid)
-  rescue Interrupt
-    retry
+  def auto_restart
+    args = [config.guard_core_path] + config.program_arguments
+    args.unshift(config.default_system_ruby) if config.windows?
+    loop do
+      exitcode = config.wait_ignoring_interrupts(config.spawn_with(*args))
+      config.exit_with(exitcode) if exitcode != 2
+    end
   end
-  $? == 0
 end
 
-guard_core_path = Gem.bin_path("guard", "_guard-core")
-while !ignore_interrupts(guard_core_path, *ARGV) && $?.exitstatus == 2
-  puts("Restarting guard...")
+unless ENV["GUARD_SPECS_RUNNING"]
+  config = GuardReloader::Config.new
+  reloader = GuardReloader.new(config)
+  reloader.setup
+  reloader.auto_restart
 end
-exit($?.exitstatus)

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.12.9"
+  VERSION = "2.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.12.9
+  version: 2.13.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor