troy 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc838bf9fc86348d55ed3f93a986c1047924d9a513901e02dafad3f45ddcdcdf
-  data.tar.gz: 544b493ec0e506a3ffb3289ae4215a0d51a0e4a88e374bd263cd3d5b25979000
+  metadata.gz: 1de66b8776191039502385cfc1ca3453f4b9bc30ae81b0eefbc4a7257124ad30
+  data.tar.gz: 51fd07dbf2caac206263ed83fd0830d31f2326e30c3cec82796dcc578470d116
 SHA512:
-  metadata.gz: 9078b888d8f31cb059f5ce90e29ccdcf19f240ff990adfd40f7e4fb0d61bc3285ae63d5e416f2ca8e949f5a75f91eaa64103587d6c8b66a4f809a7a232b4a46b
-  data.tar.gz: a092f247955e1864016ce2aeed04cea8628cef875bc23648c8b2d3093b801272d311b8d59a3b1f2889259f68ba76cf172338b51541a3b62e06d1b91fd55022cc
+  metadata.gz: 7c79d4c7ffc7976d1e7624e8432bcc450b178f45ae46ee06e896a5a501f60e0ca0eec0273853fe304e83e6ef245733e9856a3588453e46571130099c1cb07bda
+  data.tar.gz: 0d87cd79c7ef8e7be0383e5f6ff67788e06a9d3074c2d82e5e66a4ae20e2c26c259e268cbcd9c1fd0c9af740aa4fdb4be507d889f4b90a6652fc9eee97cc9010

data/lib/troy/cli.rb

@@ -15,21 +15,33 @@ module Troy
     end
 
     options assets: :boolean, file: :array
+    option :concurrency, type: :numeric, default: 10
+    option :benchmark, type: :boolean, default: false
     desc "export", "Export files"
     def export
-      if options[:assets]
-        site.export_assets
-        site.export_files
-      end
+      runner = lambda do
+        if options[:assets]
+          site.export_assets
+          site.export_files
+        end
+
+        if options[:file]
+          options[:file].each do |file|
+            site.export_pages(file)
+          end
+        end
 
-      if options[:file]
-        options[:file].each do |file|
-          site.export_pages(file)
+        if !options[:assets] && !options[:file]
+          site.export
         end
       end
 
-      if !options[:assets] && !options[:file]
-        site.export
+      if options[:benchmark]
+        require "benchmark"
+        elapsed = Benchmark.realtime(&runner)
+        puts "=> Finished in #{elapsed.round(2)}s"
+      else
+        runner.call
       end
     end
 
@@ -62,7 +74,7 @@ module Troy
 
     private
     def site
-      @site ||= Troy::Site.new(Dir.pwd)
+      @site ||= Troy::Site.new(Dir.pwd, options)
     end
   end
 end

data/lib/troy/helpers.rb

@@ -9,9 +9,9 @@ module Troy
     end
 
     def partial(name, locals = {})
+      name = name.to_s
       basename = File.basename(name)
       dirname = File.dirname(name)
-
       partial = []
       partial << dirname unless dirname.start_with?(".")
       partial << "_#{basename}.erb"

data/lib/troy/site.rb

@@ -1,9 +1,10 @@
 module Troy
   class Site
-    attr_accessor :root
+    attr_accessor :root, :options
 
-    def initialize(root)
+    def initialize(root, options)
       @root = Pathname.new(root).realpath
+      @options = options
 
       load_configuration
       load_extensions
@@ -46,14 +47,20 @@ module Troy
     def export_files
       assets = root.join("assets")
 
-      assets.entries.each do |entry|
-        basename = entry.to_s
-        next if [".", "..", "javascripts", "stylesheets"].include?(basename)
-        FileUtils.rm_rf root.join("public/#{basename}")
-        FileUtils.cp_r assets.join(entry), root.join("public/#{basename}")
+      assets.entries.each_slice(options[:concurrency]) do |slice|
+        slice.map do |entry|
+          Thread.new { export_file(assets, entry) }
+        end.each(&:join)
       end
     end
 
+    def export_file(assets, entry)
+      basename = entry.to_s
+      return if [".", "..", "javascripts", "stylesheets"].include?(basename)
+      FileUtils.rm_rf root.join("public/#{basename}")
+      FileUtils.cp_r assets.join(entry), root.join("public/#{basename}")
+    end
+
     #
     #
     def remove_public_dir
@@ -67,7 +74,13 @@ module Troy
 
       pages
         .select {|page| file.nil? || page.path == file }
-        .each(&:save)
+        .each_slice(options[:concurrency]) do |slice|
+          threads = slice.map do |page|
+            Thread.new { page.save }
+          end
+
+          threads.each(&:join)
+        end
     end
 
     #
@@ -79,18 +92,24 @@ module Troy
       sprockets.css_compressor = Sprockets::SassCompressor if config.assets.compress_css
       sprockets.js_compressor = Uglifier.new(uglifier_options) if config.assets.compress_js
 
-      config.assets.precompile.each do |asset_name|
-        asset = sprockets[asset_name]
-        output_file = asset.pathname.to_s
-          .gsub(root.join("assets").to_s, "")
-          .gsub(%r[^/], "")
-          .gsub(/\.scss$/, ".css")
-          .gsub(/\.coffee$/, ".js")
-
-        asset.write_to root.join("public/#{output_file}")
+      config.assets.precompile.each_slice(options[:concurrency]) do |slice|
+        slice.map do |asset_name|
+          Thread.new { export_asset(sprockets, asset_name) }
+        end.each(&:join)
       end
     end
 
+    def export_asset(sprockets, asset_name)
+      asset = sprockets[asset_name]
+      output_file = asset.pathname.to_s
+        .gsub(root.join("assets").to_s, "")
+        .gsub(%r[^/], "")
+        .gsub(/\.scss$/, ".css")
+        .gsub(/\.coffee$/, ".js")
+
+      asset.write_to root.join("public/#{output_file}")
+    end
+
     #
     #
     #

data/lib/troy/version.rb

@@ -1,3 +1,3 @@
 module Troy
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: troy
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A static site generator