Skip to content

Commit

Permalink
Merge pull request #48 from GuangchuangYu/master
Browse files Browse the repository at this point in the history
daemon
  • Loading branch information
sckott committed Dec 11, 2016
2 parents ffc72c9 + 80dcfc6 commit 118d670
Show file tree
Hide file tree
Showing 7 changed files with 201 additions and 142 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ CONTRIBUTING.md
appveyor.yml
README.Rmd
cran-comments.md
Makefile
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
.RData
.DS_Store

*~
21 changes: 11 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ Description: Allows printing of character strings as messages/warnings/etc.
with ASCII animals, including cats, cows, frogs, chickens, ghosts, and more.
Version: 0.4.1.9000
License: MIT + file LICENSE
Authors@R: c(person("Scott", "Chamberlain", role = c("aut", "cre"), email = "myrmecocystus@gmail.com"),
person("Tyler", "Rinker", role = c("aut"), email = "tyler.rinker@gmail.com"),
person("Thomas", "Leeper", role = c("aut"), email = "thosjleeper@gmail.com"),
person("Noam", "Ross", role = c("aut"), email = "noam.ross@gmail.com"),
person("Rich", "FitzJohn", role = c("aut"), email = "rich.fitzjohn@gmail.com"),
person("Carson", "Sievert", role = c("aut"), email = "cpsievert1@gmail.com"),
person("Kiyoko", "Gotanda", role = c("aut"), email = "photopidge@gmail.com"),
person("Andy", "Teucher", role = c("aut"), email = "andy.teucher@gmail.com"),
person("Karl", "Broman", role = c("aut"), email = "kbroman@gmail.com"),
Authors@R: c(person("Scott", "Chamberlain", role = c("aut", "cre"), email = "myrmecocystus@gmail.com"),
person("Tyler", "Rinker", role = c("aut"), email = "tyler.rinker@gmail.com"),
person("Thomas", "Leeper", role = c("aut"), email = "thosjleeper@gmail.com"),
person("Noam", "Ross", role = c("aut"), email = "noam.ross@gmail.com"),
person("Rich", "FitzJohn", role = c("aut"), email = "rich.fitzjohn@gmail.com"),
person("Carson", "Sievert", role = c("aut"), email = "cpsievert1@gmail.com"),
person("Kiyoko", "Gotanda", role = c("aut"), email = "photopidge@gmail.com"),
person("Andy", "Teucher", role = c("aut"), email = "andy.teucher@gmail.com"),
person("Karl", "Broman", role = c("aut"), email = "kbroman@gmail.com"),
person("Franz-Sebastian", "Krah", role = c("aut"), email = "f.krah@mailbox.org"),
person("Lucy", "D'Agostino McGowan", role = c("aut"), email = "lucydagostino@gmail.com")
person("Lucy", "D'Agostino McGowan", role = c("aut"), email = "lucydagostino@gmail.com"),
person("Guangchuang", "Yu", rol = c("aut"), email = "guangchuangyu@gmail.com")
)
URL: https://github.com/sckott/cowsay
BugReports: http://www.github.com/sckott/cowsay/issues
Expand Down
32 changes: 32 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION)
PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION)
PKGSRC := $(shell basename `pwd`)

all: rd check clean

rd:
Rscript -e 'roxygen2::roxygenise(".")'

build:
cd ..;\
R CMD build $(PKGSRC)

build2:
cd ..;\
R CMD build --no-build-vignettes $(PKGSRC)

install:
cd ..;\
R CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz


check: build
cd ..;\
R CMD check $(PKGNAME)_$(PKGVERS).tar.gz

clean:
cd ..;\
$(RM) -r $(PKGNAME).Rcheck/

test: build2 install
Rscript -e 'library(cowsay); say("hello there", names(animals)[length(animals)])'
27 changes: 25 additions & 2 deletions R/animals.r
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ _____________________ _____________________
\\ /
\\/
",
turkey =
turkey =
"
\n ------------- \n%s \n -------------- \n \\\ \n \\\ \n \\\
.--.
Expand All @@ -522,7 +522,7 @@ turkey =
jgs `|||
.=='=,
",
monkey =
monkey =
"
\n ------------- \n%s \n -------------- \n \\\ \n \\\ \n \\\
Expand All @@ -538,4 +538,27 @@ monkey =
/ / \\ /
,--`,--'\\/\\ /
\'-- \"--' '--'
",

daemon =
"\n ----- \n%s \n ------ \n \\\ \n \\\ \n \\\
\ , ,
\ /( )`
\ \\ \\___ / |
/- _ `-/ '
(/\\/ \\ \\ /\\
/ / | ` \
O O ) / |
`-^--'`< '
(_.) _ ) /
`.___/` /
`-----' /
<----. __ / __ \\
<----|====O)))==) \\) /====
<----' `--' `.__,' \\
| |
\\ /
______( (_ / \\______
,' ,-----' | \\
`--{__________) \\/ [nosig]
")

0 comments on commit 118d670

Please sign in to comment.