assetify 0.1.1 → 0.2.1

data/Gemfile

@@ -9,5 +9,5 @@ group :development do
   gem "rspec", ">= 2.3.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.6.0"
-#  gem "rcov", ">= 0"
+  gem "webmock", ">= 0"
 end

data/Gemfile.lock

@@ -1,6 +1,8 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
+    crack (0.1.8)
     diff-lcs (1.1.2)
     git (1.2.5)
     jeweler (1.6.0)
@@ -16,6 +18,9 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
+    webmock (1.6.4)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
@@ -24,3 +29,4 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   jeweler (>= 1.6.0)
   rspec (>= 2.3.0)
+  webmock

data/Jsfile

@@ -0,0 +1,5 @@
+#
+# Assetify Jsfile
+#
+
+rb "colored", "https://github.com/defunkt/colored/raw/master/lib/colored.rb", :to => "lib/assetify"

data/README.md

@@ -26,7 +26,7 @@ Jsfile
 
 Just like a Gemfile, but you choose the filetype before:
 
-    type "name", "url", <version>
+    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"
@@ -62,6 +62,19 @@ This downloads and 'cherry pick' the files.
 
 
 
+Other
+-----
+
+Set a different location per file:
+
+
+    js "other", "http://lib.../other.js", :to => "different/path"
+
+Filename will be: ./different/path/other.js
+This works for namespaces too, change "to" with "ns".
+
+
+
 Options
 -------
 
@@ -72,7 +85,6 @@ Change some default settings:
     csspath "public/stylesheets"
     imgpath "public/images"
 
-
 If newname is set to true (default) the file will be renamed. Ex:
 
     js "validator", "http//.../jquery.validator.min.js"
@@ -80,6 +92,8 @@ If newname is set to true (default) the file will be renamed. Ex:
 Filename will be: "validator.js"
 
 
+
+
 Contributing
 ------------
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.1

data/assetify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assetify}
-  s.version = "0.1.1"
+  s.version = "0.2.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-15}
+  s.date = %q{2011-05-30}
   s.default_executable = %q{assetify}
   s.description = %q{Downloads/updates assets based on a Jsfile. Any framework.}
   s.email = %q{x@nofxx.com}
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
+    "Jsfile",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -29,11 +30,14 @@ Gem::Specification.new do |s|
     "bin/assetify",
     "lib/assetify.rb",
     "lib/assetify/asset.rb",
+    "lib/assetify/colored.rb",
     "lib/assetify/dsl.rb",
     "lib/assetify/helpers.rb",
     "lib/assetify/pkg.rb",
+    "lib/assetify/tui.rb",
     "spec/assetify/asset_spec.rb",
     "spec/assetify/dsl_spec.rb",
+    "spec/assetify/helpers_spec.rb",
     "spec/assetify/pkg_spec.rb",
     "spec/assetify_spec.rb",
     "spec/fixtures/fancy.tgz",
@@ -53,15 +57,18 @@ Gem::Specification.new do |s|
       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<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<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<webmock>, [">= 0"])
   end
 end
 

data/lib/assetify.rb

@@ -1,5 +1,7 @@
+require "assetify/colored"
 require "assetify/helpers"
 require "assetify/asset"
+require "assetify/tui"
 require "assetify/dsl"
 require "assetify/pkg"
 
@@ -15,6 +17,9 @@ module Assetify
     :newname  =>  true
   }
 
+  TSIZE = 80
+  LINE = TUI.new
+
   class << self
 
     def no_jsfile!
@@ -80,7 +85,7 @@ TXT
     end
 
     def bar
-      puts "-" * 50
+      puts "-" * TSIZE
     end
 
     def work!(params)

data/lib/assetify/asset.rb

@@ -11,9 +11,9 @@ module Assetify
       raise "NoName" unless name
       raise "NoURL" unless url
       @type, @name = type, name
-      @ver = ver
-      @url = @ver ? url.gsub(/{VERSION}/, @ver) : url
+      @url = (@ver = ver) ? url.gsub(/{VERSION}/, @ver) : url
       @ns = params[:ns] || ""
+      @to = params[:to] || ""
       @pkg = params[:pkg]
     end
 
@@ -25,7 +25,14 @@ module Assetify
     end
 
     def path
-      @path = File.join(Opt["#{type}path".to_sym],  @ns ? @ns.to_s : "")
+      args = if @to.empty?
+        tpath = Opt["#{type}path".to_sym]
+        raise "Don`t know where to put #{type} files..." unless tpath
+        [tpath,  @ns ? @ns.to_s : ""]
+      else
+        [Dir.pwd, @to]
+      end
+      @path = File.join(args)
     end
 
     def fullpath
@@ -36,15 +43,30 @@ module Assetify
       File.exists? fullpath
     end
 
-    def install!(force = false)
-      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
+    def print_version
+      v = find_version(@data)
+      v ? "v#{v[0]} " : nil
     end
 
+    def install!(force = false)
+      LINE.p "-> #{name}.#{type}"
+      if !force && check?
+        @data = File.read(fullpath)
+        return LINE.f "#{print_version}Installed"
+      end
+      begin
+        points = Thread.new { loop do; LINE.p "."; sleep 1; end }
+        @data ||= @pkg ? @pkg.get(url) : get_data(url)
+        write @data
+        LINE.f "#{print_version}ok"
+      rescue => e
+        LINE.f :FAIL, :red
+        p "Fail: #{e}"
+      ensure
+        points.kill
+      end
+
+    end
 
   end
 

data/lib/assetify/colored.rb

@@ -0,0 +1,91 @@
+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
+#
+#   >> "this is really bold and really blue".bold.blue
+#
+#   >> Colored.red "This is red" # but this part is mostly untested
+module Colored
+  extend self
+
+  COLORS = { 
+    'black'   => 30,
+    'red'     => 31, 
+    'green'   => 32, 
+    'yellow'  => 33,
+    'blue'    => 34,
+    'magenta' => 35,
+    'cyan'    => 36,
+    'white'   => 37
+  }
+
+  EXTRAS = {
+    'clear'     => 0, 
+    'bold'      => 1,
+    'underline' => 4,
+    'reversed'  => 7
+  }
+  
+  COLORS.each do |color, value|
+    define_method(color) do 
+      colorize(self, :foreground => color)
+    end
+
+    define_method("on_#{color}") do
+      colorize(self, :background => color)
+    end
+
+    COLORS.each do |highlight, value|
+      next if color == highlight
+      define_method("#{color}_on_#{highlight}") do
+        colorize(self, :foreground => color, :background => highlight)
+      end
+    end
+  end
+
+  EXTRAS.each do |extra, value|
+    next if extra == 'clear'
+    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
+    tmp
+  end
+
+  def colorize(string, options = {})
+    colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
+    colored << string
+    colored << extra(:clear)
+  end
+
+  def colors
+    @@colors ||= COLORS.keys.sort
+  end
+
+  def extra(extra_name)
+    extra_name = extra_name.to_s
+    "\e[#{EXTRAS[extra_name]}m" if EXTRAS[extra_name]
+  end
+
+  def color(color_name)
+    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" 
+  end
+end unless Object.const_defined? :Colored
+
+String.send(:include, Colored)

data/lib/assetify/dsl.rb

@@ -4,8 +4,10 @@ module Assetify
 
     def pkg name, url, &block
       @pkg = Pkg.new name, url
+      @ns = name
       instance_exec(&block)
-      @pkg = nil
+      @ns = nil
+      assets
     end
 
     def group name, &block
@@ -19,8 +21,12 @@ module Assetify
       @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}))
+    def method_missing method, name, uri, *params
+      params, ver = params.partition { |param| param.is_a?(Hash) }
+      opts = {:ns => @ns, :pkg => @pkg}
+      params.each { |hsh| opts.merge! hsh }
+      ver = ver[0]
+      (@assets ||= []) << Asset.new(method.to_sym, name, uri, ver, opts)
     end
 
     class << self

data/lib/assetify/helpers.rb

@@ -1,24 +1,56 @@
+require 'pry'
+
 module Assetify
   module Helpers
-
     private
 
-    def print_result(txt, varchars = name)
-      puts "[#{txt}]".rjust (47 - varchars.size)
+    #
+    # Detects numerical software version from text.
+    #
+    def find_version(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 }
+      v.empty? || 0 == v[0] ? nil : v
     end
 
-    def download
-      uri = URI.parse url
-      Net::HTTP.start(uri.host) do |http|
-        @data = http.get(uri.path)
+    def download url_str, limit = 10
+      raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+      uri = URI.parse url_str
+      # # response = ""
+      http = Net::HTTP.start(uri.host, :use_ssl => url_str =~ /https/)# do |http|
+      response = http.get(uri.path.empty? ? "/" : uri.path)
+      # # end
+      # response = Net::HTTP.get_response(URI.parse(url_str) )# ,:use_ssl => url_str =~ /https/ )
+      case response
+      when Net::HTTPSuccess     then @data = response
+      when Net::HTTPRedirection then download(redirect_url(response), limit - 1)
+      else
+        p "response code: #{response.code}!"
+        response.error!
       end
     end
 
-    def write
+    def get_data(str)
+      @data = if str =~ /http/
+        download(str).body
+      else
+        File.open(str)
+      end
+    end
+
+    def write(binary)
       FileUtils.mkdir_p path unless Dir.exists? path
-      File.open(fullpath, "w") { |f| f.puts(@data) }
+      File.open(fullpath, "w") { |f| f.puts(binary) }
     end
 
+    def redirect_url response
+      if response['location'].nil?
+        response.body.match(/<a href=\"([^>]+)\">/i)[1]
+      else
+        response['location']
+      end
+    end
 
   end
 end

data/lib/assetify/pkg.rb

@@ -11,7 +11,7 @@ module Assetify
     def initialize(name, url)
       @name = name
       @pkgname = url.split("/").last
-      @url = URI.parse(url)
+      @url = url
     end
 
     def path
@@ -23,6 +23,7 @@ module Assetify
     end
 
     def get(file)
+      get_data(url) unless File.exists? File.join(PATH, @pkgname)
       data = nil
       Archive.read_open_filename(fullpath) do |ar|
         while entry = ar.next_header
@@ -35,11 +36,6 @@ module Assetify
       data
     end
 
-    def ensure
-      download unless File.exists? File.join(PATH, @pkgname)
-      unpack
-    end
-
   end
 
 end

data/lib/assetify/tui.rb

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

data/spec/assetify/asset_spec.rb

@@ -19,7 +19,12 @@ describe Asset do
       as.fullpath.should eql("public/javascripts/sweet.js")
     end
 
-  end
+    it "should detect version" do
+    #  as.instance_variable_set :data,
+     # as.find_version.should eql("1.6")
+    end
 
 
+  end
+
 end

data/spec/assetify/dsl_spec.rb

@@ -8,6 +8,13 @@ describe DSL do
     a.fullpath.should eql("public/javascripts/foo.js")
   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]
+    a.should be_an Asset
+    a.fullpath.should eql("/home/nofxx/git/assetify/spec/rock/foo.rb")
+  end
+
 
   describe "Group Assets" do
 
@@ -36,7 +43,13 @@ describe DSL 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")
+      a[0].fullpath.should eql("public/javascripts/fancy/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
 
   end

data/spec/assetify/helpers_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Helpers do
+  include Helpers
+  it "download stuff" do
+
+
+  end
+
+  it "should find from a long version" do
+    find_version("frips 1.5.7.786").should eql(["1.5.7.786", 1, 5, 7, 786])
+  end
+
+  it "should find version from text" do
+    find_version("Foo v 1.5.6").should eql(["1.5.6", 1, 5, 6])
+  end
+
+  it "should find version from text" do
+    find_version("/*!\n * jQuery JavaScript Library v1.6\n * http://jquery.com/\n *\n * Copyright 2011, John Resig\n * Date: Mon May 2 13:50:00 2011 -0400").
+      should eql(["1.6", 1, 6])
+  end
+
+  it "should rescue fine if there isn`t version" do
+    find_version("/* --------------------------------------------------------------   reset.css   * Resets default browser CSS.").
+      should be_nil
+  end
+
+end

data/spec/assetify/pkg_spec.rb

@@ -2,8 +2,15 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Pkg do
 
+
+  before do
+    `mkdir /tmp/fancy` unless Dir.exists? "/tmp/fancy"
+    `cp spec/fixtures/fancy.tgz /tmp/fancy`
+  end
+
   it "should spawn!" do
-    as = Pkg.new "cool", "http://cool.js"
+    stub_request(:get, "http://cool.js/fancy.tgz").to_return(:body => "Hi")
+    as = Pkg.new "cool", "http://cool.js/fancy.tgz"
     as.should be_instance_of Pkg
   end
 
@@ -13,9 +20,7 @@ describe Pkg do
   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 = Pkg.new "fancy", "/tmp/fancy/fancy.tgz"
     as.get("fancy/fancy.css").should eql("// Fancy css!\n\n#foo {\n  padding: 10px;\n}\n")
 
   end

data/spec/spec_helper.rb

@@ -1,8 +1,12 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+require 'webmock/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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 1
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 -03:00
+date: 2011-05-30 00:00:00 -03:00
 default_executable: assetify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,19 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: Downloads/updates assets based on a Jsfile. Any framework.
 email: x@nofxx.com
 executables: 
@@ -75,6 +88,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
+- Jsfile
 - README.md
 - Rakefile
 - VERSION
@@ -82,11 +96,14 @@ files:
 - bin/assetify
 - lib/assetify.rb
 - lib/assetify/asset.rb
+- lib/assetify/colored.rb
 - lib/assetify/dsl.rb
 - lib/assetify/helpers.rb
 - lib/assetify/pkg.rb
+- lib/assetify/tui.rb
 - spec/assetify/asset_spec.rb
 - spec/assetify/dsl_spec.rb
+- spec/assetify/helpers_spec.rb
 - spec/assetify/pkg_spec.rb
 - spec/assetify_spec.rb
 - spec/fixtures/fancy.tgz
@@ -105,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4081184387591617148
+      hash: 119346050710265348
       segments: 
       - 0
       version: "0"