assetify 2.0.1 → 3.0.0

data/lib/assetify/asset/pathfix.rb

@@ -1,22 +1,24 @@
 module Assetify
+  #
+  # *Attempt* to fix assets in js/css for #image_url
+  #
   class Pathfix
-
-    def initialize chunk, as = :erb, ns = nil
-      @chunk, @as, @ns = chunk, as, ns
+    def initialize(chunk, renderer = :erb, ns = nil)
+      @chunk = chunk
+      @renderer = renderer
+      @ns = ns
       @images = scan_images
     end
 
-    def images
-      @images
-    end
+    attr_reader :images
 
     def scan_images
-      @chunk.scan(/url\(([a-zA-Z0-9\/\_\-\.]*\.\w+)\)/xo).flatten
+      @chunk.scan(%r{url\(([a-zA-Z0-9/\_\-\.]*\.\w+)\)}xo).flatten
     end
 
-    def replace src
+    def replace(src)
       fpath = @ns ? "#{@ns}/#{src}" : src
-      if @as == :erb
+      if @renderer == :erb
         "url('<%= image_path('#{fpath}') %>')"
       else
         "image-url('#{fpath}')"
@@ -25,20 +27,16 @@ module Assetify
 
     def fix
       @images.each do |path|
-        @chunk["url(#{path})"] = replace path.split("/").last
+        @chunk["url(#{path})"] = replace path.split('/').last
       end
-      @as != :erb ? tmpl_chunk : @chunk
+      @renderer != :erb ? tmpl_chunk : @chunk
     end
 
     def tmpl_chunk
-      begin
-        require 'sass/css'
-        Sass::CSS.new(@chunk).render(@as)
-      rescue Sass::SyntaxError => e
-        @error = e
-      end
+      require 'sass/css'
+      Sass::CSS.new(@chunk).render(@renderer)
+    rescue Sass::SyntaxError => e
+      @error = e
     end
-
   end
-
 end

data/lib/assetify/asset/pkg.rb

@@ -1,16 +1,18 @@
 require 'libarchive'
 
 module Assetify
-
+  #
+  # Some Assets are inside rocks, need tools...
+  #
   class Pkg
     include Helpers
     attr_accessor :name, :url
 
-    PATH = "/tmp/"
+    PATH = '/tmp/'.freeze
 
-    def initialize(name, url, opts={})
+    def initialize(name, url, _opts = {})
       @name = name
-      @pkgname = url.split("/").last
+      @pkgname = url.split('/').last
       @url = url
     end
 
@@ -22,13 +24,13 @@ module Assetify
       File.join(path, @pkgname)
     end
 
-    def read_from_pkg(regex = ".*")
+    def read_from_pkg(regex = '.*')
       data = {}
       Archive.read_open_filename(fullpath) do |ar|
-        while entry = ar.next_header
+        while (entry = ar.next_header)
           if entry.pathname =~ /#{regex}/
-            data.merge! entry.pathname => ar.read_data
-           # return data
+            data[entry.pathname] = ar.read_data
+            # return data
           end
         end
       end
@@ -37,7 +39,7 @@ module Assetify
 
     def get(file, force = false)
       # Download and write to tmp if force or doensnt exists
-      write(get_data(url)) if force || !File.exists?(fullpath)
+      write(get_data(url)) if force || !File.exist?(fullpath)
       # Better way when multiple are found....?
       read_from_pkg(file)
     end
@@ -47,14 +49,12 @@ module Assetify
     #
     def unpack_all
       read_from_pkg.each do |file, data|
-        fname, *dir = file =~ /\/$/ ? [nil, file] : file.split("/").reverse
-        dir = File.join Opt[:vendor], dir.reverse.join("/")
-        FileUtils.mkdir_p dir unless Dir.exists?(dir)
-        next if file =~ /\/$/ # next if data.empty?
-        File.open(Opt[:vendor] + "/#{file}", "w+") { |f| f.puts(data) }
+        _fname, *dir = file =~ %r{/$} ? [nil, file] : file.split('/').reverse
+        dir = File.join Opt[:vendor], dir.reverse.join('/')
+        FileUtils.mkdir_p dir unless Dir.exist?(dir)
+        next if file =~ %r{/$} # next if data.empty?
+        File.open(Opt[:vendor] + "/#{file}", 'w+') { |f| f.puts(data) }
       end
     end
