linner 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9560019bb82e87b3dc2bd5b56c54e1d0190789fa
-  data.tar.gz: bc7ee012bf8f8a68da6a7225d085faee0d545990
+  metadata.gz: fb27a0e45fbecbbc4602af358f6dfcb3e48cc842
+  data.tar.gz: 980da5ad5a54a919a8f446fd52537ba969e234cb
 SHA512:
-  metadata.gz: 27ea5249edf87569812cc804b31bb97d9401d6350656bc705a89a54b8311d97105bbbb22a94d892abf3ac72a99bd0b6ff1cea3f4123c4dc892df3aa0bb13c1dc
-  data.tar.gz: 7dc2d9c4b18e85a6077e8245c4131da3cb3a469ba37e10f4f389ec828be8db9d261438831e3a8f3a68aec0fce03074fb6f17ca3a7bd89b0e0269c9d29c79e118
+  metadata.gz: 97bd63e2ee2bfad5f860f755c97ba6bf7bc13c398cfa218c54d9f50ebc01849af9bedeed4879073811aef4ac80fa0ecfae87a2ec794919bc75de7aefc9988916
+  data.tar.gz: 5bdcbb509510707615cf7b9c7a3f7292f2d5e649e4b78981cc86a72041bd046df376fc0218727ce3b2b9190d95e1f2bd7b52330f7893b64dfb5d2ec94b4d38cf

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.7.3
+  - fix a merge bug from the latest version
+
+v0.7.2
+  - add a unstrict mode by default to replace the revision, change the original one to strict mode, use `-s` to trigger.
+
 v0.7.1
   - prevent multiple instance running error
 

data/lib/linner.rb

@@ -62,13 +62,14 @@ 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] = env.revision["prefix"] + asset.relative_digest_path
+        prefix = env.revision["prefix"] || ""
+        hash[dest] = 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["path"], File.basename(dest)), File.join(env.revision["prefix"], env.sprites["path"], File.basename(asset.relative_digest_path)))
+          puts = File.read(path).gsub(File.join(env.sprites["path"], File.basename(dest)), File.join(prefix, env.sprites["path"], File.basename(asset.relative_digest_path)))
           File.open(path, "w") { |file| file << puts }
         end
       end
@@ -76,8 +77,9 @@ module Linner
       # revision concat template and copy assets
       (concat_assets + template_assets + copy_assets).flatten.each do |dest|
         asset = Asset.new(File.join env.public_folder, dest)
+        prefix = env.revision["prefix"] || ""
         next unless asset.revable?
-        hash[dest] = env.revision["prefix"] + asset.relative_digest_path
+        hash[dest] = prefix + asset.relative_digest_path
         asset.revision!
       end
 
@@ -112,7 +114,7 @@ module Linner
       copy(config) if config["copy"]
       concat(config) if config["concat"]
     end
-    revision if compile? and env.revision and env.revision["files"]
+    revision if compile? and env.revision
   end
 
   private
@@ -164,7 +166,8 @@ module Linner
 
   def revision
     dump_manifest
-    env.revision["files"].flatten.each do |rev|
+    files = env.revision["files"] || []
+    files.flatten.each do |rev|
       file = File.join env.public_folder, rev.to_s
       next if not File.exist?(file)
       replace_attributes file
@@ -227,7 +230,8 @@ module Linner
   end
 
   def dump_manifest
-    File.open(File.join(env.public_folder, env.revision["manifest"]), "w") do |f|
+    manifest_file = env.revision["manifest"] || "manifest.yml"
+    File.open(File.join(env.public_folder, manifest_file), "w") do |f|
       YAML.dump(manifest, f)
     end
   end

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

@@ -16,7 +16,6 @@
     <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/templates/config.yml

@@ -30,7 +30,7 @@ groups:
     paths:
       - app/templates
     precompile:
-      "/scripts/templates.js": "app/templates/**/*.hbs"
+      "../vendor/templates.js": "app/templates/**/*.hbs"
 modules:
   wrapper: cmd
   ignored: vendor/**/*
@@ -39,6 +39,8 @@ sprites:
   path: /images/
   selector: .icon-
 revision:
+  prefix: ""
+  manifest: "manifest.yml"
   files:
     - index.html
 notification: true

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/linner/environment_spec.rb

@@ -17,9 +17,6 @@ describe Environment do
   it "should equals default config" do
     @env.notification.should be_true
     @env.wrapper.should == "cmd"
-    @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,8 +26,4 @@ modules:
   ignored: "vendor/**/*"
   definition: "/scripts/app.js"
 
-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.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel