0.37

ingydotnet · Jul 17, 2014 · 2dc80a9 · 2dc80a9
1 parent 3cba351
commit 2dc80a9
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,10 @@
+# DO NOT EDIT
+#
+# This .travis.yml file generated by Zilla::Dist. To upgrade it, run:
+#
+#   > make update
+#
+
 language: perl
 
 perl:
@@ -28,6 +35,7 @@ notifications:
     - irc.freenode.net#testml
     on_success: change
     on_failure: always
+    skip_join: true
 
 # Hack to not run on tag pushes:
 branches:

diff --git a/Changes b/Changes
@@ -1,4 +1,10 @@
 ---
+version: 0.37
+date:    Wed Jul 16 23:44:36 PDT 2014
+changes:
+- Move doc to Swim
+- Fix Meta and add Contributing file
+---
 version: 0.36
 date:    Sun Jun 22 16:22:12 PDT 2014
 changes:

diff --git a/Contributing b/Contributing
@@ -0,0 +1,55 @@
+Contributing
+============
+
+The "TestML" Project needs your help!
+
+Please consider being a contributor. This file contains instructions that will
+help you be an effective contributor to the Project.
+
+GitHub
+------
+
+The code for this Project is hosted at GitHub. The repository is:
+
+  https://github.com/ingydotnet/testml-pm
+
+You can get the code with this command:
+
+  git clone https://github.com/ingydotnet/testml-pm
+
+If you've found a bug or a missing feature that you would like the author to
+know about, report it here:
+
+  https://github.com/ingydotnet/testml-pm/issues
+
+or fix it and submit a pull request here:
+
+  https://github.com/ingydotnet/testml-pm/pulls
+
+See these links for help on interacting with GitHub:
+
+* https://help.github.com/
+* https://help.github.com/articles/creating-a-pull-request
+
+Zilla::Dist
+-----------
+
+This Project uses Zilla::Dist to prepare it for publishing to CPAN. Read:
+
+  https://metacpan.org/pod/distribution/Zilla-Dist/lib/Zilla/Dist/Contributing.pod
+
+for up-to-date instructions on what contributors like yourself need to know to
+use it.
+
+IRC
+---
+
+TestML has an IRC channel where you can find real people to help you:
+
+  irc.freenode.net#testml
+
+Join the channel. Join the team!
+
+
+    Thanks in advance, Ingy döt Net
+
diff --git a/Makefile b/Makefile
@@ -7,15 +7,20 @@
 
 .PHONY: cpan test
 
-ifeq (,$(shell which zild))
-    $(error "Error: 'zild' command not found. Please install Zilla::Dist from CPAN")
+ifneq (,$(shell which zild))
+    NAME := $(shell zild meta name)
+    VERSION := $(shell zild meta version)
+    RELEASE_BRANCH := $(shell zild meta branch)
+else
+    NAME := No-Name
+    VERSION := 0
+    RELEASE_BRANCH := master
 endif
 
-NAME := $(shell zild meta name)
-VERSION := $(shell zild meta version)
 DISTDIR := $(NAME)-$(VERSION)
 DIST := $(DISTDIR).tar.gz
 NAMEPATH := $(subst -,/,$(NAME))
+SUCCESS := "$(DIST) Released!!!"
 
 default: help
 
@@ -26,6 +31,7 @@ help:
 	@echo '    make test      - Run the repo tests'
 	@echo '    make install   - Install the repo'
 	@echo '    make update    - Update generated files'
+	@echo '    make release   - Release the dist to CPAN'
 	@echo ''
 	@echo '    make cpan      - Make cpan/ dir with dist.ini'
 	@echo '    make cpanshell - Open new shell into new cpan/'
@@ -36,25 +42,40 @@ help:
 	@echo '    make distshell - Open new shell into new distdir'
 	@echo '    make disttest  - Run the dist tests'
 	@echo ''
-	@echo '    make release   - Release the dist to CPAN'
-	@echo '    make preflight - Dryrun of release'
-	@echo ''
+	@echo '    make upgrade   - Upgrade the build system (Makefile)'
 	@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 '    make help      - Show this help'
 	@echo ''
 
 test:
+ifeq ($(wildcard pkg/no-test),)
 	prove -lv test
+else
+	@echo "Testing not available. Use 'disttest' instead."
+endif
 
 install: distdir
 	(cd $(DISTDIR); perl Makefile.PL; make install)
 	make clean
 
 update: makefile
-	make readme travis version
+	make readme contrib travis version
+
+release: clean update check-release test disttest
+	make dist
+	[ -n "$$(git status -s)" ] && git commit -am '$(VERSION)'
+	cpan-upload $(DIST)
+	git push
+	git tag $(VERSION)
+	git push --tag
+	make clean
+	git status
+	@echo
+	@[ -n "$$(which cowsay)" ] && cowsay "$(SUCCESS)" || echo "$(SUCCESS)"
+	@echo
 
 cpan:
 	zild-make-cpan
@@ -64,7 +85,11 @@ cpanshell: cpan
 	make clean
 
 cpantest: cpan
+ifeq ($(wildcard pkg/no-test),)
 	(cd cpan; prove -lv t) && make clean
+else
+	@echo "Testing not available. Use 'disttest' instead."
+endif
 
 dist: clean cpan
 	(cd cpan; dzil build)
@@ -84,42 +109,29 @@ distshell: distdir
 disttest: cpan
 	(cd cpan; dzil test) && make clean
 
-release: clean update check-release test disttest
-	make dist
-	cpan-upload $(DIST)
-	git push
-	git tag $(VERSION)
-	git push --tag
-	make clean
-	git status
-	@[ -n "$$(which cowsay)" ] && cowsay "$(DIST) Released!!!" && echo
-
-preflight: clean update check-release test disttest
-	make dist
-	@echo cpan-upload $(DIST)
-	@echo git push
-	@echo git tag $(VERSION)
-	@echo git push --tag
-	make clean
-	git status
-	@[ -n "$$(which cowsay)" ] && cowsay "$(DIST) Released!!!" && echo
+upgrade:
+	cp `zild sharedir`/Makefile ./
 
 readme:
-	kwim --pod-cpan doc/$(NAMEPATH).kwim > ReadMe.pod
+	swim --pod-cpan doc/$(NAMEPATH).swim > ReadMe.pod
 
-travis:
-	zild-make-travis
+contrib:
+	zild-render-template Contributing
 
-upgrade:
-	cp `zild sharedir`/Makefile ./
+travis:
+	zild-render-template travis.yml .travis.yml
 
 clean purge:
 	rm -fr cpan .build $(DIST) $(DISTDIR)
 
+#------------------------------------------------------------------------------
+# Non-pulic-facing targets:
 #------------------------------------------------------------------------------
 check-release:
-	zild-check-release
+	RELEASE_BRANCH=$(RELEASE_BRANCH) zild-check-release
 
+# We don't want to update the Makefile in Zilla::Dist since it is the real
+# source, and would be reverting to whatever was installed.
 ifeq (Zilla-Dist,$(NAME))
 makefile:
 	@echo Skip 'make upgrade'

diff --git a/Meta b/Meta
@@ -1,12 +1,12 @@
 =meta: 0.0.1
 
 name: TestML
-version: 0.36
+version: 0.37
 abstract: A Generic Software Testing Meta Language
 homepage: http://testml.org
 
 license: perl
-copyright: 2010, 2011, 2012, 2013, 2014. Ingy döt Net.
+copyright: 2010-2014. Ingy döt Net.
 author:
   name: Ingy döt Net
   email: ingy@cpan.org
@@ -18,15 +18,16 @@ author:
 requires:
   perl: 5.8.1
   Pegex: 0.30
+
 test:
   requires:
     Capture::Tiny: 0
   cmd: prove -lv test/
 
 devel:
-  git: git@github.org/ingydotnet/testml-pm
-  irc: irc.freenode.net/testml
-  bug: https://github.com/ingydotnet/testml-pm/issues/
+  git: https://github.com/ingydotnet/testml-pm
+  bug: https://github.com/ingydotnet/testml-pm/issues
+  irc: irc.freenode.net#testml
 
 =travis:
   type: perl

diff --git a/ReadMe.pod b/ReadMe.pod
@@ -1,8 +1,8 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Kwim.
-See http://github.com/ingydotnet/kwim-pm#readme
+DO NOT EDIT. This Pod was generated by Swim.
+See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
 

diff --git a/doc/TestML.kwim → doc/TestML.swim b/doc/TestML.kwim → doc/TestML.swim
diff --git a/doc/TestML/Setup.kwim → doc/TestML/Setup.swim b/doc/TestML/Setup.kwim → doc/TestML/Setup.swim
diff --git a/lib/TestML.pm b/lib/TestML.pm
@@ -1,7 +1,7 @@
 package TestML;
 
 use TestML::Base;
-our $VERSION = '0.36';
+our $VERSION = '0.37';
 
 has runtime => ();
 has compiler => ();