vam 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c039a01f093e65d29cdaefdb4b49959a7130a91
-  data.tar.gz: 58da85981459c562168d752cc8541207268225f0
+  metadata.gz: 880869fa3bb79af11f89e83701b11f47143bee33
+  data.tar.gz: b3a64d4dfa37e72352198ef439fcc02cc58767b4
 SHA512:
-  metadata.gz: 0d94df2d42e0ad08e710f40b98d5d3c9b1d49a55cad4e9583ca027d5083a1b4fe4022e246b17c22d65663319c1ad4bceacebdd393c10e409435fac4389851d6d
-  data.tar.gz: a3f238a649404497c7aa20d86ddfc511a4a82ce3db104042b81c3d6e053624214d97c1be4af333291ba600c565dc306f0fc6daddc05d8a9b4f62a41b05e82a4c
+  metadata.gz: 2f153acebe4885565404aba62bd57fe0a44da215125cb1717842d5d31319a1f75bb65a65c958d4d9eb0e39b703a671ac502747a9fc64b7c6d3e5f1a85adf1704
+  data.tar.gz: 13a2adda247467bc08f5ffded6cf91a1f8c93f582a34a8809fa0c9c4019028777d954801ead8e1ffb0a10d225e13687ec26c44b9584b388dfef70cec8a09e896

data/lib/vam/dsl.rb

@@ -33,8 +33,13 @@ module Vam
         options[:version] = args.first
       end
 
-      vam = Vam.new name, self, options
-      @vams << vam
+      begin
+        vam = Vam.new name, self, options
+        @vams << vam
+      rescue MissingComponentError => e
+        puts e.message.colorize(:red)
+      end
+
     end
 
 

data/lib/vam/errors.rb

@@ -0,0 +1,4 @@
+module Vam
+  class MissingComponentError < StandardError
+  end
+end

data/lib/vam/repo.rb

@@ -1,5 +1,7 @@
 require 'open-uri'
 
+require 'vam/errors'
+
 module Vam
 
   class Repo
@@ -13,11 +15,16 @@ module Vam
 
 
     def latest_version(name)
+      raise MissingComponentError, "Missing component with name [ #{name} ]" unless @vendors.has_key? name
       @vendors[name].keys.sort[0]
     end
 
 
     def files(name, version)
+      unless @vendors.has_key? name and @vendors[name].has_key? version
+        raise MissingComponentError, "Missing component with name [ #{name} ] and version [ #{version} ]"
+      end
+
       @vendors[name][version].collect do |e|
         {
             dir: File.dirname(e),
@@ -52,7 +59,11 @@ module Vam
 
         Dir.glob(File.join s, '*').each do |v|
           version = File.basename(v)
-          files = Dir.glob(File.join v, '/**/*').collect { |e| e.slice!("#{v}/"); e }
+          files = Dir.glob(File.join v, '/**/*').collect do |e|
+            next if File.directory? e
+            e.slice!("#{v}/")
+            e
+          end
           repo.add name, version, files
         end
       end

data/lib/vam/vam.rb

@@ -1,9 +1,11 @@
 require 'fileutils'
 require 'colorize'
-require 'vam/constants'
 require 'open-uri'
 require 'pp'
 
+require 'vam/constants'
+require 'vam/errors'
+
 module Vam
 
   class Vam
@@ -33,12 +35,13 @@ module Vam
 
     def install(dest)
       puts "===Install #{@name}===".colorize(:blue)
-      unless cached?
-        download
-      else
+      if cached?
         puts 'Using cache...'
+      else
+        download
       end
       copy File.join(dest, @name)
+
     end
 
 
@@ -52,7 +55,7 @@ module Vam
 
       @files.each do |file|
         dir = File.join @vroot_tmp, file[:dir]
-        FileUtils.mkdir_p dir
+        FileUtils.mkdir_p dir unless Dir.exist? dir
         df = File.join dir, file[:filename]
 
         open File.join(df), 'wb' do |s|

data/lib/vam/version.rb

@@ -1,3 +1,3 @@
 module Vam
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vam
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Xingjian Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - lib/vam/cli.rb
 - lib/vam/constants.rb
 - lib/vam/dsl.rb
+- lib/vam/errors.rb
 - lib/vam/repo.rb
 - lib/vam/server.rb
 - lib/vam/vam.rb