assetify 0.0.2 → 0.1.1

data/README.md

@@ -22,7 +22,7 @@ This will create a Jsfile if not found.
 
 
 Jsfile
-------
+======
 
 Just like a Gemfile, but you choose the filetype before:
 
@@ -33,12 +33,44 @@ Just like a Gemfile, but you choose the filetype before:
 
 Now just run assetify to make sure everything is installed/up-to-date.
 
-Options:
 
-    newname true || false
-    jspath "new/path"
-    csspath "new/path"
-    imgpath "new/path"
+Groups
+------
+
+When using some compressor/minimizer (Jammit/Smurf...) namespaces come
+in handy:
+
+    group "forms" do
+      js "validator", "link"
+    end
+
+
+This will install as "public/javascripts/forms/validator.js"
+
+
+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"
+    end
+
+This downloads and 'cherry pick' the files.
+
+
+
+Options
+-------
+
+Change some default settings:
+
+    newname  true || false
+    jspath  "public/javascripts"
+    csspath "public/stylesheets"
+    imgpath "public/images"
 
 
 If newname is set to true (default) the file will be renamed. Ex:

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.1

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.0.2"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-05-12}
+  s.date = %q{2011-05-15}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}
@@ -30,7 +30,13 @@ Gem::Specification.new do |s|
     "lib/assetify.rb",
     "lib/assetify/asset.rb",
     "lib/assetify/dsl.rb",
+    "lib/assetify/helpers.rb",
+    "lib/assetify/pkg.rb",
+    "spec/assetify/asset_spec.rb",
+    "spec/assetify/dsl_spec.rb",
+    "spec/assetify/pkg_spec.rb",
     "spec/assetify_spec.rb",
+    "spec/fixtures/fancy.tgz",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/nofxx/assetify}

data/bin/assetify

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #require 'rubygems'
-# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'optparse'
 require 'assetify'
 

data/lib/assetify.rb

@@ -1,5 +1,7 @@
+require "assetify/helpers"
 require "assetify/asset"
 require "assetify/dsl"
+require "assetify/pkg"
 
 module Assetify
 
@@ -21,10 +23,21 @@ module Assetify
       unless res =~ /n|N/
         File.open("Jsfile", "w+") do |f|
           f.print <<TXT
-a :foox, "http://foox.com"
+#
+# #{Dir.pwd.split('/').last.capitalize} Jsfile
+#
+
+js  :jquery, "http://jquery.com"
+css :reset,  "http://prefered/rset/url"
+
+group :forms do
+  js :validator, "http://..."
+end
+
 TXT
         end
         puts "Jsfile created!"
+        exit 0
       end
     end
 
@@ -34,15 +47,16 @@ TXT
 
     def read_jsfile
       file = File.open("Jsfile") # ruby 1.8/1.9 (ugly) fix
-      file.send(file.respond_to?(:lines) ? :lines : :readlines).map do |line|
+      code = file.send(file.respond_to?(:lines) ? :lines : :readlines).map do |line|
         next if line =~ /^\w*\#|^#/
         if line =~ /^\w{2,3}path/
           key, val = line.split(" ")
           Opt[key.to_sym] = val
           next
         end
-        DSL.instance_eval(line)
+        line
       end.reject(&:nil?)
+      DSL.parse code.join(";")
     end
 
     def check_param params, string
@@ -65,10 +79,19 @@ TXT
       end
     end
 
+    def bar
+      puts "-" * 50
+    end
+
     def work!(params)
+      start = Time.now
+      puts "Assetify"
+      bar
       find_jsfile
       @assets = read_jsfile
       work_on params
+      bar
+      puts "Done in #{Time.now - start}s"
     end
 
 

data/lib/assetify/asset.rb

@@ -1,8 +1,10 @@
 require 'net/http'
+require 'fileutils'
 
 module Assetify
   class Asset
-    attr_accessor :type, :name, :url
+    include Helpers
+    attr_accessor :type, :name, :url, :ns
 
     def initialize(type, name, url, ver = nil, params={})
       raise "NoType" unless type
@@ -11,18 +13,23 @@ module Assetify
       @type, @name = type, name
       @ver = ver
       @url = @ver ? url.gsub(/{VERSION}/, @ver) : url
-      @new_name = params[:name]
-      @version  = params[:version]
+      @ns = params[:ns] || ""
+      @pkg = params[:pkg]
     end
 
     def filename
-      fname = Opt[:newname] ? name : url.split("/").last
-      fname += ".#{type}" unless fname =~ /\.#{type}$/
+      return @filename if @filename
+      @filename = Opt[:newname] ? name : url.split("/").last
+      @filename += ".#{type}" unless @filename =~ /\.#{type}$/
+      @filename
+    end
+
+    def path
+      @path = File.join(Opt["#{type}path".to_sym],  @ns ? @ns.to_s : "")
     end
 
     def fullpath
-      path = Opt["#{type}path".to_sym]
-      File.join(path, filename) #Dir.pwd,
+      @fullpath ||= File.join(path, filename)
     end
 
     def check?
@@ -30,21 +37,15 @@ module Assetify
     end
 
     def install!(force = false)
-      print "Installing #{name}..."
-      return puts "Installed" if !force && check?
-      unless @data
-        uri = URI.parse url
-        Net::HTTP.start(uri.host) do |http|
-          @data = http.get(uri.path)
-        end
-      end
-      #puts "Writing to #{fullpath}"
-      File.open(fullpath, "w") { |f| f.puts(@data) }
-      puts "DONE"
+      print "-> #{name}"
+      # points = Thread.new { loop do; print "."; sleep 1; end }
+      return print_result "Installed" if !force && check?
+      @data ||= @pkg ? @pkg.get(url) : download
+      write
+      print_result :ok
     end
 
-  end
-
 
+  end
 
 end

data/lib/assetify/dsl.rb

@@ -1,22 +1,36 @@
 module Assetify
 
-
   class DSL
 
+    def pkg name, url, &block
+      @pkg = Pkg.new name, url
+      instance_exec(&block)
+      @pkg = nil
+    end
+
+    def group name, &block
+      @ns = name
+      instance_exec(&block)
+      @ns = nil
+      assets
+    end
+
+    def assets
+      @assets
+    end
+
+    def method_missing method, name, uri, ver=nil, params={}
+      (@assets ||= []) << Asset.new(method.to_sym, name, uri, ver, params.merge({ :ns => @ns, :pkg => @pkg}))
+    end
+
     class << self
-      def group name, &block
-        ns = name
-        def st.method_missing method, name, url
-          Asset.new method.to_sym, ns + name, url
-        end
-        st.instance_exec(&block)
-      end
 
-      def method_missing(method, name, url, ver=nil, params={})
-        Asset.new method.to_sym, name, url, ver
+      def parse io
+        new.instance_eval(io) #.assets
       end
+
     end
-  end
 
+  end
 
 end

data/lib/assetify/helpers.rb

@@ -0,0 +1,24 @@
+module Assetify
+  module Helpers
+
+    private
+
+    def print_result(txt, varchars = name)
+      puts "[#{txt}]".rjust (47 - varchars.size)
+    end
+
+    def download
+      uri = URI.parse url
+      Net::HTTP.start(uri.host) do |http|
+        @data = http.get(uri.path)
+      end
+    end
+
+    def write
+      FileUtils.mkdir_p path unless Dir.exists? path
+      File.open(fullpath, "w") { |f| f.puts(@data) }
+    end
+
+
+  end
+end

data/lib/assetify/pkg.rb

@@ -0,0 +1,45 @@
+require 'libarchive'
+
+module Assetify
+
+  class Pkg
+    include Helpers
+    attr_accessor :name, :url
+
+    PATH = "/tmp/"
+
+    def initialize(name, url)
+      @name = name
+      @pkgname = url.split("/").last
+      @url = URI.parse(url)
+    end
+
+    def path
+      File.join(PATH, name)
+    end
+
+    def fullpath
+      File.join(path, @pkgname)
+    end
+
+    def get(file)
+      data = nil
+      Archive.read_open_filename(fullpath) do |ar|
+        while entry = ar.next_header
+          if entry.pathname =~ /#{file}/
+            data = ar.read_data
+            return data
+          end
+        end
+      end
+      data
+    end
+
+    def ensure
+      download unless File.exists? File.join(PATH, @pkgname)
+      unpack
+    end
+
+  end
+
+end

