vam 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ef282db64db1480b5306095be7f3fcd4f97ca4
-  data.tar.gz: 990d452c9c4f3507f80e74da99adeb78ab32286e
+  metadata.gz: 856fab8c57d914c9dd15f79ba3134291baa63c28
+  data.tar.gz: b7f916bb26db8fa52b2749b1a269f995debf7038
 SHA512:
-  metadata.gz: 7b55738a72d477fd413f26d8a1051b7c53c72bf9f6d1f1a1bdbaa9f430e1ce96e8871526c221a2ef0e82d57b485be67da75d672a70b5b6e103f6cf891852d35a
-  data.tar.gz: 183aa34da9e5bbc78b1d19551b70cf0d77ca72b59df8ea866f73a76e7f88b43b90ff18d42770cb98926368280ad9ee08f8da2212247549a875f476f35ab48659
+  metadata.gz: de111f95e5add288cc2bd99b399f0b8e1300505c9cd60df20b917c31271acd62295f148f77fe123c53ddb15c33d36429764be74aae3341d89e098208e103bcca
+  data.tar.gz: 1c569fb5a9ef29fb8621c8638e79013dee2f58a8c404f4223f2d9be1d9a48174e388ebcf288567d0873a3dbfe03566fe7b3cf122ad284c20918a9975db85aa5c

data/lib/vam/cli.rb

@@ -6,12 +6,27 @@ module Vam
 
     def self.start(argv)
       Dir.mkdir VAMROOT unless File.directory? VAMROOT
-      if argv.length >0 and argv[0] == 'install'
-        install
+      if argv.length > 0
+
+        case argv[0]
+          when 'install'
+            install
+          when '-v'
+            print_version
+          else
+            print_version
+        end
+
+      elsif
+        print_version
       end
     end
 
 
+    def self.print_version
+      puts "Vam: version #{VERSION}"
+    end
+
     def self.install
       vamfile = File.join Dir.pwd, 'Vamfile'
       vams = Dsl.evaluate vamfile, vamfile+'.lock'

data/lib/vam/vam.rb

@@ -16,18 +16,28 @@ module Vam
 
       if options.include?(:version)
         @version = options[:version]
-      elsif options.include?(:github)
+      end
+
+      if options.include?(:github)
         @git = "https://github.com/#{options[:github]}.git"
-      else
+      elsif options.include?(:git)
         @git = options[:git]
       end
 
+      if options.include?(:tag)
+        @tag = options[:tag]
+      end
+
       instance_eval &block
 
     end
 
 
-    def url(url, main: false)
+    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
@@ -93,9 +103,25 @@ module Vam
 
 
     def install_url(dest, url)
-      of = File.join dest, url[:filename]
-      `wget --no-check-certificate #{url[:url]} -O #{of}`
-      patch of
+      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
 
 
@@ -108,8 +134,9 @@ module Vam
 
     def patch(of)
       unless of.end_with? '.css'
-        return
+        return of
       end
+      pof = of + '.scss'    
       content = File.read of, encoding: 'utf-8'
       cwd = Dir.getwd
       Dir.chdir File.dirname(of)
@@ -119,12 +146,13 @@ module Vam
         "asset-url('#{location}')"
       end
       Dir.chdir cwd
-      File.open of+'.scss', 'w:utf-8' do |f|
+
+      File.open pof, 'w:utf-8' do |f|
         f.write content
       end
       File.delete of
+      pof
     end
 
-
   end
 end

data/lib/vam/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vam
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Xingjian Xu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler