0.33

ingydotnet · Jun 8, 2014 · 379b39a · 379b39a
1 parent 1fce65e
commit 379b39a
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,17 @@
 language: perl
+
 perl:
-- 5.18
-- 5.16
-- 5.14
-- 5.12
-- 5.10
-- 5.8
+- '5.18'
+- '5.16'
+- '5.14'
+- '5.12'
+- '5.10'
+- '5.8'
 
 install:
 - cpanm --quiet --notest
-  Pegex
   Devel::Cover::Report::Coveralls
+  Pegex
 
 script:
 - PERL5OPT=-MDevel::Cover=-coverage,statement,branch,condition,path,subroutine

diff --git a/Changes b/Changes
@@ -1,4 +1,9 @@
 ---
+version: 0.33
+date:    Sun Jun  8 12:31:30 PDT 2014
+changes:
+- Add badges
+---
 version: 0.32
 date:    Sat Jun  7 10:05:42 PDT 2014
 changes:

diff --git a/Makefile b/Makefile
@@ -5,7 +5,11 @@
 #   > make upgrade
 #
 
-.PHONY: cpan doc test
+.PHONY: cpan test
+
+ifeq (,$(shell which zild))
+    $(error "Error: 'zild' command not found. Please install Zilla::Dist from CPAN")
+endif
 
 NAME := $(shell zild meta name)
 VERSION := $(shell zild meta version)
@@ -21,18 +25,24 @@ help:
 	@echo ''
 	@echo '    make test      - Run the repo tests'
 	@echo '    make install   - Install the repo'
-	@echo '    make doc       - Make the docs'
+	@echo '    make update    - Update generated files'
 	@echo ''
 	@echo '    make cpan      - Make cpan/ dir with dist.ini'
-	@echo '    make cpan      - Open new shell into new cpan/'
+	@echo '    make cpanshell - Open new shell into new cpan/'
+	@echo '    make cpantest  - Make cpan/ dir and run tests in it'
+	@echo ''
 	@echo '    make dist      - Make CPAN distribution tarball'
 	@echo '    make distdir   - Make CPAN distribution directory'
 	@echo '    make distshell - Open new shell into new distdir'
 	@echo '    make disttest  - Run the dist tests'
+	@echo ''
 	@echo '    make publish   - Publish the dist to CPAN'
 	@echo '    make preflight - Dryrun of publish'
 	@echo ''
+	@echo '    make readme    - Make the ReadMe.pod file'
+	@echo '    make travis    - Make a travis.yml file'
 	@echo '    make upgrade   - Upgrade the build system'
+	@echo ''
 	@echo '    make clean     - Clean up build files'
 	@echo ''
 
@@ -43,15 +53,17 @@ install: distdir
 	(cd $(DISTDIR); perl Makefile.PL; make install)
 	make clean
 
-doc:
-	kwim --pod-cpan doc/$(NAMEPATH).kwim > ReadMe.pod
+update: makefile readme travis
 
 cpan:
 	zild-make-cpan
 
 cpanshell: cpan
 	(cd cpan; $$SHELL)
-	rm -fr cpan
+	make clean
+
+cpantest: cpan
+	(cd cpan; prove -lv t) && make clean
 
 dist: clean cpan
 	(cd cpan; dzil build)
@@ -66,33 +78,56 @@ distdir: clean cpan
 
 distshell: distdir
 	(cd $(DISTDIR); $$SHELL)
-	rm -fr $(DISTDIR)
+	make clean
 
 disttest: cpan
-	(cd cpan; dzil test) && rm -fr cpan
+	(cd cpan; dzil test) && make clean
 
-publish release: doc test check-release disttest
+publish release: update test check-release disttest
 	make dist
 	cpan-upload $(DIST)
 	git push
 	git tag $(VERSION)
 	git push --tag
-	rm $(DIST)
+	make clean
+	git status
 
-preflight: doc test check-release disttest
+preflight: update test check-release disttest
 	make dist
 	@echo cpan-upload $(DIST)
 	@echo git push
 	@echo git tag $(VERSION)
 	@echo git push --tag
-	rm $(DIST)
+	make clean
+	git status
 
-clean purge:
-	rm -fr cpan .build $(DIST) $(DISTDIR)
+readme:
+	kwim --pod-cpan doc/$(NAMEPATH).kwim > ReadMe.pod
+
+travis:
+	zild-make-travis
 
 upgrade:
 	cp `zild sharedir`/Makefile ./
 
+clean purge:
+	rm -fr cpan .build $(DIST) $(DISTDIR)
+
 #------------------------------------------------------------------------------
 check-release:
 	zild-check-release
+
+ifeq (Zilla-Dist,$(NAME))
+makefile:
+	@echo Skip 'make upgrade'
+else
+makefile:
+	cp Makefile /tmp/
+	make upgrade
+	@if [ -n "`diff Makefile /tmp/Makefile`" ]; then \
+	    echo "Makefile updated. Try again"; \
+	    exit 1; \
+	fi
+	rm /tmp/Makefile
+endif
+
diff --git a/Meta b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.1
 
 name: TestML
-version: 0.32
+version: 0.33
 abstract: A Generic Software Testing Meta Language
 homepage: http://testml.org
 

diff --git a/ReadMe.pod b/ReadMe.pod
@@ -14,13 +14,13 @@ TestML - A Generic Software Testing Meta Language
 
     # file t/testml/encode.tml
     %TestML 0.1.0
-    
+
     Title = 'Tests for AcmeEncode'
     Plan = 3
-    
+
     *text.apply_rot13 == *rot13
     *text.apply_md5   == *md5
-    
+
     === Encode some poetry
     --- text
     There once was a fellow named Ingy,
@@ -29,7 +29,7 @@ TestML - A Generic Software Testing Meta Language
     Gurer bapr jnf n sryybj anzrq Vatl,
     Pbzovavat ynathntrf gjnf uvf Guvatl.
     --- md5: 7a1538ff9fc8edf8ea55d02d0b0658be
-    
+
     === Encode a password
     --- text: soopersekrit
     --- md5: 64002c26dcc62c1d6d0f1cb908de1435
@@ -44,7 +44,7 @@ To run this test you would have a normal test file that looks like this:
 
     use TestML;
     use t::Bridge;
-    
+
     TestML->new(
         testml => 'testml/encode.tml',
         bridge => 't::Bridge',

diff --git a/doc/TestML/Setup.kwim b/doc/TestML/Setup.kwim
@@ -3,6 +3,10 @@ TestML::Setup
 
 Generate Test Files for a TestML Suite
 
+<badge-travis ingydotnet/testml-pm>
+
+<badge-coveralls ingydotnet/testml-pm>
+
 = Synopsis
 
   perl -MTestML::Setup -e setup testml.yaml