assetify 0.3.0 → 0.4.0

data/Gemfile

@@ -7,6 +7,6 @@ source "http://rubygems.org"
 group :development do
   gem "rspec", ">= 2.3.0"
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.6.0"
+  gem "jeweler" #, ">= 1.6.0"
   gem "webmock", ">= 0"
 end

data/Gemfile.lock

@@ -5,19 +5,19 @@ GEM
     crack (0.1.8)
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
     webmock (1.6.4)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
@@ -27,6 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  jeweler (>= 1.6.0)
+  jeweler
   rspec (>= 2.3.0)
   webmock

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-06-04}
+  s.date = %q{2011-06-30}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}
@@ -57,18 +57,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
   end
 end

data/bin/assetify

@@ -16,12 +16,15 @@ Commands:
       update         -     Outdated assets
       check          -     Prints changes
 
+Commands are matched by regex, e.g. "up -> update".
+
 Options:
 
 BANNER
 
 
   o.on('-h', "Show help") { puts o; exit }
+  o.on('-d', "Verbose (Debug)") { Opt[:debug] = true }
   o.parse!
 end
 

data/lib/assetify.rb

@@ -7,6 +7,10 @@ require "assetify/pkg"
 
 module Assetify
 
+  TSIZE = 80
+  LINE = TUI.new
+  ASSETS = [:javascripts, :stylesheets, :images]
+
   class NoJSFile < StandardError
   end
 
@@ -18,11 +22,12 @@ module Assetify
     :newname  =>  true
   }
 
-  TSIZE = 80
-  LINE = TUI.new
 
   class << self
 
+    #
+    # Jsfile stuff
+    #
     def no_jsfile!
       print "Jsfile not found, create one? [Y/n] "
       res = gets.chomp
@@ -65,6 +70,10 @@ TXT
       DSL.parse code.join(";")
     end
 
+    #
+    # Text Interface
+    #
+
     def check_param params, string
       unless string.include? params[0]
         puts "Did you mean #{string}?"

data/lib/assetify/asset.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 module Assetify
   class Asset
     include Helpers
-    attr_accessor :type, :name, :url, :ns, :pkg
+    attr_accessor :type, :name, :url, :ns, :pkg, :ver
     alias :ext :type
 
     def initialize(type, name, url, ver = nil, params={})
@@ -21,7 +21,7 @@ module Assetify
     def filename
       return @filename if @filename
       @filename = Opt[:newname] ? name : url.split("/").last
-      @filename += ".#{type}" unless @filename =~ /\.#{type}$/
+      @filename += ".#{type}" unless @filename =~ /\.\w{1,6}$/
       @filename
     end
 
@@ -45,8 +45,9 @@ module Assetify
     end
 
     def print_version
-      v = find_version(@data)
-      v ? "v#{v[0]} " : nil
+      return "" unless ver
+      ver_str = ver.size > 10 ? ver[0..10] : ver[0]
+      "v#{ver_str} "
     end
 
     def data
@@ -54,6 +55,11 @@ module Assetify
       @data ||= @pkg ? @pkg.get(url, :force).values.first : get_data(url)
     end
 
+    def ver
+      return nil unless @data
+      @ver ||= find_version(@data)
+    end
+
     def install!(force = false)
       LINE.p "-> #{name}.#{type}"
       if !force && check?

data/lib/assetify/helpers.rb

@@ -1,20 +1,46 @@
-require 'pry'
+# require 'pry'
+require 'digest/md5'
+
+class String
+  #
+  # From ptools - http://rdoc.info/gems/ptools/1.2.1/File.binary%3F
+  #
+  def binary?
+    #s = (File.read(file, File.stat(file).blksize) || "").split(//)
+    s = (self[0..4096].force_encoding("binary") || "") #.split(//)
+    ratio =  s.gsub(/\d|\w|\s|[-~\.]/,'').size / s.size.to_f
+    # if Opt[:debug]
+    #   print "Detecting #{s}"
+    #   puts "Ratio #{ratio}"
+    # end
+    ratio > 0.3
+  end
+end
 
 module Assetify
   module Helpers
-    private
 
     #
     # Detects numerical software version from text.
     #
     def find_version(txt)
       return unless txt
-      version = txt.match /(?:(\d+)\.)?(?:(\d+)\.)?(\d+)?\.?(\d+)/
+      txt.binary? ? find_version_from_bin(txt) : find_version_from_txt(txt)
+    end
+
+    private
+
+    def find_version_from_txt blob
+      version = blob.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 }
       v.empty? || 0 == v[0] ? nil : v
     end
 
+    def find_version_from_bin blob
+      Digest::MD5.hexdigest blob
+    end
+
     def download url_str, limit = 10
       raise ArgumentError, 'HTTP redirect too deep' if limit == 0
       uri = URI.parse url_str
@@ -27,7 +53,7 @@ module Assetify
       when Net::HTTPSuccess     then @data = response
       when Net::HTTPRedirection then download(redirect_url(response), limit - 1)
       else
-        p "response code: #{response.code}!"
+        puts "response code: #{response.code}!"
         response.error!
       end
     end

data/spec/assetify/asset_spec.rb

@@ -20,11 +20,14 @@ describe Asset do
     end
 
     it "should detect version" do
-    #  as.instance_variable_set :data,
-     # as.find_version.should eql("1.6")
+      as.instance_variable_set "@data", "/* foo v 1.5.6 */"
+      as.ver[0].should eql("1.5.6")
     end
 
-
+    it "should print version" do
+      as.instance_variable_set "@data", "\u001F\x8B\b\u0000\xF5\u0000"
+      as.print_version.should eql("v537c8396f74 ")
+    end
   end
 
 end

data/spec/assetify/dsl_spec.rb

@@ -2,12 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe DSL do
 
-  it "should group and use a namespace" do
+  it "should parse js nicely" do
     a = Assetify::DSL.parse("js 'foo', 'foolink'")[0]
     a.should be_an Asset
     a.fullpath.should eql("public/javascripts/foo.js")
   end
 
+  it "should parse css nicely" do
+    a = Assetify::DSL.parse("css 'foo', 'foolink'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("public/stylesheets/foo.css")
+  end
+
+  it "should parse img nicely (gif)" do
+    a = Assetify::DSL.parse("img 'foo.gif', 'foolink'")[0]
+    a.should be_an Asset
+    a.fullpath.should eql("public/images/foo.gif")
+  end
+
   it "should accept a especific location with :to" do
     Dir.should_receive(:pwd).and_return("/home/nofxx/git/assetify")
     a = Assetify::DSL.parse("rb 'foo', 'foolink', :to => 'spec/rock'")[0]
@@ -88,7 +100,7 @@ describe DSL 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")
+      as[0].fullpath.should eql("/home/nofxx/git/assetify/images/complex/two.png")
     end
 
 

data/spec/assetify/helpers_spec.rb

@@ -1,10 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Helpers do
+  BINDATA = File.read(File.join(File.dirname(__FILE__), "..", "fixtures", "complex.tgz"))
+
   include Helpers
-  it "download stuff" do
 
+  it "should detect text as not binary" do
+    "I'm not a cylon!".should_not be_binary
+    "/*** Comment nice for v1.4.5 ***/".should_not be_binary
+  end
 
+  it "should detect robot talk as binary" do
+    BINDATA.should be_binary
+    "\u001F\x8B\b\u0000\xF5\u0000".should be_binary
   end
 
   it "should find from a long version" do
@@ -20,6 +28,10 @@ describe Helpers do
       should eql(["1.6", 1, 6])
   end
 
+  it "should find version from binary" do
+    find_version(BINDATA).should eql("c29b335e572251b1b79b88bf8c2847ec")
+  end
+
   it "should rescue fine if there isn`t version" do
     find_version("/* --------------------------------------------------------------   reset.css   * Resets default browser CSS.").
       should be_nil

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 -03:00
+date: 2011-06-30 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,10 +55,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 6
         - 0
-        version: 1.6.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -123,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2700940674252686388
+      hash: -3303407953126557976
       segments: 
       - 0
       version: "0"