comparison piecrust/commands/builtin/baking.py @ 205:e725af1d48fb

bake: Changes in how assets directories are configured. Change `skip_patterns` and `force_patterns` to `ignore` and `force`. Put less responsibility on the `bake` command to specify all those settings, and more on the `Baker` and `ProcessorPipeline` themselves. Add some tests.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 18 Jan 2015 12:12:57 -0800
parents 0c9de41689bb
children a47580a0955b
comparison
equal deleted inserted replaced
204:f98451237371 205:e725af1d48fb
59 else: 59 else:
60 logger.error(str(ex)) 60 logger.error(str(ex))
61 return 1 61 return 1
62 62
63 def _bakeSources(self, ctx, out_dir): 63 def _bakeSources(self, ctx, out_dir):
64 num_workers = ctx.app.config.get('baker/workers') or 4
65 baker = Baker( 64 baker = Baker(
66 ctx.app, out_dir, 65 ctx.app, out_dir,
67 force=ctx.args.force, 66 force=ctx.args.force)
68 no_assets=ctx.args.no_assets,
69 num_workers=num_workers)
70 baker.bake() 67 baker.bake()
71 68
72 def _bakeAssets(self, ctx, out_dir): 69 def _bakeAssets(self, ctx, out_dir):
73 baker_params = ctx.app.config.get('baker') or {}
74 mounts = (baker_params.get('assets_dirs') or
75 ctx.app.assets_dirs)
76 skip_patterns = (baker_params.get('ignore') or
77 baker_params.get('skip_patterns'))
78 force_patterns = (baker_params.get('force') or
79 baker_params.get('force_patterns'))
80 num_workers = ctx.app.config.get('baker/workers') or 4
81 proc = ProcessorPipeline( 70 proc = ProcessorPipeline(
82 ctx.app, mounts, out_dir, 71 ctx.app, out_dir,
83 force=ctx.args.force, 72 force=ctx.args.force)
84 skip_patterns=skip_patterns,
85 force_patterns=force_patterns,
86 num_workers=num_workers)
87 proc.run() 73 proc.run()
88 74
89 75
90 class ShowRecordCommand(ChefCommand): 76 class ShowRecordCommand(ChefCommand):
91 def __init__(self): 77 def __init__(self):