guard-haskell 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTQ0ZGEwYjZhYWUzN2ZmMDAxZDU5YmEyNWZjYTMyMzMwMGNlZDI5Mw==
+    NmQxYWQ2YzZiMmUwOGY3YTMzNjIzM2IyYTNjNjcxODk5ZGMyYzFlMQ==
   data.tar.gz: !binary |-
-    ZWE4ZTUyODhjNTZmNzMxOTQyN2RlZmU4Y2U5Y2EyYTU0MzQ3MzY4Mg==
+    YjEzZjFmZjk3ZWUyNTA4Yjc3MDkwOTgwZTJjNzQ1YzViYjU3NWMyNw==
 SHA512:
   metadata.gz: !binary |-
-    MTA3YjUzNGQ2MmYxZjJjZWRhZjFiYTM4MDllMzAwOWRkMDNiMTZmMjY2MWQz
-    YmYyZjI2ODgwZGU1NjdlNGUwZDc5OWFhZWZjZGMyNTgxNTI3YmI1ZTBjYzUz
-    ZmQ2ZDAzYmU1ZmU1NjZkMDNkMWQwYmFlNmJhZDcwMTAyYWNjOGE=
+    OTE2OTEzZWNjMmZmZjllNTEzMDBlMWMwNmJiYTFmOGMzOGU0NDc2MjNjOWRh
+    YjQ2MjI0NjkwODNjMDZiMWNkYTRlNzE2MjhiODkyMDBjMTE3OGI3ZGY1MDQ1
+    YWQ2NjU1ZjFiZjAwOWFhNTVmNjFjNjhhYWQ3NTQ4NTkzNmM2ZGQ=
   data.tar.gz: !binary |-
-    YjZkYTEyYzc5M2EzNGI5OGNlOTk0YzNhYTc0MWJlODk2NzU4MGQ2ZWExMDRl
-    YWZlZjNlNzI3M2JkODcwNjJkNTllM2Q5Njk2NWZhZTYzYjA3OTVhZTlmYTRi
-    NGVmODJmZDIxYWY5MjIyNTI3Y2M3MzQ2YzE4OGQxMGE1ZTFjOTA=
+    ZDljODRhOGVmZTYzZjcwNjlhOWUxODcxZDM2ZDliNGE1MjM4YTJmODA0ZDUx
+    MTY2NTQ1MzdlNjM2NjBmY2Y3NWM3OGI4ZWM1ZGQxNTNhYjgzOGEzNDE3MWY3
+    MjY3NDM4MTFjMTQ1YzMxN2IyMzBlMTVmMzMyYzc5NDc1MDU4ODI=

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+1.1.0
+=====
+
+  * Support for `guard init haskell`

