fix for 1.0 (#23)

* fix for 1.0

* fix AV

Author: KristofferC

Project.toml

@@ -1,6 +1,12 @@
 name = "Crayons"
 uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
-version = "0.5.0"
+version = "1.0.0"
 
 [compat]
-julia = "0.7"
+julia = "0.7, 1.0"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

README.md

@@ -161,8 +161,6 @@ print(GREEN_FG(
 
 ## Misc
 
-The Base function `print_with_color` is extended so that the first argument can also be a `Crayon`.
-
 The function `inv` on a `Crayon` returns a `Crayon` that undos what the `Crayon` in the argument to `inv` does.
 As an example, `inv(Crayon(bold = true))` returns a `Crayon` that disables bold.
 

REQUIRE

@@ -1 +1 @@
-julia 0.7-
+julia 0.7 2.0

appveyor.yml

@@ -1,9 +1,19 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - julia_version: 0.7
+  - julia_version: 1.0
+  - julia_version: latest
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
+
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+#matrix:
+#  allow_failures:
+#  - julia_version: latest
+
 branches:
   only:
     - master
@@ -16,18 +26,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-  - C:\projects\julia\bin\julia -e "
-    import InteractiveUtils; versioninfo();
-    import Pkg; Pkg.build()"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test()"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

src/crayon.jl

@@ -93,8 +93,10 @@ struct Crayon
     strikethrough::ANSIStyle
 end
 
-anyactive(x::Crayon) = ((x.reset.active && x.reset.on)          || x.fg.active    || x.bg.active       || x.bold.active    || x.faint.active ||
-                         x.italics.active || x.underline.active || x.blink.active || x.negative.active || x.conceal.active || x.strikethrough.active)
+anyactive(x::Crayon) = ((x.reset.active && x.reset.on) ||
+                        x.fg.active    || x.bg.active       || x.bold.active      ||
+                        x.faint.active || x.italics.active  || x.underline.active ||
+                        x.blink.active || x.negative.active || x.conceal.active   || x.strikethrough.active)
 
 Base.inv(c::Crayon) = Crayon(inv(c.fg), inv(c.bg), ANSIStyle(), # no point taking inverse of reset,
                              inv(c.bold), inv(c.faint), inv(c.italics), inv(c.underline),
@@ -270,22 +272,6 @@ function Base.merge(toks::Crayon...)
     return tok
 end
 
-function Base.with_output_color(f::Function, crayon::Crayon, io::IO, args...)
-    buf = IOBuffer()
-    print(buf, crayon)
-    try f(buf, args...)
-    finally
-        print(buf, inv(crayon))
-        print(io, String(take!(buf)))
-    end
-end
-
-Base.print_with_color(crayon::Crayon, io::IO, msg::AbstractString...) =
-    Base.with_output_color(print, crayon, io, msg...)
-Base.print_with_color(crayon::Crayon, msg::AbstractString...) =
-    print_with_color(crayon, stdout, msg...)
-
-
 # 24bit -> 256 colors
 function _to256(crayon::Crayon)
     fg = crayon.fg

src/crayon_wrapper.jl

@@ -6,7 +6,7 @@ end
 function (c::Crayon)(args::Union{CrayonWrapper,AbstractString}...)
     typefix(cw::CrayonWrapper) = cw
     typefix(str) = String(str)
-    
+
     CrayonWrapper(c, typefix.(collect(args)))
 end
 

src/macro.jl

@@ -115,4 +115,4 @@ function _parse_color_string(token::AbstractString)
     end
 
     throw(ArgumentError("could not parse $token as a color"))
-end
+end

test/runtests.jl

@@ -1,11 +1,6 @@
 using Crayons
 using Crayons.Box
-
-if VERSION < v"0.7.0-DEV.2005"
-    using Base.Test
-else
-    using Test
-end
+using Test
 
 withenv("FORCE_COLOR" => true) do
 
@@ -73,7 +68,6 @@ withenv("FORCE_256_COLORS" => true) do
     @test string(crayon"(0,0,255)") == string(Crayon(foreground = 21))
     @test string(crayon"fg:(0,0,255) bg:(255,0,255)") == string(Crayon(foreground = 21, background = 201))
 end
-    
 
 # CrayonStack
 cs = CrayonStack()
@@ -126,11 +120,6 @@ pop!(cs) # State change: fg = default
 
 string(BLACK_BG * WHITE_FG * BOLD) == string(Crayon(foreground = :white, background = :black, bold = true))
 
-# print_with_color
-io = IOBuffer()
-print_with_color(Crayon(foreground = :red), io, "haho")
-@test String(take!(io)) == string(Crayon(foreground = :red), "haho", inv(Crayon(foreground = :red)))
-
 # Call overloading
 @test string(Crayon()("hello")) == "hello"
 @test string(Crayon()(split("hello world")[1])) == "hello" # test substrings