data/spec/assetify/asset_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Asset do
+
+  it "should spawn!" do
+    as = Asset.new :js, "cool", "http://cool.js"
+    as.should be_instance_of Asset
+  end
+
+  describe "Instantiated" do
+
+    let (:as) { Asset.new :js, "sweet", "http://candy.js" }
+
+    it "should have filename" do
+      as.filename.should eql("sweet.js")
+    end
+
+    it "should have fullpath" do
+      as.fullpath.should eql("public/javascripts/sweet.js")
+    end
+
+  end
+
+
+end

data/spec/assetify/dsl_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DSL do
+
+  it "should group and use a namespace" do
+    a = Assetify::DSL.parse("js 'foo', 'foolink'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("public/javascripts/foo.js")
+  end
+
+
+  describe "Group Assets" do
+
+    it "should group and use a namespace" do
+      a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; end"
+      a[0].should be_an Asset
+      a[0].fullpath.should eql("public/javascripts/common/foo.js")
+    end
+
+    it "should group and use a namespace 2" do
+      a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; js 'rock', 'rocklink'; end"
+      a[0].should be_an Asset
+      a[0].fullpath.should eql("public/javascripts/common/foo.js")
+    end
+
+    it "should go back to root" do
+      a = Assetify::DSL.parse "group 'common' do; js 'foo', 'foolink'; end; js 'rock', 'rocklink'"
+      a[1].should be_an Asset
+      a[1].fullpath.should eql("public/javascripts/rock.js")
+    end
+
+  end
+
+  describe "Pkg Assets" do
+
+    it "should group and use a namespace" 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/common/foo.js")
+    end
+
+  end
+
+
+end

data/spec/assetify/pkg_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Pkg do
+
+  it "should spawn!" do
+    as = Pkg.new "cool", "http://cool.js"
+    as.should be_instance_of Pkg
+  end
+
+  it "should spawn!" do
+    as = Pkg.new "cool", "http://cool.js"
+    as.should be_instance_of Pkg
+  end
+
+  it "should get file from unpack" do
+    `mkdir /tmp/fancy` unless Dir.exists? "/tmp/fancy"
+    `cp spec/fixtures/fancy.tgz /tmp/fancy`
+    as = Pkg.new "fancy", "http://fancy.tgz"
+    as.get("fancy/fancy.css").should eql("// Fancy css!\n\n#foo {\n  padding: 10px;\n}\n")
+
+  end
+
+end

data/spec/assetify_spec.rb

@@ -1,11 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Assetify do
-  include Assetify
-
-  def mock_jsfile(d = 'js "cool", "http://cool.js/down"')
-    File.should_receive(:open).once.with("Jsfile").and_return(d)
-  end
 
   it "shoud read_jsfile" do
     mock_jsfile
@@ -14,7 +9,7 @@ describe Assetify do
 
   it "should skip comments" do
     mock_jsfile("#\n# Oi\n#\n")
-    Assetify.read_jsfile.should be_empty
+    Assetify.read_jsfile.should be_nil
   end
 
   it "should work with versions url" do

data/spec/spec_helper.rb

@@ -2,11 +2,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'assetify'
+include Assetify
+def mock_jsfile(d = 'js "cool", "http://cool.js/down"')
+  File.should_receive(:open).once.with("Jsfile").and_return(d)
+end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 2
-  version: 0.0.2
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -03:00
+date: 2011-05-15 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,13 @@ files:
 - lib/assetify.rb
 - lib/assetify/asset.rb
 - lib/assetify/dsl.rb
+- lib/assetify/helpers.rb
+- lib/assetify/pkg.rb
+- spec/assetify/asset_spec.rb
+- spec/assetify/dsl_spec.rb
+- spec/assetify/pkg_spec.rb
 - spec/assetify_spec.rb
+- spec/fixtures/fancy.tgz
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/assetify
@@ -99,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2822937878022070943
+      hash: -4081184387591617148
       segments: 
       - 0
       version: "0"