vam 0.0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 856fab8c57d914c9dd15f79ba3134291baa63c28
-  data.tar.gz: b7f916bb26db8fa52b2749b1a269f995debf7038
+  metadata.gz: 21438f192cfe610da5318d736124dc28125a8cdc
+  data.tar.gz: e3eedbc8b35fbe958b9aba9bd36e79752078734f
 SHA512:
-  metadata.gz: de111f95e5add288cc2bd99b399f0b8e1300505c9cd60df20b917c31271acd62295f148f77fe123c53ddb15c33d36429764be74aae3341d89e098208e103bcca
-  data.tar.gz: 1c569fb5a9ef29fb8621c8638e79013dee2f58a8c404f4223f2d9be1d9a48174e388ebcf288567d0873a3dbfe03566fe7b3cf122ad284c20918a9975db85aa5c
+  metadata.gz: 6698abfbcd07645db688a3bba203bea2b93586960889d11e64b067f89b8d517a6b1fda94b796bc2de2a5710361fb86c0b6779f993dcb4ea428a06a0f04f78453
+  data.tar.gz: 4e9329ebbf350d8b81a7075cb5e001ea424167353852d31fb9b81d45d469719fffb6676e54140014e2b05de382be97fa3f8b1ed192eb96c218f88db119347a45

data/README.md

@@ -1,6 +1,6 @@
 # Vam
 
-TODO: Write a gem description
+Vendor Assets Manager
 
 ## Installation
 

data/bin/vam

@@ -3,7 +3,3 @@
 require 'vam'
 
 Vam::CLI.start(ARGV)
-
-
-
-

data/lib/vam/cli.rb

@@ -1,5 +1,7 @@
 require 'vam/constants'
 require 'vam/dsl'
+require 'vam/repo'
+require 'vam/server'
 
 module Vam
   class CLI
@@ -11,6 +13,8 @@ module Vam
         case argv[0]
           when 'install'
             install
+          when 'scan'
+            scan
           when '-v'
             print_version
           else
@@ -29,9 +33,9 @@ module Vam
 
     def self.install
       vamfile = File.join Dir.pwd, 'Vamfile'
-      vams = Dsl.evaluate vamfile, vamfile+'.lock'
+      dsl = Dsl.evaluate vamfile
 
-      for vam in vams
+      dsl.vams.each do |vam|
         dest = File.join Dir.pwd, 'vendor', 'assets', 'components'
         vam.install dest
       end
@@ -39,5 +43,10 @@ module Vam
     end
 
 
+    def self.scan
+      dir = Dir.getwd
+      Repo.scan dir
+    end
+
   end
 end

data/lib/vam/dsl.rb

@@ -1,14 +1,17 @@
 require 'vam/vam'
 
+require 'jimson'
+
+
 module Vam
   class Dsl
 
-    attr_reader :vams
+    attr_reader :vams, :repo
 
-    def self.evaluate(vamfile, lockfile)
+    def self.evaluate(vamfile)
       dsl = new()
       dsl.eval_vamfile(vamfile)
-      return dsl.vams
+      return dsl
     end
 
 
@@ -23,16 +26,22 @@ module Vam
     end
 
 
-    def vam(name, *args, &block)
+    def vam(name, *args)
       options = args.last.is_a?(Hash) ? args.last.dup : {}
 
       if args.first.is_a?(String)
         options[:version] = args.first
       end
 
-      vam = Vam.new name, options, &block
+      vam = Vam.new name, self, options
       @vams << vam
     end
 
+
+    def source(url)
+      @source = url
+      @repo = Repo.load url
+    end
+
   end
 end

data/lib/vam/repo.rb

@@ -0,0 +1,77 @@
+require 'open-uri'
+
+module Vam
+
+  class Repo
+
+    attr_accessor :repo_url
+
+    def initialize
+      @repo_url = ''
+      @vendors = {}
+    end
+
+
+    def latest_version(name)
+      @vendors[name].keys.sort[0]
+    end
+
+
+    def files(name, version)
+      @vendors[name][version].collect do |e|
+        {
+            dir: File.dirname(e),
+            filename: File.basename(e),
+            url: File.join(repo_url, name, version, e)
+        }
+      end
+    end
+
+
+    def add(name, version, rpath)
+      unless @vendors.include? name
+        @vendors[name] = {}
+      end
+
+      unless @vendors[name].include? version
+        @vendors[name][version] = []
+      end
+
+      if rpath.is_a? Array
+        @vendors[name][version] = rpath
+      else
+        @vendors[name][version] << rpath
+      end
+    end
+
+
+    def self.scan(dir)
+      repo = Repo.new
+      Dir.glob(File.join dir, '*').each do |s|
+        name = File.basename(s)
+
+        Dir.glob(File.join s, '*').each do |v|
+          version = File.basename(v)
+          files = Dir.glob(File.join v, '/**/*').collect { |e| e.slice!("#{v}/"); e }
+          repo.add name, version, files
+        end
+      end
+
+      Repo.dump dir, repo
+    end
+
+
+    def self.load(repo_url)
+      repo = Marshal.load open(File.join(repo_url, 'repo'))
+      repo.repo_url = repo_url
+      repo
+    end
+
+
+    def self.dump(dir, repo)
+      File.open(File.join(dir, 'repo'), 'w') {|f| f.write(Marshal.dump repo)}
+    end
+
+  end
+
+end

data/lib/vam/server.rb

@@ -0,0 +1,29 @@
+require 'jimson'
+
+module Vam
+
+  class VamServer
+
+    class Handler
+      extend Jimson::Handler
+      def sum(a,b)
+        a + b
+      end
+    end
+
+
+    def initialize(host, port)
+      @host = host
+      @port = port
+    end
+
+
+    def start
+      server = Jimson::Server.new(Handler.new, host: @host, port: @port, server: 'thin')
+      server.start
+    end
+
+
+  end
+
+end

data/lib/vam/vam.rb

@@ -1,158 +1,79 @@
 require 'fileutils'
 require 'colorize'
 require 'vam/constants'
+require 'open-uri'
+require 'pp'
 
 module Vam
 
   class Vam
 
-    def initialize(name, options, &block)
-      @name = name
+    SNAPSHOT = 'SNAPSHOT'
 
-      @tmproot = "#{VAMROOT}/#{@name}"
+    def initialize(name, dsl, options)
+      @name = name
+      @dsl = dsl
 
       @urls = []
-      @locals = []
 
       if options.include?(:version)
         @version = options[:version]
+      else
+        @version = @dsl.repo.latest_version @name
       end
 
-      if options.include?(:github)
-        @git = "https://github.com/#{options[:github]}.git"
-      elsif options.include?(:git)
-        @git = options[:git]
-      end
-
-      if options.include?(:tag)
-        @tag = options[:tag]
-      end
-
-      instance_eval &block
-
-    end
-
-
-    def url(url, main: true)
-      unless ['.css', '.js'].include? File.extname(url)
-        main = false
-      end
-
-      filename = main ? 'index'+File.extname(url) : File.basename(url)
-      @urls << {url: url, filename: filename}
-    end
+      @files = @dsl.repo.files @name, @version
 
+      tmproot = "#{VAMROOT}/#{@name}"
+      @vroot = File.join tmproot, @version
+      @vroot_tmp = File.join tmproot, ".tmp-#{@version}"
 
-    def local(local, main: false)
-      filename = main ? 'index'+File.extname(local) : File.basename(local)
-      @locals << {local: local, filename: filename}
     end
 
 
     def install(dest)
       puts "===Install #{@name}===".colorize(:blue)
-
-      @dest = dest
-      puts @dest
-
-      dest = File.join dest, @name
-      FileUtils.mkdir_p dest unless File.exist? dest
-
-      if @git
-        clone_git @git
-
-        for local in @locals
-          install_local dest, local, @tmproot
-        end
-
-      end
-
-      for url in @urls
-        install_url dest, url
-      end
-
-      @dest = nil
-
-    end
-
-
-    def install_local(dest, local, root)
-      local_path = File.join root, local[:local]
-
-      if File.directory? local_path
-        for f in Dir.glob File.join(local_path, '*')
-          FileUtils.cp_r f, dest
-        end
-        patch_dir dest
+      if cached?
+        download
       else
-        of = File.join dest, local[:filename]
-        FileUtils.cp local_path, of
-        patch of
+        puts 'Using cache...'
       end
+      copy File.join(dest, @name)
     end
 
 
-    def clone_git(git)
-      if File.directory? @tmproot
-        `cd #{@tmproot};git pull`
-      else
-        `git clone --depth=1 #{git} #{@tmproot}`
-      end
-
+    def cached?
+      File.directory? @vroot
     end
 
 
-    def install_url(dest, url)
-      unless @version
-        d = File.join @tmproot, '_default_'
-        FileUtils.mkdir_p d
-        of = File.join d, url[:filename]
-        `rm #{of}`
-      else
-        d = File.join @tmproot, @version
-        FileUtils.mkdir_p d
-        of = File.join d, url[:filename]
-      end
-      
-      df = File.join dest, url[:filename]
-
-      unless File.exist? of
-        `wget --no-check-certificate #{url[:url]} -O #{of}`
-        of = patch of
-      end
-
-      FileUtils.cp of, df
-    end
+    def download
+      FileUtils.mkdir_p @vroot_tmp
 
+      @files.each do |file|
+        dir = File.join @vroot_tmp, file[:dir]
+        FileUtils.mkdir_p dir
+        df = File.join dir, file[:filename]
 
-    def patch_dir(dir)
-      for of in Dir.glob("#{dir}/**/*.css")
-        patch of
+        open File.join(df), 'wb' do |s|
+          puts "Download #{file[:url]}"
+          s << open(file[:url]).read
+        end
       end
+
+      FileUtils.move @vroot_tmp, @vroot
     end
 
 
-    def patch(of)
-      unless of.end_with? '.css'
-        return of
-      end
-      pof = of + '.scss'    
-      content = File.read of, encoding: 'utf-8'
-      cwd = Dir.getwd
-      Dir.chdir File.dirname(of)
-      content = content.gsub /url\('?([\w|\.|\/|#|\?]+)'?\)/ do |m|
-        location = File.expand_path $1
-        location = location[@dest.length+1..-1]
-        "asset-url('#{location}')"
+    def copy(dest)
+      if Dir.exist? dest
+        FileUtils.rm_r dest
+        FileUtils.mkdir_p dest
       end
-      Dir.chdir cwd
 
-      File.open pof, 'w:utf-8' do |f|
-        f.write content
-      end
-      File.delete of
-      pof
+      FileUtils.cp_r "#{@vroot}/.", dest
     end
 
+
   end
 end

data/lib/vam/version.rb

@@ -1,3 +1,3 @@
 module Vam
-  VERSION = "0.0.4"
+  VERSION = '1.0.0'
 end

data/vam.gemspec

@@ -4,19 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vam/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vam"
+  spec.name          = 'vam'
   spec.version       = Vam::VERSION
   spec.authors       = ['Xingjian Xu']
   spec.email         = ['dotswing@gmail.com']
   spec.summary       = %q{Vendor assets managment}
   spec.description   = %q{Vendor assets managment tool}
-  spec.homepage      = "http://github.com/dotswing/vam"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/dotswing/vam'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vam
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Xingjian Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,8 @@ files:
 - lib/vam/cli.rb
 - lib/vam/constants.rb
 - lib/vam/dsl.rb
+- lib/vam/repo.rb
+- lib/vam/server.rb
 - lib/vam/vam.rb
 - lib/vam/version.rb
 - vam.gemspec