linner 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41ee9a6cf2562f365e6e9a263adb9e2b8568dbb
-  data.tar.gz: 93028ef33bbaee5194089522c5c95378a9f15bd1
+  metadata.gz: 96597b56da64c0335227695b713d6ca663a93192
+  data.tar.gz: ac32c7dfd3bf23876cd8db939a4927a5b5fcf599
 SHA512:
-  metadata.gz: 81973fdb6415ffb48402bbe9399281dcc9cac652ee0210d9a9b9cd5b5f4d613112d1ae5e5008df95d260e2180cd74ab087ddc51c61bd3596d3d2a821d80a3e6a
-  data.tar.gz: 0bdd137d04e3f169271e6721ccb56ceabb7145d1ca14460a0b7ea42572ab81591dc0d63e6f20f5613fa7628ca939076bd4fd8fe32f753d1e919203a30132e882
+  metadata.gz: c4ffb6f987945e1aff80caf495e728a0013ac32cbfc200f86f4cbe65223f7a24b4ce3dfb23cd3f24240a95b963aead6829591f94fa7c7f91749e0edf6c3a3993
+  data.tar.gz: d105dcab73e1f4b26a55f588e5d2aecb990dd1a9367e5086a8f59bd92ccfcd1dd9e7db1804163bb49cc682c87690b298f2cb6fdc48c6325efdff6b494735a110

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Saito
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,21 @@
 # Linner
 
-HTML5 Application Assembler
+Linner is a full-featured HTML5 application assembler.
+
+![Linner](http://d.pr/i/bWPA+)
+
+* Fast!
+* Supports `Sass` and `Coffee`.
+* Supports OS X Lion and Mountaion Lion Notifications.
+* Supports Modular Javascript, All your code will be wrap by `CMD`.
+* Supports `concat` code by `config file` not `directive processor`.
+* Supports `copy` code from `src` to `dist`.
+* Supports Real-time `concat` by `$ linner watch`.
+* Supports `compress` by `$ linner build`.
+
+## Requirements
+
+* Ruby 2.0
 
 ## Installation
 

data/lib/linner.rb

@@ -1,7 +1,7 @@
 require "linner/version"
 require "linner/command"
 require "linner/asset"
-require "linner/sort"
+require "linner/helper"
 require "linner/environment"
 require "linner/wrapper"
 require "linner/template"
@@ -16,12 +16,11 @@ module Linner
   end
 
   def environment
-    @env ||= Linner::Environment.new root.join("config.yml")
+    @env ||= Environment.new root.join("config.yml")
   end
 
-  def perform(options = {})
-    compile = options[:compile]
-    environment.files.values.each do |config|
+  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
     end
@@ -30,14 +29,13 @@ module Linner
   private
   def concat(config)
     assets = []
-    concat, before, after = environment.extract_by(config)
-    concat.each do |dist, regex|
+    config["concat"].each do |dist, regex|
       Thread.new do
-        dist = Linner::Asset.new(environment.public_folder.join(dist).to_path)
+        dist = Asset.new(File.join environment.public_folder, dist)
+        dist.content = ""
         matches = Dir.glob(File.join root, regex).uniq
-        matches.extend(Linner::Sort)
-        matches.sort(before: before, after: after).each do |m|
-          asset = Linner::Asset.new(m)
+        matches.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
@@ -51,13 +49,13 @@ module Linner
   end
 
   def copy(config)
-    config["copy"].to_h.each do |dist, regex|
+    config["copy"].each do |dist, regex|
       Thread.new do
         matches = Dir.glob(File.join root, regex)
         matches.each do |path|
-          asset = Linner::Asset.new(path)
+          asset = Asset.new(path)
           asset.path = File.join(environment.public_folder, dist, asset.logical_path)
-          next if File.exist? asset.path and FileUtils.uptodate? path, [asset.path]
+          next if File.exist?(asset.path) and FileUtils.uptodate?(path, [asset.path])
           asset.write
         end
       end.join

data/lib/linner/asset.rb

@@ -5,38 +5,26 @@ module Linner
 
     def initialize(path)
       @path = path
-      if path =~ /#{Linner.root.to_path}\/public/
-        @content = ""
-      else
-        @content = Linner::Template.new(path).render
-      end
-    end
-
-    def type
-      @type ||= if @path =~ /\.(js|coffee)$/
-        "script"
-      elsif @path =~ /\.(css|sass|scss)/
-        "style"
-      end
+      @content ||= File.exist?(path) ? Tilt.new(path).render : ""
     end
 
     def wrap
-      Linner::Wrapper.wrap(logical_path.chomp(File.extname logical_path), @content)
+      Wrapper.wrap(logical_path.chomp(File.extname logical_path), @content)
     end
 
     def wrappable?
-      !!(!@path.include? Linner.root.join("vendor").to_path and type == "script")
+      !!(@path.include? Linner.root.join("app").to_path and Template.template_for_script?(@path))
     end
 
     def write
       FileUtils.mkdir_p File.dirname(@path)
-      File.open @path, "w+" do |file|
+      File.open @path, "w" do |file|
         file.write @content
       end
     end
 
     def compress
-      @content = Linner::Compressor.compress(self)
+      @content = Compressor.compress(self)
     end
 
     def logical_path

data/lib/linner/command.rb

@@ -11,7 +11,7 @@ module Linner
 
     desc "build", "build assets"
     def build
-      Linner::Notifier.info do
+      Notifier.info do
         Linner.perform compile: true
       end
     end
@@ -20,16 +20,16 @@ module Linner
     def watch
       proc = Proc.new do |modified, added, removed|
         begin
-          Linner::Notifier.info{ Linner.perform }
+          Notifier.info{ Linner.perform }
         rescue
-          Linner::Notifier.error $!
+          Notifier.error $!
         end
       end
       proc.call
       listener = Listen.to "app/", "vendor/", "test/", filter: /\.(js|coffee|css|sass|scss)$/
       listener.change &proc
       trap :INT do
-        Linner::Notifier.exit
+        Notifier.exit
         exit!
       end
       listener.start!
@@ -37,7 +37,7 @@ module Linner
 
     desc "clean", "clean assets"
     def clean
-      FileUtils.rm_rf File.join(Linner.environment.public_folder, "/.")
+      FileUtils.rm_rf Dir.glob("#{Linner.environment.public_folder}/*")
     end
 
     desc "new", "create the skeleton of project"

data/lib/linner/compressor.rb

@@ -5,10 +5,9 @@ module Linner
   class Compressor
 
     def self.compress(asset)
-      case asset.type
-      when "script"
+      if Template.template_for_script? asset.path
         Uglifier.compile asset.content, comments: "none"
-      when "style"
+      elsif Template.template_for_style? asset.path
         YUI::CssCompressor.new.compress asset.content
       end
     end

data/lib/linner/environment.rb

@@ -4,26 +4,25 @@ module Linner
   class Environment
 
     def initialize(path)
-      @config ||= YAML::load File.read 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)
     end
 
-    def public_folder
-      Linner.root.join(@config["paths"].to_h["public"] || "public")
+    %w(app test vendor public).each do |method|
+      define_method("#{method}_folder") do
+        Linner.root.join(@env["paths"][method]).expand_path.to_path
+      end
     end
 
-    def files
-      @config["files"] || []
-    end
-
-    def notifications
-      @config["notifications"] || false
+    %w(notification wrapper).each do |method|
+      define_method(method) do
+        @env[method]
+      end
     end
 
-    def extract_by(file)
-      concat = file["concat"] || []
-      before = file["order"].to_h["before"] || []
-      after = file["order"].to_h["after"] || []
-      [concat, before, after]
+    def files
+      @env["files"].values
     end
   end
 end

data/lib/linner/{sort.rb → helper.rb}

@@ -1,7 +1,14 @@
 module Linner
-  module Sort
+  module HashRecursiveMerge
+    def rmerge!(other_hash)
+      merge!(other_hash) do |key, oldval, newval|
+        oldval.class == self.class ? oldval.rmerge!(newval) : newval
+      end
+    end
+  end
 
-    def sort(before: [], after: [])
+  module Sort
+    def sort_by_before_and_after(before, after)
       sort_by_before(self, before)
       sort_by_after(self, after)
       self
@@ -25,3 +32,11 @@ module Linner
     end
   end
 end
+
+class Hash
+  include Linner::HashRecursiveMerge
+end
+
+class Array
+  include Linner::Sort
+end

data/lib/linner/notifier.rb

@@ -2,22 +2,23 @@ require "terminal-notifier"
 
 module Linner
   class Notifier
+    class << self
+      def info
+        time = Time.now
+        yield
+        puts "🍜 : Done in #{'%.3f' % (Time.now - time)}s."
+      end
 
-    def self.info
-      time = Time.now
-      yield
-      puts "🍜 : Done in #{'%.3f' % (Time.now - time)}s."
-    end
-
-    def self.error(message)
-      puts message = "👻 : #{message}!"
-      if Linner.environment.notifications && TerminalNotifier.available?
-        TerminalNotifier.notify message, :title => 'Linner'
+      def error(message)
+        puts message = "👻 : #{message}!"
+        if Linner.environment.notifications && TerminalNotifier.available?
+          TerminalNotifier.notify message, :title => 'Linner'
+        end
       end
-    end
 
-    def self.exit
-      puts "\r🍵 : Let's take a break!"
+      def exit
+        puts "\r🍵 : Let's take a break!"
+      end
     end
   end
 end

data/lib/linner/template.rb

@@ -1,25 +1,31 @@
-require 'tilt'
-require 'sass'
-require 'coffee_script'
+require "tilt"
+require "sass"
+require "coffee_script"
+
+module Tilt
+  class JavascriptTemplate < PlainTemplate
+    self.default_mime_type = 'application/javascript'
+  end
+
+  class CSSTemplate < PlainTemplate
+    self.default_mime_type = 'text/css'
+  end
+
+  Tilt.register Tilt::CSSTemplate, "css"
+  Tilt.register Tilt::JavascriptTemplate, "js"
+end
 
 module Linner
   class Template
 
-    def initialize(path)
-      @path = path
-    end
-
-    def render
-      if supported_template? @path
-        Tilt.new(@path).render
-      else
-        File.read @path
+    class << self
+      def template_for_script?(path)
+        [Tilt::JavascriptTemplate, Tilt::CoffeeScriptTemplate].include? Tilt[path]
       end
-    end
 
-    private
-    def supported_template?(path)
-      %w[.coffee .sass .scss].include? File.extname(path)
+      def template_for_style?(path)
+        [Tilt::CSSTemplate, Tilt::SassTemplate, Tilt::ScssTemplate].include? Tilt[path]
+      end
     end
   end
 end

data/lib/linner/templates/config.yml

@@ -3,7 +3,7 @@ paths:
 files:
   scripts:
     concat:
-      "scripts/app.js": "app/scripts/**/*.{js,coffee}"
+      "scripts/app.js": "app/**/*.{js,coffee}"
       "scripts/vendor.js": "vendor/**/*.{js,coffee}"
     order:
       before:
@@ -20,7 +20,5 @@ files:
     copy:
       "/": "app/views/**/*.{html,hbs}"
 modules:
-  wrapper: "cmd"
-conventions:
-  ignored: "_"
+  wrapper: "CMD"
 notifications: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/linner/wrapper.rb

@@ -1,17 +1,13 @@
 module Linner
   class Wrapper
+    WRAPPER =
+      'window.require.define({"%s":' +
+        'function(exports, require, module){' +
+        '%s' +
+        ";}});\n"
 
-    class << self
-      def wrapper
-        'window.require.define({"%s":' +
-          'function(exports, require, module){' +
-          '%s' +
-          ";}});\n"
-      end
-
-      def wrap(name, content)
-        wrapper % [name, content]
-      end
+    def self.wrap(name, content)
+      WRAPPER % [name, content]
     end
   end
 end

data/linner.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "yui-compressor", "~> 0.9.6"
   spec.add_dependency "terminal-notifier", "~> 1.4"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "bundler", "~> 1.3"
 end

data/spec/fixtures/app.js

@@ -0,0 +1 @@
+console.log("app.js")

data/spec/linner/asset_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe Asset do
+
+  before(:each) do
+    @asset = Asset.new("app.js")
+  end
+end

data/spec/linner/environment_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Environment do
+  before(:each) do
+    @env = Environment.new(root.join "config.yml")
+  end
+
+  describe "convension" do
+    it "should equals default path folder" do
+      @env.app_folder.should == root.join("app").to_path
+      @env.test_folder.should == root.join("test").to_path
+      @env.vendor_folder.should == root.join("vendor").to_path
+      @env.public_folder.should == root.join("public").to_path
+    end
+
+    it "should equals default config" do
+      @env.notification.should be_true
+      @env.wrapper.should == "CMD"
+      @env.files.should respond_to(:each)
+    end
+
+    it "should equals default before and after" do
+      @env.files.each do |file|
+        file["copy"].should respond_to(:each)
+        file["concat"].should respond_to(:each)
+        file["order"]["before"].should respond_to(:each)
+        file["order"]["after"].should respond_to(:each)
+      end
+    end
+  end
+end

data/spec/linner/helper_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe Array do
+  before(:each) do
+    @array = %w[app.js jquery.js bootstrap.css reset.css vendor.js]
+  end
+
+  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
+    end
+
+    it "will change by before items" do
+      @array.sort_by_before_and_after(["jquery.js", "vendor.js"], [])
+      @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.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.should =~ %w[jquery.js vendor.js app.js reset.css bootstrap.css]
+    end
+  end
+end

data/spec/linner/template_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Template do
+
+  describe :templates do
+
+    it "should be javascript tempalate" do
+      Tilt["app.js"].should == Tilt::JavascriptTemplate
+    end
+
+    it "should be css template" do
+      Tilt["app.css"].should == Tilt::CSSTemplate
+    end
+
+    it "should tempalte for script" do
+      Template.template_for_script? "app.js".should be_true
+      Template.template_for_script? "app.coffee".should be_true
+    end
+
+    it "should tempalte for style" do
+      Template.template_for_style? "app.css".should be_true
+      Template.template_for_style? "app.sass".should be_true
+      Template.template_for_style? "app.scss".should be_true
+    end
+  end
+end

data/spec/linner/wrapper_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Wrapper do
+
+  before(:each) do
+    @name = "app"
+    @script = 'module.exports = function() {return console.log("log from app!");};'
+    @expected_script = 'window.require.define({"app":' +
+      'function(exports, require, module){' +
+      'module.exports = function() {' +
+      'return console.log("log from app!");' +
+      '};' +
+      ";}});\n"
+  end
+
+  describe :wrap do
+    it "should wrapped by wrapper" do
+      script = Wrapper.wrap(@name, @script)
+      script.should eq @expected_script
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require "linner"
+
+include Linner
+
+module Linner
+  extend self
+
+  def root
+    Pathname(".").join("spec/fixtures").expand_path
+  end
+end

data/vendor/config.default.yml

@@ -0,0 +1,38 @@
+paths:
+  app: "app"
+  test: "test"
+  vendor: "vendor"
+  public: "public"
+files:
+  scripts:
+    concat:
+      "scripts/app.js": "app/**/*.{js,coffee}"
+      "scripts/vendor.js": "vendor/**/*.{js,coffee}"
+    copy: {}
+    order:
+      before:
+        - "vendor/jquery-1.10.2.js"
+      after: []
+  styles:
+    concat:
+      "styles/app.css": "app/**/[a-z]*.{css,scss,sass}"
+    copy: {}
+    order:
+      before: []
+      after: []
+  images:
+    concat: {}
+    copy:
+      "images/": "app/**/*.{png,gif}"
+    order:
+      before: []
+      after: []
+  views:
+    concat: {}
+    copy:
+      "/": "app/**/*.{html,hbs}"
+    order:
+      before: []
+      after: []
+wrapper: "CMD"
+notification: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,33 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: HTML5 Application Assembler
 email:
 - saitowu@gmail.com
@@ -159,8 +173,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - bin/linner
@@ -169,8 +185,8 @@ files:
 - lib/linner/command.rb
 - lib/linner/compressor.rb
 - lib/linner/environment.rb
+- lib/linner/helper.rb
 - lib/linner/notifier.rb
-- lib/linner/sort.rb
 - lib/linner/template.rb
 - lib/linner/templates/app/images/.gitkeep
 - lib/linner/templates/app/scripts/app.coffee
@@ -184,6 +200,15 @@ files:
 - lib/linner/version.rb
 - lib/linner/wrapper.rb
 - linner.gemspec
+- spec/fixtures/app.js
+- spec/fixtures/config.yml
+- spec/linner/asset_spec.rb
+- spec/linner/environment_spec.rb
+- spec/linner/helper_spec.rb
+- spec/linner/template_spec.rb
+- spec/linner/wrapper_spec.rb
+- spec/spec_helper.rb
+- vendor/config.default.yml
 homepage: https://github.com/saitowu/linner
 licenses:
 - MIT
@@ -208,4 +233,12 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: HTML5 Application Assembler
-test_files: []
+test_files:
+- spec/fixtures/app.js
+- spec/fixtures/config.yml
+- spec/linner/asset_spec.rb
+- spec/linner/environment_spec.rb
+- spec/linner/helper_spec.rb
+- spec/linner/template_spec.rb
+- spec/linner/wrapper_spec.rb
+- spec/spec_helper.rb