0.19

ingydotnet · Jun 18, 2014 · 5087d71 · 5087d71
1 parent a9f6f54
commit 5087d71
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,3 +25,8 @@ script:
 after_success:
 - cover -report coveralls
 
+
+# Hack to not run on tag pushes:
+branches:
+  except:
+  - /^v?[0-9]+\.[0-9]+/
diff --git a/Changes b/Changes
@@ -1,4 +1,9 @@
 ---
+version: 0.19
+date:    Wed Jun 18 11:23:29 PDT 2014
+changes:
+- Tests using TestML needed 'inc'
+---
 version: 0.18
 date:    Mon Jun 16 15:46:07 PDT 2014
 changes:

diff --git a/Makefile b/Makefile
@@ -53,7 +53,8 @@ install: distdir
 	(cd $(DISTDIR); perl Makefile.PL; make install)
 	make clean
 
-update: makefile readme travis version
+update: makefile
+	make readme travis version
 
 cpan:
 	zild-make-cpan
@@ -83,7 +84,7 @@ distshell: distdir
 disttest: cpan
 	(cd cpan; dzil test) && make clean
 
-release: update test check-release disttest
+release: clean update check-release test disttest
 	make dist
 	cpan-upload $(DIST)
 	git push
@@ -92,7 +93,7 @@ release: update test check-release disttest
 	make clean
 	git status
 
-preflight: update test check-release disttest
+preflight: clean update check-release test disttest
 	make dist
 	@echo cpan-upload $(DIST)
 	@echo git push
@@ -121,14 +122,7 @@ 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
+makefile: upgrade
 endif
 
 version:

diff --git a/Meta b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.1
 
 name: Template-Toolkit-Simple
-version: 0.18
+version: 0.19
 abstract: A Simple Interface to Template Toolkit
 homepage: https://metacpan.org/release/Template-Toolkit-Simple
 

diff --git a/lib/Template/Toolkit/Simple.pm b/lib/Template/Toolkit/Simple.pm
@@ -1,6 +1,6 @@
 use strict; use warnings;
 package Template::Toolkit::Simple;
-our $VERSION = '0.18';
+our $VERSION = '0.19';
 
 use Encode;
 use Getopt::Long;

diff --git a/test/cli.t b/test/cli.t
@@ -1,3 +1,5 @@
+use lib 'inc';
+
 use TestML;
 
 TestML->new(

diff --git a/test/render_json.t b/test/render_json.t
@@ -1,3 +1,5 @@
+use lib 'inc';
+
 {
     use Test::More;
     eval "use JSON::XS; 1" or

diff --git a/test/render_xml.t b/test/render_xml.t
@@ -1,3 +1,5 @@
+use lib 'inc';
+
 {
     use Test::More;
     eval "use XML::Simple; 1" or

diff --git a/test/render_yaml.t b/test/render_yaml.t
@@ -1,3 +1,5 @@
+use lib 'inc';
+
 use TestML;
 
 TestML->new(