locomotivecms_wagon 2.0.0.pre.alpha.3 → 2.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50873f213bdcfed4f2805e3234779843063a592
-  data.tar.gz: 858be1870e92f8babccc46f1d1e0c9ec45f6cf7f
+  metadata.gz: af0162fe63e4c9884c03e7a7265ffb72e30bbb16
+  data.tar.gz: 1199659382fb6103c4432ab7127fd897581f2275
 SHA512:
-  metadata.gz: ccf20a282732acfb247467c130fe9001b065ef06e60f7d2507f44e3f13a506b8b476d29861167ffc7618fc567f1a04d247a92a828870ca4df14f36ff789e8878
-  data.tar.gz: c7264b43a72794eb57de873f4eb52e62235dd03a83b65a522f774b893105232d5174c7b5be95a2f66cadc33483bcd94f89f51e5804228dacce7d578119b280fe
+  metadata.gz: f76b0ebb45502c6d25dcc88706361c0c0603c845fcd22ebe963e4543efcf5da3e3e68caeedf774503e05d22b149f358d1ee410a83eb5cd0c1459d45676f309a0
+  data.tar.gz: e43fa9d4065eb13632e2d1f6fe03f7dd05989f02599af2c7f5985762faeb343b14639835c8d48b874d360a216492acf978ce827e4e8e33cdefa506b92871642f

data/Gemfile

@@ -3,20 +3,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in wagon.gemspec
 gemspec
 
-# Development
-# gem 'locomotivecms-liquid', path: '../gems/liquid', require: false
-# gem 'locomotivecms-solid', path: '../gems/solid', require: false
-# gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
-# gem 'locomotivecms_mounter', github: 'locomotivecms/mounter', ref: '6025c4a', require: false
-
 gem 'rb-fsevent', '~> 0.9.1'
 
 gem 'therubyracer'
 
+# Development
 # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'b2de77e', require: false
 # gem 'locomotivecms_coal', github: 'locomotivecms/coal', ref: '32b2844', require: false
 # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '3046b79893', require: false
 
+# Local development
 # gem 'locomotivecms_coal', path: '../in_progress/coal', require: false
 # gem 'locomotivecms_steam', path: '../in_progress/steam', require: false
 # gem 'locomotivecms_common', path: '../in_progress/common', require: false

data/bin/wagon

@@ -9,4 +9,4 @@ $stdout.sync = true
 require 'locomotive/wagon'
 require 'locomotive/wagon/cli'
 
-Locomotive::Wagon::CLI::Main.start
+Locomotive::Wagon::CLI::Main.start

data/generators/cloned/config/deploy.yml.tt

@@ -1,8 +1,9 @@
 production:
   host: <%= config[:host] %>
-<% if config[:email] -%>
+  handle: <%= config[:handle] %>
   email: <%= config[:email] %>
+<% if config[:password] -%>
   password: <%= config[:password] %>
 <% elsif config[:api_key] -%>
   api_key: <%= config[:api_key] -%>
-<% end -%>
+<% end -%>

data/generators/content_type/app/content_types/%slug%.yml.tt

@@ -25,6 +25,13 @@ order_by: manually
 # Array of emails to be notified of new entries made with the public API
 # public_submission_accounts: ['john@example.com']
 
+# Control the display of the content type in the back-office.
+# display_settings:
+#   seo: false              # display the SEO tab for the content entries
+#   advanced: false         # display the Advanced tab for the content entries
+#   position: 1             # position in the sidebar menu
+#   hidden: false           # hidden for authors?
+
 # A list describing each field
 fields: <% config[:fields].each_with_index do |field, index| %>
 - <%= field.name -%>: # The lowercase, underscored name of the field

data/lib/locomotive/wagon/cli.rb

@@ -9,21 +9,23 @@ module Locomotive
 
         protected
 
-        # Check if the path given in option ('.' by default) points to a LocomotiveCMS
+        # Check if the path given in option ('.' by default) points to a Locomotive
         # site. It is also possible to pass a path other than the one from the options.
         #
         # @param [ String ] path The optional path of the site instead of options['path']
         #
-        # @return [ String ] The fullpath to the LocomotiveCMS site or nil if it is not a valid site.
+        # @return [ String ] The fullpath to the Locomotive site or nil if it is not a valid site.
         #
         def check_path!(path = nil)
           path ||= options['path']
 
           path = path == '.' ? Dir.pwd : File.expand_path(path)
 
-          (File.exists?(File.join(path, 'config', 'site.yml')) ? path : nil).tap do |_path|
+          site_or_deploy_file = File.exists?(File.join(path, 'config', 'site.yml')) || File.exists?(File.join(path, 'config', 'deploy.yml'))
+
+          (site_or_deploy_file ? path : nil).tap do |_path|
             if _path.nil?
-              say 'The path does not point to a LocomotiveCMS site', :red
+              say 'The path does not point to a Locomotive site', :red
             end
           end
         end
@@ -35,7 +37,7 @@ module Locomotive
         def force_color_if_asked(options)
           if options[:force_color]
             # thor
-            require 'locomotive/wagon/misc/thor'
+            require 'locomotive/wagon/tools/thor'
             self.shell = Thor::Shell::ForceColor.new
 
             # bypass colorize code
@@ -50,7 +52,7 @@ module Locomotive
         include Locomotive::Wagon::CLI::ForceColor
         include Locomotive::Wagon::CLI::CheckPath
 
-        class_option :path, aliases: '-p', type: :string, default: '.', optional: true, desc: 'if your LocomotiveCMS site is not in the current path'
+        class_option :path, aliases: '-p', type: :string, default: '.', optional: true, desc: 'if your Locomotive site is not in the current path'
 
         desc 'content_type SLUG FIELDS', 'Creates a content type with the specified slug and fields.'
         method_option :name, aliases: '-n', type: :string, default: nil, optional: true, desc: 'Name of the content type as it will be displayed in the back-office'
@@ -151,10 +153,10 @@ module Locomotive
 
         protected
 
-        # Read the YAML config file of a LocomotiveCMS site.
+        # Read the YAML config file of a Locomotive site.
         # The path should be returned by the check_path! method first.
         #
-        # @param [ String ] path The full path to a LocomotiveCMS site.
+        # @param [ String ] path The full path to a Locomotive site.
         #
         # @return [ Hash ] The site
         #
@@ -171,7 +173,7 @@ module Locomotive
 
         class_option :force_color, type: :boolean, default: false, desc: 'Whether or not to use ANSI color in the output.'
 
-        desc 'version', 'Version of the LocomotiveCMS Wagon'
+        desc 'version', 'Version of the Locomotive Wagon'
         def version
           require 'locomotive/wagon/version'
           say Locomotive::Wagon::VERSION
@@ -214,15 +216,16 @@ module Locomotive
           end
         end
 
-        desc 'clone NAME HOST [PATH]', 'Clone a remote LocomotiveCMS site'
-        method_option :verbose,   aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
-        method_option :email,     aliases: '-e', desc: 'email of an administrator account'
-        method_option :password,  aliases: '-p', desc: 'password of an administrator account'
-        method_option :api_key,   aliases: '-a', desc: 'api key of an administrator account'
-        def clone(name, host, path = '.')
+        desc 'backup NAME HOST [PATH]', 'Backup a remote Locomotive site'
+        option :verbose,   aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        option :handle,    aliases: '-h', desc: 'handle of your site'
+        option :email,     aliases: '-e', desc: 'email of an administrator account'
+        option :password,  aliases: '-p', desc: 'password of an administrator account (use api_key instead)'
+        option :api_key,   aliases: '-a', desc: 'api key of an administrator account'
+        def backup(name, host, path = '.')
           begin
-            if Locomotive::Wagon.clone(name, path, { host: host }.merge(options))
-              self.print_next_instructions_when_site_created(name, path)
+            if Locomotive::Wagon.clone(name, path, { host: host }.merge(options), shell)
+              self.print_next_instructions_when_site_created(name, path, true)
             end
           rescue Exception => e
             self.print_exception(e, options[:verbose])
@@ -230,7 +233,7 @@ module Locomotive
           end
         end
 
-        desc 'generate RESOURCE ARGUMENTS', 'Generates a content_type, page, or snippet'
+        desc 'generate RESOURCE ARGUMENTS [PATH]', 'Generates a content_type, page, or snippet'
         long_desc <<-LONGDESC
           Generates a content_type, page, or snippet
 
@@ -241,8 +244,8 @@ module Locomotive
         subcommand 'generate', Generate
 
         desc 'list_templates', 'List all the templates to create either a site or a content type'
-        method_option :lib, aliases: '-l', type: 'string', desc: 'Path to an external ruby lib or generator'
-        method_option :json, aliases: '-j', type: :boolean, default: false, desc: 'Output the list in JSON'
+        option :lib, aliases: '-l', type: 'string', desc: 'Path to an external ruby lib or generator'
+        option :json, aliases: '-j', type: :boolean, default: false, desc: 'Output the list in JSON'
         def list_templates
           force_color_if_asked(options)
           require 'locomotive/wagon/generators/site'
@@ -260,12 +263,12 @@ module Locomotive
         end
 
         desc 'serve [PATH]', 'Serve a site from the file system'
-        method_option :host, aliases: '-h', type: 'string', default: '0.0.0.0', desc: 'The host (address) of the Thin server'
-        method_option :port, aliases: '-p', type: 'string', default: '3333', desc: 'The port of the Thin server'
-        method_option :daemonize, aliases: '-d', type: 'boolean', default: false, desc: 'Run daemonized Thin server in the background'
-        method_option :live_reload_port, aliases: '-l', type: 'string', default: false, desc: 'Include the Livereload javascript in each page'
-        method_option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized Thin server if found before starting a new one'
-        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        option :host, aliases: '-h', type: 'string', default: '0.0.0.0', desc: 'The host (address) of the Thin server'
+        option :port, aliases: '-p', type: 'string', default: '3333', desc: 'The port of the Thin server'
+        option :daemonize, aliases: '-d', type: 'boolean', default: false, desc: 'Run daemonized Thin server in the background'
+        option :live_reload_port, aliases: '-l', type: 'string', default: false, desc: 'Include the Livereload javascript in each page'
+        option :force, aliases: '-f', type: 'boolean', default: false, desc: 'Stop the current daemonized Thin server if found before starting a new one'
+        option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def serve(path = '.')
           parent_pid = Process.pid
           force_color_if_asked(options)
@@ -297,12 +300,12 @@ module Locomotive
           end
         end
 
-        desc 'push ENV [PATH]', 'Push a site to a remote LocomotiveCMS Engine'
-        method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
-        method_option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
-        method_option :shell, type: 'boolean', default: true, desc: 'Use shell to ask for missing connection information like the site handle (in this case, take a random one)'
-        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
-        def push(env, path = '.')
+        desc 'deploy ENV [PATH]', 'Deploy a site to a remote Locomotive Engine'
+        option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only push the resource(s) passed in argument'
+        option :data, aliases: '-d', type: 'boolean', default: false, desc: 'Push the content entries and the editable elements (by default, they are not)'
+        option :shell, type: 'boolean', default: true, desc: 'Use shell to ask for missing connection information like the site handle (in this case, take a random one)'
+        option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        def deploy(env, path = '.')
           force_color_if_asked(options)
 
           if check_path!(path)
@@ -315,36 +318,49 @@ module Locomotive
           end
         end
 
-        desc 'pull ENV [PATH]', 'Pull a site from a remote LocomotiveCMS Engine'
-        method_option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only pull the resource(s) passed in argument'
-        method_option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        desc 'sync ENV [PATH]', 'Synchronize the local content with the one from a remote Locomotive site.'
+        option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only pull the resource(s) passed (pages, content_entries, translations) in argument'
+        option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
+        def sync(env, path = '.')
+          if check_path!(path)
+            begin
+              Locomotive::Wagon.sync(env, path, options)
+            rescue Exception => e
+              self.print_exception(e, options[:verbose])
+              exit(1)
+            end
+          end
+        end
+
+        desc 'pull ENV [PATH]', '[DEPRECATED, use sync instead] Pull a site from a remote Locomotive Engine.'
+        option :resources, aliases: '-r', type: 'array', default: nil, desc: 'Only pull the resource(s) passed in argument'
+        option :verbose, aliases: '-v', type: 'boolean', default: false, desc: 'display the full error stack trace if an error occurs'
         def pull(env, path = '.')
           if check_path!(path)
-            if connection_info = self.retrieve_connection_info(env, path)
-              begin
-                Locomotive::Wagon.pull(path, connection_info, options)
-              rescue Exception => e
-                self.print_exception(e, options[:verbose])
-                exit(1)
-              end
+            begin
+              Locomotive::Wagon.pull(env, path, options, options[:shell] ? shell : nil)
+            rescue Exception => e
+              self.print_exception(e, options[:verbose])
+              exit(1)
             end
           end
         end
 
-        desc 'destroy ENV [PATH]', 'Destroy a remote LocomotiveCMS Engine'
+        desc 'destroy ENV [PATH]', 'Destroy a remote Locomotive site'
         def destroy(env, path = '.')
           if check_path!(path)
-            if connection_info = self.retrieve_connection_info(env, path)
-              if ask('Are you sure ?', limited_to: %w(yes no)) == 'yes'
-                Locomotive::Wagon.destroy(path, connection_info)
-              else
-                say 'The destroy operation has been cancelled', :red
-                exit(1)
-              end
+            if ask('Are you sure?', limited_to: %w(yes no)) == 'yes'
+              Locomotive::Wagon.destroy(env, path)
+            else
+              say 'The destroy operation has been cancelled', :red
+              exit(1)
             end
           end
         end
 
+        # aliases
+        map push: :deploy, clone: :backup
+
         protected
 
         # Print a nice message when a site has been created.
@@ -376,29 +392,6 @@ module Locomotive
           end
         end
 
-        # # From a site specified by a path, retrieve the information of the connection
-        # # for a environment located in the config/deploy.yml file of the site.
-        # #
-        # # @param [ String ] env The environment (development, staging, production, ...etc)
-        # # @param [ String ] path The path of the local site
-        # # @param [ Boolean ] use_shell True by default, use it to ask for missing information (subdomain for instance)
-        # #
-        # # @return [ Hash ] The information of the connection or nil if errors
-        # #
-        # def retrieve_connection_info(env, path, use_shell = true)
-        #   require 'locomotive/wagon/misc/deployment_connection'
-
-        #   begin
-        #     service = Locomotive::Wagon::DeploymentConnection.new(path, use_shell ? shell : nil)
-
-        #     service.get_information(env)
-
-        #   rescue Exception => e
-        #     self.print_exception(e, options[:verbose])
-        #     nil
-        #   end
-        # end
-
       end
 
     end

data/lib/locomotive/wagon/commands/clone_command.rb

@@ -0,0 +1,35 @@
+module Locomotive::Wagon
+
+  class CloneCommand < Struct.new(:name, :path, :options, :shell)
+
+    def self.clone(name, path, options, shell)
+      new(name, path, options, shell).clone
+    end
+
+    def clone
+      # create an empty site with the minimal settings
+      create_site
+
+      # pull the pages, content_types, basically any resources from the remote site
+      pull_site
+    end
+
+    def connection_info
+      options.symbolize_keys.slice(:host, :handle, :email, :api_key, :password)
+    end
+
+    private
+
+    def create_site
+      require 'locomotive/wagon/generators/site'
+      generator = Locomotive::Wagon::Generators::Site::Cloned
+      generator.start [name, path, 'true', connection_info]
+    end
+
+    def pull_site
+      Locomotive::Wagon.pull('production', File.join(path, name), options.symbolize_keys, shell)
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/destroy_command.rb

@@ -0,0 +1,29 @@
+require_relative  'concerns/api_concern'
+require_relative  'concerns/deploy_file_concern'
+
+module Locomotive::Wagon
+
+  class DestroyCommand < Struct.new(:env, :path, :options)
+
+    include ApiConcern
+    include DeployFileConcern
+
+    def self.destroy(env, path, options)
+      self.new(env, path, options).destroy
+    end
+
+    def destroy
+      api_client = api_site_client(connection_information)
+
+      api_client.current_site.destroy
+    end
+
+    private
+
+    def connection_information
+      read_deploy_settings(self.env, self.path)
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/loggers/base_logger.rb

@@ -0,0 +1,31 @@
+module Locomotive::Wagon
+
+  class BaseLogger
+
+    private
+
+    def log(message, color = nil, ident = nil, print = false)
+      ident = ' ' * (ident || 0)
+
+      message = "#{ident}#{message.gsub("\n", "\n" + ident)}"
+      message = message.colorize(color) if color
+
+      if print
+        print message
+      else
+        puts message
+      end
+    end
+
+    def _subscribe(type, action = nil, &block)
+      name = ['wagon', type, [*action]].flatten.compact.join('.')
+
+      ActiveSupport::Notifications.subscribe(name) do |*args|
+        event = ActiveSupport::Notifications::Event.new *args
+        yield(event)
+      end
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/loggers/pull_logger.rb

@@ -0,0 +1,23 @@
+require_relative 'base_logger'
+
+module Locomotive::Wagon
+
+  class PullLogger < BaseLogger
+
+    def initialize
+      subscribe :start do |event|
+        log "\n"
+        log "Pulling #{event.payload[:name].camelcase}", { color: :black, background: :white }
+      end
+
+    end
+
+    private
+
+    def subscribe(action = nil, &block)
+      _subscribe('pull', action, &block)
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/loggers/push_logger.rb

@@ -1,6 +1,8 @@
+require_relative 'base_logger'
+
 module Locomotive::Wagon
 
-  class PushLogger
+  class PushLogger < BaseLogger
 
     def initialize
       subscribe 'site_created' do |event|
@@ -32,28 +34,32 @@ module Locomotive::Wagon
 
     private
 
-    def log(message, color = nil, ident = nil, print = false)
-      ident = ' ' * (ident || 0)
+    # def log(message, color = nil, ident = nil, print = false)
+    #   ident = ' ' * (ident || 0)
 
-      message = "#{ident}#{message.gsub("\n", "\n" + ident)}"
-      message = message.colorize(color) if color
+    #   message = "#{ident}#{message.gsub("\n", "\n" + ident)}"
+    #   message = message.colorize(color) if color
 
-      if print
-        print message
-      else
-        puts message
-      end
-    end
+    #   if print
+    #     print message
+    #   else
+    #     puts message
+    #   end
+    # end
 
     def subscribe(action = nil, &block)
-      name = ['wagon', 'push', [*action]].flatten.compact.join('.')
-
-      ActiveSupport::Notifications.subscribe(name) do |*args|
-        event = ActiveSupport::Notifications::Event.new *args
-        yield(event)
-      end
+      _subscribe('push', action, &block)
     end
 
+    # def subscribe(action = nil, &block)
+    #   name = ['wagon', 'push', [*action]].flatten.compact.join('.')
+
+    #   ActiveSupport::Notifications.subscribe(name) do |*args|
+    #     event = ActiveSupport::Notifications::Event.new *args
+    #     yield(event)
+    #   end
+    # end
+
   end
 
 end

data/lib/locomotive/wagon/commands/loggers/sync_logger.rb

@@ -0,0 +1,23 @@
+require_relative 'base_logger'
+
+module Locomotive::Wagon
+
+  class SyncLogger < BaseLogger
+
+    def initialize
+      subscribe :start do |event|
+        log "\n"
+        log "Syncing #{event.payload[:name].camelcase}", { color: :black, background: :white }
+      end
+
+    end
+
+    private
+
+    def subscribe(action = nil, &block)
+      _subscribe('sync', action, &block)
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/pull_command.rb

@@ -0,0 +1,55 @@
+require 'locomotive/common'
+
+require_relative '../tools/styled_yaml'
+
+require_relative 'loggers/pull_logger'
+
+require_relative_all  'concerns'
+
+require_relative      'pull_sub_commands/pull_base_command'
+require_relative_all  'pull_sub_commands'
+
+module Locomotive::Wagon
+
+  class PullCommand < Struct.new(:env, :path, :options, :shell)
+
+    RESOURCES = %w(site pages content_types content_entries snippets theme_assets translations content_assets).freeze
+
+    include ApiConcern
+    include DeployFileConcern
+    include InstrumentationConcern
+
+    def self.pull(env, path, options, shell)
+      self.new(env, path, options, shell).pull
+    end
+
+    def pull
+      PullLogger.new if options[:verbose]
+
+      api_client = api_site_client(connection_information)
+      site = api_client.current_site.get
+
+      each_resource do |klass|
+        klass.pull(api_client, site, path)
+      end
+    end
+
+    private
+
+    def each_resource
+      RESOURCES.each do |name|
+        next if !options[:resources].blank? && !options[:resources].include?(name)
+
+        klass = "Locomotive::Wagon::Pull#{name.camelcase}Command".constantize
+
+        yield klass
+      end
+    end
+
+    def connection_information
+      read_deploy_settings(self.env, self.path)
+    end
+
+  end
+
+end

data/lib/locomotive/wagon/commands/pull_sub_commands/concerns/assets_concern.rb

@@ -0,0 +1,75 @@
+require 'tempfile'
+
+module Locomotive::Wagon
+
+  module AssetsConcern
+
+    # The content assets on the remote engine follows the format: /sites/<id>/assets/<type>/<file>
+    # This method replaces these urls by their local representation. <type>/<file>
+    #
+    # @param [ String ] content The text where the assets will be replaced.
+    #
+    def replace_asset_urls(content)
+      return '' if content.blank?
+
+      content.force_encoding('utf-8').gsub(/\/sites\/[0-9a-f]{24}\/(assets|pages|theme|content_entry[0-9a-f]{24})\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.([a-z]{2,3})/) do |url|
+        filename = "#{$4}.#{$5}"
+        folder = case $1
+        when 'assets', 'pages'  then File.join('samples', $1)
+        when 'theme'            then $3
+        when /\Acontent_entry/  then File.join('samples', 'content_entries')
+        end
+
+        if filepath = write_asset(url, File.join(path, 'public', folder, filename))
+          File.join('', folder, File.basename(filepath))
+        else
+          ''
+        end
+      end
+    end
+
+    private
+
+    def find_unique_filepath(filepath, binary_file, index = 1)
+      if File.exists?(filepath)
+        # required because we need to make sure we use the content of file from its start
+        binary_file.rewind
+
+        return filepath if FileUtils.compare_stream(binary_file, File.open(filepath))
+
+        folder, ext = File.dirname(filepath), File.extname(filepath)
+        basename = File.basename(filepath, ext)
+
+        find_unique_filepath(File.join(folder, "#{basename}-#{index}#{ext}"), binary, index + 1)
+      else
+        filepath
+      end
+    end
+
+    def get_asset_binary(url)
+      unless url =~ /\Ahttp:\/\//
+        base = api_client.uri.dup.tap { |u| u.path = '' }.to_s
+        url = URI.join(base, url).to_s
+      end
+
+      binary = Faraday.get(url).body rescue nil
+    end
+
+    def write_asset(url, filepath)
+      if binary = get_asset_binary(url)
+        FileUtils.mkdir_p(File.dirname(filepath))
+
+        (binary_file = Tempfile.new(File.basename(filepath))).write(binary)
+
+        find_unique_filepath(filepath, binary_file).tap do |filepath|
+          File.open(filepath, 'wb') { |f| f.write(binary) }
+        end
+      else
+        instrument :missing_asset, url: url
+        nil
+      end
+    end
+
+  end
+
+end