assetify 0.2.2 → 0.3.0

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+
+# gem "execjs"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.md

@@ -24,14 +24,23 @@ This will create a Jsfile if not found.
 Jsfile
 ======
 
-Just like a Gemfile, but you choose the filetype before:
+Just like a Gemfile, but you choose the filetype (or extension) before:
 
     type "name", "url", <"version"> or <:options>
 
     js "jquery", "http://code.jquery.com/jquery-{VERSION}.min.js", "1.6"
     js "tipsy", "https://github.com/jaz303/tipsy/.../jquery.tipsy.js"
 
-Now just run assetify to make sure everything is installed/up-to-date.
+Stylesheets:
+
+    css "tipsy", "https://github.com/jaz303/tipsy/.../jquery.tipsy.css"
+
+Any file:
+
+    mp3 "alert", "http://link/to/audio"
+
+
+Now just run `assetify` to make sure everything is installed/up-to-date.
 
 
 Groups
@@ -47,6 +56,15 @@ in handy:
 
 This will install as "public/javascripts/forms/validator.js"
 
+You can nest groups too:
+
+    group "forms" do
+      js "validator", "link"
+      group "extra" do
+        js "another", "link"
+      end
+    end
+
 
 Pkgs
 ----
@@ -54,13 +72,47 @@ Pkgs
 Big projects makes you download tons of files for some .min files and css.
 
     pkg "fancy", "http://to.tgz.or.zip" do
-      js  "cool", "internal/js/cool"
-      css "cool", "internal/css/cool"
+      js  "cool", "internal/js/cool.js"
+      css "cool", "internal/css/cool.css"
     end
 
 This downloads and 'cherry pick' the files.
+Files will be written with the namespace "fancy":
+
+    /javascripts/fancy/cool.js
+
+You can pass :shallow => true to avoid the namespace:
+
+    pkg "fancy", "http://to.tgz.or.zip", :shallow => true do
+
+Results in:
+
+    /javascript/cool.js
+
+
+Also, please check out the note about link inside pkgs below.
+
+
+Dir
+___
+
+You can resource a full directory of files, too. Very useful when
+dealing with pkgs:
+
+    pkg "complexfw", "link" do
+      js  "complex.min.js"
+      dir "images/", :to => "images/complexfw"
+      # Another option, treat all as a type:
+      dir "src/", :as => :js
+    end
+
+All files inside images will be copied to "images/complexfw" and
+all files in 'src' to 'javascripts' (or whatever else jspath is).
 
 
+Note: Have in mind that the "link" inside dir/packages *is a regex*
+that returns the *first match* inside the archive. Check out libarchive
+or the pkg.rb source for more info.
 
 Other
 -----

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-05-30}
+  s.date = %q{2011-06-04}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     "spec/assetify/helpers_spec.rb",
     "spec/assetify/pkg_spec.rb",
     "spec/assetify_spec.rb",
+    "spec/fixtures/complex.tgz",
     "spec/fixtures/fancy.tgz",
     "spec/spec_helper.rb"
   ]

data/lib/assetify.rb

@@ -14,6 +14,7 @@ module Assetify
     :jspath   =>  "public/javascripts",
     :csspath  =>  "public/stylesheets",
     :imgpath  =>  "public/images",
+    :vendor   =>  "public/vendor",
     :newname  =>  true
   }
 
@@ -71,14 +72,20 @@ TXT
       end
     end
 
+    # Fuzzy find files
+    def find_assets(filter = nil)
+      return @assets unless filter
+      @assets.select {  |a| "#{a.name}#{a.pkg}" =~ /#{filter}/ }
+    end
+
     def work_on params
       case params.first
       when /^i/, nil
         check_param params, "install" if params[0]
-        @assets.map(&:install!)
+        find_assets(params[1]).map(&:install!)
       when /^u/
         check_param params, "update"
-        @assets.map { |a| a.install! :force }
+        find_assets(params[1]).map { |a| a.install! :force }
       else
         puts "Dunno how to #{params.join}."
       end

data/lib/assetify/asset.rb

@@ -4,7 +4,8 @@ require 'fileutils'
 module Assetify
   class Asset
     include Helpers
-    attr_accessor :type, :name, :url, :ns
+    attr_accessor :type, :name, :url, :ns, :pkg
+    alias :ext :type
 
     def initialize(type, name, url, ver = nil, params={})
       raise "NoType" unless type
@@ -48,6 +49,11 @@ module Assetify
       v ? "v#{v[0]} " : nil
     end
 
+    def data
+      # Get data, from a pkg or download directly
+      @data ||= @pkg ? @pkg.get(url, :force).values.first : get_data(url)
+    end
+
     def install!(force = false)
       LINE.p "-> #{name}.#{type}"
       if !force && check?
@@ -55,13 +61,14 @@ module Assetify
         return LINE.f "#{print_version}Installed"
       end
       begin
+        # Creates a thread to insert dots while downloading
         points = Thread.new { loop do; LINE.p "."; sleep 1; end }
-        @data ||= @pkg ? @pkg.get(url) : get_data(url)
-        write @data
+
+        write data
         LINE.f "#{print_version}ok"
       rescue => e
         LINE.f :FAIL, :red
-        p "Fail: #{e}"
+        p "Fail: #{e} #{e.backtrace}"
       ensure
         points.kill
       end

data/lib/assetify/dsl.rb

@@ -1,26 +1,49 @@
 module Assetify
 
   class DSL
+    attr_reader :assets
 
-    def pkg name, url, &block
+    def set_namespace(name)
+      @ns = @ns.nil? ? name : "#{@ns}/#{name}"
+    end
+
+    def pkg name, url, opts = {}, &block
       @pkg = Pkg.new name, url
-      @ns = name
-      instance_exec(&block)
-      @ns = nil
+      if block_given?
+        set_namespace name unless opts[:shallow]
+        instance_exec &block
+        @ns = @pkg = nil
+      else
+        @pkg.unpack_to_vendor
+      end
       assets
     end
 
     def group name, &block
-      @ns = name
-      instance_exec(&block)
+      set_namespace name
+      instance_exec &block
       @ns = nil
       assets
     end
 
-    def assets
-      @assets
+    def dir regex, to
+      to = to[: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
+          (@assets ||= []) << Asset.new(ext, name, path, nil, {
+                                        :pkg => @pkg,
+                                          :to => to})# h.split(".").last,                                        )
+        end
+      end
     end
 
+    #
+    # js "foo", "http://foo.com"
+    # js "foo", "http://foo.com", :to => "/other/place"
+    #
     def method_missing method, name, uri, *params
       params, ver = params.partition { |param| param.is_a?(Hash) }
       opts = {:ns => @ns, :pkg => @pkg}

data/lib/assetify/helpers.rb

@@ -8,6 +8,7 @@ module Assetify
     # Detects numerical software version from text.
     #
     def find_version(txt)
+      return unless txt
       version = txt.match /(?:(\d+)\.)?(?:(\d+)\.)?(\d+)?\.?(\d+)/
       # If matches a dot, it`s text. Otherwise make it number.
       v = version.to_a.reject(&:nil?).map { |d| d =~ /\./ ? d : d.to_i }
@@ -40,7 +41,7 @@ module Assetify
     end
 
     def write(binary)
-      FileUtils.mkdir_p path unless Dir.exists? path
+      FileUtils.mkdir_p path unless  Dir.exists?(path)
       File.open(fullpath, "w") { |f| f.puts(binary) }
     end
 

data/lib/assetify/pkg.rb

@@ -22,20 +22,36 @@ module Assetify
       File.join(path, @pkgname)
     end
 
-    def get(file)
-      get_data(url) unless File.exists? File.join(PATH, @pkgname)
-      data = nil
+    def read_from_pkg(regex = ".*")
+      data = {}
       Archive.read_open_filename(fullpath) do |ar|
         while entry = ar.next_header
-          if entry.pathname =~ /#{file}/
-            data = ar.read_data
-            return data
+          if entry.pathname =~ /#{regex}/
+            data.merge! entry.pathname => ar.read_data
+           # return data
           end
         end
       end
       data
     end
 
+    def get(file, force = false)
+      # Download and write to tmp if force or doensnt exists
+      write(get_data(url)) if force || !File.exists?(File.join(fullpath))
+      # Better way when multiple are found....?
+      read_from_pkg(file)
+    end
+
+    def unpack_to_vendor
+      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) }
+      end
+    end
+
   end
 
 end

data/spec/assetify/dsl_spec.rb

@@ -41,6 +41,12 @@ describe DSL do
       a[1].fullpath.should eql("public/javascripts/rock.js")
     end
 
+    it "should work with nested namespaces" do
+      a = Assetify::DSL.parse "group 'common' do; group 'nice' do; js 'foo', 'foolink'; end; end"
+      a[0].should be_an Asset
+      a[0].fullpath.should eql("public/javascripts/common/nice/foo.js")
+    end
+
   end
 
   describe "Pkg Assets" do
@@ -51,13 +57,41 @@ describe DSL do
       a[0].fullpath.should eql("public/javascripts/fancy/foo.js")
     end
 
+    it "should accept shallow too" do
+      a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip', :shallow => true do; js 'foo', 'foolink'; end"
+      a[0].should be_an Asset
+      a[0].fullpath.should eql("public/javascripts/foo.js")
+    end
+
     it "should fetch inside archive" do
       a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip' do; js 'foo', 'foolink'; end"
       a[0].should be_an Asset
       a[0].fullpath.should eql("public/javascripts/fancy/foo.js")
     end
 
+    it "should unpack to vendor if no block given" do
+      Pkg.should_receive(:new).with("fancy", "http://fancy.zip").and_return(mp = mock(Pkg))
+      mp.should_receive :unpack_to_vendor
+      a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip'"
+    end
   end
 
+  describe "Directories" do
+
+    it "should read from pkg the regex" do
+      Pkg.should_receive(:new).with("fancy", "http://fancy.zip").and_return(mp = mock(Pkg))
+      mp.should_receive(:get).with("images/").and_return([])
+      a = Assetify::DSL.parse "pkg 'fancy', 'http://fancy.zip' do; dir 'images/', :to => 'images/complex/'; end"
+    end
+
+    it "should read from pkg the regex" do
+      as = Assetify::DSL.parse "pkg 'complex', 'http://complex.tgz' do; dir 'images/', :to => 'images/complex/'; end"
+      as[0].name.should eql("two")
+      as[0].ext.should eql("png")
+      as[0].fullpath.should eql("png")
+    end
+
+
+  end
 
 end

data/spec/assetify/pkg_spec.rb

@@ -4,8 +4,10 @@ describe Pkg do
 
 
   before do
-    `mkdir /tmp/fancy` unless Dir.exists? "/tmp/fancy"
-    `cp spec/fixtures/fancy.tgz /tmp/fancy`
+    [:fancy, :complex].each do |ns|
+      `mkdir /tmp/#{ns}` unless Dir.exists? "/tmp/#{ns}"
+      `cp spec/fixtures/#{ns}.tgz /tmp/#{ns}/`
+    end
   end
 
   it "should spawn!" do
@@ -21,8 +23,19 @@ describe Pkg do
 
   it "should get file from unpack" do
     as = Pkg.new "fancy", "/tmp/fancy/fancy.tgz"
-    as.get("fancy/fancy.css").should eql("// Fancy css!\n\n#foo {\n  padding: 10px;\n}\n")
+    as.get("fancy/fancy.css").should eql("fancy/fancy.css" => "// Fancy css!\n\n#foo {\n  padding: 10px;\n}\n")
+  end
+
+  it "should read all assets within pkg" do
+    as = Pkg.new "complex", "/tmp/complex/complex.tgz"
+    as.read_from_pkg.should be_a Hash #(hash_including "complex/images/3.png"=>"Im a png image..3\n")
+  end
 
+  it "should unpack all to vendor" do
+    as = Pkg.new "complex", "/tmp/complex/complex.tgz"
+    as.unpack_to_vendor #.should be_a Hash #(hash_including "complex/images/3.png"=>"Im a png image..3\n")
+    File.exists?("public/vendor/complex/src/main.js").should be_true
+    `rm -rf public/vendor`
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 -03:00
+date: 2011-06-04 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - spec/assetify/helpers_spec.rb
 - spec/assetify/pkg_spec.rb
 - spec/assetify_spec.rb
+- spec/fixtures/complex.tgz
 - spec/fixtures/fancy.tgz
 - spec/spec_helper.rb
 has_rdoc: true
@@ -122,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2020690596737373236
+      hash: -2700940674252686388
       segments: 
       - 0
       version: "0"