Changeset 22113 for lang/perl/Module-Setup

Timestamp:

10/25/08 20:21:03 (5 years ago)

Author:

yappo

Message:

module-setup --devel を軽く実装

Location:

lang/perl/Module-Setup/trunk

Files:

• bin/module-setup (modified) (1 diff)
• lib/Module/Setup.pm (modified) (4 diffs)
• lib/Module/Setup/Devel.pm (added)
• lib/Module/Setup/Distribute.pm (modified) (3 diffs)
• lib/Module/Setup/Path/Flavor.pm (modified) (2 diffs)
• lib/Module/Setup/Test/Flavor.pm (modified) (1 diff)
• t/010_core/setup_options.t (modified) (2 diffs)
• t/97_podspell.t (modified) (1 diff)

lang/perl/Module-Setup/trunk/bin/module-setup

@@ -47 +47 @@
     --help                     Show this message
 
+For Devel:
+
+    --devel                    for flavor development
+    --test                     develpoment flavor test
+
+    $ module-setup --devel FlavorClassName  # create skeleton
+    $ cd FlavorClassName
+    $ # edit
+    $ module-setup --devel --test      # flavor test
+    $ module-setup --devel --pack      # flavor packing
+
 =cut
 

lang/perl/Module-Setup/trunk/lib/Module/Setup.pm

@@ -17 +17 @@
 use Pod::Usage;
 
+use Module::Setup::Devel;
 use Module::Setup::Distribute;
 use Module::Setup::Path;
+use Module::Setup::Path::Flavor;
 use Module::Setup::Path::Template;
 
@@ -75 +77 @@
         'target'                       => \($options->{target}),
         'module-setup-dir'             => \($options->{module_setup_dir}),
+        'devel'                        => \($options->{devel}),
+        'test'                         => \($options->{test}),
         version                        => \&_setup_options_version,
         help                           => \&_setup_options_pod2usage,
@@ -123 +127 @@
 
     $options->{flavor_class} ||= 'Default';
+    return Module::Setup::Devel->new($self)->run if $options->{devel};
+
     $self->setup_base_dir;
 
@@ -421 +427 @@
 
     my $template = [];
-    $self->_collect_flavor_files($template, file   => $self->base_dir->flavor->template);
-    $self->_collect_flavor_files($template, plugin => $self->base_dir->flavor->plugins);
+    my $flavor_dir = exists $config->{flavor_dir} ? Module::Setup::Path::Flavor->new( $config->{flavor_dir} ) : $self->base_dir->flavor;
+    $self->_collect_flavor_files($template, file   => $flavor_dir->template);
+    $self->_collect_flavor_files($template, plugin => $flavor_dir->plugins);
     push @{ $template }, +{
-        config => YAML::LoadFile($self->base_dir->flavor->config->path),
+        config => YAML::LoadFile($flavor_dir->config->path),
     };
 
     unless ($config->{without_additional}) {
         $template = [] if $config->{additional};
-        for my $additional ( $self->base_dir->flavor->additional->path->children ) {
+        for my $additional ( $flavor_dir->additional->path->children ) {
             next unless $additional->is_dir;
             my $name = $additional->dir_list(-1);
             next if $config->{additional} && $name ne $config->{additional};
-            my $base_path = Module::Setup::Path::Template->new($self->base_dir->flavor->additional->path, $name);
+            my $base_path = Module::Setup::Path::Template->new($flavor_dir->additional->path, $name);
 
             my $templates = [];

lang/perl/Module-Setup/trunk/lib/Module/Setup/Distribute.pm

@@ -4 +4 @@
 
 use Fcntl qw( :mode );
+use YAML ();
 
 use Module::Setup::Path::Dir;
@@ -20 +21 @@
     }, $class;
 
+    $self->{target_path} = Module::Setup::Path::Dir->new($target);
     $self->{base_path}   = Module::Setup::Path::Dir->new($target, $self->{dist_name});
     $self->{dist_path}   = Module::Setup::Path::Dir->new($target, $self->{dist_name});
@@ -33 +35 @@
 sub package       { shift->{package} };
 sub dist_name     { shift->{dist_name} };
+sub target_path   { shift->{target_path} };
 sub base_path     { shift->{base_path} };
 sub dist_path     { shift->{dist_path} };

lang/perl/Module-Setup/trunk/lib/Module/Setup/Path/Flavor.pm

@@ -3 +3 @@
 use warnings;
 use base 'Module::Setup::Path::Base';
+
+use YAML ();
 
 use Module::Setup::Path::Config;
@@ -26 +28 @@
 sub additional { shift->{additional} }
 
+sub create_flavor {
+    my($self, $config) = @_;
+
+    $self->path->mkpath;
+    $self->plugins->path->mkpath;
+    $self->template->path->mkpath;
+    $self->additional->path->mkpath;
+    YAML::DumpFile($self->config->path, $config);
+}
+
 1;

lang/perl/Module-Setup/trunk/lib/Module/Setup/Test/Flavor.pm

@@ -80 +80 @@
         }
     }
-    
+
     plan tests => $count;
     module_setup $options, $module;

lang/perl/Module-Setup/trunk/t/010_core/setup_options.t

@@ -22 +22 @@
         additional         => undef,
         without_additional => undef,
+        devel              => undef,
+        test               => undef,
         %{ $block->options || {} },
     };
@@ -116 +118 @@
 pack: 1
 without_additional: 1
+
+===
+--- input
+--devel
+--test
+--- argv
+--- options
+devel: 1
+test: 1

lang/perl/Module-Setup/trunk/t/97_podspell.t

@@ -20 +20 @@
 utils
 PBP pbp
+devel