multi_sync 0.0.2 → 0.0.3

data/lib/multi_sync/configuration.rb

@@ -19,10 +19,13 @@ module MultiSync
     #
     # @param options [Hash]
     def initialize(*args)
-      Celluloid.logger = MultiSync.test? ? nil : MultiSync.logger
+      # Celluloid.logger = MultiSync.verbose? ? nil : MultiSync.logger
+      Celluloid.logger = nil
       super
     end
 
+    private
+
     def celluloid_cores
       Celluloid.cores
     end

data/lib/multi_sync/extensions/jekyll.rb

@@ -0,0 +1,24 @@
+module MultiSync
+  module Extensions
+    class Jekyll
+      MultiSync.debug "Jekyll -v #{::Jekyll::VERSION} auto-detected"
+      class << self
+        def source_dir
+          ''
+        end
+
+        def destination_dir
+          ''
+        end
+
+        # def jekyll_site
+        #   @jekyll_site ||= ::Jekyll::Site.new(jekyll_configuration)
+        # end
+
+        # def jekyll_configuration
+        #   @jekyll_configuration ||= ::Jekyll.configuration
+        # end
+      end
+    end
+  end
+end

data/lib/multi_sync/extensions/middleman.rb

@@ -2,21 +2,15 @@ module MultiSync
   module Extensions
     class Middleman
       MultiSync.debug "Middleman -v #{::Middleman::VERSION} auto-detected"
-
       class << self
         def source_dir
-          File.expand_path(File.join(ENV['MM_ROOT'], 'build'))
+          Pathname.new(File.join(ENV['MM_ROOT'], 'build'))
         end
 
         def destination_dir
           ''
         end
       end
-
-      MultiSync.source(:middleman,
-        type: :local,
-        source_dir: MultiSync::Extensions::Middleman.source_dir
-      )
     end
   end
 end

data/lib/multi_sync/extensions/rails.rb

@@ -2,10 +2,8 @@ module MultiSync
   module Extensions
     require 'multi_sync/extensions/rails/railtie' if defined?(::Rails::Railtie)
     require 'multi_sync/extensions/rails/asset_sync'
-
     class Rails
       MultiSync.debug "Rails -v #{::Rails::VERSION::STRING} auto-detected"
-
       class << self
         def source_dir
           ::Rails.root.join('public', destination_dir)

data/lib/multi_sync/{mixins/pluralize_helper.rb → helpers/pluralize.rb}

@@ -1,6 +1,6 @@
 module MultiSync
-  module Mixins
-    module PluralizeHelper
+  module Helpers
+    module Pluralize
       def pluralize(n, singular, plural = nil, prefix = true)
         if n == 1
           (prefix ? '1 ' : '') + singular

data/lib/multi_sync/logging.rb

@@ -5,22 +5,27 @@ module MultiSync
   module Logging
     MUTEX = Mutex.new
 
+    # Retrieves the current MultiSync logger
     def logger
       @logger || initialize_logger
     end
 
+    # Sets the current MultiSync logger
     def logger=(new_logger)
       @logger = new_logger ? new_logger : Logger.new('/dev/null')
     end
 
+    # Retrieves the current MultiSync status_logger
     def status_logger
       @status_logger || initialize_status_logger
     end
 
+    # Sets the current MultiSync logger
     def status_logger=(new_status_logger)
       @status_logger = new_status_logger ? new_status_logger : nil
     end
 
+    #
     def say_status(status, message, log_status = true)
       return if status_logger.nil?
 
@@ -31,8 +36,10 @@ module MultiSync
       end
     end
 
+    #
     def log(message, level = :debug)
       # We're not in verbose mode so disable all non-info logs
+      say_status :sync, message
       return if !MultiSync.verbose && level != :info
       MUTEX.synchronize do
         logger.send(level, message)

data/lib/multi_sync/resource.rb

@@ -1,13 +1,11 @@
 require 'virtus'
 require 'pathname'
 require 'digest/md5'
-require 'multi_sync/mixins/log_helper'
 
 module MultiSync
   class Resource
     include Comparable
     include Virtus.model
-    include MultiSync::Mixins::LogHelper
 
     attribute :path_with_root, Pathname
     attribute :path_without_root, Pathname

data/lib/multi_sync/resources/local_resource.rb

@@ -3,7 +3,6 @@ require 'multi_sync/resource'
 
 module MultiSync
   class LocalResource < Resource
-
     def body
       File.read(path_with_root.to_s)
     rescue

data/lib/multi_sync/source.rb

@@ -2,13 +2,11 @@ require 'virtus'
 require 'pathname'
 require 'lazily'
 require 'multi_sync/attributes/pathname'
-require 'multi_sync/mixins/log_helper'
 require 'multi_sync/resources/local_resource'
 
 module MultiSync
   class Source
     include Virtus.model
-    include MultiSync::Mixins::LogHelper
 
     attribute :source_dir, MultiSync::Attributes::Pathname
 

data/lib/multi_sync/sources/local_source.rb

@@ -5,13 +5,15 @@ module MultiSync
   class LocalSource < Source
     def files
       files = []
+      # create a local_resource from each file
+      # making sure to skip any that do not match the include/exclude patterns
       included_files = Dir.glob(source_dir + include)
       excluded_files = exclude.nil? ? [] : Dir.glob(source_dir + exclude)
       (included_files - excluded_files).lazily.each { |path|
         next if File.directory?(path)
         files << path_to_local_resource(path)
       }
-      files
+      files.sort
     end
   end
 end

data/lib/multi_sync/sources/manifest_source.rb

@@ -7,17 +7,6 @@ module MultiSync
   class ManifestSource < Source
     def files
       files = []
-      manifest_hash = {}
-
-      # ::ActionView::Base has a shortcut to the manifest file
-      # otherwise lets hunt down that manifest file!
-      if defined?(::ActionView::Base) && ::ActionView::Base.respond_to?(:assets_manifest)
-        manifest_hash = ::ActionView::Base.assets_manifest.files
-      else
-        manifest_path = locate_manifest(source_dir)
-        manifest_hash = parse_manifest(manifest_path)
-      end
-
       # create a local_resource from each file
       # making sure to skip any that do not match the include/exclude patterns
       manifest_hash.lazily.each { |key, value|
@@ -26,14 +15,22 @@ module MultiSync
         file = path_to_local_resource(path, mtime: value['mtime'], digest: value['digest'], content_length: value['size'])
         files << file
       }
-
-      files
+      files.sort
     end
 
     private
 
-    def locate_manifest(dir)
-      Dir.glob(dir + 'manifest*.{json,yaml,yml}').max { |f| File.ctime(f) }
+    def manifest_hash
+      manifest_hash = {}
+      # ::ActionView::Base has a shortcut to the manifest file
+      # otherwise lets hunt down that manifest file!
+      if defined?(::ActionView::Base) && ::ActionView::Base.respond_to?(:assets_manifest)
+        manifest_hash = ::ActionView::Base.assets_manifest.files
+      else
+        manifest_path = Dir.glob(source_dir + 'manifest*.{json,yaml,yml}').max { |f| File.ctime(f) }
+        manifest_hash = parse_manifest(manifest_path)
+      end
+      manifest_hash
     end
 
     def parse_manifest(manifest_path)
@@ -46,6 +43,8 @@ module MultiSync
         manifest_hash = MultiJson.load(manifest_data)
       when '.yml', '.yaml'
         manifest_hash = YAML.load(manifest_data)
+      else
+        fail ArgumentError, "Unknown manifest type: #{manifest_path}"
       end
 
       # different versions of Sprockets have different manifest layouts, lets try and work around this by checking for the presence of "files" and "assets" in the manifest first
@@ -71,7 +70,6 @@ module MultiSync
           }
         }
 
-        #
         manifest_hash = modified_manifest_hash
 
       end

data/lib/multi_sync/target.rb

@@ -4,18 +4,18 @@ require 'virtus'
 require 'pathname'
 require 'celluloid'
 require 'multi_sync/attributes/pathname'
-require 'multi_sync/mixins/log_helper'
 
 module MultiSync
   class Target
     include Celluloid
     include Virtus.model
-    include MultiSync::Mixins::LogHelper
-    
+
     attribute :target_dir, MultiSync::Attributes::Pathname, default: Pathname.new('')
     attribute :destination_dir, MultiSync::Attributes::Pathname, default: Pathname.new('')
     attribute :credentials, Hash, default: :default_credentials
 
+    private
+
     def default_credentials
       Marshal.load(Marshal.dump(MultiSync.credentials))
     end

data/lib/multi_sync/targets/aws_target.rb

@@ -3,7 +3,6 @@ require 'multi_sync/resources/remote_resource'
 
 module MultiSync
   class AwsTarget < Target
-    
     attribute :connection, Fog::Storage, lazy: true, default: lambda { |target, attribute|
       Fog::Storage.new(target.credentials.merge(provider: :aws))
     }
@@ -15,26 +14,23 @@ module MultiSync
       return files if directory.nil?
 
       directory.files.lazily.each { |file|
-
         pathname = Pathname.new(file.key)
 
         # eg directory or overreaching AWS globbing
         next unless valid_path?(pathname)
-
         files << MultiSync::RemoteResource.new(
           file: file,
           path_with_root: target_dir + pathname, # pathname seems to already have the prefix (destination_dir)
           path_without_root: destination_dir != '' ? pathname.relative_path_from(destination_dir).cleanpath : pathname
         )
-
       }
 
-      files
+      files.sort
     end
 
     def upload(resource)
-      MultiSync.say_status :upload, resource.path_without_root.to_s
-      MultiSync.debug "Upload #{resource.class_name}:'#{resource.path_without_root}' to #{class_name}:'#{File.join('/', target_dir + destination_dir)}'"
+      # MultiSync.say_status :upload, resource.path_without_root
+      MultiSync.debug "Upload #{resource} '#{resource.path_without_root}' to #{self} '/#{target_dir + destination_dir}'"
       directory = connection.directories.get(target_dir.to_s)
       return if directory.nil?
 
@@ -55,8 +51,8 @@ module MultiSync
     end
 
     def delete(resource)
-      MultiSync.say_status :delete, resource.path_without_root.to_s
-      MultiSync.debug "Delete #{resource.class_name}:'#{resource.path_without_root}' from #{class_name}:'#{File.join('/', target_dir + destination_dir)}'"
+      # MultiSync.say_status :delete, resource.path_without_root
+      MultiSync.debug "Delete #{resource} '#{resource.path_without_root}' from #{self} '/#{target_dir + destination_dir}'"
       connection.delete_object(target_dir.to_s, (destination_dir + resource.path_without_root).to_s)
       resource
     end
@@ -66,7 +62,7 @@ module MultiSync
     # directory or overreaching AWS globbing
     def valid_path?(pathname)
       # directory
-      return false if pathname.to_s =~ /\/$/
+      return false if pathname.directory?
 
       # overreaching AWS globbing
       return false if !destination_dir.to_s.empty? && !(pathname.to_s =~ /^#{destination_dir.to_s}\//)

data/lib/multi_sync/targets/local_target.rb

@@ -3,7 +3,6 @@ require 'multi_sync/resources/remote_resource'
 
 module MultiSync
   class LocalTarget < Target
-
     attribute :connection, Fog::Storage, lazy: true, default: lambda { |target, attribute|
       Fog::Storage.new(target.credentials.merge(provider: :local))
     }
@@ -15,40 +14,33 @@ module MultiSync
       return files if directory.nil?
 
       directory.files.lazily.each { |file|
-
         pathname = Pathname.new(file.key)
 
         # directory
         next if pathname.directory?
-
-        MultiSync.debug "Found RemoteResource:'#{pathname}' from #{class_name}:'#{File.join(connection.local_root, destination_dir)}'"
-
         files << MultiSync::RemoteResource.new(
           file: file,
           path_with_root: target_dir + destination_dir + pathname,
           path_without_root: pathname
         )
-
       }
 
-      files
+      files.sort
     end
 
     def upload(resource)
-      key = resource.path_without_root.to_s
-      MultiSync.say_status :upload, key
-      MultiSync.debug "Upload #{resource.class_name}:'#{key}' to #{class_name}:'#{File.join(connection.local_root, destination_dir)}'"
+      # MultiSync.say_status :upload, resource.path_with_root
+      MultiSync.debug "Upload #{resource} '#{resource.path_without_root}' to #{self} '#{File.join(connection.local_root, destination_dir)}'"
       directory = connection.directories.get(destination_dir.to_s)
       return if directory.nil?
-      directory.files.create(key: key, body: resource.body)
+      directory.files.create(key: resource.path_without_root.to_s, body: resource.body)
       resource
     end
 
     def delete(resource)
-      key = resource.path_without_root.to_s
-      MultiSync.say_status :delete, key
-      MultiSync.debug "Delete #{resource.class_name}:'#{key}' from #{class_name}:'#{File.join(connection.local_root, destination_dir)}'"
-      connection.directories.get(destination_dir.to_s).files.get(key).destroy
+      # MultiSync.say_status :delete, resource.path_with_root
+      MultiSync.debug "Delete #{resource} '#{resource.path_without_root}' from #{self} '#{File.join(connection.local_root, destination_dir)}'"
+      connection.directories.get(destination_dir.to_s).files.get(resource.path_without_root.to_s).destroy
       resource
     end
   end

data/lib/multi_sync/version.rb

@@ -1,3 +1,3 @@
 module MultiSync
-  VERSION = '0.0.2' unless defined?(MultiSync::VERSION)
+  VERSION = '0.0.3' unless defined?(MultiSync::VERSION)
 end

data/lib/tasks/multi_sync_rails.rake

@@ -10,12 +10,12 @@ namespace :assets do
   end
 end
 
-Rake::Task['assets:precompile'].enhance do
-  Rake::Task['assets:sync'].invoke if defined?(MultiSync)
-end
-
 if Rake::Task.task_defined?('assets:precompile:nondigest')
   Rake::Task['assets:precompile:nondigest'].enhance do
     Rake::Task['assets:sync'].invoke if defined?(MultiSync)
   end
+else
+  Rake::Task['assets:precompile'].enhance do
+    Rake::Task['assets:sync'].invoke if defined?(MultiSync)
+  end
 end

data/multi_sync.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = MultiSync::VERSION
   spec.authors       = ['Karl Freeman']
   spec.email         = ['karlfreeman@gmail.com']
-  spec.summary       = %q{A flexible synchronisation library for your assets}
-  spec.description   = %q{A flexible synchronisation library for your assets}
+  spec.summary       = %q{Flexible synchronisation for your assets}
+  spec.description   = %q{Flexible synchronisation for your assets}
   spec.homepage      = 'https://github.com/karlfreeman/multi_sync'
   spec.license       = 'MIT'
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency 'fog', '~> 1.2'
+  spec.add_dependency 'unf'
   spec.add_dependency 'lazily', '~> 0.1'
   spec.add_dependency 'virtus', '~> 1.0'
   spec.add_dependency 'celluloid', '~> 0.15'

data/spec/support/fog.rb

@@ -1,6 +1,5 @@
 require 'fog'
 Fog::Mock.delay = 0
-
 module Fog
   module SpecHelpers
     def self.extended(example_group)

data/spec/support/timecop.rb

@@ -1,2 +1,8 @@
 require 'timecop'
-Timecop.freeze
+RSpec.configure do |config|
+  config.around do |ex|
+    Timecop.freeze do
+      ex.run
+    end
+  end
+end