Changeset 9831

Timestamp:

04/19/08 03:39:08 (5 years ago)

Author:

hanekomu

Message:

r6217@91-113-92-200: marcel | 2008-04-18 20:27:23 +0200

• .shipit: fixed svk.tagpattern
  
• Dist::Joseki::Cmd::Command::tagcheck now looks for svk.tagpattern in
  .shipit as well
  
• bin/ptags_sort sorts according to @INC order
  
• Makefile.PL now also requires ShipIt?
  
• added bin/ptags_sort
  
  

Location:

lang/perl/Dist-Joseki/trunk

Files:

• .shipit (modified) (1 diff)
• Changes (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• bin/ptags (modified) (1 diff)
• bin/ptags_sort (added)
• lib/Dist/Joseki/Cmd/Command/tagcheck.pm (modified) (4 diffs)
• tools/dotfiles/.bashrc (modified) (1 diff)

lang/perl/Dist-Joseki/trunk/.shipit

@@ -1 +1 @@
 steps = ApplyYAMLChangeLogVersion, Manifest, DistTest, Commit, Tag, MakeDist, MyUploadCPAN, DistClean, Twitter
 
-svk.tagpattern = //local/cpan/tags/Dist-Joseki-%v
+svk.tagpattern = //local/coderepos/lang/perl/Dist-Joseki/tags/Dist-Joseki-%v
 
 twitter.config = ~/.twitterrc

lang/perl/Dist-Joseki/trunk/Changes

@@ -14 +14 @@
       - "Dist::Joseki::DistType::*: replaced fixed calls to 'perl' with calls to the 'current executable'"
       - updated dotfiles
-    date: 2008-04-17T08:27:44Z
+      - '.shipit: fixed svk.tagpattern'
+      - Dist::Joseki::Cmd::Command::tagcheck now looks for svk.tagpattern in .shipit as well
+      - bin/ptags_sort sorts according to @INC order
+      - Makefile.PL now also requires ShipIt
+      - added bin/ptags_sort
+    date: 2008-04-18T18:27:22Z
     tags: []
     version: 0.14

lang/perl/Dist-Joseki/trunk/Makefile.PL

@@ -20 +20 @@
 requires 'Parse::CPAN::Packages';
 requires 'Perl::Version';
+requires 'ShipIt';
 requires 'Test::TAP::HTMLMatrix';
 requires 'Text::Diff';

lang/perl/Dist-Joseki/trunk/bin/ptags

@@ -34 +34 @@
 # as well as installed system-wide; in this case you most likely want tags to
 # point to the locally installed version.
+#
+# On the other hand, it might not matter anyway because if you sort the ptags
+# file, the order of equal tags will depend on the sort order of the path. But
+# see the ptags_sort program.
 
 our @lib = grep { !/^\.+$/ } reverse @INC;

lang/perl/Dist-Joseki/trunk/lib/Dist/Joseki/Cmd/Command/tagcheck.pm

@@ -4 +4 @@
 use warnings;
 use Dist::Joseki::SVK;
+use ShipIt::Conf;
 
 
@@ -22 +23 @@
             'tagbase|b=s',
             'depot path where tagged versions are',
-            { default => $cmd_config->{tagbase} },
+            # no defaults here, they are more complicated. see get_tagbase()
         ],
 
@@ -30 +31 @@
             { default => $cmd_config->{file} || 'Changes' },
         ],
+
+        [
+            'verbose|v',
+            'be verbose',
+            { default => 0 },
+        ],
     );
 }
 
+
+sub get_tagbase {
+    my $self = shift;
+
+    return $self->opt('tagbase') if defined $self->opt('tagbase');
+
+    my $shipit_conf = ShipIt::Conf->parse('.shipit');
+    my $tagbase = $shipit_conf->value('svk.tagpattern');
+    if (defined $tagbase) {
+
+        # svk.tagpattern will be the complete pattern, but we need the tag
+        # base path. Usually it will be the last '/tags/' directory in the
+        # pattern, so let's try to be smart.
+
+        $tagbase =~ s!^(.*/tags)/.*$!$1!;
+        return $tagbase;
+    }
+
+    return $self->app->config->{tagcheck};
+}
 
 sub run_single {
@@ -39 +66 @@
     $self->SUPER::run_single(@_);
 
+    my $tagbase = $self->get_tagbase;
+    print "tagbase [$tagbase]\n" if $self->opt('verbose');
+
     my $svk = Dist::Joseki::SVK->new(
-        tag_base         => $self->opt('tagbase'),
+        tag_base         => $tagbase,
         changes_filename => $self->opt('file'),
     );

lang/perl/Dist-Joseki/trunk/tools/dotfiles/.bashrc

@@ -139 +139 @@
     fi
 
-    sort -o $PTAGSFILE $PTAGSFILE
+    ptags_sort <$PTAGSFILE >$PTAGSFILE.sorted
+    mv $PTAGSFILE.sorted $PTAGSFILE
 }