linner 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585082427c02565f16f135a1f1cc56a284ee92c3
-  data.tar.gz: 7f7e21241ec1504e63073b952e4c818b62709923
+  metadata.gz: 23a2780b01c0a039f16e2c30ca97c7dbcb383673
+  data.tar.gz: c5f70fa15527c208f8bab35ff64a03009bbd0e2c
 SHA512:
-  metadata.gz: 92642b5fdca72bac9283cdd9b9e8b97f537cfeabcd29a7ebe8a4c2e523fa6fe9cf591e912e9b903cedf756afe46ec64f69092c7fefc7cf6755aae596f45467cc
-  data.tar.gz: 05d9d83205b4ba55c49cc97864285a54cf5166f30ff7ed44783f28fccbd1c8649cf2b5d1765603333973d0180f73346b8ae3256c21b04f0e67e3fe80d2a9443d
+  metadata.gz: 6cccf5a5ac4175c46267f9ff1985ebd0deefdd13697f107ad43e3d544879ed597661b79176d878066c1eb57c079c6737064f1ebac5d4439988338e17b6ed8e9c
+  data.tar.gz: 745643de1507e32f3c35f3cf38ee41039c490716de0c6dced3e1e275b7851067e02321971cd67fad0ef59f8d2445a11e93afb37a9130a4676f6c78769b5cac9e

data/CHANGELOG

@@ -1,5 +1,10 @@
+v0.6.2
+  - fix bin-packing algo problem
+  - add auto reload environment support
+  - add native path bundle support
+
 v0.6.1
-  - use `hpricot` to instead of `nokogiri`, because `nokogiri` has parse problem when `revision`.
+  - use `hpricot` to instead of `nokogiri`, because `nokogiri` has parse problem when `revision`
 
 v0.6.0
   - add sprites support

data/lib/linner.rb

@@ -20,18 +20,20 @@ Encoding.default_internal = Encoding::UTF_8
 module Linner
   extend self
 
-  attr_accessor :compile
+  attr_accessor :env, :compile
 
   def root
     @root ||= Pathname('.').expand_path
   end
 
+  def config_file
+    linner_file = root.join("Linnerfile")
+    config_file = root.join("config.yml")
+    File.exist?(linner_file) ? linner_file : config_file
+  end
+
   def env
-    @env ||= Environment.new begin
-      linner_file = root.join("Linnerfile")
-      config_file = root.join("config.yml")
-      File.exist?(linner_file) ? linner_file : config_file
-    end
+    @env ||= Environment.new config_file
   end
 
   def cache
@@ -42,8 +44,19 @@ module Linner
     @manifest ||= begin
       hash = {}
       env.groups.each do |config|
-        config["concat"].to_h.each do |dest, pattern|
+        concat_assets = template_assets = copy_assets = []
+        concat_assets = config["concat"].keys if config["concat"]
+        template_assets = config["template"].keys if config["template"]
+        config["copy"].each do |dest, pattern|
+          copy_assets = Dir.glob(pattern).map do |path|
+            logical_path = Asset.new(path).logical_path
+            dest_path = File.join(dest, logical_path)
+          end
+        end if config["copy"]
+
+        (concat_assets + template_assets + copy_assets).uniq.each do |dest|
           asset = Asset.new(File.join env.public_folder, dest)
+          next unless asset.revable?
           hash[dest] = asset.relative_digest_path
           asset.revision!
         end
@@ -137,7 +150,7 @@ module Linner
     end
 
     name = File.basename(dest).sub(/[^.]+\z/, "png")
-    path = File.join(env.public_folder, env.sprites["path"], File.basename(dest).sub(/[^.]+\z/, "png"))
+    path = File.join(env.public_folder, env.sprites["path"], name)
     FileUtils.mkdir_p File.dirname(path)
     map.save path
 

data/lib/linner/asset.rb

@@ -28,6 +28,10 @@ module Linner
       digest_path.gsub /#{Linner.env.public_folder}/, ""
     end
 
+    def revable?
+      javascript? or stylesheet?
+    end
+
     def revision!
       File.rename path, digest_path
     end

data/lib/linner/bundler.rb

@@ -1,3 +1,4 @@
+require "uri"
 require "digest"
 require "fileutils"
 require "open-uri"
@@ -52,15 +53,18 @@ module Linner
     def install_to_repository(url, path)
       FileUtils.mkdir_p File.dirname(path)
       File.open(path, "w") do |dist|
-        open(url, "r:UTF-8") {|file| dist.write file.read}
+        if url =~ URI::regexp
+          open(url, "r:UTF-8") {|file| dist.write file.read}
+        else
+          dist.write(File.read Pathname(url).expand_path)
+        end
       end
     end
 
     def link_to_vendor(path, dist)
-      if !File.exist?(dist) or Digest::MD5.file(path).hexdigest != Digest::MD5.file(dist).hexdigest
-        FileUtils.mkdir_p File.dirname(dist)
-        FileUtils.cp path, dist
-      end
+      return if File.exist?(dist) and Digest::MD5.file(path).hexdigest == Digest::MD5.file(dist).hexdigest
+      FileUtils.mkdir_p File.dirname(dist)
+      FileUtils.cp path, dist
     end
   end
 end

data/lib/linner/command.rb

@@ -47,6 +47,7 @@ module Linner
       clean
       Linner::Bundler.new(env.bundles).perform
       perform
+      watch_for_env
       watch_for_perform
       watch_for_reload
       sleep
@@ -92,6 +93,14 @@ module Linner
       end
     end
 
+    def watch_for_env
+      Listen.to Linner.root, filter: /(config\.yml|Linnerfile)$/ do |modified, added, removed|
+        Linner.env = Environment.new Linner.config_file
+        Linner::Bundler.new(env.bundles).perform
+        perform
+      end
+    end
+
     def exit!
       Notifier.exit
       Kernel::exit

data/lib/linner/environment.rb

@@ -5,8 +5,7 @@ module Linner
 
     def initialize(path)
       @env ||= (YAML::load(File.read path) || Hash.new)
-      @convension = YAML::load File.read(File.join File.dirname(__FILE__), "../../vendor", "config.default.yml")
-      @env = @convension.rmerge!(@env)
+      merge_with_convension
     end
 
     %w(app test vendor public).each do |method|
@@ -54,5 +53,11 @@ module Linner
     def groups
       @env["groups"].values
     end
+
+    private
+    def merge_with_convension
+      convension = YAML::load File.read(File.join File.dirname(__FILE__), "../../vendor", "config.default.yml")
+      @env = convension.rmerge!(@env)
+    end
   end
 end

data/lib/linner/sprite.rb

@@ -73,7 +73,7 @@ module Linner
 
     def split_block(block, image)
       block[:used] = true
-      block[:down] = {:x => block[:x], :y => block[:y] + image.width, :w => block[:w], :h => block[:h] - image.height}
+      block[:down] = {:x => block[:x], :y => block[:y] + image.height, :w => block[:w], :h => block[:h] - image.height}
       block[:right] = {:x => block[:x] + image.width, :y => block[:y], :w => block[:w] - image.width, :h => image.height}
     end
 

data/lib/linner/templates/app/views/index.html

@@ -1,21 +1,22 @@
 <!DOCTYPE html>
-    <head>
-        <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>Linner boilerplate</title>
-        <meta name="description" content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Linner boilerplate</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="/styles/app.css">
-    </head>
-    <body>
-        <!--[if lt IE 7]>
-            <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-        <![endif]-->
-        <div class="icon-logo"></div>
-        <script src="/scripts/vendor.js"></script>
-        <script src="/scripts/app.js"></script>
-        <script src="/scripts/templates.js"></script>
-        <script>require("app")()</script>
-    </body>
+    <link rel="stylesheet" href="/styles/app.css">
+  </head>
+  <body>
+    <!--[if lt IE 7]>
+      <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+    <![endif]-->
+    <div class="icon-logo"></div>
+    <script src="/scripts/vendor.js"></script>
+    <script src="/scripts/app.js"></script>
+    <script src="/scripts/templates.js"></script>
+    <script>require("app")()</script>
+  </body>
 </html>

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel