vvtool 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74ed4763ed8caa9579aeff4f6806856408bc82ab01ae397e34be317f94f0713f
-  data.tar.gz: 531a928af8d8f42a79846db6abc66abc04efd02449b7c6e35702245c451c98de
+  metadata.gz: 668a54ed11dccbb02442c07b01fb1f722a69c60e652c2a8ebac4a5f86ac656c3
+  data.tar.gz: 613fab98b7b3bcce11180134ef8cad3bdf54b6b1c143202fda37679f42b129eb
 SHA512:
-  metadata.gz: 6f44f05746a501d8fb5296bdc2b63c8b3f8b81bac00fa9b032d91c0683938df389f66fb3a06c8f717de461b12ec6d2b5c9ea55bb6e3450b3025045ac53023ada
-  data.tar.gz: b0a8c34cdeb5950b15b0baaf294708ada8de017f4308ea98d6a41e6dcabe783fe6cbd7439a48be7a61f510f9f19f7c39dd685e3dd6d34bfef31fcbb97b8835c4
+  metadata.gz: 170c5ee0a2d048e33cb0ab89cf757af1ba996ba19fa0d42c0bd7b3096ea4a020d8ce512edec487f7a2a973888a64b1334ba673b5651128bc7001d3b0be2f55be
+  data.tar.gz: be0181373e6a0f903989645971baf8420f0dd4f99ebea5b58b991a5ac4435299d54068a4fe39aa821f84dd2eebcbad6ebee3c860dd5746e92f088a98c90e7fea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vvtool (0.1.4)
+    vvtool (0.1.5)
       listen (~> 3.0)
       rqrcode (~> 0.10.0)
       thor (~> 0.20)
@@ -9,20 +9,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    chunky_png (1.3.10)
+    chunky_png (1.3.11)
     ffi (1.9.25)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    rake (10.4.2)
+    rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
     ruby_dep (1.5.0)
-    thor (0.20.0)
+    thor (0.20.3)
 
 PLATFORMS
   ruby
@@ -33,4 +33,4 @@ DEPENDENCIES
   vvtool!
 
 BUNDLED WITH
-   1.16.4
+   1.17.1

data/bin/vvtool

@@ -1,3 +1,2 @@
 #!/usr/bin/env ruby
-require "vvtool.rb"
-
+require "vvtool.rb"

data/lib/vvtool.rb

@@ -1,15 +1,16 @@
 #!/usr/bin/ruby
 
 require "vvtool/version"
+require "vvtool/live_server.rb"
 require 'Thor'
 
-require_relative "live_server.rb"
 
 module VVTool
+
     class CLI < Thor
       desc "run", "启动 VirtualView 实时预览服务"
       def runLiveServer
-        live_server_run
+        VVTool::live_server_run()
       end
 
       desc "about", "关于"

data/lib/{live_server.rb → vvtool/live_server.rb}

@@ -159,109 +159,115 @@ module VVPrepare
   end
 end
 
-# 第一次
-def firstBuild()
-  # 0. Clean
-  VVPrepare.clean
-
-  # 0.1 检查编译器 - 没有则下载
-  VVPrepare.checkVVCompiler
-
-  # 0.2 检查 config.properties - 没有则下载
-  VVPrepare.checkVVConfigProperties
-
-  puts 'Start build templates...'
+module VVTool
+  # 第一次
+  def firstBuild(check_dependency)
+    # 0. Clean
+    VVPrepare.clean
+
+    if check_dependency
+      # 0.1 检查编译器 - 没有则下载
+      VVPrepare.checkVVCompiler
+
+      # 0.2 检查 config.properties - 没有则下载
+      VVPrepare.checkVVConfigProperties
+    end
 
-  # 1. 拷贝出来集中所有 .xml 模版文件
-  VVPrepare.copyXML TemplatesPath
+    puts 'Start build templates...'
 
-  # 2. 生成 compiler.jar 编译所需的 templatelist.properties 文件
-  VVPrepare.generateProperties
+    # 1. 拷贝出来集中所有 .xml 模版文件
+    VVPrepare.copyXML TemplatesPath
 
-  # 3. 编译
-  VVPrepare.vvbuild
+    # 2. 生成 compiler.jar 编译所需的 templatelist.properties 文件
+    VVPrepare.generateProperties
 
-  # 4. 生成 data.json
-  VVPrepare.generateDataJSON TemplatesPath
+    # 3. 编译
+    VVPrepare.vvbuild
 
-  # 5. Clean
-  VVPrepare.clean
+    # 4. 生成 data.json
+    VVPrepare.generateDataJSON TemplatesPath
 
-  puts 'All templates build finished.'
-end
+    # 5. Clean
+    VVPrepare.clean
 
-# 单次编译
-public def singleBuild(aTemplatePath)
-  # 0. Clean
-  VVPrepare.clean
+    puts 'All templates build finished.'
+  end
 
-  # 1. 拷贝出来集中所有 .xml 模版文件
-  VVPrepare.copyXML aTemplatePath
+  # 单次编译
+  def singleBuild(aTemplatePath)
+    # 0. Clean
+    VVPrepare.clean
 
+    # 1. 拷贝出来集中所有 .xml 模版文件
+    VVPrepare.copyXML aTemplatePath
 
