linner 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1156772623483911f99bcb23fb8e7609a593748
-  data.tar.gz: d0503752526db29a76957ca9bc7a18ea1506db6f
+  metadata.gz: 234c003d2a8de857346b8001b7d76f4e0e2dc1d3
+  data.tar.gz: 5f67d62fd866da6717fa56f619be7a8613a1c859
 SHA512:
-  metadata.gz: c2cda5370061201ca4507e88d7f12c94cf22244229a5b7a69a6e72e47e25ac08dcdbd258650f4c82b1cf95b68656452064e572e1d2eb243b5623bfde4fa32694
-  data.tar.gz: 33431b81c8bb1dc6b7dace4cce86cf4376decc6f3d0a0b14082f4bd3c655fca08115ab43b691e83aa4e8c47d4173e208e89df4810cc6ab25220657b6a31115d9
+  metadata.gz: a78076faccfb160445dbe5c3846ba796e787c36a46c0f699f72890e0837dee3ca62f237dd0d83c00772d0eb06fe5b648dd456021c70cdce85ba5c27519726d91
+  data.tar.gz: 2324de42bd8f6ab2fbb82a7a98b54e71fe61f20958edc4c2e798bebfe089dae86fd729c35c6813c873c607f5942703344ecfb7ef670fd19c1a59d4f271de91e8

data/lib/linner.rb

@@ -25,48 +25,46 @@ module Linner
 
   def perform(compile: false)
     environment.files.each do |config|
-      Thread.new {concat(config).each {|asset| asset.compress if compile; asset.write}}.join
-      Thread.new {copy(config)}.join
+      concat(config, compile)
+      copy(config)
     end
   end
 
   private
-  def concat(config)
-    assets = []
-    config["concat"].each do |dest, regex|
-      Thread.new do
-        dest = Asset.new(File.join environment.public_folder, dest)
-        dest.content = ""
-        Dir.glob(regex).uniq.sort_by_before_and_after(config["order"]["before"], config["order"]["after"]).each do |m|
-          asset = Asset.new(m)
-          content = asset.content
-          if asset.wrappable?
-            content = asset.wrap
-          end
-          dest.content << content
+  def concat(config, compile)
+    config["concat"].map do |dest, regex|
+      matches = Dir.glob(regex).uniq.order_by(before:config["order"]["before"], after:config["order"]["after"])
+      dest = Asset.new(File.join environment.public_folder, dest)
+      dest.content = ""
+      cached = matches.select do |path|
+        mtime = File.mtime(path).to_i
+        mtime == cache[path] ? false : cache[path] = mtime
+      end
+      next if cached.empty?
+      matches.each do |m|
+        asset = Asset.new(m)
+        content = asset.content
+        if asset.wrappable?
+          content = asset.wrap
         end
-        assets << dest
-      end.join
+        dest.content << content
+      end
+      dest.compress if compile
+      dest.write
     end
-    assets
   end
 
   def copy(config)
     config["copy"].each do |dest, regex|
-      Thread.new do
-        Dir.glob(regex).each do |path|
-          mtime = File.mtime(path).to_i
-          if cache[path]
-            next if mtime == cache[path]
-          else
-            cache[path] = mtime
-          end
-          logical_path = Asset.new(path).logical_path
-          dest_path = File.join(environment.public_folder, dest, logical_path)
-          FileUtils.mkdir_p File.dirname(dest_path)
-          FileUtils.cp_r path, dest_path
-        end
-      end.join
+      Dir.glob(regex).each do |path|
+        mtime = File.mtime(path).to_i
+        next if cache[path] == mtime
+        cache[path] = mtime
+        logical_path = Asset.new(path).logical_path
+        dest_path = File.join(environment.public_folder, dest, logical_path)
+        FileUtils.mkdir_p File.dirname(dest_path)
+        FileUtils.cp_r path, dest_path
+      end
     end
   end
 end

data/lib/linner/environment.rb

@@ -15,10 +15,12 @@ module Linner
       end
     end
 
-    %w(notification wrapper).each do |method|
-      define_method(method) do
-        @env[method]
-      end
+    def notification
+      @env["notification"]
+    end
+
+    def wrapper
+      @env["modules"]["wrapper"]
     end
 
     def files

data/lib/linner/helper.rb

@@ -7,15 +7,15 @@ module Linner
     end
   end
 
-  module Sort
-    def sort_by_before_and_after(before, after)
-      sort_by_before(self, before)
-      sort_by_after(self, after)
+  module Order
+    def order_by(before:[], after:[])
+      order_by_before(self, before)
+      order_by_after(self, after)
       self
     end
 
     private
-    def sort_by_before(list, before)
+    def order_by_before(list, before)
       before.reverse.each do |f|
         if i = list.index {|x| x =~ /#{f}/i}
           list.unshift list.delete_at i
@@ -23,7 +23,7 @@ module Linner
       end
     end
 
-    def sort_by_after(list, after)
+    def order_by_after(list, after)
       after.reverse.each do |f|
         if i = list.index {|x| x =~ /#{f}/i}
           list.push list.delete_at i
@@ -38,5 +38,5 @@ class Hash
 end
 
 class Array
-  include Linner::Sort
+  include Linner::Order
 end

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/spec/linner/helper_spec.rb

@@ -7,21 +7,21 @@ describe Array do
 
   describe :sort do
     it "won't change when before and after are empty array" do
-      @array.sort_by_before_and_after([], []).should be_equal @array
+      @array.order_by(before:[], after:[]).should be_equal @array
     end
 
     it "will change by before items" do
-      @array.sort_by_before_and_after(["jquery.js", "vendor.js"], [])
+      @array.order_by(before:["jquery.js", "vendor.js"], after:[])
       @array.should =~ %w[jquery.js vendor.js app.js bootstrap.css reset.css]
     end
 
     it "will change by after items" do
-      @array.sort_by_before_and_after([], ["reset.css", "bootstrap.css"])
+      @array.order_by(before:[], after:["reset.css", "bootstrap.css"])
       @array.should =~ %w[app.js jquery.js vendor.js reset.css bootstrap.css]
     end
 
     it "will change by before and after items" do
-      @array.sort_by_before_and_after(["jquery.js", "vendor.js"], ["reset.css", "bootstrap.css"])
+      @array.order_by(before:["jquery.js", "vendor.js"], after:["reset.css", "bootstrap.css"])
       @array.should =~ %w[jquery.js vendor.js app.js reset.css bootstrap.css]
     end
   end

data/vendor/config.default.yml

@@ -29,5 +29,6 @@ files:
     order:
       before: []
       after: []
-wrapper: "CMD"
+modules:
+  wrapper: "CMD"
 notification: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor