remove @mockup

wookay · Dec 31, 2019 · 68a620b · 68a620b
1 parent f698daf
commit 68a620b
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 225 deletions.
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@
   - [@onlyonce](#onlyonce)
   - [@If](#If)
   - [@useinside](#useinside)
-  - [@mockup](#mockup)
   - [`@__END__`](#__end__)
+  - [`@__REPL__`](#__repl__)
 
 
 # runtests
@@ -33,19 +33,17 @@ runtests(@__DIR__)
 for the `runtests.jl`, `ARGS` are used to filter the targets and to set the start offset of the tests.
 
 ```
-~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s jive/m start=3
-1/5 jive/mockup/mockup.jl --
-2/5 jive/skip/skip-calls.jl --
-3/5 jive/skip/skip-exprs.jl
-    Pass 4  (0.38 seconds)
-4/5 jive/skip/skip-functions.jl
-    Pass 4  (0.05 seconds)
-5/5 jive/skip/skip-modules.jl
+~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s start=3
+1/4 jive/skip/skip-calls.jl --
+2/4 jive/skip/skip-exprs.jl --
+3/4 jive/skip/skip-functions.jl
+    Pass 4  (0.37 seconds)
+4/4 jive/skip/skip-modules.jl
     Pass 4  (0.01 seconds)
-✅  All 12 tests have been completed.  (0.73 seconds)
+✅   All 8 tests have been completed.  (0.65 seconds)
 ```
 
-in the above example, test files are matched for only have `jive/s` `jive/m` and jumping up to the 3rd file.
+in the above example, test files are matched for only have `jive/s` and jumping up to the 3rd file.
 
 ### Examples
 
@@ -180,13 +178,6 @@ end
 ```
 
 
-# @mockup
-
-used to produce a replica from the other module.
-
-* [test/jive/mockup](https://github.com/wookay/Jive.jl/blob/master/test/jive/mockup)
-
-
 # `@__END__`
 
 `throw(Jive.EndError())`
@@ -199,6 +190,29 @@ using Jive
 ```
 
 
+# `@__REPL__`
+
+* [`test/jive/__REPL__`](https://github.com/wookay/Jive.jl/blob/master/test/jive/__REPL__)
+
+```
+~/.julia/dev/Jive/test/jive/__REPL__ $ cat test.jl
+using Jive
+
+a = 1
+
+@__REPL__
+
+@info :a a
+~/.julia/dev/Jive/test/jive/__REPL__ $ julia test.jl
+julia> a += 2
+3
+
+julia> ^D  # Ctrl + D to exit the REPL
+┌ Info: a
+└   a = 3
+```
+
+
 [docs-latest-img]: https://img.shields.io/badge/docs-latest-blue.svg
 [docs-latest-url]: https://wookay.github.io/docs/Jive.jl/
 

diff --git a/docs/make.jl b/docs/make.jl
@@ -19,7 +19,6 @@ makedocs(
         "@onlyonce" => "onlyonce.md",
         "@If" => "If.md",
         "@useinside" => "useinside.md",
-        "@mockup" => "mockup.md",
         "`@__END__`" => "END.md",
         "`@__REPL__`" => "REPL.md",
     ],

diff --git a/docs/src/REPL.md b/docs/src/REPL.md
@@ -3,3 +3,23 @@
 ```@docs
 Jive.@__REPL__
 ```
+
+* [`test/jive/__REPL__`](https://github.com/wookay/Jive.jl/blob/master/test/jive/__REPL__)
+
+```
+~/.julia/dev/Jive/test/jive/__REPL__ $ cat test.jl
+using Jive
+
+a = 1
+
+@__REPL__
+
+@info :a a
+~/.julia/dev/Jive/test/jive/__REPL__ $ julia test.jl
+julia> a += 2
+3
+
+julia> ^D  # Ctrl + D to exit the REPL
+┌ Info: a
+└   a = 3
+```
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -13,8 +13,8 @@
   - [@onlyonce](#onlyonce)
   - [@If](#If)
   - [@useinside](#useinside)
-  - [@mockup](#mockup)
   - [`@__END__`](#__end__)
+  - [`@__REPL__`](#__repl__)
 
 
 # runtests
@@ -30,19 +30,17 @@ runtests(@__DIR__)
 for the `runtests.jl`, `ARGS` are used to filter the targets and to set the start offset of the tests.
 
 ```
-~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s jive/m start=3
-1/5 jive/mockup/mockup.jl --
-2/5 jive/skip/skip-calls.jl --
-3/5 jive/skip/skip-exprs.jl
-    Pass 4  (0.38 seconds)
-4/5 jive/skip/skip-functions.jl
-    Pass 4  (0.05 seconds)
-5/5 jive/skip/skip-modules.jl
+~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s start=3
+1/4 jive/skip/skip-calls.jl --
+2/4 jive/skip/skip-exprs.jl --
+3/4 jive/skip/skip-functions.jl
+    Pass 4  (0.37 seconds)
+4/4 jive/skip/skip-modules.jl
     Pass 4  (0.01 seconds)
-✅  All 12 tests have been completed.  (0.73 seconds)
+✅  All 8 tests have been completed.  (0.65 seconds)
 ```
 
-in the above example, test files are matched for only have `jive/s` `jive/m` and jumping up to the 3rd file.
+in the above example, test files are matched for only have `jive/s` and jumping up to the 3rd file.
 
 ### Examples
 
@@ -177,13 +175,6 @@ end
 ```
 
 
-# @mockup
-
-used to produce a replica from the other module.
-
-* [test/jive/mockup](https://github.com/wookay/Jive.jl/blob/master/test/jive/mockup)
-
-
 # `@__END__`
 
 `throw(Jive.EndError())`
@@ -194,3 +185,26 @@ used to produce a replica from the other module.
 using Jive
 @__END__
 ```
+
+
+# `@__REPL__`
+
+* [`test/jive/__REPL__`](https://github.com/wookay/Jive.jl/blob/master/test/jive/__REPL__)
+
+```
+~/.julia/dev/Jive/test/jive/__REPL__ $ cat test.jl
+using Jive
+
+a = 1
+
+@__REPL__
+
+@info :a a
+~/.julia/dev/Jive/test/jive/__REPL__ $ julia test.jl
+julia> a += 2
+3
+
+julia> ^D  # Ctrl + D to exit the REPL
+┌ Info: a
+└   a = 3
+```
diff --git a/docs/src/mockup.md b/docs/src/mockup.md
diff --git a/docs/src/runtests.md b/docs/src/runtests.md
@@ -15,19 +15,17 @@ runtests(@__DIR__, skip=[], node1=[], targets=ARGS)
 for the `runtests.jl`, `ARGS` are used to filter the targets and to set the start offset of the tests.
 
 ```
-~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s jive/m start=3
-1/5 jive/mockup/mockup.jl --
-2/5 jive/skip/skip-calls.jl --
-3/5 jive/skip/skip-exprs.jl
-    Pass 4  (0.38 seconds)
-4/5 jive/skip/skip-functions.jl
-    Pass 4  (0.05 seconds)
-5/5 jive/skip/skip-modules.jl
+~/.julia/dev/Jive/test $ julia --color=yes runtests.jl jive/s start=3
+1/4 jive/skip/skip-calls.jl --
+2/4 jive/skip/skip-exprs.jl --
+3/4 jive/skip/skip-functions.jl
+    Pass 4  (0.37 seconds)
+4/4 jive/skip/skip-modules.jl
     Pass 4  (0.01 seconds)
-✅  All 12 tests have been completed.  (0.73 seconds)
+✅   All 8 tests have been completed.  (0.65 seconds)
 ```
 
-in the above example, test files are matched for only have `jive/s` `jive/m` and jumping up to the 3rd file.
+in the above example, test files are matched for only have `jive/s` and jumping up to the 3rd file.
 
 ### Examples
 

diff --git a/src/Jive.jl b/src/Jive.jl
@@ -1,8 +1,5 @@
 module Jive
 
-export Mock, @mockup
-include("mockup.jl")
-
 export @skip
 include("skip.jl")
 

diff --git a/src/__REPL__.jl b/src/__REPL__.jl
@@ -26,9 +26,9 @@ macro __REPL__()
         end
     end
     quote
-        if Base.JLOptions().isinteractive == 1
+        if Base.JLOptions().isinteractive == 1 || isdefined(Base, :active_repl)
             throw(REPLError())
-        elseif !isdefined(Base, :active_repl)
+        else
             interactiveinput = isa(stdin, Base.TTY)
             quiet = true
             banner = false

diff --git a/src/mockup.jl b/src/mockup.jl