Skip to content

Commit

Permalink
0.32
Browse files Browse the repository at this point in the history
  • Loading branch information
@ingydotnet
ingydotnet committed Jun 7, 2014
1 parent 1f0f3c9 commit c539cf9
Show file tree
Hide file tree
Showing 19 changed files with 81 additions and 36 deletions.
6 changes: 6 additions & 0 deletions Changes
View file
@@ -1,4 +1,10 @@
---
version: 0.32
date: Sat Jun 7 10:05:42 PDT 2014
changes:
- zild release
- Switch to PkgVersion
---
version: 0.31
date: Sun May 18 01:08:48 PDT 2014
changes:
Expand Down
72 changes: 44 additions & 28 deletions Makefile
View file
@@ -1,29 +1,39 @@
# DO NOT EDIT.
#
# This Makefile came from Zilla::Dist. To upgrade it, run:
#
# > make upgrade
#

.PHONY: cpan doc test

NAME := $(shell grep '^name: ' Meta 2>/dev/null | cut -d' ' -f2)
VERSION := $(shell grep '^version: ' Meta 2>/dev/null | cut -d' ' -f2)
NAME := $(shell zild meta name)
VERSION := $(shell zild meta version)
DISTDIR := $(NAME)-$(VERSION)
DIST := $(DISTDIR).tar.gz
NAMEPATH := $(subst -,/,$(NAME))

default: help

help:
@echo ''
@echo 'Makefile targets:'
@echo ''
@echo ' make test - Run the repo tests'
@echo ' make install - Install the repo'
@echo ' make doc - Make the docs'
@echo ' make test - Run the repo tests'
@echo ' make install - Install the repo'
@echo ' make doc - Make the docs'
@echo ''
@echo ' make cpan - Make cpan/ dir with dist.ini'
@echo ' make dist - Make CPAN distribution tarball'
@echo ' make distdir - Make CPAN distribution directory'
@echo ' make disttest - Run the dist tests'
@echo ' make publish - Publish the dist to CPAN'
@echo ' make publish-dryrun - Don'"'"'t actually push to CPAN'
@echo ' make cpan - Make cpan/ dir with dist.ini'
@echo ' make cpan - Open new shell into new cpan/'
@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 ' make publish - Publish the dist to CPAN'
@echo ' make preflight - Dryrun of publish'
@echo ''
@echo ' make upgrade - Upgrade the build system'
@echo ' make clean - Clean up build files'
@echo ' make upgrade - Upgrade the build system'
@echo ' make clean - Clean up build files'
@echo ''

test:
Expand All @@ -34,10 +44,14 @@ install: distdir
make clean

doc:
kwim --pod-cpan doc/$(NAME).kwim > ReadMe.pod
kwim --pod-cpan doc/$(NAMEPATH).kwim > ReadMe.pod

cpan:
./.pkg/bin/make-cpan
zild-make-cpan

cpanshell: cpan
(cd cpan; $$SHELL)
rm -fr cpan

dist: clean cpan
(cd cpan; dzil build)
Expand All @@ -50,33 +64,35 @@ distdir: clean cpan
tar xzf $(DIST)
rm -fr cpan $(DIST)

distshell: distdir
(cd $(DISTDIR); $$SHELL)
rm -fr $(DISTDIR)

disttest: cpan
(cd cpan; dzil test) && rm -fr cpan

publish: check-release dist
publish release: doc test check-release disttest
make dist
cpan-upload $(DIST)
git push
git tag $(VERSION)
git push --tag
rm $(DIST)

publish-dryrun: check-release dist
echo cpan-upload $(DIST)
echo git tag $(VERSION)
echo git push --tag
preflight: doc test check-release disttest
make dist
@echo cpan-upload $(DIST)
@echo git push
@echo git tag $(VERSION)
@echo git push --tag
rm $(DIST)

clean purge:
rm -fr cpan .build $(DIST) $(DISTDIR)

upgrade:
(PKGREPO=$(PWD) make -C ../perl5-pkg do-upgrade)
cp `zild sharedir`/Makefile ./

#------------------------------------------------------------------------------
check-release:
./.pkg/bin/check-release

