photish 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31149e215cc2087c36f281ad5a1984ad2ce5f45b
-  data.tar.gz: 64ee1e2e49df780d17533a63bf3d17e8346fa7ea
+  metadata.gz: f08162db8cbc022f3aecdd04c4efe502efe834c9
+  data.tar.gz: 1fbde379d36f30cda00c4f4c5d36890b03c88bd8
 SHA512:
-  metadata.gz: 6f9e9849870e9dcaaf562a5e5b13e6d931bddea503f00e2351958c8bbe763cbe7191c1322a0173a87cc2a02fbacb3fbf1ca6ddfe7cfc20d9e1be72f60625fe47
-  data.tar.gz: e937262b5fa4c831585831ff2161412bb6f50a10ca729b83513159f2bbaf28148e95a3fd58f9b21a0009b4be1782b888b55cbff71bbfc1e772df1c70bf964e6e
+  metadata.gz: 2ae6a4943986519c5164ec030aa0580efe9a3ed02510d5d5e3e21e6214f3b2c6a9c9dcd311a2da8fe6dbdcec2d92f6ec90f5460508ff25389cf4cf3a047a7310
+  data.tar.gz: efe37a0593db07a2b51a4f660d0da47a09e72c049c10c132a041d60b2ee524e973a9fea33c546bdb68b04f9c684da86bc73ad621b557e7de0899f78ec7cdcc87

data/README.md

@@ -66,6 +66,7 @@ and running:
     - [Caching](#caching)
       - [Automatic Rengeneration](#automatic-regeneration)
       - [Forced Regeneration](#forced-regeneration)
+    - [Crude Performance Measures](#crude-performance-measures)
   - [Host](#host)
   - [Rake Task](#rake-task)
   - [Plugins](#plugins)
@@ -314,7 +315,7 @@ Field                  | Purpose
 `templates/photo`      | the photo template file in the `site/_templates` folder, must be overridden if using a different template engine
 `logging`              | a listing of the various logging options
 `logging/colorize`     | when outputting to `STDOUT`, `true` to use color, `false` for none
-`logging/level`        | the default logging level, it is advised to keep this at `info`
+`logging/level`        | the default logging level, it is advised to keep this at `info`, supported are `debug`, `info`, `warn`, `error` and `fatal`
 `logging/output`       | the appenders for the logger, `stdout` goes to `STDOUT`, `file` goes to `log/photish.log`
 `url`                  | a listing of the various url options
 `url/host`             | if you would like URLs generated with a specific host prefix, you can define it here, otherwise leave it as '/' or do not set this configuration at all
@@ -494,17 +495,19 @@ and threads can be used to rapidly speed up generation. However, if the
 collection has a small number of photos and pages, workers and threads will
 increase the generation time as loading a new ruby process and creating
 multiple threads may have a higher setup time then just generating everything
-in a single ruby process.
+in a single ruby process and thread.
 
 The number of workers and threads is configurable in the [config
 file](#config-file-options) with the `workers` and `threads` options. By
-default, Photish will spawn a worker for each processor detected on the
-computer. It will then create 2 threads per worker. As each worker spawns it's
-own thread, for a computer with 4 processors, 4 workers will be created, each
-with 2 threads, which means in total Photish will manage 8 threads and
-potentially run 8 Image Magick processes concurrently. When tweaking the number
-of workers and threads it is important to consider IO bottlenecks as this will
-most likely be the limiting factor in performance.
+default, Photish will spawn a thread for each processor detected on the
+computer. It will then run this on a single worker.
+
+When configuring more than 1 worker, it is important to remember that each
+worker will spawn their own set of threads, if 4 workers are created, each with
+2 threads, it means in total Photish will manage 8 threads and potentially run
+8 Image Magick processes concurrently.  When tweaking the number of workers and
+threads it is important to consider IO bottlenecks as this will most likely be
+the limiting factor in performance.
 
 #### Caching
 
@@ -516,7 +519,7 @@ The cache file is stored in the `output_dir` and is named `.changes.yml`.
 
 ##### Automatic Regeneration
 
-Images are regenerated when they are modified, renamed or moved.
+Images are regenerated when a photo is modified, renamed or moved.
 
 Changing the `qualities` option in the config file will also trigger a full
 regeneration of all images.
@@ -533,6 +536,33 @@ on every change:
 
     $ photish host --force
 
+### Crude Performance Measures
+
+Below are some crude performance measures to get a ballpark idea of how
+Photish performs when generating for a large collection.
+
+**Benchmark Computer:**
+
+    MacBook Pro (Retina, 13-inch, Early 2015)
+    2.7 GHz Intel Core i5 (4 processors)
+    8 GB 1867 MHz DDR3
+
+
+Photos  | Size (M) | Workers   | Threads | Total Threads | Time (Seconds)
+--------|----------|-----------|---------|---------------|----------------
+934     | 464      | 1         | 1       | 1             | 601
+934     | 464      | 2         | 1       | 2             | 367
+934     | 464      | 4         | 1       | 4             | 312
+934     | 464      | 8         | 1       | 8             | 328
+934     | 464      | 1         | 2       | 2             | 346
+934     | 464      | 1         | 4       | 4             | **288**
+934     | 464      | 1         | 8       | 8             | 290
+934     | 464      | 2         | 2       | 4             | 309
+
+It is interesting to note the 20-30 second difference between using 4 workers
+vs. 4 threads. The time difference is due to the setup time of creating a whole
+new ruby process for each worker.
+
 ### Host
 
 To test and view your changes locally, the host command can be used to run a
@@ -587,7 +617,6 @@ called inside the template, it will render the message in bold wrapped in the
 **site/_plugins/shout.rb**
 ```ruby
 module Photish::Plugin::Shout
-
   def self.is_for?(type)
     Photish::Plugin::Type::Photo == type
   end

data/Rakefile

@@ -3,6 +3,7 @@ require "rspec/core/rake_task"
 require 'cucumber'
 require 'cucumber/rake/task'
 require 'photish/rake/task'
+require 'metric_fu'
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -25,7 +26,8 @@ end
 task :default => [:clean,
                   :spec,
                   :features,
-                  :gather_coverage]
+                  :gather_coverage,
+                  'metrics:all']
 
 namespace :photish do
   Photish::Rake::Task.new(:init, 'Creates a basic project') do |t|

data/TODO.md

@@ -2,8 +2,6 @@
 
 ## In Progress
 
-1. Look at error handling, exiting and cleanup (files, processes and threads)
-
 ## Backlog
 
 1. Plugin as a gem to deploy to github pages, netlify, amazon s3

data/lib/photish/cache/manifest.rb

@@ -22,7 +22,9 @@ module Photish
       end
 
       def flush_to_disk
-        File.open(worker_db_file, 'w') { |f| f.write(worker_db.to_yaml) }
+        File.open(worker_db_file(worker_index), 'w') do
+          |f| f.write(worker_db.to_yaml)
+        end
       end
 
       def preload
@@ -37,6 +39,10 @@ module Photish
                   :worker_index,
                   :worker_db
 
+      delegate :db_file,
+               :worker_db_file,
+               to: :manifest_db_file
+
       def checksum_of_file(file_path)
         cache.fetch(file_path.hash) do |key|
           cache[key] = version_hash.to_s +
@@ -49,12 +55,8 @@ module Photish
         @db = File.exist?(db_file) ? YAML.load_file(db_file) : {}
       end
 
-      def db_file
-        ManifestDbFile.db_file(output_dir)
-      end
-
-      def worker_db_file
-        ManifestDbFile.worker_db_file(output_dir, worker_index)
+      def manifest_db_file
+        ManifestDbFile.new(output_dir)
       end
     end
   end

data/lib/photish/cache/manifest_db_file.rb

@@ -1,33 +1,36 @@
 module Photish
   module Cache
-    module ManifestDbFile
-      def concat_db_files(output_dir, workers)
+    class ManifestDbFile
+      def initialize(output_dir)
+        @output_dir = output_dir
+      end
+
+      def concat_db_files(workers)
         changes = (1..workers).inject({}) do |accumulator, worker_index|
-          file = worker_db_file(output_dir, worker_index)
+          file = worker_db_file(worker_index)
           accumulator.merge!(YAML.load_file(file)) if File.exist?(file)
           accumulator
         end
-        File.open(db_file(output_dir), 'w') { |f| f.write(changes.to_yaml) }
+        File.open(db_file, 'w') { |f| f.write(changes.to_yaml) }
       end
 
-      def clear(output_dir)
-        FileUtils.rm_rf(db_file(output_dir))
+      def clear
+        FileUtils.rm_rf(db_file)
       end
 
-      def db_file(output_dir)
+      def db_file
         FileUtils.mkdir_p(output_dir)
         File.join(output_dir, '.changes.yml')
       end
 
-      def worker_db_file(output_dir, index)
+      def worker_db_file(index)
         FileUtils.mkdir_p(output_dir)
         File.join(output_dir, ".changes.#{index}.yml")
       end
 
-      module_function :concat_db_files,
-                      :db_file,
-                      :worker_db_file,
-                      :clear
+      private
+
+      attr_reader :output_dir
     end
   end
 end

data/lib/photish/command/base.rb

@@ -1,25 +1,23 @@
 module Photish
   module Command
     class Base
+      include Log::Loggable
+      include Log::SafeBlock
+
       def initialize(runtime_config)
         @runtime_config = runtime_config
-        @log = Logging.logger[self]
       end
 
       def execute
         setup_logging
-        begin
+        handle_errors(self.class.name) do
           run
-        rescue => e
-          log.fatal "An exception occured #{e.class} \"#{e.message}\" #{e.backtrace.join("\n")}"
-          exit(false)
         end
       end
 
       protected
 
-      attr_reader :runtime_config,
-                  :log
+      attr_reader :runtime_config
 
       delegate :config,
                :version_hash,
@@ -32,7 +30,7 @@ module Photish
       end
 
       def setup_logging
-        Log::Logger.instance.setup_logging(config)
+        Log::LogSetup.instance.configure(config.logging)
       end
     end
   end

data/lib/photish/command/deploy.rb

@@ -23,7 +23,7 @@ module Photish
       end
 
       def load_all_plugins
-        Plugin::Repository.reload(log, site_dir)
+        Plugin::Repository.instance.reload(site_dir)
       end
 
       def engine_class
@@ -33,7 +33,7 @@ module Photish
       end
 
       def deploy_plugins
-        Plugin::Repository.plugins_for(deploy_plugin_type)
+        Plugin::Repository.instance.plugins_for(deploy_plugin_type)
       end
 
       def deploy_plugin_type

data/lib/photish/command/generate.rb

@@ -2,13 +2,13 @@ module Photish
   module Command
     class Generate < Base
       def run
-        log.info "Starting generation with #{workers} workers"
+        log.info "Generating with #{workers} workers and #{threads} threads"
 
-        clear_cache if force_regeneration?
+        clear if force_regeneration?
         spawn_all_workers
         load_all_plugins
         wait_for_workers_to_complete
-        concat_db_files
+        concat_db_files(workers)
         perform_serial_generation
 
         log.info "Generation completed successfully"
@@ -24,18 +24,19 @@ module Photish
                :photish_executable,
                :workers,
                :force,
+               :threads,
                to: :config
 
+      delegate :concat_db_files,
+               :clear,
+               to: :manifest_db_file
+
       def force_regeneration?
         force == true
       end
 
-      def clear_cache
-        Cache::ManifestDbFile.clear(output_dir)
-      end
-
       def load_all_plugins
-        Plugin::Repository.reload(log, site_dir)
+        Plugin::Repository.instance.reload(site_dir)
       end
 
       def spawn_all_workers
@@ -81,8 +82,8 @@ module Photish
          "--worker_index=#{worker_index}"].join(' ')
       end
 
-      def concat_db_files
-        Cache::ManifestDbFile.concat_db_files(output_dir, workers)
+      def manifest_db_file
+        Cache::ManifestDbFile.new(output_dir)
       end
     end
   end

data/lib/photish/command/host.rb

@@ -2,8 +2,6 @@ module Photish
   module Command
     class Host < Base
       def run
-        Photish::Log::Logger.instance.setup_logging(config)
-
         log.info "Site will be running at http://0.0.0.0:#{port}/"
         log.info "Monitoring paths #{paths_to_monitor}"
 
@@ -33,14 +31,20 @@ module Photish
 
       def regenerate_thread
         @regenerate_thread ||= Thread.new do
-          loop do
-            queue.pop
-            queue.clear
-            regenerate_entire_site
+          handle_errors('Regenerate Thread') do
+            regenerate_loop
           end
         end
       end
 
+      def regenerate_loop
+        loop do
+          queue.pop
+          queue.clear
+          regenerate_entire_site
+        end
+      end
+
       def server
         @server ||= WEBrick::HTTPServer.new(Port: port,
                                             DocumentRoot: output_dir,
@@ -49,14 +53,25 @@ module Photish
       end
 
       def listener
-        @listener ||= Listen.to(*paths_to_monitor) do |modified, added, removed|
-          log.info "File was modified #{modified}" if modified.present?
-          log.info "File was added #{added}" if added.present?
-          log.info "File was removed #{removed}" if removed.present?
-          queue.push(modified || added || removed)
+        @listener ||= Listen.to(*paths_to_monitor) do |mod, add, del|
+          handle_errors('File Change Listener') do
+            handle_change(mod, add, del)
+          end
         end
       end
 
+      def handle_change(mod, add, del)
+        changes = changes_as_hash(mod, add, del)
+        log.info "File change detected: #{changes}}"
+        queue.push(changes)
+      end
+
+      def changes_as_hash(mod, add, del)
+        { modified: mod,
+          added:    add,
+          removed:  del, }
+      end
+
       def paths_to_monitor
         [site_dir,
          photo_dir]

data/lib/photish/command/worker.rb

@@ -21,8 +21,8 @@ module Photish
                to: :config
 
       def load_all_plugins
-        return if Plugin::Repository.loaded?
-        Plugin::Repository.reload(log, site_dir)
+        return if Plugin::Repository.instance.loaded?
+        Plugin::Repository.instance.reload(site_dir)
       end
 
       def render_whole_site

data/lib/photish/config/default_config.rb

@@ -12,38 +12,54 @@ module Photish
           worker_index: 0,
           force: false,
           photish_executable: photish_executable,
-          qualities: [
-            { name: 'Original',
-              params: [] },
-            { name: 'Low',
-              params: ['-resize', '200x200'] }
-          ],
-          templates: {
-            layout: 'layout.slim',
-            collection: 'collection.slim',
-            album: 'album.slim',
-            photo: 'photo.slim'
-          },
-          logging: {
-            colorize: true,
-            output: ['stdout', 'file'],
-            level: 'info'
-          },
-          url: {
-            host: '',
-            base: nil
-          }
+          qualities: qualities,
+          templates: templates,
+          logging: logging,
+          url: url
         }
       end
 
       private
 
+      def url
+        {
+          host: '',
+          base: nil
+        }
+      end
+
+      def logging
+        {
+          colorize: true,
+          output: ['stdout', 'file'],
+          level: 'info'
+        }
+      end
+
+      def templates
+        {
+          layout: 'layout.slim',
+          collection: 'collection.slim',
+          album: 'album.slim',
+          photo: 'photo.slim'
+        }
+      end
+
+      def qualities
+        [
+          { name: 'Original',
+            params: [] },
+          { name: 'Low',
+            params: ['-resize', '200x200'] }
+        ]
+      end
+
       def workers
-        processor_count / 2
+        1
       end
 
       def threads
-        2
+        processor_count
       end
 
       def processor_count

data/lib/photish/log/access_log.rb

@@ -1,9 +1,7 @@
 module Photish
   module Log
     class AccessLog
-      def initialize
-        @log = Logging.logger[self]
-      end
+      include Loggable
 
       def <<(message)
         log.info message.chomp

data/lib/photish/log/formatter.rb

@@ -0,0 +1,87 @@
+module Photish
+  module Log
+    class Formatter
+      def initialize(color)
+        @color = color
+      end
+
+      def call(severity, datetime, progname, msg)
+        LogLine.new(@color, severity, datetime, progname, msg).format
+      end
+
+      private
+
+      class LogLine
+        def initialize(color, severity, datetime, progname, msg)
+          @color = color
+          @severity = severity
+          @datetime = datetime
+          @progname = progname
+          @msg = msg
+        end
+
+        def format
+          line = ''
+          line << timestamp
+          line << pid
+          line << severity
+          line << progname
+          line << msg
+          line
+        end
+
+        private
+
+        SEV = {
+          'DEBUG' => [:green,  :default],
+          'INFO'  => [:green,  :default],
+          'WARN'  => [:yellow, :default],
+          'ERROR' => [:red,    :default],
+          'FATAL' => [:white,  :red    ],
+        }
+
+       def color?
+         !!@color
+       end
+
+        def severity
+          str = "#{@severity}"
+          str = str.colorize(color: SEV[@severity].first,
+                             background: SEV[@severity].last) if color?
+          " #{str} "
+        end
+
+        def timestamp
+          str = "[#{@datetime.strftime("%Y-%m-%dT%H:%M:%S.%L")}]"
+          str = str.colorize(:cyan) if color?
+          str
+        end
+
+        def pid
+          str = "[#{Process.pid.to_s.rjust(5, '0')}]"
+          str = str.colorize(:light_magenta) if color?
+          str
+        end
+
+        def progname
+          str = "#{@progname}"
+          str = str.colorize(:magenta) if color?
+          str
+        end
+
+        def msg
+          str = ': '
+          if @msg.kind_of?(Exception)
+            str << "#{@msg.class} \"#{@msg.message}\"\n"
+            str << "#{@msg.backtrace.join("\n")}"
+          else
+            str << "#{@msg}"
+          end
+          str << "\n"
+          str = str.colorize(:light_blue) if color?
+          str
+        end
+      end
+    end
+  end
+end

data/lib/photish/log/log_setup.rb

@@ -0,0 +1,79 @@
+module Photish
+  module Log
+    class LogSetup
+      LEVEL = {
+        debug: Logger::DEBUG,
+        info:  Logger::INFO,
+        warn:  Logger::WARN,
+        error: Logger::ERROR,
+        fatal: Logger::FATAL,
+      }
+
+      include Singleton
+
+      attr_accessor :setup_complete
+
+      def initialize
+        @config = nil
+      end
+
+      def configure(incoming_config)
+        return if config
+        @config = incoming_config
+      end
+
+      def new_logger(name)
+        logger = setup_new_logger(name, null_file)
+        logger.extend(stdout_broadcast(name)) if output_to_stdout?
+        logger.extend(file_broadcast(name)) if output_to_file?
+        logger
+      end
+
+      private
+
+      attr_reader :config
+
+      delegate :output,
+               :level,
+               :colorize,
+               to: :config
+
+      def null_file
+        File.open(File::NULL, 'w')
+      end
+
+      def setup_new_logger(name, stream)
+        logger = ActiveSupport::Logger.new(stream)
+        logger.progname = name
+        logger.level = logging_level
+        logger
+      end
+
+      def file_broadcast(name)
+        file = File.join('log', 'photish.log')
+        FileUtils.mkdir_p('log')
+        logger = setup_new_logger(name, file)
+        logger.formatter = Log::Formatter.new(false)
+        ActiveSupport::Logger.broadcast(logger)
+      end
+
+      def stdout_broadcast(name)
+        logger = setup_new_logger(name, STDOUT)
+        logger.formatter = Log::Formatter.new(colorize)
+        ActiveSupport::Logger.broadcast(logger)
+      end
+
+      def logging_level
+        LEVEL.fetch(level.try(:to_sym))
+      end
+
+      def output_to_stdout?
+        output.include?('stdout')
+      end
+
+      def output_to_file?
+        output.include?('file')
+      end
+    end
+  end
+end

data/lib/photish/log/loggable.rb

@@ -0,0 +1,9 @@
+module Photish
+  module Log
+    module Loggable
+      def log
+        @log ||= LogSetup.instance.new_logger(self.class.name)
+      end
+    end
+  end
+end

data/lib/photish/log/safe_block.rb

@@ -0,0 +1,17 @@
+module Photish
+  module Log
+    module SafeBlock
+      def handle_errors(name)
+        begin
+          yield
+          @runtime_error_occured = false
+        rescue Exception => e
+          log.fatal "#{name} died due to exception"
+          log.fatal e unless e.kind_of?(SystemExit)
+          Thread.list.each(&:kill) 
+          exit(1)
+        end
+      end
+    end
+  end
+end

data/lib/photish/plugin/pluginable.rb

@@ -2,10 +2,15 @@ module Photish
   module Plugin
     module Pluginable
       def initialize(*_args)
-        Photish::Plugin::Repository.plugins_for(self.plugin_type).each do |moduol|
+        plugins_for_type.each do |moduol|
           self.class.send(:include, moduol)
         end
       end
+
+      def plugins_for_type
+        Photish::Plugin::Repository.instance
+                                   .plugins_for(self.plugin_type)
+      end
     end
   end
 end

data/lib/photish/plugin/repository.rb

@@ -2,32 +2,14 @@ module Photish
   module Plugin
     class Repository
       include Singleton
+      include Log::Loggable
 
-      class << self
-        def reload(log, site_dir)
-          self.instance.reload(log, site_dir)
-        end
-
-        def plugins_for(type)
-          self.instance.plugins_for(type)
-        end
-
-        def loaded?
-          self.instance.loaded?
-        end
-      end
-
-      def reload(log, site_dir)
+      def reload(site_dir)
         log.info "Loading plugins..."
-        Dir[File.join(site_dir, '_plugins', '*.rb')].each do |file|
-          load file
-        end
 
-        @all_plugins = nil
-
-        all_plugins.each do |plugin|
-          log.info "Found plugin #{plugin}"
-        end
+        load_each_plugin_file(site_dir)
+        clear_plugin_cache
+        load_each_plugin_constant
       end
 
       def plugins_for(type)
@@ -45,6 +27,22 @@ module Photish
 
       private
 
+      def load_each_plugin_constant
+        all_plugins.each do |plugin|
+          log.info "Found plugin #{plugin}"
+        end
+      end
+
+      def clear_plugin_cache
+        @all_plugins = nil
+      end
+
+      def load_each_plugin_file(site_dir)
+        Dir[File.join(site_dir, '_plugins', '*.rb')].each do |file|
+          load file
+        end
+      end
+
       def constants
         Photish::Plugin.constants
       end

data/lib/photish/render/image_conversion.rb

@@ -1,12 +1,13 @@
 module Photish
   module Render
     class ImageConversion
+      include Log::Loggable
+
       def initialize(output_dir, worker_index, version_hash, threads)
         @output_dir = output_dir
         @worker_index = worker_index
         @version_hash = version_hash
         @threads = threads
-        @log = Logging.logger[self]
       end
 
       def render(images)
@@ -21,7 +22,6 @@ module Photish
       private
 
       attr_reader :output_dir,
-                  :log,
                   :worker_index,
                   :version_hash,
                   :threads
@@ -34,7 +34,9 @@ module Photish
 
       def spawn_thread_instances(image_queue)
         (0...threads).map do
-          Thread.new { process_images(image_queue) }
+          Thread.new do
+            process_images(image_queue)
+          end
         end
       end
 

data/lib/photish/render/page.rb

@@ -1,11 +1,12 @@
 module Photish
   module Render
     class Page
+      include Log::Loggable
+
       def initialize(layout_file, template_file, output_dir)
         @layout_file = layout_file
         @template_file = template_file
         @output_dir = output_dir
-        @log = Logging.logger[self]
       end
 
       def render(models)
@@ -17,8 +18,7 @@ module Photish
 
       attr_reader :template_file,
                   :layout_file,
-                  :output_dir,
-                  :log
+                  :output_dir
 
       def render_all(models)
         Array(models).each do |model|

data/lib/photish/version.rb

@@ -1,3 +1,3 @@
 module Photish
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/photish.rb

@@ -1,6 +1,5 @@
 # 3rd Party
 require 'mini_magick'
-require 'logging'
 require 'tilt'
 require 'rake'
 require 'active_support'
@@ -17,8 +16,14 @@ require 'mime-types'
 require 'thread'
 require 'thwait'
 require 'slim'
+require 'colorize'
 
 # Photish
+require 'photish/log/loggable'
+require 'photish/log/formatter'
+require 'photish/log/log_setup'
+require 'photish/log/access_log'
+require 'photish/log/safe_block'
 require 'photish/plugin/type'
 require 'photish/plugin/pluginable'
 require 'photish/plugin/repository'
@@ -29,10 +34,6 @@ require 'photish/command/host'
 require 'photish/command/init'
 require 'photish/command/deploy'
 require 'photish/cli/interface'
-require 'photish/log/logger'
-require 'photish/log/logger'
-require 'photish/log/access_log'
-require 'photish/log/logger'
 require 'photish/config/default_config'
 require 'photish/config/file_config'
 require 'photish/config/file_config_location'

data/photish.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mini_magick", "~> 4.3"
   spec.add_dependency "mini_exiftool", "~> 2.5"
   spec.add_dependency "recursive-open-struct", "~> 1.0"
-  spec.add_dependency "logging", "~> 2.0"
   spec.add_dependency "listen", "~> 3.0"
   spec.add_dependency "facter", "~> 2.4"
   spec.add_dependency "mime-types", "~> 3.0"
+  spec.add_dependency "colorize", "~> 0.7.7"
 
   spec.add_development_dependency "anemone", "~> 0.7"
   spec.add_development_dependency "bundler", "~> 1.10"
@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "retriable"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "rspec-html-matchers"
+  spec.add_development_dependency "metric_fu"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photish
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Henry Lawson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,61 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: facter
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: metric_fu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Photish is a simple, convention based (but
     configurable) static photo site generator.
@@ -364,7 +378,10 @@ files:
 - lib/photish/gallery/traits/metadatable.rb
 - lib/photish/gallery/traits/urlable.rb
 - lib/photish/log/access_log.rb
-- lib/photish/log/logger.rb
+- lib/photish/log/formatter.rb
+- lib/photish/log/log_setup.rb
+- lib/photish/log/loggable.rb
+- lib/photish/log/safe_block.rb
 - lib/photish/plugin/pluginable.rb
 - lib/photish/plugin/repository.rb
 - lib/photish/plugin/type.rb

data/lib/photish/log/logger.rb

@@ -1,78 +0,0 @@
-module Photish
-  module Log
-    class Logger
-      include Singleton
-
-      attr_accessor :setup_complete
-
-      def initialize
-        @setup_complete = false
-      end
-
-      def setup_logging(config)
-        return if setup_complete
-
-        setup_color_scheme if colorize?(config)
-        setup_stdout_output if output_to_stdout?(config)
-        setup_file_output if output_to_file?(config)
-
-        Logging.logger.root.level = logging_level(config)
-        self.setup_complete = true
-      end
-
-      private
-
-      def logging_level(config)
-        config.logging.level.try(:to_sym)
-      end
-
-      def colorize?(config)
-        config.logging.colorize
-      end
-
-      def output_to_stdout?(config)
-        config.logging.output.include?('stdout')
-      end
-
-      def output_to_file?(config)
-        config.logging.output.include?('file')
-      end
-
-      def setup_color_scheme
-        Logging.color_scheme('bright',
-          levels: {
-            info: :green,
-            warn:  :yellow,
-            error: :red,
-            fatal: [:white, :on_red]
-          },
-          date: :blue,
-          logger: :cyan,
-          message: :magenta
-        )
-      end
-
-      def setup_stdout_output
-        stdout_appender = Logging.appenders.stdout(
-          'stdout',
-          layout: Logging.layouts.pattern(
-            pattern: '[%d][%p][%t] %-5l %c: %m\n',
-            color_scheme: 'bright'
-          )
-        )
-        Logging.logger.root.add_appenders(stdout_appender)
-      end
-
-      def setup_file_output
-        FileUtils.mkdir_p('log')
-        file_appender = Logging.appenders.file(
-           'log/photish.log',
-           layout: Logging.layouts.pattern(
-              pattern: '[%d][%p][%t] %-5l %c: %m\n',
-           )
-        )
-        Logging.logger.root.add_appenders(file_appender)
-      end
-    end
-  end
-end