-
   end
-
 end

data/lib/assetify/assetfile.rb

@@ -1,16 +1,17 @@
 module Assetify
+  #
+  # The Assetfile!
+  #
   class Assetfile
     class << self
-
-
       #
       # Assetfile stuff
       #
       def missing!
-        print "Assetfile not found, create one? [Y/n] "
+        print 'Assetfile not found, create one? [Y/n] '
         res = $stdin.gets.chomp # dont forget stdin
         unless res =~ /n|N/
-          File.open("Assetfile", "w+") do |f|
+          File.open('Assetfile', 'w+') do |f|
             f.print <<TXT
 #
 # #{Dir.pwd.split('/').last.capitalize} Assetfile
@@ -25,7 +26,7 @@ end
 
 TXT
           end
-          puts "Assetfile created!"
+          puts 'Assetfile created!'
           exit 0
         end
       end
@@ -35,21 +36,21 @@ TXT
       #
       #
       def find
-        missing! unless File.exists?("Assetfile")
+        missing! unless File.exist?('Assetfile')
       end
 
       def read
-        file = File.open("Assetfile") # ruby 1.8/1.9 (ugly) fix
-        code = file.send(file.respond_to?(:lines) ? :lines : :readlines).map do |line|
+        file = File.open('Assetfile') # ruby 1.8/1.9 (ugly) fix
+        code = file.each_line.map do |line|
           # Parse options
           if line =~ /^\w{2,3}path/
-            key, val = line.split(" ")
+            key, val = line.split(' ')
             Opt[key.to_sym] = val
             next
           end
           line
         end.reject(&:nil?)
-        DSL.parse code.join("")
+        DSL.parse code.join('')
       end
 
       # def write

data/lib/assetify/cli.rb

@@ -2,14 +2,13 @@
 # To be refactored...
 #
 module Assetify
-  LINE  = CLI.new
+  LINE = CLI.new
 
   class << self
-
     #
     # Text Interface
     #
-    def check_param params, string
+    def check_param(params, string)
       unless string.include? params[0]
         puts "Did you mean #{string}?"
         exit 0
@@ -22,6 +21,40 @@ module Assetify
       Asset.filter params
     end
 
+    def check(assets)
+      assets.each do |a|
+        LINE.p a.header
+        if a.file_exists? # Return if file is on path
+          a.read_data
+          LINE.f "#{a.print_version} Installed"
+        else
+          LINE.f 'Not Found', :red
+        end
+      end
+    end
+
+    def install(assets, force = false)
+      assets.each do |a|
+        LINE.p a.header
+        if !force && a.file_exists? # Return if file is on path
+          a.read_data
+          return LINE.f "#{a.print_version} Installed"
+        end
+        begin
+          # Creates a thread to insert dots while downloading
+          points = Thread.new { loop { ; LINE.p '.'; sleep 1; } }
+
+          a.install! force
+          LINE.f "#{a.print_version} ok"
+        rescue => e
+          LINE.f :FAIL, :red
+          p "Fail: #{e} #{e.backtrace}"
+        ensure
+          points.kill
+        end
+      end
+    end
+
     #
     # CLI Master case/switch!
     #
@@ -34,19 +67,20 @@ module Assetify
     # c -> check
     # w -> web
     #
-    def work_on params
+    def work_on(params)
+      assets = find_assets(params[1])
       case params.first
       when /^i/, nil
-        check_param params, "install" if params[0]
-        find_assets(params[1]).map(&:install!)
+        check_param params, 'install' if params[0]
+        install assets
       when /^u/
-        check_param params, "update"
-        find_assets(params[1]).map { |a| a.install! :force }
+        check_param params, 'update'
+        install assets, :force
       when /^c/
-        check_param params, "check"
-        find_assets(params[1]).map { |a| a.check! }
+        check_param params, 'check'
+        check assets
       when /^w/
-        check_param params, "web"
+        check_param params, 'web'
         GUI.boot!
       else
         puts "Dunno how to #{params.join}."
@@ -57,7 +91,7 @@ module Assetify
     # Divider bar
     #
     def bar