data/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec, all_on_start: true do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -71,6 +71,28 @@ Pass custom ghci options, for example, `-XCPP` directives like `-DTEST` (default
 
 "Top" spec location (default: `test/Spec.hs`).
 
+## Known problems
+
+### App you test uses the GHC API
+
+Unfortunately, testing such applications with `guard-haskell` is basically impossible
+because `ghci` uses `GHC API` too.  Sooner or later you will see something like:
+
+```
+GHCi runtime linker: fatal error: I found a duplicate definition for symbol
+   HUnitzm1zi2zi5zi2_TestziHUnitziBase_zdwzdcshowsPrec_slow
+whilst processing object file
+   /home/maksenov/.cabal/lib/HUnit-1.2.5.2/ghc-7.6.2/HSHUnit-1.2.5.2.o
+This could be caused by:
+   * Loading two different object files which export the same symbol
+   * Specifying the same object file twice on the GHCi command line
+   * An incorrect `package.conf' entry, causing some object to be
+     loaded twice.
+GHCi cannot safely continue in this situation.  Exiting now.  Sorry.
+```
+
+Fragile concurrent access is a known limitation of the `GHC API`, which hopefully will be eventually fixed.
+
   [0]: https://github.com/guard/guard#readme
   [1]: http://hspec.github.io/
   [2]: http://hspec.github.io/hspec-discover.html

data/guard-haskell.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '>= 1.3.5'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'guard-rspec'
 end

data/lib/guard/haskell.rb

@@ -22,7 +22,7 @@ module ::Guard
 
     require 'guard/haskell/repl'
 
-    attr_reader :repl, :top_spec, :ghci_options, :targets
+    attr_reader :repl, :top_spec, :ghci_options, :targets, :last_run
     attr_reader :all_on_start, :all_on_pass
 
     def initialize options = {}
@@ -43,7 +43,6 @@ module ::Guard
 
       if all_on_start
         run_all
-        success?
       end
     end
 
@@ -58,28 +57,39 @@ module ::Guard
 
     def run_all
       repl.run
+      success?
     end
 
     def run pattern
-      if @last_run == :success
-        repl.run(pattern)
-      else
+      if last_run == :runtime_failure
         repl.rerun
+      else
+        repl.run(pattern)
       end
+      success?
     end
 
     def success?
-      if repl.success?
-        if @last_run == :failure
-          @last_run = :success
-          if all_on_pass
-            run_all
-            success?
-          end
+      case [last_run, repl.result]
+      when [:runtime_failure, :success],
+          [:compile_failure, :success]
+        @last_run = :success
+        Notifier.notify('Success')
+        if all_on_pass
+          run_all
         end
+      when [:success, :success]
         Notifier.notify('Success')
-      else
-        @last_run = :failure
+      when [:runtime_failure, :compile_failure],
+        [:runtime_failure, :runtime_failure],
+        [:compile_failure, :compile_failure]
+        Notifier.notify('Failure', image: :failed)
+      when [:compile_failure, :runtime_failure],
+        [:success, :runtime_failure]
+        @last_run = :runtime_failure
+        Notifier.notify('Failure', image: :failed)
+      when [:success, :compile_failure]
+        @last_run = :compile_failure
         Notifier.notify('Failure', image: :failed)
       end
     end
@@ -95,7 +105,6 @@ module ::Guard
       case paths.first
       when /(.+)Spec\.l?hs$/, /(.+)\.l?hs$/
         run($1.strip_lowercase_directories.path_to_module_name)
-        success?
       end
     end
   end

data/lib/guard/haskell/repl.rb

@@ -1,12 +1,16 @@
-require 'io/wait'
 require 'open3'
 
 class ::Guard::Haskell::Repl
-  attr_reader :stdin, :reader, :thread, :success
+  attr_reader :stdin, :reader, :thread, :result
+
+  def initialize
+    @running = false
+    @result  = :success
+  end
 
   def start ghci_options
     cmd = ["ghci"]
-    Dir["*"].each { |x| cmd << "-i#{x}" }
+    Dir["*"].each { |d| cmd << "-i#{d}" if File.directory?(d) }
     sandbox = ::Dir[".cabal-sandbox/*packages.conf.d"].first
     cmd << "-package-db=#{sandbox}" if sandbox
     cmd.concat(ghci_options)
@@ -14,25 +18,24 @@ class ::Guard::Haskell::Repl
     @stdin, stdout, @thread = ::Open3.popen2e(*cmd)
     @reader = ::Thread.new do
       loop do
-        n = stdout.nread
-        if n > 0
-          out = stdout.read(n)
+        while (out = stdout.gets)
           print out
           if @running
             case out
             when /\d+ examples?, 0 failures/
-              @success = true
+              @result  = :success
+              @running = false
+            when /\d+ examples?, \d+ failures?/
+              @result  = :runtime_failure
               @running = false
-            when /\d+ examples?, \d+ failures?/,
-                 /Failed, modules loaded:/,
+            when /Failed, modules loaded:/,
                  /\*{3} Exception:/,
-                 /phase `C preprocessor' failed/
-              @success = false
+                 /phase `C preprocessor' failed/,
+                 /^GHCi runtime linker: fatal error:/
+              @result  = :compile_failure
               @running = false
             end
           end
-        else
-          sleep(0.1)
         end
       end
     end
@@ -59,9 +62,9 @@ class ::Guard::Haskell::Repl
     _repl ":reload\n:main --color --rerun\n"
   end
 
-  def success?
+  def result
     while @running do sleep(0.01) end
-    @success
+    @result
   end
 
   def _repl command

data/lib/guard/haskell/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module HaskellVersion
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/spec/{haskell_spec.rb → guard/haskell_spec.rb}

@@ -79,7 +79,7 @@ describe ::Guard::Haskell do
     it "runs all specs on start with :all_on_start option enabled" do
       custom_guard = ::Guard::Haskell.new(all_on_start: true)
 
-      expect(custom_guard).to receive(:run_all)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run)
       expect(custom_guard).to receive(:success?)
 
       custom_guard.start
@@ -111,6 +111,15 @@ describe ::Guard::Haskell do
   end
 
   describe "#run" do
+    it "checks success after run" do
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
+      expect(guard).to receive(:success?)
+      guard.instance_variable_set(:@last_run, :success)
+
+      guard.start
+      guard.run("Foo")
+    end
+
     it "runs specs matching pattern if last run was a success" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
       guard.instance_variable_set(:@last_run, :success)
@@ -119,36 +128,98 @@ describe ::Guard::Haskell do
       guard.run("Foo")
     end
 
-    it "reruns previous specs if last run was a failure" do
+    it "runs specs matching pattern if last run was a compile time failure" do
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
+      guard.instance_variable_set(:@last_run, :compile_failure)
+
+      guard.start
+      guard.run("Foo")
+    end
+
+    it "reruns previous specs if last run was a runtime failure" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:rerun)
-      guard.instance_variable_set(:@last_run, :failure)
+      guard.instance_variable_set(:@last_run, :runtime_failure)
 
       guard.start
       guard.run("Foo")
     end
   end
 
-  describe "#success" do
-    it "notifies on success" do
-      ::Guard::Haskell::Repl.any_instance.stub(:success?) { true }
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
-      expect(::Guard::Notifier).to receive(:notify).with('Success')
-      guard.instance_variable_set(:@last_run, :failure)
+  describe "#run_all" do
+    it "checks success after run" do
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run)
+      expect(guard).to receive(:success?)
+      guard.instance_variable_set(:@last_run, :success)
 
       guard.start
-      guard.success?
-      expect(guard.instance_variable_get(:@last_run)).to eq(:success)
+      guard.run_all
     end
+  end
 
-    it "notifies on failure" do
-      ::Guard::Haskell::Repl.any_instance.stub(:success?) { false }
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
-      expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
-      guard.instance_variable_set(:@last_run, :success)
+  describe "#success" do
+    def notify(before, received, after)
+      ::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.success?
-      expect(guard.instance_variable_get(:@last_run)).to eq(:failure)
+      expect(guard.instance_variable_get(:@last_run)).to eq(after)
+    end
+
+    it "notifies on success after success" do
+      notify(:success, :success, :success) do
+        expect(::Guard::Notifier).to receive(:notify).with('Success')
+      end
+    end
+
+    it "notifies on success after runtime failure" do
+      notify(:runtime_failure, :success, :success) do
+        expect(::Guard::Notifier).to receive(:notify).with('Success')
+      end
+    end
+
+    it "notifies on success after compile time failure" do
+      notify(:compile_failure, :success, :success) do
+        expect(::Guard::Notifier).to receive(:notify).with('Success')
+      end
+    end
+
+    it "notifies on runtime failure after success" do
+      notify(:success, :runtime_failure, :runtime_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
+    end
+
+    it "notifies on runtime failure after runtime failure" do
+      notify(:runtime_failure, :runtime_failure, :runtime_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
+    end
+
+    it "notifies on runtime failure after compile time failure" do
+      notify(:compile_failure, :runtime_failure, :runtime_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
+    end
+
+    it "notifies on compile time failure after success" do
+      notify(:success, :compile_failure, :compile_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
+    end
+
+    it "notifies on compile time failure after runtime failure" do
+      notify(:runtime_failure, :compile_failure, :runtime_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
+    end
+
+    it "notifies on compile time failure after compile time failure" do
+      notify(:compile_failure, :compile_failure, :compile_failure) do
+        expect(::Guard::Notifier).to receive(:notify).with('Failure', image: :failed)
+      end
     end
 
     it "does not run all specs on success after failure by default" do
@@ -161,10 +232,21 @@ describe ::Guard::Haskell do
       guard.success?
     end
 
-    it "runs all specs on success after failure with :all_on_pass option" do
-      ::Guard::Haskell::Repl.any_instance.stub(:success?) { true }
+    it "runs all specs 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.success?
+    end
+
+    it "runs all specs 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, :failure)
+      custom_guard.instance_variable_set(:@last_run, :compile_failure)
 
       expect(custom_guard).to receive(:run_all)
 
@@ -194,7 +276,7 @@ describe ::Guard::Haskell do
   describe "#run_on_modifications" do
     it "run specs for simple haskell files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["Foo.hs"])
@@ -202,7 +284,7 @@ describe ::Guard::Haskell do
 
     it "run specs for simple literate haskell files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["Foo.lhs"])
@@ -210,7 +292,7 @@ describe ::Guard::Haskell do
 
     it "run specs for *complex* haskell files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Bar.Baz")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["foo/Bar/Baz.hs"])
@@ -218,7 +300,7 @@ describe ::Guard::Haskell do
 
     it "run specs for simple haskell spec files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["FooSpec.hs"])
@@ -226,7 +308,7 @@ describe ::Guard::Haskell do
 
     it "run specs for simple literate haskell spec files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Foo")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["FooSpec.lhs"])
@@ -234,7 +316,7 @@ describe ::Guard::Haskell do
 
     it "run specs for *complex* haskell spec files" do
       expect_any_instance_of(::Guard::Haskell::Repl).to receive(:run).with("Bar.Baz")
-      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:success?)
+      expect_any_instance_of(::Guard::Haskell::Repl).to receive(:result)
 
       guard.start
       guard.run_on_modifications(["foo/Bar/BazSpec.hs"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-haskell
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matvey Aksenov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Guard::Haskell automatically runs your specs
 email: matvey.aksenov@gmail.com
 executables: []
@@ -74,7 +88,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -83,7 +99,7 @@ files:
 - lib/guard/haskell/repl.rb
 - lib/guard/haskell/templates/Guardfile
 - lib/guard/haskell/version.rb
-- spec/haskell_spec.rb
+- spec/guard/haskell_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/supki/guard-haskell#readme
 licenses:
@@ -110,5 +126,5 @@ signing_key:
 specification_version: 4
 summary: Guard gem for Haskell
 test_files:
-- spec/haskell_spec.rb
+- spec/guard/haskell_spec.rb
 - spec/spec_helper.rb