ZMediumToMarkdown 1.3.9 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d6f0e842faa414ceb2a9e08eab389e56e10e3636d6d21a5853c5fb0dad17b5
-  data.tar.gz: 767d52380374c45fe7f1f698425204ca22ac88c97dc5859de1e9020e1bcbbbc3
+  metadata.gz: 71acabe26dd68541c1cc082f19d7d8a2063c6f7ec591e63015fd3129a8ed1deb
+  data.tar.gz: 49b9ae6f7b014cec7a1f46869d41d8b3f2fa6726f90bdc2a3913d8205b8f8fe4
 SHA512:
-  metadata.gz: e80de85129ca95baf8a187ef286722fe64a35e862c42a03f1dde3c092ba9a812ea897fe10a9db973187e85a7d76a754eee08dbf1e14d7a5e7b6f3c28d3b691b9
-  data.tar.gz: 36fa0ef2f103274d07c2ad12dc1c0ab8da5ac3fc51b9c34e121de9a6808c42abdc13c5eda54ad72d58887a491511b2b0219d8c85a383f26ca6e346066ccccdfc
+  metadata.gz: f0c12ceb63459b3e01d4f6df554e8305c5e086c4f02efc17fa974b5ee7059b75f5f47606c0c452ccc8e31a5f056a741d6d7d0d80a8fb4eb136b4c0fe40ca9b35
+  data.tar.gz: 06b3de0e481fdacea12e70b504a7eace9fbe5f18c8a7c15eae15554e70eb7755a67e5644e188e75fd214f0030e08fb2d8d0d6b79c5d3852e4dad029b95a3a763

data/bin/ZMediumToMarkdown

@@ -32,7 +32,7 @@ class Main
             end
 
             opts.on('-n', '--new', 'Update to latest version') do
-                if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
+                if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
                     Helper.downloadLatestVersion()
                 else
                     puts "You're using the latest version :)"
@@ -46,9 +46,11 @@ class Main
                 Helper.printNewVersionMessageIfExists()
             end
 
-            opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version') do
-                puts "Version:#{Helper.getLocalVersionFromGemspec().to_string}"
+            opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version & Output Path') do
+                puts "Version:#{Helper.getLocalVersion().to_s}"
                 puts "Output Path:#{outputFilePath.getAbsolutePath(nil)}"
+                
+                Helper.printNewVersionMessageIfExists()
             end
             
         end.parse!

data/lib/Helper.rb

@@ -11,20 +11,6 @@ require 'zip'
 
 class Helper
 
-    class Version
-        attr_accessor :major, :minor, :patch
-
-        def initialize(major, minor, patch)
-            @major = major.to_i
-            @minor = minor.to_i
-            @patch = patch.to_i
-        end
-
-        def to_string()
-            "#{major.to_s}.#{minor.to_s}.#{patch.to_s}"
-        end
-    end
-
     def self.createDirIfNotExist(dirPath)
         dirs = dirPath.split("/")
         currentDir = ""
@@ -46,42 +32,48 @@ class Helper
     end
 
     def self.downloadLatestVersion()
-        apiPath = 'https://api.github.com/repos/ZhgChgLi/ZMediumToMarkdown/releases'
-        versions = JSON.parse(Request.URL(apiPath).body).sort { |a,b| b["id"] <=> a["id"] }
-
-        version = nil
-        index = 0
-        while version == nil do
-            thisVersion = versions[index]
-            if thisVersion["prerelease"] == false
-                version = thisVersion
-                next
-            end
-            index += 1
-        end
+        rootPath = File.expand_path('../', File.dirname(__FILE__))
         
-        zipFilePath = version["zipball_url"]
-        puts "Downloading latest version from github..."
-        open('latest.zip', 'wb') do |fo|
-            fo.print open(zipFilePath).read
-        end
+        if File.file?("#{rootPath}/ZMediumToMarkdown.gemspec")
+            apiPath = 'https://api.github.com/repos/ZhgChgLi/ZMediumToMarkdown/releases'
+            versions = JSON.parse(Request.URL(apiPath).body).sort { |a,b| b["id"] <=> a["id"] }
+
+            version = nil
+            index = 0
+            while version == nil do
+                thisVersion = versions[index]
+                if thisVersion["prerelease"] == false
+                    version = thisVersion
+                    next
+                end
+                index += 1
+            end
+            
+            zipFilePath = version["zipball_url"]
+            puts "Downloading latest version from github..."
+            open('latest.zip', 'wb') do |fo|
+                fo.print open(zipFilePath).read
+            end
 
-        puts "Unzip..."
-        Zip::File.open("latest.zip") do |zipfile|
-            zipfile.each do |file|
-                fileNames = file.name.split("/")
-                fileNames.shift
-                filePath = fileNames.join("/")
-                if filePath != ''
-                    puts "Unzinp...#{filePath}"
-                    zipfile.extract(file, filePath) { true }
+            puts "Unzip..."
+            Zip::File.open("latest.zip") do |zipfile|
+                zipfile.each do |file|
+                    fileNames = file.name.split("/")
+                    fileNames.shift
+                    filePath = fileNames.join("/")
+                    if filePath != ''
+                        puts "Unzinp...#{filePath}"
+                        zipfile.extract(file, filePath) { true }
+                    end
                 end
             end
-        end
-        File.delete("latest.zip")
+            File.delete("latest.zip")
 
-        tagName = version["tag_name"]
-        puts "Update to version #{tagName} successfully!"
+            tagName = version["tag_name"]
+            puts "Update to version #{tagName} successfully!"
+        else
+            system("gem update ZMediumToMarkdown")
+        end
     end
 
     def self.createPostInfo(postInfo)
@@ -97,15 +89,15 @@ class Helper
     end
 
     def self.printNewVersionMessageIfExists() 
-        if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
+        if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
             puts "##########################################################"
             puts "#####           New Version Available!!!             #####"
-            puts "##### Please type `bin/ZMediumToMarkdown -n` to update!!##"
+            puts "##### Please type `ZMediumToMarkdown -n` to update!! #####"
             puts "##########################################################"
         end
     end
 
-    def self.getLocalVersionFromGemspec()
+    def self.getLocalVersion()
         rootPath = File.expand_path('../', File.dirname(__FILE__))
         
         result = nil
@@ -117,8 +109,7 @@ class Helper
         end
 
         if !result.nil?
-            versions = result.split(".")
-            Version.new(versions[0],versions[1],versions[2])
+            Gem::Version.new(result)
         else
             nil
         end
@@ -140,8 +131,7 @@ class Helper
         end
 
         if !tagName.nil?
-            versions = (tagName.downcase.gsub! 'v','') .split(".")
-            Version.new(versions[0],versions[1],versions[2])
+            Gem::Version.new(tagName.downcase.gsub! 'v','')
         else
             nil
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.2
 platform: ruby
 authors:
 - ZhgChgLi