-  # 2. 生成 compiler.jar 编译所需的 templatelist.properties 文件
-  VVPrepare.generateProperties
 
-  # 3. 编译
-  VVPrepare.vvbuild
+    # 2. 生成 compiler.jar 编译所需的 templatelist.properties 文件
+    VVPrepare.generateProperties
 
-  # 4. 生成 data.json
-  VVPrepare.generateDataJSON aTemplatePath
+    # 3. 编译
+    VVPrepare.vvbuild
 
-  # 5. Clean
-  VVPrepare.clean
-end
+    # 4. 生成 data.json
+    VVPrepare.generateDataJSON aTemplatePath
 
-def live_server_run
-    firstBuild()
-
-    puts TemplatesPath
-    # HTTP Server
-    Thread.new {
-      http_server = WEBrick::HTTPServer.new(
-        :Port => HTTPServerPort,  
-        :DocumentRoot => TemplatesPath,
-        :Logger => WEBrick::Log.new(VVBuildLogFilePath),
-        :AccessLog => []
-        )
-      http_server.start
-    }
+    # 5. Clean
+    VVPrepare.clean
+  end
 
-    puts "Start HTTP server: http://#{LocalIP || '127.0.0.1'}:#{HTTPServerPort}"
+  def live_server_run(check_dependency = true)
+      self.firstBuild(check_dependency)
+
+      puts TemplatesPath
+      # HTTP Server
+      Thread.new {
+        http_server = WEBrick::HTTPServer.new(
+          :Port => HTTPServerPort,  
+          :DocumentRoot => TemplatesPath,
+          :Logger => WEBrick::Log.new(VVBuildLogFilePath),
+          :AccessLog => []
+          )
+        http_server.start
+      }
 
-    # File Watch
-    listener = Listen.to(TemplatesPath, only: [/\.xml$/, /\.json$/]) { |modified, added, removed|
-      (modified + added).each { |filePath|
-        thisTemplatePath = Pathname.new(filePath).dirname
-        thisTemplateName = File.basename filePath, '.*'
-        thisTemplateNameAndExt = File.basename filePath
-        next if thisTemplateNameAndExt == 'data.json'
-        puts "[#{ Time.now.strftime("%H:%M:%S") }] Update template: #{thisTemplateName} (#{thisTemplateNameAndExt})"
+      puts "Start HTTP server: http://#{LocalIP || '127.0.0.1'}:#{HTTPServerPort}"
 
-        self.singleBuild thisTemplatePath
-        VVPrepare.clean
-        $buildCount += 1
-      }
-    }.start
+      # File Watch
+      listener = Listen.to(TemplatesPath, only: [/\.xml$/, /\.json$/]) { |modified, added, removed|
+        (modified + added).each { |filePath|
+          thisTemplatePath = Pathname.new(filePath).dirname
+          thisTemplateName = File.basename filePath, '.*'
+          thisTemplateNameAndExt = File.basename filePath
+          next if thisTemplateNameAndExt == 'data.json'
+          puts "[#{ Time.now.strftime("%H:%M:%S") }] Update template: #{thisTemplateName} (#{thisTemplateNameAndExt})"
 
-    puts 'Start Watching...'
-    puts ''
+          self.singleBuild thisTemplatePath
+          VVPrepare.clean
+          $buildCount += 1
+        }
+      }.start
 
-    trap "SIGINT" do
+      puts 'Start Watching...'
       puts ''
-      puts "Bye, see you next time, build count: #{$buildCount}"
-      
-      # clean
-      FileUtils.rm_f VVBuildLogFilePath
-      FileUtils.rm_f DirFilePath
 
-      exit 130
-    end
+      trap "SIGINT" do
+        puts ''
+        puts "Bye, see you next time, build count: #{$buildCount}"
+        
+        # clean
+        FileUtils.rm_f VVBuildLogFilePath
+        FileUtils.rm_f DirFilePath
 
-    # 从 RubyGems 上检查新版本
-    check_new_version
+        exit 130
+      end
 
-    sleep
-end
+      # 从 RubyGems 上检查新版本
+      check_new_version
+
+      sleep
+  end
 
-# live_server_run
+  module_function :live_server_run
+  module_function :firstBuild
+  module_function :singleBuild
+end

data/lib/vvtool/version.rb

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

data/lib/{version_checker.rb → vvtool/version_checker.rb}

@@ -2,7 +2,7 @@
 
 require 'net/http'
 require 'json'
-require_relative "vvtool/version.rb"
+require 'vvtool/version.rb'
 
 RubyGemsLatestVersionURL = 'https://rubygems.org/api/v1/versions/vvtool/latest.json'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vvtool
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - isaced
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,11 +96,11 @@ files:
 - README.md
 - Rakefile
 - bin/vvtool
-- lib/live_server.rb
-- lib/utils.rb
-- lib/version_checker.rb
 - lib/vvtool.rb
+- lib/vvtool/live_server.rb
+- lib/vvtool/utils.rb
 - lib/vvtool/version.rb
+- lib/vvtool/version_checker.rb
 - vvtool.gemspec
 homepage: https://github.com/isaced/VVTool
 licenses: