[Bps-public-commit] SD branch, master, updated. 0.73-3-gad32aa5

[jesse]

The branch, master has been updated
       via  ad32aa51302cc200ae4910fd0c161ca436f92359 (commit)
       via  8e0432d8059e90445b41673c1951c904a7c4c107 (commit)
       via  aaa76462ea4362fe9dcb76d5099853f8fd1104a0 (commit)
      from  01245b709ebead68501f83d41ac05d960f1603d3 (commit)

Summary of changes:
 Makefile.PL                      |    2 +-
 lib/App/SD/Replica/hm.pm         |    1 -
 tools/shipwright-package         |    4 ++--
 tools/shipwright-package-minimal |   33 +++++++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 tools/shipwright-package-minimal

- Log -----------------------------------------------------------------
commit aaa76462ea4362fe9dcb76d5099853f8fd1104a0
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sat Sep 12 16:42:37 2009 +0900

    shipwright packaging cleanup

diff --git a/tools/shipwright-package b/tools/shipwright-package
index 1b44a77..1cd23a1 100644
--- a/tools/shipwright-package
+++ b/tools/shipwright-package
@@ -4,7 +4,7 @@ export REPO=${HOME}/shipwright-sd-${TODAY}.git/
 
 export GIT_PATH="git:file://$REPO"
 export MIN_PERL=5.008006
-export SKIP="--skip=Pod::Simple,Module::Signature,Test::Pod,Test::Pod::Coverage,Test::Distribution,Pod::Readme,Archive::Tar,HTML::Lint,Prophet,Encode,Date::Calc,Test::Cukes,Quantum::Superpositions,Test::Memory::Cycle,Text::Greeking,Test::HTTP::Server::Simple,Test::WWW::Mechanize,Module::Build,Test::Warn,Test::MockTime,Test::MockModule,Test::MockObject,Test::Warn"
+export SKIP="--skip=Pod::Simple,Module::Signature,Test::Pod,Test::Pod::Coverage,Test::Distribution,Pod::Readme,Archive::Tar,HTML::Lint,Prophet,Encode,Date::Calc,Test::Cukes,Quantum::Superpositions,Test::Memory::Cycle,Text::Greeking,Test::HTTP::Server::Simple,Test::WWW::Mechanize,Module::Build,Test::Warn,Test::MockTime,Test::MockModule,Test::MockObject,Test::Warn,HTTP::Cookies,HTTP::Request::Common"
 export IMPORT="shipwright import --min-perl-version=$MIN_PERL $SKIP -r $GIT_PATH --log-file - --log-level debug"
 rm -rf $REPO
 
@@ -17,7 +17,6 @@ $IMPORT \
  cpan:File::ShareDir \
  cpan:DBI \
  cpan:DBD::SQLite \
- cpan:Net::GitHub \
  cpan:Term::ReadLine::Perl \
  cpan:JSON::XS \
  cpan:Net::Bonjour \
@@ -26,6 +25,7 @@ $IMPORT \
  git:git+ssh://fsck.com/git/prophet.git \
  cpan:RT::Client::REST \
  cpan:Email::Address \
+ cpan:Net::GitHub \
  cpan:Net::Jifty \
  cpan:Net::Trac \
  cpan:Net::Google::Code \

commit 8e0432d8059e90445b41673c1951c904a7c4c107
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sat Sep 12 16:42:53 2009 +0900

    packaging for shipwright sans deps

diff --git a/tools/shipwright-package-minimal b/tools/shipwright-package-minimal
new file mode 100644
index 0000000..e90b931
--- /dev/null
+++ b/tools/shipwright-package-minimal
@@ -0,0 +1,33 @@
+export TODAY=`date +%Y-%m-%d`
+export REPO=${HOME}/shipwright-sd-min-${TODAY}
+export GIT_PATH="git:file://$REPO"
+export MIN_PERL=5.008006
+export SKIP="--skip=Pod::Simple,Module::Signature,Test::Pod,Test::Pod::Coverage,Test::Distribution,Pod::Readme,Archive::Tar,HTML::Lint,Encode,Date::Calc,Test::Cukes,Quantum::Superpositions,Test::Memory::Cycle,Text::Greeking,Test::HTTP::Server::Simple,Test::WWW::Mechanize,Module::Build,Test::Warn,Test::MockTime,Test::MockModule,Test::MockObject,Test::Warn,Compress::Raw::Bzip2,Digest::SHA1,Compress::Raw::Zlib,Test::Script::Run,Test::Exception,Test::Simple,Test::More"
+export IMPORT="shipwright import --min-perl-version=$MIN_PERL $SKIP -r $GIT_PATH --log-file - --log-level debug --skip-all-recommends"
+rm -rf $REPO
+mkdir $REPO
+shipwright create -r $GIT_PATH
+# Optional deps we still want
+$IMPORT \
+ cpan:App::SD
+
+cd /tmp
+shipwright maintain -r $GIT_PATH --update-order
+cd /tmp
+git clone file://${REPO} hack-$$
+cd hack-$$/scripts/cpan-DateTime-Format-Natural
+perl -pi -e s'/Build test/Build/g' build
+git config push.default matching
+git commit -m 'Made DTFN not run its tests which add a slew of deps' build
+git push
+cd /tmp/
+rm -rf hack-$$
+
+git clone file://$REPO /tmp/sdex-$$
+cd /tmp/sdex-$$ 
+echo "# one argument per line
+--skip-man-pages
+--skip-test
+--install-base=~/sd
+" > __default_builder_options 
+./bin/shipwright-utility --generate-tar-file /tmp/sd-image-${TODAY}.bin

commit ad32aa51302cc200ae4910fd0c161ca436f92359
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Sep 15 06:50:12 2009 +0900

    UNIVERSAL::require is neither a dependency of prophet nor required.
    
    	Thanks to biffhero++ for catching this

diff --git a/Makefile.PL b/Makefile.PL
index cc7084f..f9000fa 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,7 +5,7 @@ copyright('2008-2009 Best Practical Solutions, LLC');
 license('MIT');
 version_from('lib/App/SD.pm');
 
-requires 'Prophet'; # URI UNIVERSAL::require Params::Validate Class::Accessor Template::Declare::Tags Test::HTTP::Server::Simple JSON Test::WWW::Mechanize Any::Moose
+requires 'Prophet'; # URI Params::Validate Class::Accessor Template::Declare::Tags Test::HTTP::Server::Simple JSON Test::WWW::Mechanize Any::Moose
 
 requires('DateTime');
 requires('Time::Progress');
diff --git a/lib/App/SD/Replica/hm.pm b/lib/App/SD/Replica/hm.pm
index 1a7ec4b..0888932 100644
--- a/lib/App/SD/Replica/hm.pm
+++ b/lib/App/SD/Replica/hm.pm
@@ -2,7 +2,6 @@ package App::SD::Replica::hm;
 use Any::Moose;
 extends 'App::SD::ForeignReplica';
 use Params::Validate qw(:all);
-use UNIVERSAL::require;
 use URI;
 use Memoize;
 use Prophet::ChangeSet;

-----------------------------------------------------------------------