linner 0.6.7 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b770edd6563495529705c3c1a51f41f6dad5c431
-  data.tar.gz: 48902da4077a1a0cf2f1573c57422bd5b0e25b08
+  metadata.gz: 43cb77203c178db5c3249c4ce36d95d58f12b5e8
+  data.tar.gz: bf3d1893c49c31ba54d0970e1361363bab7ec998
 SHA512:
-  metadata.gz: 6bcbf588cd150bf62b071daa8926b2df9da683dd708ecb6b5607e69ca5d31ec7e9286824b8f41b22951e369811ed54c00674271806f95b11ed2d36537d8559c1
-  data.tar.gz: 214244e4cdbe6fa91f0c1496550972a2dcd521f44b89aa92f1ac7b35ed09d344a8421ac32aaa3f00fd310c86979c7dc6474fc12f0da22f7146f225b067b5a42a
+  metadata.gz: 4cecbc782ce184650bbf7fbf4ebacd40fc71a0a5fdd130eb9db8bcf05fe62760a3775abf7401366a270355acefac31f72739e4960583721cc3044502815f1196
+  data.tar.gz: 1ee56de1b603b060157dc6a2c9053422634dd85ba50a2ac82b5a8dbd939baa928ad44157d07823bada8e10a15c96a515597b9e3d840a1cd784e75ccb2a77cf2f

data/CHANGELOG

@@ -1,3 +1,14 @@
+v0.7.0
+  - lock the sass version to 3.2.19, cause compass not works perfectly with it
+  - remove Hpricot, use plain regex to support revision
+  - `revision` now is a hash, support `prefix`, move the `manifest` into `revision`, revision now has a `files` key
+
+v0.6.7
+  - bypass a windows platform expand_path bug in ruby v2.0.0
+
+v0.6.6
+  - lock the gem http to v0.5.0 and reel to 0.4.0
+
 v0.6.5
   - upgrade uglifier to 2.5.0 cause uglifier 2.2.0 has IE 8 compatibility issues
   - upgrade handlebars.rb to 0.1.2 cause handlebars version updated to 1.3.0

data/README.md

@@ -4,11 +4,11 @@
 
 Linner is a full-featured HTML5 application assembler.
 
-![Linner](http://d.pr/i/bWPA+)
+![Linner](http://cl.ly/image/2J0d1C0D3S0E/logo.png)
 
 #### Screencast
 
-[![Screencast](http://d.pr/i/MIyk+)](https://vimeo.com/71944672)
+[![Screencast](http://cl.ly/image/000k0R400F30/Image%202014-04-29%20at%2010.20.12%20AM.png)](https://vimeo.com/71944672)
 
 * Fast!
 * Supports `Sass`, `Compass` and `Coffee`.
@@ -34,7 +34,9 @@ Linner is a full-featured HTML5 application assembler.
 
 #### Windows
 
-* JRuby 1.7.4 with 2.0 mode (`set JRUBY_OPTS=--2.0`)
+* Install [Ruby](http://rubyinstaller.org/downloads/) and [DevKit](http://rubyinstaller.org/downloads/)
+* Install gem `wdm`
+* Install Node.js to make Linner faster
 
 ## Installation
 

data/bin/linner

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 
+# Trap interrupts to quit cleanly. See
+# https://twitter.com/mitchellh/status/283014103189053442
+Signal.trap("INT") { abort }
+
 require File.dirname(__FILE__) + "/../lib/linner"
 Linner::Command.start

data/docs/config.md

@@ -78,8 +78,6 @@ sprites:
   path: "/images/"
   # css selector
   selector: ".icon-"
-  # css url background: url(/images/icon.png)
-  url: "http://s3.amazonaws.com/"
 ```
 
 ## `modules`
@@ -106,10 +104,20 @@ The definition file will prepend to `definition` field, which will join with `pu
 Default:
 
 ```yaml
-revision: "index.html"
+revision:
+  prefix: ""
+  manifest: "manifest.yml"
+  files:
+    - "index.html"
 ```
 
-`index.html` will join with `public` folder. So, by default when you `build` your application, the `public/index.html` file will be rewrited with revision.
+the `prefix` will join with revision hashes, It's useful for CDN support.
+
+the `manifest` will join with `public` folder, write a manifest file with the name.
+
+`index.html` will join with `public` folder. So, by default when you `build` your application, the `public/index.html` file will be rewrote with revision.
+
+
 
 If you don't need `revision` support, it can be `false`.
 

data/lib/linner/bundler.rb

@@ -22,9 +22,9 @@ module Linner
     end
 
     def check
-      return [false, "Bundles didn't exsit!"] unless File.exists? REPOSITORY
+      return [false, "Bundles didn't exsit!"] unless File.exist? REPOSITORY
       @bundles.each do |bundle|
-        unless File.exists?(bundle.path) and File.exists?(File.join(VENDOR, bundle.name))
+        unless File.exist?(bundle.path) and File.exist?(File.join(VENDOR, bundle.name))
           return [false, "Bundle #{bundle.name} v#{bundle.version} didn't match!"]
         end
       end
@@ -32,12 +32,12 @@ module Linner
     end
 
     def install
-      unless File.exists? REPOSITORY
+      unless File.exist? REPOSITORY
         FileUtils.mkdir_p(REPOSITORY)
       end
       @bundles.each do |bundle|
         if bundle.version != "master"
-          next if File.exists?(bundle.path) and File.exists?(File.join(VENDOR, bundle.name))
+          next if File.exist?(bundle.path) and File.exist?(File.join(VENDOR, bundle.name))
         end
         puts "Installing #{bundle.name} #{bundle.version}..."
         install_to_repository bundle.url, bundle.path

data/lib/linner/command.rb

@@ -37,15 +37,14 @@ module Linner
     def build
       Linner.compile = true
       clean
-      Linner::Bundler.new(env.bundles).perform
+      Bundler.new(env.bundles).perform
       perform
     end
 
     desc "watch", "watch assets"
     def watch
-      trap(:INT) { exit! }
       clean
-      Linner::Bundler.new(env.bundles).perform
+      Bundler.new(env.bundles).perform
       perform
       watch_for_env
       watch_for_perform
@@ -96,7 +95,7 @@ module Linner
     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
+        Bundler.new(env.bundles).perform
       end
     end
 
@@ -106,4 +105,3 @@ module Linner
     end
   end
 end
-

data/lib/linner/environment.rb

@@ -20,16 +20,20 @@ module Linner
 
     def watched_paths
       [app_folder, vendor_folder, test_folder].select do |path|
-        File.exists? path
+        File.exist? path
       end
     end
 
-    %w(revision notification manifest).each do |method|
+    %w(revision notification).each do |method|
       define_method("#{method}") do
         @env[method]
       end
     end
 
+    def manifest
+      revision["manifest"]
+    end
+
     def bundles
       @env["bundles"] || []
     end

data/lib/linner/sprite.rb

@@ -51,7 +51,7 @@ module Linner
 "#{selector}#{selector_with_pseudo_class} {
   width: #{image.width}px;
   height: #{image.height}px;
-  background: url(#{File.join config['url'], name}) -#{image.left}px -#{image.top}px no-repeat;
+  background: url(#{File.join config['path'], name}) -#{image.left}px -#{image.top}px no-repeat;
 }
 "
       end

data/lib/linner/templates/config.yml

@@ -36,10 +36,11 @@ modules:
   ignored: vendor/**/*
   definition: /scripts/app.js
 sprites:
-  url: /images/
   path: /images/
   selector: .icon-
-revision: index.html
+revision:
+  files:
+    - index.html
 notification: true
 bundles:
   jquery.js:
@@ -48,4 +49,3 @@ bundles:
   handlebars.js:
     version: 1.0.0
     url: https://raw.github.com/wycats/handlebars.js/1.0.0/dist/handlebars.runtime.js
-

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.6.7"
+  VERSION = "0.7.0"
 end

data/lib/linner.rb

@@ -1,5 +1,3 @@
-require "hpricot"
-
 require "linner/version"
 require "linner/command"
 require "linner/asset"
@@ -64,13 +62,13 @@ module Linner
         name = File.basename(dest).sub /[^.]+\z/, "png"
         dest = File.join env.sprites["path"], name
         asset = Asset.new(File.join env.public_folder, dest)
-        hash[dest] = asset.relative_digest_path
+        hash[dest] = env.revision["prefix"] + asset.relative_digest_path
         asset.revision!
 
         (concat_assets + copy_assets).flatten.each do |file|
           path = File.join env.public_folder, file
           next unless Asset.new(path).stylesheet?
-          puts = File.read(path).gsub(File.join(env.sprites["url"], File.basename(dest)), File.join(env.sprites["url"], File.basename(asset.relative_digest_path)))
+          puts = File.read(path).gsub(File.join(env.sprites["path"], File.basename(dest)), File.join(env.revision["prefix"], env.sprites["path"], File.basename(asset.relative_digest_path)))
           File.open(path, "w") { |file| file << puts }
         end
       end
@@ -79,7 +77,7 @@ module Linner
       (concat_assets + template_assets + copy_assets).flatten.each do |dest|
         asset = Asset.new(File.join env.public_folder, dest)
         next unless asset.revable?
-        hash[dest] = asset.relative_digest_path
+        hash[dest] = env.revision["prefix"] + asset.relative_digest_path
         asset.revision!
       end
 
@@ -110,7 +108,7 @@ module Linner
       copy(config) if config["copy"]
       concat(config) if config["concat"]
     end
-    revision if compile? and env.revision
+    revision if compile? and env.revision and env.revision["files"]
   end
 
   private
@@ -162,7 +160,7 @@ module Linner
 
   def revision
     dump_manifest
-    [env.revision].flatten.each do |rev|
+    env.revision["files"].flatten.each do |rev|
       file = File.join env.public_folder, rev.to_s
       next if not File.exist?(file)
       replace_attributes file
@@ -207,21 +205,20 @@ module Linner
   end
 
   def replace_attributes file
-    doc = Hpricot(File.read file)
-    replace_tag_with_manifest_value doc, "script", "src"
-    replace_tag_with_manifest_value doc, "link", "href"
-    File.open(file, "w") {|f| f.write doc.to_html}
-  end
+    doc = File.read file
+    doc.gsub!(/(<script.+src=['"])([^"']+)(["'])/) do |m|
+      if p = manifest[$2] then $1 << p << $3 else m end
+    end
 
-  def replace_tag_with_manifest_value doc, tag, attribute
-    doc.search("//#{tag}").each do |tag|
-      value = tag.attributes[attribute]
-      tag.attributes[attribute] = manifest[value] if value and manifest[value]
+    doc.gsub!(/(<link[^\>]+href=['"])([^"']+)(["'])/) do |m|
+      if p = manifest[$2] then $1 << p << $3 else m end
     end
+
+    File.open(file, "w") {|f| f.write doc}
   end
 
   def dump_manifest
-    File.open(File.join(env.public_folder, env.manifest), "w") do |f|
+    File.open(File.join(env.public_folder, env.revision["manifest"]), "w") do |f|
       YAML.dump(manifest, f)
     end
   end

data/linner.gemspec

@@ -22,10 +22,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "http", "~> 0.5.0"
   spec.add_dependency "thor", "~> 0.18"
   spec.add_dependency "tilt", "~> 1.4"
-  spec.add_dependency "sass", "~> 3.2"
+  spec.add_dependency "sass", "~> 3.2.19"
   spec.add_dependency "listen", "~> 1.3"
   spec.add_dependency "uglifier", "~> 2.5.0"
-  spec.add_dependency "hpricot", "~> 0.8.6"
   spec.add_dependency "compass", "~> 0.12.2"
   spec.add_dependency "cssminify", "~> 1.0.2"
   spec.add_dependency "coffee-script", "~> 2.2"

data/spec/linner/environment_spec.rb

@@ -17,8 +17,9 @@ describe Environment do
   it "should equals default config" do
     @env.notification.should be_true
     @env.wrapper.should == "cmd"
-    @env.manifest.should == "manifest.yml"
-    @env.revision.should == false
+    @env.revision["prefix"].should == ""
+    @env.revision["manifest"].should == "manifest.yml"
+    @env.revision["files"].should == nil
     @env.groups.should respond_to(:each)
   end
 end

data/vendor/config.default.yml

@@ -26,6 +26,8 @@ modules:
   ignored: "vendor/**/*"
   definition: "/scripts/app.js"
 
-manifest: "manifest.yml"
-revision: false
+revision:
+  prefix: ""
+  manifest: "manifest.yml"
+
 notification: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.19
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement