guard-haskell 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI3NmViYzJlOThiNjQxYjNlM2VlZWRhY2Y4MTIyODc0MThiOGRhMw==
+    MTlhNDgyMGFhYTJhZDQxMjQyNjhlMWQxMmMwMTE5YzljYzY4NzNhYw==
   data.tar.gz: !binary |-
-    ODYyZTU5ZTM1YzM2OWJlNTU2ZTcxMDRmMTFjOTE2YzkxMTY5MDcyMA==
+    NDk2ZjBjMjI0MjdiMDJkMDM5ZDY4ZTg2Y2VjNTk5MWQ3ZmE2ODM5MA==
 SHA512:
   metadata.gz: !binary |-
-    NjVjYmNiOTIwNGM1NzZmYTBkZWYwZTRkMWE1NDY0M2Y1MWEyYzNlOTBjZDU3
-    NmQ3Y2IzMDhlYjBiZmQ2OTQ2OTc5YmVhOGJiZjg5MGMxNDkzMGM1MDBmYjE4
-    NjlkNmU3ZmUyMGYwMTQ4NzUxODVlODc0YjRkYjRiZmM1MWQ5MmI=
+    MWNhODA4OWM5NDU3ZGJmNzUyYjVmMTUzMWU2Mjc3YmQxMTgyYzkzZjUxMTA5
+    ZTk4Y2FiYTc3YWQwYmIzNTMyOGNhYTdhMTQ3ODZiZjY4M2RkZTE4OWNiODNj
+    NzA0MTliMDgyZDVmMzI3MGRjODE1ZDkwMDNlOTFlYTdkOGMwOTU=
   data.tar.gz: !binary |-
-    NWU4YmJkYmRkY2ZhNTZlMDI1NDI4ODllN2YyMDQ0ZGViODI2NWYwNWI3OWUz
-    MGJmZDkxMjAxMTRiYjE1ZmVhYTVkYzU3NmYzYTU1ZTFhOWE4ZjI1ODcyYWQ3
-    MGNkNzQyYTNhMjE1NWFiMjI2Mzg2OTNjN2NiNjc3NTc3YjYzMTI=
+    MWExZTU3Mjg0ZDVkODJjMzQzYzg2NzYwYjM3YmE4Y2QwOTg5MThiMjBjMTk3
+    MTJmMDNkZTc5ZmE4MWE0ZThlMzhjZTI5NThkMzcwNDMxY2MyOTIyNzVlYjM1
+    YWM5YjFmYmVlYzFiNzI1MzM1YTBlM2Y2ODJhZGM1N2U1YzNhYjY=

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
+
 rvm:
     - 1.9.3
     - 2.0.0
+    - 2.1.1
     - ruby-head
+
 matrix:
     allow_failures:
         - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+1.6.0
+=====
+
+  * Handle Haskell pre-processor phase failures
+
+  * Handle missing Haskell pre-processor failures
+
+  * More extensible Guardfile template
+
 1.5.0
 =====
 
@@ -13,7 +22,7 @@
 =====
 
   * Ignore user cabal package database if sandbox is found
-  * Catch CPP failures (previously did n't work because of the typo)
+  * Catch CPP failures (previously didn't work because of the typo)
   * Add `focus_on_fail` option
 
 1.2.0

data/lib/guard/haskell/repl.rb

@@ -3,11 +3,6 @@ require 'open3'
 class ::Guard::Haskell::Repl
   attr_reader :stdin, :listener, :thread, :result
 
-  def initialize
-    @running = false
-    @result  = :success
-  end
-
   def self.test(str)
     case str
     when /\d+ examples?, 0 failures/,
@@ -19,13 +14,18 @@ class ::Guard::Haskell::Repl
          /\*{3} Exception:/,
          /cannot find object file for module/,
          /phase `C pre-processor' failed/,
+         /phase `Haskell pre-processor' failed/,
          /GHCi runtime linker: fatal error:/,
-         /During interactive linking, GHCi couldn't find the following symbol:/
+         /During interactive linking, GHCi couldn't find the following symbol:/,
+         /ghc: could not execute:/
       :compile_failure
     end
   end
 
-  def start(ghci_options, sandbox_glob)
+  def initialize(ghci_options, sandbox_glob)
+    @running = false
+    @result  = :success
+
     cmd = ["ghci"]
 
     Dir["*"].each { |d| cmd << "-i#{d}" if File.directory?(d) }

data/lib/guard/haskell/templates/Guardfile

@@ -1,4 +1,8 @@
-guard :haskell, ghci_options: ["-ignore-dot-ghci"] do
+ghci_options =
+  [ "-ignore-dot-ghci" \
+  ]
+
+guard :haskell, ghci_options: ghci_options do
   watch(%r{test/.+Spec\.l?hs$})
   watch(%r{src/.+\.l?hs$})
 end

data/lib/guard/haskell/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module HaskellVersion
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end

data/lib/guard/haskell.rb

@@ -22,7 +22,8 @@ module ::Guard
 
     require 'guard/haskell/repl'
 
-    attr_reader :repl, :targets, :last_run, :opts
+    attr_accessor :opts, :repl
+    attr_reader :targets, :last_run
 
     Options = Struct.new(
       :top_spec,
@@ -44,14 +45,12 @@ module ::Guard
 
     def initialize(user_options = {})
       super
-
-      @last_run = :success # try to prove it wasn't :-)
-      @opts     = Options.new(*DEFAULT_OPTIONS.merge(user_options).values)
-      @repl     = Repl.new
+      self.opts = Options.new(*DEFAULT_OPTIONS.merge(user_options).values)
     end
 
     def start
-      repl.start(opts.ghci_options, opts.sandbox_glob)
+      @last_run = :success # try to prove it wasn't :-)
+      self.repl = Repl.new(opts.ghci_options, opts.sandbox_glob)
       repl.init(opts.top_spec)
 
       @targets = ::Set.new(::Dir.glob("**/*.{hs,lhs}"))

data/spec/guard/haskell/repl_spec.rb

@@ -95,6 +95,10 @@ describe ::Guard::Haskell::Repl do
       expect(::Guard::Haskell::Repl.test("phase `C pre-processor' failed")).to eq(:compile_failure)
     end
 
+    it "handles Haskell pre-processor errors" do
+      expect(::Guard::Haskell::Repl.test("phase `Haskell pre-processor' failed")).to eq(:compile_failure)
+    end
+
     it "handles runtime linker errors" do
       expect(::Guard::Haskell::Repl.test("GHCi runtime linker: fatal error:")).to eq(:compile_failure)
     end
@@ -173,6 +177,26 @@ describe ::Guard::Haskell::Repl do
         expect(repl.instance_variable_get(:@running)).to eq(false)
         expect(repl.instance_variable_get(:@result)).to eq(:compile_failure)
       end
+
+      it "handles preprocessor phase failures" do
+        in_stream  = ::File.open(run_file["preprocessor-phase-failed.error"])
+        repl.instance_variable_set(:@running, true)
+
+        repl.send(:listen, in_stream, dev_null)
+
+        expect(repl.instance_variable_get(:@running)).to eq(false)
+        expect(repl.instance_variable_get(:@result)).to eq(:compile_failure)
+      end
+
+      it "handles missing preprocessor error" do
+        in_stream  = ::File.open(run_file["missing-preprocessor.error"])
+        repl.instance_variable_set(:@running, true)
+
+        repl.send(:listen, in_stream, dev_null)
+
+        expect(repl.instance_variable_get(:@running)).to eq(false)
+        expect(repl.instance_variable_get(:@result)).to eq(:compile_failure)
+      end
     end
   end
 

data/spec/guard/haskell_spec.rb

@@ -33,12 +33,16 @@ describe "monkey patching" do
   end
 end
 
+class ::Guard::Haskell::Repl
+  def initialize(*args)
+  end
+end
+
 describe ::Guard::Haskell do
   let(:guard) { ::Guard::Haskell.new }
 
   before :each do
     ::Guard.stub(:add_group)
-    ::Guard::Haskell::Repl.any_instance.stub(:start)
     ::Guard::Haskell::Repl.any_instance.stub(:init)
   end
 
@@ -127,10 +131,10 @@ describe ::Guard::Haskell do
     it "reruns failing examples if last run was a runtime failure and @focus_on_fail is set" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:reload_and_rerun)
       expect_any_instance_of(::Guard::Haskell::Repl).not_to receive(:reload_and_run_matching).with("Foo")
-      guard.instance_variable_set(:@last_run, :runtime_failure)
-      guard.opts.focus_on_fail = true
 
+      guard.opts.focus_on_fail = true
       guard.start
+      guard.instance_variable_set(:@last_run, :runtime_failure)
       guard.run("Foo")
     end
 
@@ -149,7 +153,6 @@ describe ::Guard::Haskell do
     it "checks success after run" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:reload_and_run_matching)
       expect(guard).to receive(:success?)
-      guard.instance_variable_set(:@last_run, :success)
 
       guard.start
       guard.run_all
@@ -161,9 +164,9 @@ describe ::Guard::Haskell do
       ::Guard::Haskell::Repl.any_instance.stub(:result) { received }
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
       yield
-      guard.instance_variable_set(:@last_run, before)
 
       guard.start
+      guard.instance_variable_set(:@last_run, before)
       guard.success?
       expect(guard.instance_variable_get(:@last_run)).to eq(after)
     end
@@ -224,33 +227,30 @@ describe ::Guard::Haskell do
 
     it "does not run all specs on success after failure by default" do
       ::Guard::Haskell::Repl.any_instance.stub(:success?) { true }
-      guard.instance_variable_set(:@last_run, :failure)
-
       expect(guard).not_to receive(:run_all)
 
       guard.start
+      guard.instance_variable_set(:@last_run, :failure)
       guard.success?
     end
 
     it "runs all examples on success after runtime failure with :all_on_pass option" do
       ::Guard::Haskell::Repl.any_instance.stub(:result) { :success }
       custom_guard = ::Guard::Haskell.new(all_on_pass: true)
-      custom_guard.instance_variable_set(:@last_run, :runtime_failure)
-
       expect(custom_guard).to receive(:run_all)
 
       custom_guard.start
+      custom_guard.instance_variable_set(:@last_run, :runtime_failure)
       custom_guard.success?
     end
 
     it "runs all examples on success after compile time failure with :all_on_pass option" do
       ::Guard::Haskell::Repl.any_instance.stub(:result) { :success }
       custom_guard = ::Guard::Haskell.new(all_on_pass: true)
-      custom_guard.instance_variable_set(:@last_run, :compile_failure)
-
       expect(custom_guard).to receive(:run_all)
 
       custom_guard.start
+      custom_guard.instance_variable_set(:@last_run, :compile_failure)
       custom_guard.success?
     end
   end

data/spec/run-files/missing-preprocessor.error

@@ -0,0 +1,9 @@
+Cabal sandboxes found:
+  .cabal-sandbox/x86_64-linux-ghc-7.6.3-packages.conf.d
+Cabal sandbox used:
+  .cabal-sandbox/x86_64-linux-ghc-7.6.3-packages.conf.d
+GHCi, version 7.6.3: http://www.haskell.org/ghc/  :? for help
+Loading package ghc-prim ... linking ... done.
+Loading package integer-gmp ... linking ... done.
+Loading package base ... linking ... done.
+ghc: could not execute: hspec-disco

data/spec/run-files/preprocessor-phase-failed.error

@@ -0,0 +1,5 @@
+*Main> hspec-discover: unexpected argument `o'
+
+Usage: hspec-discover SRC CUR DST [--formatter=FORMATTER] [--no-main]
+
+phase `Haskell pre-processor' failed (exitcode = 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-haskell
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Matvey Aksenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -117,6 +117,8 @@ files:
 - spec/guard/haskell_spec.rb
 - spec/run-files/cpp-exception.error
 - spec/run-files/hspec-exception.error
+- spec/run-files/missing-preprocessor.error
+- spec/run-files/preprocessor-phase-failed.error
 - spec/run-files/runtime-linker-cannot-find-object-file.error
 - spec/run-files/runtime-linker-couldn't-find-symbol.error
 - spec/run-files/runtime-linker-duplicate-definition-for-symbol.error
@@ -152,6 +154,8 @@ test_files:
 - spec/guard/haskell_spec.rb
 - spec/run-files/cpp-exception.error
 - spec/run-files/hspec-exception.error
+- spec/run-files/missing-preprocessor.error
+- spec/run-files/preprocessor-phase-failed.error
 - spec/run-files/runtime-linker-cannot-find-object-file.error
 - spec/run-files/runtime-linker-couldn't-find-symbol.error
 - spec/run-files/runtime-linker-duplicate-definition-for-symbol.error