From 9f63817ad257852392b50302aefd6f9c99ae4091 Mon Sep 17 00:00:00 2001 From: Dale Evans Date: Sat, 18 Apr 2015 23:39:39 +0000 Subject: [PATCH 1/2] Checking in changes prior to tagging of version 0.18. Changelog diff is: diff --git a/Changes b/Changes index d5f9739..cad29f4 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,10 @@ Revision history for perl module PocketIO {{$NEXT}} +0.18 2015-04-18T23:38:57Z + + - license + 0.17 2014-01-07T20:29:26Z - just meta files update --- Build.PL | 34 ++++++++++++++-------------------- Changes | 4 ++++ META.json | 19 +++++++++---------- README.md | 30 +++++++++++++++++++----------- lib/PocketIO.pm | 13 ++++++++++--- minil.toml | 3 +++ 6 files changed, 59 insertions(+), 44 deletions(-) diff --git a/Build.PL b/Build.PL index 06f4e11..c006936 100644 --- a/Build.PL +++ b/Build.PL @@ -12,8 +12,6 @@ use utf8; use Module::Build; use File::Basename; use File::Spec; -use CPAN::Meta; -use CPAN::Meta::Prereqs; my %args = ( license => 'perl', @@ -33,7 +31,8 @@ my %args = ( test_files => ((-d '.git' || $ENV{RELEASE_TESTING}) && -d 'xt') ? 't/ xt/' : 't/', recursive_test_files => 1, - + + ); if (-d 'share') { $args{share_dir} = 'share'; @@ -52,20 +51,15 @@ my $builder = Module::Build->subclass( )->new(%args); $builder->create_build_script(); -my $mbmeta = CPAN::Meta->load_file('MYMETA.json'); -my $meta = CPAN::Meta->load_file('META.json'); -my $prereqs_hash = CPAN::Meta::Prereqs->new( - $meta->prereqs -)->with_merged_prereqs( - CPAN::Meta::Prereqs->new($mbmeta->prereqs) -)->as_string_hash; -my $mymeta = CPAN::Meta->new( - { - %{$meta->as_struct}, - prereqs => $prereqs_hash - } -); -print "Merging cpanfile prereqs to MYMETA.yml\n"; -$mymeta->save('MYMETA.yml', { version => 1.4 }); -print "Merging cpanfile prereqs to MYMETA.json\n"; -$mymeta->save('MYMETA.json', { version => 2 }); +use File::Copy; + +print "cp META.json MYMETA.json\n"; +copy("META.json","MYMETA.json") or die "Copy failed(META.json): $!"; + +if (-f 'META.yml') { + print "cp META.yml MYMETA.yml\n"; + copy("META.yml","MYMETA.yml") or die "Copy failed(META.yml): $!"; +} else { + print "There is no META.yml... You may install this module from the repository...\n"; +} + diff --git a/Changes b/Changes index d5f9739..cad29f4 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,10 @@ Revision history for perl module PocketIO {{$NEXT}} +0.18 2015-04-18T23:38:57Z + + - license + 0.17 2014-01-07T20:29:26Z - just meta files update diff --git a/META.json b/META.json index 6c773ca..08aa382 100644 --- a/META.json +++ b/META.json @@ -4,9 +4,9 @@ "Viacheslav Tykhanovskyi, C." ], "dynamic_config" : 0, - "generated_by" : "Minilla/v0.7.5, CPAN::Meta::Converter version 2.130880", + "generated_by" : "Minilla/v2.3.0, CPAN::Meta::Converter version 2.143240", "license" : [ - "unknown" + "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", @@ -28,15 +28,14 @@ "prereqs" : { "configure" : { "requires" : { - "CPAN::Meta" : "0", - "CPAN::Meta::Prereqs" : "0", "Module::Build" : "0.38" } }, "develop" : { "requires" : { "Test::CPAN::Meta" : "0", - "Test::MinimumVersion" : "0.10108", + "Test::MinimumVersion::Fast" : "0.04", + "Test::PAUSE::Permissions" : "0.04", "Test::Pod" : "1.41", "Test::Spellunker" : "v0.2.7" } @@ -57,16 +56,16 @@ "release_status" : "unstable", "resources" : { "bugtracker" : { - "web" : "https://github.com/vti/pocketio/issues" + "web" : "https://github.com/daleevans/pocketio/issues" }, - "homepage" : "https://github.com/vti/pocketio", + "homepage" : "https://github.com/daleevans/pocketio", "repository" : { "type" : "git", - "url" : "git://github.com/vti/pocketio.git", - "web" : "https://github.com/vti/pocketio" + "url" : "git://github.com/daleevans/pocketio.git", + "web" : "https://github.com/daleevans/pocketio" } }, - "version" : "0.17", + "version" : "0.18", "x_contributors" : [ "Jens Gassmann ", "Audrey Tang ", diff --git a/README.md b/README.md index e34aca4..93f3482 100644 --- a/README.md +++ b/README.md @@ -38,19 +38,19 @@ PocketIO - Socket.IO PSGI application # DESCRIPTION -[PocketIO](http://search.cpan.org/perldoc?PocketIO) is a server implementation of SocketIO in Perl, you still need +[PocketIO](https://metacpan.org/pod/PocketIO) is a server implementation of SocketIO in Perl, you still need `socket.io` javascript library on the client. -[PocketIO](http://search.cpan.org/perldoc?PocketIO) aims to have API as close as possible to the Node.js implementation +[PocketIO](https://metacpan.org/pod/PocketIO) aims to have API as close as possible to the Node.js implementation and sometimes it might look not very perlish. ## How to use -First you mount [PocketIO](http://search.cpan.org/perldoc?PocketIO) as a normal [Plack](http://search.cpan.org/perldoc?Plack) application. It is recommended +First you mount [PocketIO](https://metacpan.org/pod/PocketIO) as a normal [Plack](https://metacpan.org/pod/Plack) application. It is recommended to mount it to the `/socket.io` path since that will not require any changes on the client side. -When the client is connected your handler is called with a [PocketIO::Socket](http://search.cpan.org/perldoc?PocketIO::Socket) +When the client is connected your handler is called with a [PocketIO::Socket](https://metacpan.org/pod/PocketIO::Socket) object as a first parameter. ## Sending and receiving messages @@ -159,6 +159,7 @@ broadcasts. You can subscribe or unsubscribe a socket to/from a room: $socket->send('hello'); } ); + - class or instance, method PocketIO->new(class => 'MyHandler', method => 'run'); @@ -185,12 +186,12 @@ broadcasts. You can subscribe or unsubscribe a socket to/from a room: # TLS/SSL -For TLS/SSL a secure proxy is needed. `stunnel` or [App::TLSMe](http://search.cpan.org/perldoc?App::TLSMe) are +For TLS/SSL a secure proxy is needed. `stunnel` or [App::TLSMe](https://metacpan.org/pod/App::TLSMe) are recommended. # SCALING -See [PocketIO::Pool::Redis](http://search.cpan.org/perldoc?PocketIO::Pool::Redis). +See [PocketIO::Pool::Redis](https://metacpan.org/pod/PocketIO::Pool::Redis). # DEBUGGING @@ -200,11 +201,11 @@ Use `POCKETIO_DEBUG` and `POCKETIO_CONNECTION_DEBUG` variables for debugging. ## `new` -Create a new [PocketIO](http://search.cpan.org/perldoc?PocketIO) instance. +Create a new [PocketIO](https://metacpan.org/pod/PocketIO) instance. ## `pool` -Holds [PocketIO::Pool](http://search.cpan.org/perldoc?PocketIO::Pool) object by default. +Holds [PocketIO::Pool](https://metacpan.org/pod/PocketIO::Pool) object by default. ## `call` @@ -219,7 +220,7 @@ Returns PSGI code reference. More information about SocketIO you can find on the website [http://socket.io/](http://socket.io/), or on the GitHub [https://github.com/LearnBoost/Socket.IO](https://github.com/LearnBoost/Socket.IO). -[Protocol::SocketIO](http://search.cpan.org/perldoc?Protocol::SocketIO), [PSGI](http://search.cpan.org/perldoc?PSGI) +[Protocol::SocketIO](https://metacpan.org/pod/Protocol::SocketIO), [PSGI](https://metacpan.org/pod/PSGI) # DEVELOPMENT @@ -255,5 +256,12 @@ Viacheslav Tykhanovskyi, `vti@cpan.org`. Copyright (C) 2011-2013, Viacheslav Tykhanovskyi -This program is free software, you can redistribute it and/or modify it under -the terms of the Artistic License version 2.0. +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself: + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" diff --git a/lib/PocketIO.pm b/lib/PocketIO.pm index abf0035..63a553a 100644 --- a/lib/PocketIO.pm +++ b/lib/PocketIO.pm @@ -3,7 +3,7 @@ package PocketIO; use strict; use warnings; -our $VERSION = '0.17'; +our $VERSION = '0.18'; use overload '&{}' => sub { shift->to_app(@_) }, fallback => 1; @@ -363,7 +363,14 @@ Viacheslav Tykhanovskyi, C. Copyright (C) 2011-2013, Viacheslav Tykhanovskyi -This program is free software, you can redistribute it and/or modify it under -the terms of the Artistic License version 2.0. +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself: + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" =cut diff --git a/minil.toml b/minil.toml index b40446d..e5d57d9 100644 --- a/minil.toml +++ b/minil.toml @@ -1 +1,4 @@ name = "PocketIO" +license = "perl_5" +[release] +do_not_upload_to_cpan=true From acd308ac3ccf61f6017028d5b4df3acb61d8c8d3 Mon Sep 17 00:00:00 2001 From: Dale Evans Date: Sat, 18 Apr 2015 23:41:05 +0000 Subject: [PATCH 2/2] :Revert "Checking in changes prior to tagging of version 0.18." This reverts commit 9f63817ad257852392b50302aefd6f9c99ae4091. --- Build.PL | 34 ++++++++++++++++++++-------------- Changes | 4 ---- META.json | 19 ++++++++++--------- README.md | 30 +++++++++++------------------- lib/PocketIO.pm | 13 +++---------- minil.toml | 3 --- 6 files changed, 44 insertions(+), 59 deletions(-) diff --git a/Build.PL b/Build.PL index c006936..06f4e11 100644 --- a/Build.PL +++ b/Build.PL @@ -12,6 +12,8 @@ use utf8; use Module::Build; use File::Basename; use File::Spec; +use CPAN::Meta; +use CPAN::Meta::Prereqs; my %args = ( license => 'perl', @@ -31,8 +33,7 @@ my %args = ( test_files => ((-d '.git' || $ENV{RELEASE_TESTING}) && -d 'xt') ? 't/ xt/' : 't/', recursive_test_files => 1, - - + ); if (-d 'share') { $args{share_dir} = 'share'; @@ -51,15 +52,20 @@ my $builder = Module::Build->subclass( )->new(%args); $builder->create_build_script(); -use File::Copy; - -print "cp META.json MYMETA.json\n"; -copy("META.json","MYMETA.json") or die "Copy failed(META.json): $!"; - -if (-f 'META.yml') { - print "cp META.yml MYMETA.yml\n"; - copy("META.yml","MYMETA.yml") or die "Copy failed(META.yml): $!"; -} else { - print "There is no META.yml... You may install this module from the repository...\n"; -} - +my $mbmeta = CPAN::Meta->load_file('MYMETA.json'); +my $meta = CPAN::Meta->load_file('META.json'); +my $prereqs_hash = CPAN::Meta::Prereqs->new( + $meta->prereqs +)->with_merged_prereqs( + CPAN::Meta::Prereqs->new($mbmeta->prereqs) +)->as_string_hash; +my $mymeta = CPAN::Meta->new( + { + %{$meta->as_struct}, + prereqs => $prereqs_hash + } +); +print "Merging cpanfile prereqs to MYMETA.yml\n"; +$mymeta->save('MYMETA.yml', { version => 1.4 }); +print "Merging cpanfile prereqs to MYMETA.json\n"; +$mymeta->save('MYMETA.json', { version => 2 }); diff --git a/Changes b/Changes index cad29f4..d5f9739 100644 --- a/Changes +++ b/Changes @@ -2,10 +2,6 @@ Revision history for perl module PocketIO {{$NEXT}} -0.18 2015-04-18T23:38:57Z - - - license - 0.17 2014-01-07T20:29:26Z - just meta files update diff --git a/META.json b/META.json index 08aa382..6c773ca 100644 --- a/META.json +++ b/META.json @@ -4,9 +4,9 @@ "Viacheslav Tykhanovskyi, C." ], "dynamic_config" : 0, - "generated_by" : "Minilla/v2.3.0, CPAN::Meta::Converter version 2.143240", + "generated_by" : "Minilla/v0.7.5, CPAN::Meta::Converter version 2.130880", "license" : [ - "perl_5" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", @@ -28,14 +28,15 @@ "prereqs" : { "configure" : { "requires" : { + "CPAN::Meta" : "0", + "CPAN::Meta::Prereqs" : "0", "Module::Build" : "0.38" } }, "develop" : { "requires" : { "Test::CPAN::Meta" : "0", - "Test::MinimumVersion::Fast" : "0.04", - "Test::PAUSE::Permissions" : "0.04", + "Test::MinimumVersion" : "0.10108", "Test::Pod" : "1.41", "Test::Spellunker" : "v0.2.7" } @@ -56,16 +57,16 @@ "release_status" : "unstable", "resources" : { "bugtracker" : { - "web" : "https://github.com/daleevans/pocketio/issues" + "web" : "https://github.com/vti/pocketio/issues" }, - "homepage" : "https://github.com/daleevans/pocketio", + "homepage" : "https://github.com/vti/pocketio", "repository" : { "type" : "git", - "url" : "git://github.com/daleevans/pocketio.git", - "web" : "https://github.com/daleevans/pocketio" + "url" : "git://github.com/vti/pocketio.git", + "web" : "https://github.com/vti/pocketio" } }, - "version" : "0.18", + "version" : "0.17", "x_contributors" : [ "Jens Gassmann ", "Audrey Tang ", diff --git a/README.md b/README.md index 93f3482..e34aca4 100644 --- a/README.md +++ b/README.md @@ -38,19 +38,19 @@ PocketIO - Socket.IO PSGI application # DESCRIPTION -[PocketIO](https://metacpan.org/pod/PocketIO) is a server implementation of SocketIO in Perl, you still need +[PocketIO](http://search.cpan.org/perldoc?PocketIO) is a server implementation of SocketIO in Perl, you still need `socket.io` javascript library on the client. -[PocketIO](https://metacpan.org/pod/PocketIO) aims to have API as close as possible to the Node.js implementation +[PocketIO](http://search.cpan.org/perldoc?PocketIO) aims to have API as close as possible to the Node.js implementation and sometimes it might look not very perlish. ## How to use -First you mount [PocketIO](https://metacpan.org/pod/PocketIO) as a normal [Plack](https://metacpan.org/pod/Plack) application. It is recommended +First you mount [PocketIO](http://search.cpan.org/perldoc?PocketIO) as a normal [Plack](http://search.cpan.org/perldoc?Plack) application. It is recommended to mount it to the `/socket.io` path since that will not require any changes on the client side. -When the client is connected your handler is called with a [PocketIO::Socket](https://metacpan.org/pod/PocketIO::Socket) +When the client is connected your handler is called with a [PocketIO::Socket](http://search.cpan.org/perldoc?PocketIO::Socket) object as a first parameter. ## Sending and receiving messages @@ -159,7 +159,6 @@ broadcasts. You can subscribe or unsubscribe a socket to/from a room: $socket->send('hello'); } ); - - class or instance, method PocketIO->new(class => 'MyHandler', method => 'run'); @@ -186,12 +185,12 @@ broadcasts. You can subscribe or unsubscribe a socket to/from a room: # TLS/SSL -For TLS/SSL a secure proxy is needed. `stunnel` or [App::TLSMe](https://metacpan.org/pod/App::TLSMe) are +For TLS/SSL a secure proxy is needed. `stunnel` or [App::TLSMe](http://search.cpan.org/perldoc?App::TLSMe) are recommended. # SCALING -See [PocketIO::Pool::Redis](https://metacpan.org/pod/PocketIO::Pool::Redis). +See [PocketIO::Pool::Redis](http://search.cpan.org/perldoc?PocketIO::Pool::Redis). # DEBUGGING @@ -201,11 +200,11 @@ Use `POCKETIO_DEBUG` and `POCKETIO_CONNECTION_DEBUG` variables for debugging. ## `new` -Create a new [PocketIO](https://metacpan.org/pod/PocketIO) instance. +Create a new [PocketIO](http://search.cpan.org/perldoc?PocketIO) instance. ## `pool` -Holds [PocketIO::Pool](https://metacpan.org/pod/PocketIO::Pool) object by default. +Holds [PocketIO::Pool](http://search.cpan.org/perldoc?PocketIO::Pool) object by default. ## `call` @@ -220,7 +219,7 @@ Returns PSGI code reference. More information about SocketIO you can find on the website [http://socket.io/](http://socket.io/), or on the GitHub [https://github.com/LearnBoost/Socket.IO](https://github.com/LearnBoost/Socket.IO). -[Protocol::SocketIO](https://metacpan.org/pod/Protocol::SocketIO), [PSGI](https://metacpan.org/pod/PSGI) +[Protocol::SocketIO](http://search.cpan.org/perldoc?Protocol::SocketIO), [PSGI](http://search.cpan.org/perldoc?PSGI) # DEVELOPMENT @@ -256,12 +255,5 @@ Viacheslav Tykhanovskyi, `vti@cpan.org`. Copyright (C) 2011-2013, Viacheslav Tykhanovskyi -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. - -Terms of the Perl programming language system itself: - -a) the GNU General Public License as published by the Free - Software Foundation; either version 1, or (at your option) any - later version, or -b) the "Artistic License" +This program is free software, you can redistribute it and/or modify it under +the terms of the Artistic License version 2.0. diff --git a/lib/PocketIO.pm b/lib/PocketIO.pm index 63a553a..abf0035 100644 --- a/lib/PocketIO.pm +++ b/lib/PocketIO.pm @@ -3,7 +3,7 @@ package PocketIO; use strict; use warnings; -our $VERSION = '0.18'; +our $VERSION = '0.17'; use overload '&{}' => sub { shift->to_app(@_) }, fallback => 1; @@ -363,14 +363,7 @@ Viacheslav Tykhanovskyi, C. Copyright (C) 2011-2013, Viacheslav Tykhanovskyi -This is free software; you can redistribute it and/or modify it under -the same terms as the Perl 5 programming language system itself. - -Terms of the Perl programming language system itself: - -a) the GNU General Public License as published by the Free - Software Foundation; either version 1, or (at your option) any - later version, or -b) the "Artistic License" +This program is free software, you can redistribute it and/or modify it under +the terms of the Artistic License version 2.0. =cut diff --git a/minil.toml b/minil.toml index e5d57d9..b40446d 100644 --- a/minil.toml +++ b/minil.toml @@ -1,4 +1 @@ name = "PocketIO" -license = "perl_5" -[release] -do_not_upload_to_cpan=true