vvtool 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 981351ccbf3b6a5f9d3ef72442bf39a1bd840e42
-  data.tar.gz: 83a5df6b83dff552eb741e2aeee91803d212d54d
+SHA256:
+  metadata.gz: 74ed4763ed8caa9579aeff4f6806856408bc82ab01ae397e34be317f94f0713f
+  data.tar.gz: 531a928af8d8f42a79846db6abc66abc04efd02449b7c6e35702245c451c98de
 SHA512:
-  metadata.gz: 39e1e7b7936756acaf6cb6338da61d103e36c7d802447489212141129d16285716e1de0f17c1fbee399db1bad359ed5ffca6553fad85c7c521e107f9bfa9fd6d
-  data.tar.gz: dc94ba76391e984eec238f8c68ded2800c053b5724b10b8dd31996a9888611270eb3a2b302df53bbdce4521f47a3933eada38249f64742f11b010daf7bf7059d
+  metadata.gz: 6f44f05746a501d8fb5296bdc2b63c8b3f8b81bac00fa9b032d91c0683938df389f66fb3a06c8f717de461b12ec6d2b5c9ea55bb6e3450b3025045ac53023ada
+  data.tar.gz: b0a8c34cdeb5950b15b0baaf294708ada8de017f4308ea98d6a41e6dcabe783fe6cbd7439a48be7a61f510f9f19f7c39dd685e3dd6d34bfef31fcbb97b8835c4

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+ - 1.9
+ - 2.3
+ - 2.5
+ - 2.6
+before_install: rm Gemfile.lock
+script: "rake build"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vvtool (0.1.2)
+    vvtool (0.1.4)
       listen (~> 3.0)
       rqrcode (~> 0.10.0)
       thor (~> 0.20)
@@ -33,4 +33,4 @@ DEPENDENCIES
   vvtool!
 
 BUNDLED WITH
-   1.16.3
+   1.16.4

data/README.md

@@ -1,6 +1,4 @@
-# VVTool
-
-[![Gem](https://img.shields.io/gem/v/vvtool.svg)](https://rubygems.org/gems/vvtool)
+# VVTool  [![Build Status](https://travis-ci.org/isaced/VVTool.svg?branch=master)](https://travis-ci.org/isaced/VVTool) [![Gem](https://img.shields.io/gem/v/vvtool.svg)](https://rubygems.org/gems/vvtool)
 
 这是一个加速开发 Virtual View 模版的小脚本，让你能脱离繁重的开发环境 Xcode 和 Android Studio，只需一个轻量级的文本编辑器如 VSCode/Atom/SublimeText 即可开始进入开发，并且提供热加载能力，大大加速提高开发调试效率。
 

data/lib/live_server.rb

@@ -10,6 +10,9 @@ require 'net/http'
 require 'socket'
 require 'rqrcode'
 
+require_relative 'utils.rb'
+require_relative "version_checker.rb"
+
 # 路径
 PropertiesFileName = 'templatelist.properties'
 ConfigPropertiesFileName = 'config.properties'
@@ -23,12 +26,18 @@ VVConfigPropertiesFilePath = File.join(TemplatesPath, ConfigPropertiesFileName)
 PropertiesFilePath = File.join(TemplatesPath, PropertiesFileName)
 DirFilePath = File.join(TemplatesPath, '.dir')
 
+# VV 编译器下载地址 URL
 VVCompilerDownloadURL = 'https://raw.githubusercontent.com/alibaba/virtualview_tools/bb727ac668856732f66c3845b27646c1b4124fc8/compiler-tools/TemplateWorkSpace/compiler.jar'
+# VV 默认的 config.properties 下载地址 URL
 VVConfigPropertiesDownloadURL = 'https://raw.githubusercontent.com/alibaba/virtualview_tools/bb727ac668856732f66c3845b27646c1b4124fc8/compiler-tools/TemplateWorkSpace/config.properties'
 
-LocalIP = Socket::getaddrinfo(Socket.gethostname,"echo",Socket::AF_INET)[0][3]
+# 获取本机 IP
+LocalIP = get_first_public_ipv4()
+
+# HTTP 服务端口号
 HTTPServerPort = 7788
 
+# 编译次数计数
 $buildCount = 1
 
 module VVPrepare
@@ -130,9 +139,11 @@ module VVPrepare
       end
 
       # 生成二维码
-      qrcode = RQRCode::QRCode.new("http://#{LocalIP}:#{HTTPServerPort}/#{templateName}/data.json")
-      qrcodeFilePath = File.join(aTemplatePath, "#{templateName}_QR.png")
-      qrcode.as_png(file: qrcodeFilePath)
+      if LocalIP
+        qrcode = RQRCode::QRCode.new("http://#{LocalIP}:#{HTTPServerPort}/#{templateName}/data.json")
+        qrcodeFilePath = File.join(aTemplatePath, "#{templateName}_QR.png")
+        qrcode.as_png(file: qrcodeFilePath)
+      end
     }
 
     # 生成模版目录结构 .dir（HTTP Server 读取）
@@ -216,7 +227,7 @@ def live_server_run
       http_server.start
     }
 
-    puts "Start HTTP server: http://#{LocalIP}:#{HTTPServerPort}"
+    puts "Start HTTP server: http://#{LocalIP || '127.0.0.1'}:#{HTTPServerPort}"
 
     # File Watch
     listener = Listen.to(TemplatesPath, only: [/\.xml$/, /\.json$/]) { |modified, added, removed|
@@ -247,6 +258,9 @@ def live_server_run
       exit 130
     end
 
+    # 从 RubyGems 上检查新版本
+    check_new_version
+
     sleep
 end
 

data/lib/utils.rb

@@ -0,0 +1,6 @@
+require 'socket'
+
+def get_first_public_ipv4
+  ip_info = Socket.ip_address_list.detect{|intf| intf.ipv4? and !intf.ipv4_loopback? and !intf.ipv4_multicast? and !intf.ipv4_private?}
+  ip_info.ip_address unless ip_info.nil?
+end

data/lib/version_checker.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby
+
+require 'net/http'
+require 'json'
+require_relative "vvtool/version.rb"
+
+RubyGemsLatestVersionURL = 'https://rubygems.org/api/v1/versions/vvtool/latest.json'
+
+def get_remote_version
+  begin
+    Thread.new {
+      response = Net::HTTP.get(URI(RubyGemsLatestVersionURL))
+      response = JSON.parse(response)
+      yield response['version']
+    }
+  end
+end
+
+def check_new_version
+  get_remote_version { |remoteVersion| 
+    currentVersion = VVTool::VERSION
+    if currentVersion < remoteVersion
+      puts "VVTool 发现新版本 v#{remoteVersion}（当前 v#{currentVersion}），可以通过命令 `sudo gem install vvtool` 升级"
+    end
+  }
+end

data/lib/vvtool.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/ruby
 
 require "vvtool/version"
-require "live_server.rb"
 require 'Thor'
 
+require_relative "live_server.rb"
+
 module VVTool
     class CLI < Thor
       desc "run", "启动 VirtualView 实时预览服务"

data/lib/vvtool/version.rb

@@ -1,3 +1,3 @@
 module VVTool
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvtool
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - isaced
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -96,6 +97,8 @@ files:
 - Rakefile
 - bin/vvtool
 - lib/live_server.rb
+- lib/utils.rb
+- lib/version_checker.rb
 - lib/vvtool.rb
 - lib/vvtool/version.rb
 - vvtool.gemspec
@@ -119,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: VVTool - VirtualView 工具集.