do-upgrade:
mkdir -p $(PKGREPO)/.pkg/bin
cp Makefile $(PKGREPO)/Makefile
cp dist.ini $(PKGREPO)/.pkg/
cp -r bin/* $(PKGREPO)/.pkg/bin/
zild-check-release
5 changes: 1 addition & 4 deletions Meta
View file
@@ -1,7 +1,7 @@
=meta: 0.0.1

name: TestML
version: 0.31
version: 0.32
abstract: A Generic Software Testing Meta Language
homepage: http://testml.org

Expand All @@ -28,9 +28,6 @@ devel:
irc: irc.freenode.net/testml
bug: https://github.com/ingydotnet/testml-pm/issues/

=cpan:
ourpkgversion: 1

=travis: perl

# XXX need to generate TestML shims:
Expand Down
1 change: 0 additions & 1 deletion lib/Module/Install/TestML.pm
View file
@@ -1,6 +1,5 @@
# XXX This module should be deprecated or at least moved to a separate dist.
package Module::Install::TestML;
# VERSION

use strict;
use warnings;
Expand Down
2 changes: 0 additions & 2 deletions lib/TestML.pm
View file
@@ -1,6 +1,4 @@
# ABSTRACT: A Generic Software Testing Meta Language
package TestML;
# VERSION

use TestML::Base;

Expand Down
1 change: 0 additions & 1 deletion lib/TestML/Base.pm
View file
@@ -1,5 +1,4 @@
package TestML::Base;
#VERSION

# use Mo qw'build default builder xxx import';
# The following line of code was produced from the previous line by
Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Bridge.pm
View file
@@ -1,4 +1,5 @@
package TestML::Bridge;

use TestML::Base;

use TestML::Util 'runtime';
Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Compiler.pm
View file
@@ -1,6 +1,7 @@
use TestML::Runtime;

package TestML::Compiler;

use TestML::Base;

has code => ();
Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Compiler/Lite.pm
View file
@@ -1,4 +1,5 @@
package TestML::Compiler::Lite;

use TestML::Base;
extends 'TestML::Compiler';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Compiler/Pegex.pm
View file
@@ -1,4 +1,5 @@
package TestML::Compiler::Pegex;

use TestML::Base;
extends 'TestML::Compiler';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Compiler/Pegex/AST.pm
View file
@@ -1,4 +1,5 @@
package TestML::Compiler::Pegex::AST;

use TestML::Base;
extends 'Pegex::Tree';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Compiler/Pegex/Grammar.pm
View file
@@ -1,4 +1,5 @@
package TestML::Compiler::Pegex::Grammar;

use TestML::Base;
extends 'Pegex::Grammar';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Library.pm
View file
@@ -1,4 +1,5 @@
package TestML::Library;

use TestML::Base;

sub runtime {
Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Library/Debug.pm
View file
@@ -1,4 +1,5 @@
package TestML::Library::Debug;

use TestML::Base;
extends 'TestML::Library';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Library/Standard.pm
View file
@@ -1,4 +1,5 @@
package TestML::Library::Standard;

use TestML::Base;
extends 'TestML::Library';

Expand Down
18 changes: 18 additions & 0 deletions lib/TestML/Runtime.pm
View file
@@ -1,4 +1,5 @@
package TestML::Runtime;

use TestML::Base;

has testml => ();
Expand Down Expand Up @@ -286,6 +287,7 @@ sub read_testml_file {

#-----------------------------------------------------------------------------
package TestML::Function;

use TestML::Base;

has type => 'Func'; # Functions are TestML typed objects
Expand Down Expand Up @@ -320,13 +322,15 @@ sub forgetvar {

#-----------------------------------------------------------------------------
package TestML::Assignment;

use TestML::Base;

has name => ();
has expr => ();

#-----------------------------------------------------------------------------
package TestML::Statement;

use TestML::Base;

has expr => ();
Expand All @@ -335,44 +339,51 @@ has points => ();

#-----------------------------------------------------------------------------
package TestML::Expression;

use TestML::Base;

has calls => [];

#-----------------------------------------------------------------------------
package TestML::Assertion;

use TestML::Base;

has name => ();
has expr => ();

#-----------------------------------------------------------------------------
package TestML::Call;

use TestML::Base;

has name => ();
has args => ();

#-----------------------------------------------------------------------------
package TestML::Callable;

use TestML::Base;
has value => ();

#-----------------------------------------------------------------------------
package TestML::Block;

use TestML::Base;

has label => '';
has points => {};

#-----------------------------------------------------------------------------
package TestML::Point;

use TestML::Base;

has name => ();

#-----------------------------------------------------------------------------
package TestML::Object;

use TestML::Base;

has value => ();
Expand All @@ -391,6 +402,7 @@ sub none { $TestML::Constant::None }

#-----------------------------------------------------------------------------
package TestML::Str;

use TestML::Base;
extends 'TestML::Object';

Expand All @@ -405,6 +417,7 @@ sub list { TestML::List->new(value => [split //, $_[0]->value]) }

#-----------------------------------------------------------------------------
package TestML::Num;

use TestML::Base;
extends 'TestML::Object';

Expand All @@ -419,6 +432,7 @@ sub list {

#-----------------------------------------------------------------------------
package TestML::Bool;

use TestML::Base;
extends 'TestML::Object';

Expand All @@ -428,6 +442,7 @@ sub bool { $_[0] }

#-----------------------------------------------------------------------------
package TestML::List;

use TestML::Base;
extends 'TestML::Object';
has value => [];
Expand All @@ -439,6 +454,7 @@ sub push {

#-----------------------------------------------------------------------------
package TestML::None;

use TestML::Base;
extends 'TestML::Object';

Expand All @@ -449,11 +465,13 @@ sub list { TestML::List->new(value => []) }

#-----------------------------------------------------------------------------
package TestML::Native;

use TestML::Base;
extends 'TestML::Object';

#-----------------------------------------------------------------------------
package TestML::Error;

use TestML::Base;
extends 'TestML::Object';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Runtime/TAP.pm
View file
Expand Up @@ -2,6 +2,7 @@ use Test::Builder;
use TestML::Runtime;

package TestML::Runtime::TAP;

use TestML::Base;
extends 'TestML::Runtime';

Expand Down
1 change: 1 addition & 0 deletions lib/TestML/Setup.pm
View file
@@ -1,4 +1,5 @@
package TestML::Setup;

use TestML::Base;

use YAML::XS;
Expand Down
1 change: 1 addition & 0 deletions test/TestMLBridge.pm
View file
@@ -1,4 +1,5 @@
package TestMLBridge;

use base TestML::Bridge;
use TestML::Util;

Expand Down

0 comments on commit c539cf9

Please sign in to comment.