linner 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da7940f6afc37793df10b89c7de5319df22ef4a
-  data.tar.gz: 78d598e3d444373fa669ffa9a8efba2ff2a209c6
+  metadata.gz: 3d4b9dcd8883940be8091b2e79983293de357e8c
+  data.tar.gz: aaf4b84e513d058360dcc93b56e21e0212d60c8b
 SHA512:
-  metadata.gz: 0160dbd09246a9de42b3b5dd820b69d33e7c2fbac64be4b367fd269d848e4355a95bfdc411a0b55835a11c0524398350f145760120a0ef6dcab5260d385ca7cc
-  data.tar.gz: 25820424614789c286d2c20f7bcdd03dfd23e2d74b59f10d2f2115d77f388c7ed7011d142e1640c1243f4a43df1e1a34482abaaf4dec4fb8c104a4e3421763b1
+  metadata.gz: 5f2364faae6de07606f8afec744c962c689a9fc4588f5451c279b96d40039a6f2195802d37f62ce8e7e1701234fab3da295adf66d64ffd5962a70351454a2fc5
+  data.tar.gz: ed780f4bfe2b73195e2365dd2e337f60f69c537482241c06aad1051ef5a0c7d1dee5a374202d1cc0af900cfb942c24d478e966e2af5b1e6400e6e81190299752

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.8.4
+  - fix the vendor path for bundles
+  - fix the sprite url config, now it's working again
+
 v0.8.3
   - fix a windows md5sum bug cause it calculate in text mode by default
 

data/lib/linner.rb

@@ -67,7 +67,8 @@ module Linner
         (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(prefix, env.sprites["path"], File.basename(asset.relative_digest_path)))
+          url = env.sprites["url"] || env.sprites["path"]
+          puts = File.read(path).gsub(File.join(url, File.basename(dest)), File.join(prefix, url, File.basename(asset.relative_digest_path)))
           File.open(path, "w") { |file| file << puts }
         end
       end

data/lib/linner/bundler.rb

@@ -5,7 +5,6 @@ require "open-uri"
 
 module Linner
   class Bundler
-    VENDOR = Pathname(".").join "vendor"
     REPOSITORY = File.expand_path "~/.linner/bundles"
 
     Bundle = Struct.new(:name, :version, :url) do
@@ -14,17 +13,18 @@ module Linner
       end
     end
 
-    def initialize(bundles)
+    def initialize(env)
       @bundles = []
-      bundles.each do |name, props|
+      env.bundles.each do |name, props|
         @bundles << Bundle.new(name, props["version"], props["url"])
       end
+      @vendor = Pathname(".").join env.vendor_folder
     end
 
     def check
       return [false, "Bundles didn't exsit!"] unless File.exist? REPOSITORY
       @bundles.each do |bundle|
-        unless File.exist?(bundle.path) and File.exist?(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
@@ -37,14 +37,14 @@ module Linner
       end
       @bundles.each do |bundle|
         if bundle.version != "master"
-          next if File.exist?(bundle.path) and File.exist?(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
+        install_to_repository bundle
         if gzipped?(bundle.path)
-          link_and_extract_to_vendor bundle.path, File.join(VENDOR, ".pkg", bundle.name, File.basename(bundle.path)), File.join(VENDOR, bundle.name)
+          link_and_extract_to_vendor bundle.path, File.join(@vendor, ".pkg", bundle.name, File.basename(bundle.path)), File.join(@vendor, bundle.name)
         else
-          link_to_vendor bundle.path, File.join(VENDOR, bundle.name)
+          link_to_vendor bundle.path, File.join(@vendor, bundle.name)
         end
       end
     end
@@ -54,14 +54,19 @@ module Linner
     end
 
     private
-    def install_to_repository(url, path)
-      FileUtils.mkdir_p File.dirname(path)
-      File.open(path, "w") do |dest|
-        if url =~ URI::regexp
-          open(url, "r:UTF-8") {|file| dest.write file.read}
-        else
-          dest.write(File.read Pathname(url).expand_path)
+    def install_to_repository(bundle)
+      FileUtils.mkdir_p File.dirname(bundle.path)
+      begin
+        File.open(bundle.path, "w") do |dest|
+          if bundle.url =~ URI::regexp
+            open(bundle.url, "r:UTF-8") {|file| dest.write file.read}
+          else
+            dest.write(File.read Pathname(bundle.url).expand_path)
+          end
         end
+      rescue
+        Notifier.error("Can't fetch bundle #{bundle.name} from #{bundle.url}")
+        Kernel::exit
       end
     end
 

data/lib/linner/command.rb

@@ -17,14 +17,14 @@ module Linner
 
     desc "check", "check dependencies"
     def check
-      message = Linner::Bundler.new(env.bundles).check
+      message = Linner::Bundler.new(env).check
       puts (message.first ? "🍵 :" : "👻 :") + message.last
     end
 
     desc "install", "install dependencies"
     def install
       begin
-        Linner::Bundler.new(env.bundles).perform
+        Linner::Bundler.new(env).perform
       rescue
         puts "👻 : Install failed!"
         puts $!
@@ -43,14 +43,14 @@ module Linner
       Linner.compile = true
       Linner.strict = true if options[:strict]
       clean
-      Bundler.new(env.bundles).perform
+      Bundler.new(env).perform
       perform
     end
 
     desc "watch", "watch assets"
     def watch
       clean
-      Bundler.new(env.bundles).perform
+      Bundler.new(env).perform
       perform
       watch_for_env
       watch_for_perform
@@ -101,7 +101,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
-        Bundler.new(env.bundles).perform
+        Bundler.new(env).perform
       end
     end
 

data/lib/linner/sprite.rb

@@ -42,6 +42,7 @@ module Linner
 
     def generate_style(config, name)
       selector = config["selector"] || ".icon-"
+      url = config['url'] || config['path']
       @images.inject("") do |style, image|
         logical_path = Asset.new(image.path).logical_path
         selector_with_pseudo_class = logical_path.chomp(File.extname(logical_path))
@@ -53,7 +54,7 @@ module Linner
 "#{selector}#{selector_with_pseudo_class} {
   width: #{image.width}px;
   height: #{image.height}px;
-  background: url(#{File.join config['path'], name}) -#{image.left}px -#{image.top}px no-repeat;
+  background: url(#{File.join url, name}) -#{image.left}px -#{image.top}px no-repeat;
 }
 "
       end

data/lib/linner/templates/config.yml

@@ -8,7 +8,7 @@ groups:
       "/scripts/app.js": "app/**/*.{js,coffee}"
       "/scripts/vendor.js": "vendor/**/*.{js,coffee}"
     order:
-      - vendor/jquery-1.10.2.js
+      - vendor/jquery.js
       - ...
       - app/scripts/app.coffee
   styles:

data/lib/linner/version.rb

@@ -1,3 +1,3 @@
 module Linner
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/linner/bundler_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Bundler do
   before(:each) do
-    bundles = Environment.new(root.join "config.yml").bundles
-    @bundler = Linner::Bundler.new(bundles)
+    env = Environment.new(root.join "config.yml")
+    @bundler = Linner::Bundler.new(env)
   end
 
   it "should check failure when REPOSITORY is not exist" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linner
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Saito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor