linner 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a828ea61a82b07f330f0d595bd99c4584ba9c5dc
-  data.tar.gz: 50321b435438150ab81e60619d7556527305a70e
+  metadata.gz: ad0db2767b837ef41fc611523a7208c1ae2eb7dc
+  data.tar.gz: 0b0171fa4c551709cd155859cc9723033a2ef3b6
 SHA512:
-  metadata.gz: 1889066c24c0ef266440e90103d2c97b1741f92ce7319a2b1796b98451f2b8a0fdb16e49c7c99987513a815c5f46e4f0383db1b463c7d2b54eef102adb881333
-  data.tar.gz: 1bb6b864afe6c9d335ff0a23011266518fa38301440194a75a9b2c9e1a3bb18e1fd48c601938f13027bc216d703c514a720e279005423a7ab13ba93eb5f296c7
+  metadata.gz: 6a505783f236a3a1ea6a9390a5b40dc9d62de55798aa2cc2cf83a9d3e4b695ec5af96dcf267c70b2d72d64ed8bdd2b01a42c096d2a5cd4944b9e7aac0727908f
+  data.tar.gz: 7b8751ebbbafd8ec0db858d793d80ab1e16513be93331bd14e363cdd77a294867807a140d9814abb057f05724a4368cc196d44867aad676d3ffde81637872d43

data/CHANGELOG

@@ -1,3 +1,12 @@
+v 0.4.0
+  - revision support
+  - fix memory leak in `cache_miss?`
+  - quit `fsevent` process when `ctrl + c` triggered
+
+v 0.3.2
+  - fix Celluiod logger bug
+  - suggest windows user to use jruby instead
+
 v 0.3.1
   - add `livereload` support
 

data/README.md

