pannier 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73f6eeb9126643df23c6620c70188f9d5cc1ac3d
-  data.tar.gz: 1f32b050411a85102b150dc6a12d76e0719d86da
+  metadata.gz: 26de5e4810d23907a4665742c191d1e9be933e0c
+  data.tar.gz: ea743f7ab6f193646789cc8123ff4ea923f6025d
 SHA512:
-  metadata.gz: f1fb482e967a5112f6465eb2445e521b205901907a723c0606f5f452c1b28d31caa668e74402870f60f5e87eeba36a2a365de26f06bd5cd937988931f6cc698b
-  data.tar.gz: f3396f40dec19c4555ab9ece93bbc81f36599725b5b79e2a70b69cbd9076c3bdbd548659093481eef72bc4440db007e8b92770f218e9eaa72fa2ae468410b69b
+  metadata.gz: b5dffb59f31f6f4bd5991bfe3e8b99d94bd8199e47f580b124c351c7241a31a1ed7e7f913225031f996076006c8addfa4b09823439fcdedd7f0ab89d7dd55f26
+  data.tar.gz: deb929cceb6d85f0a97ea279746957c8e6cd3483e06b99462a61100426e71f0c6e270488ca34cc1c034a8ef3472e42f89898aecb4541c4fc85aa1774c4392c7c

data/lib/pannier/app.rb

@@ -11,7 +11,7 @@ module Pannier
     extend DSL
 
     attr_reader :env, :input_path, :output_path,
-                :behaviors, :packages
+                :behaviors, :packages, :logger
 
     def initialize(env_name = 'development')
       @env = Environment.new(env_name)
@@ -42,14 +42,9 @@ module Pannier
       @manifest_writer ||= ManifestWriter.new(self, @env)
     end
 
-    def log(messages, options = {})
-      return unless @logger
-      indent   = options.fetch(:indent) { 0 }
-      messages = Array(messages)
-      messages.each do |msg|
-        indent.times { msg.prepend(' ') }
-        @logger.debug(msg)
-      end
+    def clobber!
+      manifest_writer.clobber!(@input_path)
+      @packages.each(&:clobber!)
     end
 
     def process!

data/lib/pannier/cli.rb

@@ -13,6 +13,18 @@ module Pannier
       public_send(command, *opts)
     end
 
+    def clobber(*opts)
+      opts = Slop.parse(opts, :help => true, :ignore_case => true) do
+        banner 'Usage: pannier clobber [options]'
+        on :c, :config,  'Config file',      :argument => :optional, :default => '.assets.rb'
+        on :e, :env,     'Host environment', :argument => :optional, :default => 'development'
+      end
+
+      app = load_app(opts)
+      app.clobber!
+      exit
+    end
+
     def process(*opts)
       opts = Slop.parse(opts, :help => true, :ignore_case => true) do
         banner 'Usage: pannier process [options]'
@@ -21,11 +33,7 @@ module Pannier
         on :a, :assets,  'Asset paths',      :argument => :optional, :as => Array
       end
 
-      config_path = File.expand_path(opts[:config])
-      err(no_config_msg(config_path)) && abort unless File.exists?(config_path)
-
-      app = Pannier.load(config_path, opts[:env])
-
+      app = load_app(opts)
       if opts.assets?
         paths = opts[:assets].map { |path| File.expand_path(path) }
         app.process_owners!(*paths)
@@ -50,6 +58,12 @@ module Pannier
 
     private
 
+      def load_app(opts)
+        config_path = File.expand_path(opts[:config])
+        err(no_config_msg(config_path)) && abort unless File.exists?(config_path)
+        Pannier.load(config_path, opts[:env])
+      end
+
       def no_config_msg(path)
         <<-txt
         Pannier config file not found at #{path}.
@@ -59,6 +73,7 @@ module Pannier
       def usage_msg
         <<-txt
         Available commands (run any command with --help for details):
+            pannier clobber        Remove processed assets
             pannier process        Process assets
             pannier usage          Show this list of commands
         txt

data/lib/pannier/logger.rb

@@ -5,16 +5,10 @@ module Pannier
 
     def initialize(*args)
       super
-      @formatter = _formatter
-    end
-
-    private
-
-      def _formatter
-        proc do |severity, time, progname, msg|
-          msg + "\n"
-        end
+      @formatter = ->(_, _, _, message) do
+        message + "\n"
       end
+    end
 
   end
 end

data/lib/pannier/logger/package_logger.rb

@@ -0,0 +1,36 @@
+module Pannier
+  class Logger
+    class PackageLogger
+
+      def initialize(logger, package)
+        @logger, @package = logger, package
+      end
+
+      def wrap(&block)
+        log_input!
+        block.call
+        log_output!
+      end
+
+      def log!(messages, indent = 0)
+        return unless @logger
+        Array(messages).each do |msg|
+          indent.times { msg.prepend(' ') }
+          @logger.info(msg)
+        end
+      end
+
+      def log_input!
+        log!("Package #{@package.name.inspect}")
+        log!('Input ->', 2)
+        log!(@package.input_assets.map(&:path), 4)
+      end
+
+      def log_output!
+        log!('Output ->', 2)
+        log!(@package.output_assets.map(&:path), 4)
+      end
+
+    end
+  end
+end

data/lib/pannier/manifest_writer.rb

@@ -20,6 +20,11 @@ module Pannier
       MultiJson.dump(@report.tree)
     end
 
+    def clobber!(dir_path)
+      path = File.join(*[dir_path, basename].compact)
+      FileUtils.rm_f(path)
+    end
+
     def write!(dir_path)
       @report.build!
       FileUtils.mkdir_p(dir_path)

data/lib/pannier/package.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'ostruct'
 require 'pathname'
 require 'set'
@@ -6,6 +7,7 @@ require 'pannier/asset'
 require 'pannier/concatenator'
 require 'pannier/dsl'
 require 'pannier/errors'
+require 'pannier/logger/package_logger'
 
 module Pannier
   class Package
@@ -63,8 +65,17 @@ module Pannier
       @input_assets.any? { |a| paths.include?(a.path) }
     end
 
+    def package_logger
+      @package_logger ||= Logger::PackageLogger.new(@app.logger, self)
+    end
+
+    def clobber!
+      copy!
+      FileUtils.rm_f(@output_assets.map(&:path))
+    end
+
     def process!
-      process_with_logs! do
+      package_logger.wrap do
         copy!
         !@processors.empty? && @processors.each do |instructions|
           send(*instructions)
@@ -140,20 +151,5 @@ module Pannier
       end
 
     end
-
-    private
-
-      def process_with_logs!(&block)
-        @app.log("Package #{name.inspect}", :indent => 2)
-        @app.log('-> Input', :indent => 4)
-        @app.log(@input_assets.map(&:path), :indent => 6)
-        
-        block.call
-        
-        @app.log('-> Output', :indent => 4)
-        @app.log(@output_assets.map(&:path), :indent => 6)
-        @app.log("\n")
-      end
-
   end
 end

data/lib/pannier/version.rb

@@ -1,3 +1,3 @@
 module Pannier
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pannier
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
@@ -214,6 +214,7 @@ files:
 - lib/pannier/errors.rb
 - lib/pannier/file_handler.rb
 - lib/pannier/logger.rb
+- lib/pannier/logger/package_logger.rb
 - lib/pannier/manifest_writer.rb
 - lib/pannier/mounted.rb
 - lib/pannier/mounted/app.rb