-      puts "-" * TSIZE
+      puts '-' * TSIZE
     end
 
     def work!(params)
@@ -65,13 +99,11 @@ module Assetify
       Assetfile.find
       print "Assetify - #{Asset.all.size} assets"
       print " | #{params[1..-1].join(' . ')}" if params[1]
-      puts " |"
+      puts ' |'
       bar
       work_on params
       bar
       puts "Done in #{Time.now - start}s"
     end
-
   end
-
 end

data/lib/assetify/cli/colored.rb

@@ -2,9 +2,9 @@ require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
 
 ##
 # cute.
-# 
+#
 #   >> "this is red".red
-#  
+#
 #   >> "this is red with a blue background (read: ugly)".red_on_blue
 #
 #   >> "this is red with an underline".red.underline
@@ -15,53 +15,51 @@ require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
 module Colored
   extend self
 
-  COLORS = { 
+  COLORS = {
     'black'   => 30,
-    'red'     => 31, 
-    'green'   => 32, 
+    'red'     => 31,
+    'green'   => 32,
     'yellow'  => 33,
     'blue'    => 34,
     'magenta' => 35,
     'cyan'    => 36,
     'white'   => 37
-  }
+  }.freeze
 
   EXTRAS = {
-    'clear'     => 0, 
+    'clear'     => 0,
     'bold'      => 1,
     'underline' => 4,
     'reversed'  => 7
-  }
-  
-  COLORS.each do |color, value|
-    define_method(color) do 
-      colorize(self, :foreground => color)
+  }.freeze
+
+  COLORS.each do |color, _value|
+    define_method(color) do
+      colorize(self, foreground: color)
     end
 
     define_method("on_#{color}") do
-      colorize(self, :background => color)
+      colorize(self, background: color)
     end
 
-    COLORS.each do |highlight, value|
+    COLORS.each do |highlight, _value|
       next if color == highlight
       define_method("#{color}_on_#{highlight}") do
-        colorize(self, :foreground => color, :background => highlight)
+        colorize(self, foreground: color, background: highlight)
       end
     end
   end
 
-  EXTRAS.each do |extra, value|
+  EXTRAS.each do |extra, _value|
     next if extra == 'clear'
-    define_method(extra) do 
-      colorize(self, :extra => extra)
+    define_method(extra) do
+      colorize(self, extra: extra)
     end
   end
 
   define_method(:to_eol) do
     tmp = sub(/^(\e\[[\[\e0-9;m]+m)/, "\\1\e[2K")
-    if tmp == self
-      return "\e[2K" << self
-    end
+    return "\e[2K" << self if tmp == self
     tmp
   end
 
@@ -84,7 +82,7 @@ module Colored
     background = color_name.to_s =~ /on_/
     color_name = color_name.to_s.sub('on_', '')
     return unless color_name && COLORS[color_name]
-    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m" 
+    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m"
   end
 end unless Object.const_defined? :Colored
 

data/lib/assetify/cli/term.rb

@@ -1,18 +1,20 @@
 module Assetify
-
+  #
+  # Command Line Interface
+  #
   class CLI
     def initialize(size = TSIZE)
       @size = size
       @chars = 0
     end
 
-    def p txt
+    def p(txt)
       @chars += txt.size
       print txt
     end
 
-    def f txt, color = :green
-      puts "[#{txt}]".send(color).bold.rjust (TSIZE - @chars + 17)
+    def f(txt, color = :green)
+      puts "[#{txt}]".send(color).bold.rjust(TSIZE - @chars + 17)
       @chars = 0
     end
   end

data/lib/assetify/constants.rb

@@ -1,13 +1,12 @@
 module Assetify
-
   Opt = {
-    :vendor   =>  "public/vendor",
-    :newname  =>  true
+    vendor: 'public/vendor',
+    newname: true
   }
 
   TSIZE = 80
-  ASSETS_PATH = "vendor/assets"
-  ASSETS = [:javascripts, :stylesheets, :images]
+  ASSETS_PATH = 'vendor/assets'.freeze
+  ASSETS = [:javascripts, :stylesheets, :images].freeze
   ASSETS.each do |asset|
     Opt.merge!(asset => "#{ASSETS_PATH}/#{asset}")
   end

data/lib/assetify/dsl.rb

@@ -1,5 +1,7 @@
 module Assetify
-
+  #
+  # Nice Assetfile reader
+  #
   class DSL
     attr_reader :assets
 
@@ -9,11 +11,11 @@ module Assetify
     # pkg :foo, "http://to.tgz" do
     # end
     #
-    def pkg name, url, opts = {}, &block
+    def pkg(name, url, opts = {}, &block)
       @pkg = Pkg.new name, url
       if block_given?
-        set_namespace name unless opts[:shallow]
-        instance_exec &block
+        use_namespace(name) unless opts[:shallow]
+        instance_exec(&block)
       else
         @pkg.unpack_all
       end
@@ -28,9 +30,9 @@ module Assetify
     # group :foo do
     # end
     #
-    def group name, &block
-      set_namespace name
-      instance_exec &block
+    def group(name, &block)
+      use_namespace(name)
+      instance_exec(&block)
       @ns = nil
       assets
     ensure
@@ -45,14 +47,14 @@ module Assetify
     #   dir "images/*jpg"
     # end
     #
-    def dir regex, params = {}
+    def dir(regex, params = {})
       to = params[:to]
       if @pkg
-        @pkg.get(regex).each do |path, data|
-          next if path =~ /\/$/ # dont let dirs get in... ugly
-          ext, *name = path.split(".").reverse
-          name = name.reverse.join(".").split("/").last
-          create_asset(ext, name, path, nil, { :to => to } )
+        @pkg.get(regex).each do |path, _data|
+          next if path =~ %r{/$} # dont let dirs get in... ugly
+          ext, *name = path.split('.').reverse
+          name = name.reverse.join('.').split('/').last
+          create_asset(ext, name, path, nil, to: to)
         end
       end
     end
@@ -62,20 +64,20 @@ module Assetify
     #
     #    a "jquery", "http://...jquery.js"
     #
-    def a name, url, *params
-      extension = url.split(".").last
+    def a(name, url, *_params)
+      extension = url.split('.').last
       parse_method extension, name, url
     end
-    alias :asset :a
+    alias asset a
 
     #
     # Filter/validate DSL to parse
     #
-    def method_missing method, name=nil, uri=nil, *params
-      unless name && uri
-        raise SyntaxError.new "Syntax Error on Assetfile. `#{method} :#{name}`"
-      else
+    def method_missing(method, name = nil, uri = nil, *params)
+      if name && uri
         parse_method method, name, uri, params
+      else
+        raise SyntaxError, "Syntax Error on Assetfile. `#{method} :#{name}`"
       end
     end
 
@@ -90,6 +92,15 @@ module Assetify
       end
     end
 
+    #
+    # DSL.parse()
+    #
+    def self.parse(chunk)
+      # puts "Assetify - Error Parsing 'Assetfile'."
+      # Instance eval with 2nd, 3rd args to the rescue
+      new.instance_eval(chunk, 'Assetfile', 1)
+    end
+
     private
 
     #
@@ -98,7 +109,7 @@ module Assetify
     # js "foo", "http://foo.com"
     # js "foo", "http://foo.com", :to => "/other/place"
     #
-    def parse_method method, name, uri, params=[]
+    def parse_method(method, name, uri, params = [])
       params, ver = params.partition { |param| param.is_a?(Hash) }
       opts = {}
       params.each { |hsh| opts.merge! hsh }
@@ -110,25 +121,14 @@ module Assetify
     # Helper to create asset with correct options
     #
     def create_asset(ext, name, path, ver, opts = {})
-      opts.merge! ({pkg: @pkg, ns: @ns })
+      opts[:pkg] = @pkg
+      opts[:ns] = @ns
       @assets ||= []
       @assets << Asset.new(ext, name, path, ver, opts)
     end
 
-
-    def set_namespace name
+    def use_namespace(name)
       @ns = @ns.nil? ? name : "#{@ns}/#{name}"
     end
-
-    #
-    # DSL.parse()
-    #
-    def self.parse chunk
-      # puts "Assetify - Error Parsing 'Assetfile'."
-      # Instance eval with 2nd, 3rd args to the rescue
-      new.instance_eval(chunk, "Assetfile", 1)
-    end
-
   end
-
 end