@@ -4,6 +4,10 @@ Linner is a full-featured HTML5 application assembler.
 
 ![Linner](http://d.pr/i/bWPA+)
 
+#### Screencast
+
+[![Screencast](http://d.pr/i/MIyk+)](https://vimeo.com/71944672)
+
 * Fast!
 * Supports `Sass`, `Compass` and `Coffee`.
 * Supports OS X Lion and Mountaion Lion Notifications.
@@ -14,33 +18,43 @@ Linner is a full-featured HTML5 application assembler.
 * Supports `compress` by `$ linner build`.
 * Supports `LiveReload` with [LiveReload Chrome Extention](https://chrome.google.com/webstore/detail/livereload/jnihajbhpnppcggbcgedagnkighmdlei).
 
+#### Documents
+
+[https://github.com/SaitoWu/linner/tree/master/docs](https://github.com/SaitoWu/linner/tree/master/docs)
+
 ## Requirements
 
+#### *nix
+
 * Ruby 2.0
 
+#### Windows
+
+* JRuby 1.7.4 with 2.0 mode (`set JRUBY_OPTS=--2.0`)
+
 ## Installation
 
     $ gem install linner
 
 ## Usage
 
-Skeleton:
+#### Skeleton
 
     $ linner new webapp && cd webapp
 
-Watch:
+#### Watch
 
     $ linner watch
 
-Server:
+#### Server
 
     $ ./bin/server # or server if put "./bin" in your PATH
 
-Build:
+#### Build
 
     $ linner build
 
-Clean:
+#### Clean
 
     $ linner clean
 

data/docs/commands.md

@@ -0,0 +1,21 @@
+# Command
+
+## `linner new <path>`
+
+Create new brunch project.
+
+## `linner watch`
+
+Watch linner directory and rebuild if something changed.
+
+## `linner build`
+
+Build and Minify a linner project.
+
+## `linner clean`
+
+Clean up linner public folder.
+
+## `server`
+
+Start up a server at port 3000.

data/docs/config.md

@@ -0,0 +1,104 @@
+# Configuration file
+
+Linner use `config.yml` file to config your application.
+
+## `paths`
+
+`paths` defines application paths, it contains `app`, `test`, `vendor` and `public` folders.
+
+Default:
+
+```yaml
+paths:
+  app: "app"
+  test: "test"
+  vendor: "vendor"
+  public: "public"
+```
+
+`linner watch` command will watch `app`, `test` and `vendor` folders, and the builded file will be in `public` folder.
+
+## `groups`
+
+`groups` defines application groups, you can define any type of groups in it.
+
+Default:
+
+```yaml
+groups:
+  scripts:
+    paths:
+      - "app/scripts"
+    order:
+      - "vendor/jquery-1.10.2.js"
+      - "..."
+  styles:
+    paths:
+      - "app/styles"
+  images:
+    paths:
+      - "app/images"
+  views:
+    paths:
+      - "app/views"
+```
+
+the default configuration defines four groups: `scripts`, `styles`, `images` and `views` group.
+
+`paths` defines where can linner find this group's files, It's a `Array`.
+
+`concat` defines concatenation of files in Linner. the `Dir.glob` of `value` will be concat to `key` file.
+
+`copy` defines copy strategy of files in Linner. The `Dir.glob` of `value` will be copy to `key` folder.
+
+`order` defines the order of this group files, and It's very useful when you `concat` your files. for example:
+
+```yaml
+order:
+  - "vendor/jquery-1.10.2.js"
+  - "..."
+  - "vendor/underscore.js"
+```
+
+In the above example, if a group contains 5 files, `vendor/jquery-1.10.2.js` will be the first, and `vendor/underscore.js` will be the last file.
+
+## `modules`
+
+`modules` defines application module strategy, The default wrapper is `cmd`.
+
+Default:
+
+```yaml
+modules:
+  wrapper: "cmd"
+  ignored: "vendor/**/*"
+  definition: "scripts/app.js"
+```
+
+All of your code will be wrapped by `cmd`(Common Module Definition) except `ignored` glob pattern.
+
+The definition file will prepend to `definition` field, which will join with `public` folder.
+
+## `revision`
+
+`revision` defines application layout page, which contains `link` and `script` tags.
+
+Default:
+
+```yaml
+revision: "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.
+
+If you don't need `revision` support, it can be `false`.
+
+## `notification`
+
+`notification` defines application error notification.
+
+Default:
+
+```yaml
+notification: true
+```

data/lib/linner.rb

@@ -1,3 +1,5 @@
+require "nokogiri"
+
 require "linner/version"
 require "linner/command"
 require "linner/asset"
@@ -9,6 +11,9 @@ require "linner/notifier"
 require "linner/compressor"
 require "linner/environment"
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
+
 module Linner
   extend self
 
@@ -40,9 +45,10 @@ module Linner
 
   def perform(*asset)
     env.groups.each do |config|
-      concat(config) if config["concat"]
       copy(config) if config["copy"]
+      concat(config) if config["concat"]
     end
+    revision if compile? and env.revision
   end
 
 private
@@ -71,19 +77,30 @@ private
     end
   end
 
+  def revision
+    revision = File.join env.public_folder, env.revision
+    doc = Nokogiri::HTML.parse(File.read revision)
+    doc.search("script").each do |x|
+      next unless src = x.attributes["src"]
+      asset = Asset.new(File.join env.public_folder, src)
+      x.set_attribute "src", asset.revision!
+    end
+    doc.search("link").each do |x|
+      next unless href = x.attributes["href"]
+      asset = Asset.new(File.join env.public_folder, href)
+      x.set_attribute "href", asset.revision!
+    end
+    File.open(revision, "w") do |f|
+      f.write doc.to_html
+    end
+  end
+
   def cache_miss?(path)
     asset = Asset.new(path)
-    if asset.stylesheet? and Tilt[path] != Tilt::CSSTemplate
-      partials = Sass::Engine.for_file(path, sass_engine_options).dependencies.map{|m| m.options[:filename]}
-      cache_missed = partials.select do |partial|
-        partial_asset = Asset.new(partial)
-        (cache[partial] and cache[partial].mtime == partial_asset.mtime) ? false : cache[partial] = partial_asset
-      end
-      unless cache_missed.empty?
-        cache[path] = asset
-        return true
-      end
+    if cache[path] and cache[path].mtime == asset.mtime
+      false
+    else
+      cache[path] = asset
     end
-    (cache[path] and cache[path].mtime == asset.mtime) ? false : cache[path] = asset
   end
 end

data/lib/linner/asset.rb

@@ -1,3 +1,5 @@
+require "digest"
+
 module Linner
   class Asset
 
@@ -14,6 +16,20 @@ module Linner
       @mtime
     end
 
+    def extname
+      File.extname @path
+    end
+
+    def digest
+      Digest::MD5.hexdigest content
+    end
+
+    def revision!
+      revision = @path.chomp(extname) << "-#{digest}" << extname
+      File.rename @path, revision
+      revision.gsub /#{Linner.env.public_folder}/, ""
+    end
+
     def content
       return @content if @content
       source = begin

data/lib/linner/command.rb

@@ -18,7 +18,10 @@ module Linner
     desc "build", "build assets"
     def build
       Linner.compile = true
-      Notifier.info do
+
+      clean
+
+      Notifier.profile do
         Linner.perform
       end
     end
@@ -27,12 +30,14 @@ module Linner
     def watch
       trap :INT do
         Notifier.exit
-        exit!
+        Process.kill("QUIT", 0)
       end
 
+      clean
+
       @proc = Proc.new do |modified, added, removed|
         begin
-          Notifier.info{ Linner.perform }
+          Notifier.profile{ Linner.perform }
         rescue
           Notifier.error $!
         end
@@ -40,6 +45,10 @@ module Linner
       @proc.call
 
       Listen.to env.app_folder, env.vendor_folder, env.test_folder do |modified, added, removed|
+        is_include_partial_styles = (modified + added + removed).any? do |path|
+          Asset.new(path).stylesheet? and File.basename(path).start_with? "_"
+        end
+        Linner.cache.reject! {|k, v| v.stylesheet?} if is_include_partial_styles
         @proc.call
       end
 

data/lib/linner/environment.rb

@@ -19,6 +19,10 @@ module Linner
       end
     end
 
+    def revision
+      @env["revision"]
+    end
+
     def notification
       @env["notification"]
     end

data/lib/linner/notifier.rb

@@ -3,7 +3,7 @@ require "terminal-notifier"
 module Linner
   class Notifier
     class << self
-      def info
+      def profile
         time = Time.now
         yield
         puts "🍜 : Done in #{'%.3f' % (Time.now - time)}s."

data/lib/linner/reactor.rb

@@ -27,7 +27,7 @@ module Linner
 
     def route_request(connection, request)
       if request.url.start_with? "/livereload.js"
-        return connection.respond :ok, File.read(File.join(File.dirname(__FILE__), "../../vendor", "livereload.js"))
+        return connection.respond :ok, {"Content_Type" => 'application/ecmascript'}, File.read(File.join(File.dirname(__FILE__), "../../vendor", "livereload.js"))
       end
 
       path = File.join(Linner.environment.public_folder, request.url[1..-1])

data/lib/linner/templates/config.yml

@@ -19,4 +19,5 @@ groups:
       "/": "app/views/**/*.{html,hbs}"
 modules:
   wrapper: "cmd"
+revision: "index.html"
 notification: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/linner.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "listen", "~> 1.2"
   spec.add_dependency "nio4r", "~> 0.5.0"
   spec.add_dependency "uglifier", "~> 2.1"
+  spec.add_dependency "nokogiri", "~> 1.6.0"
   spec.add_dependency "compass", "~> 0.12.2"
-  spec.add_dependency "multi_json", "~> 1.7"
   spec.add_dependency "cssminify", "~> 1.0.2"
   spec.add_dependency "coffee-script", "~> 2.2"
   spec.add_dependency "terminal-notifier", "~> 1.4"

data/spec/linner/environment_spec.rb

@@ -17,6 +17,7 @@ describe Environment do
   it "should equals default config" do
     @env.notification.should be_true
     @env.wrapper.should == "cmd"
+    @env.revision.should == false
     @env.groups.should respond_to(:each)
   end
 end

data/vendor/config.default.yml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel
@@ -109,33 +109,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: compass
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: cssminify
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,8 @@ files:
 - README.md
 - Rakefile
 - bin/linner
+- docs/commands.md
+- docs/config.md
 - lib/linner.rb
 - lib/linner/asset.rb
 - lib/linner/command.rb
@@ -301,3 +303,4 @@ test_files:
 - spec/linner/template_spec.rb
 - spec/linner/wrapper_spec.rb
 - spec/spec_helper.rb
+has_rdoc: