ZMediumToMarkdown 1.3.8 → 1.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/bin/ZMediumToMarkdown +5 -3
  3. data/lib/Helper.rb +41 -51
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '047916f49250b0e48700908c765903cb45c934a2b6f8907fbdaf0adc6e07b597'
4
- data.tar.gz: 7e7ba6e03af72831bd3707ffe9e2d54ef94115ba55993e1647fa8e0b8727ae09
3
+ metadata.gz: 34291a687f27e5574c6b62f7cedce434d3d47c4c3733ae1ac4e9828e2d2752a3
4
+ data.tar.gz: 7bb3d0c05ec07545063254cc5cabadc14ba9ef8792c0f35ccfab9b9f0d953e12
5
5
  SHA512:
6
- metadata.gz: cf1721121992e4de3bc8659baf19d56b4c9ecbcfadc53d141a8733b4b14e6986dd083ab246adbe77c0852493631fa5547be8b5d6d9084cf82fe1c4aa3e151b9f
7
- data.tar.gz: 61c54cbde7f3d3b383df1f1038580f7fb8b824677bc809320e115a5df4fa2cf2cd498e204dca21e7afa29f0a0ad713bf4d1ea61403bacd31a1787b8cec9dff24
6
+ metadata.gz: 899bfab86c7ed2b1000a609dda46b718774d09422d85ef03b4273a300c0624d724d878b0e25702dc043e0761ccaefdb1c8c34c5531f2d7e6fe58ccb73abb1b8e
7
+ data.tar.gz: 54ffaf7cc0e7f7bd078b929bac128096c92b1e6fc9d25e3ae1c980db962ce9729966d614a2d2cbd7c013b8f7b9d947522f5b7a48bbdf83eb7429da66463046e9
@@ -13,7 +13,7 @@ class Main
13
13
  fetcher = ZMediumFetcher.new
14
14
  ARGV << '-h' if ARGV.empty?
15
15
 
16
- filePath = Dir.getwd
16
+ filePath = ENV['PWD'] || ::Dir.pwd
17
17
  outputFilePath = PathPolicy.new(filePath, "Output")
18
18
 
19
19
  OptionParser.new do |opts|
@@ -32,7 +32,7 @@ class Main
32
32
  end
33
33
 
34
34
  opts.on('-n', '--new', 'Update to latest version') do
35
- if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
35
+ if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
36
36
  Helper.downloadLatestVersion()
37
37
  else
38
38
  puts "You're using the latest version :)"
@@ -47,8 +47,10 @@ class Main
47
47
  end
48
48
 
49
49
  opts.on('-v', '--version', 'Print current ZMediumToMarkdown Version') do
50
- puts "Version:#{Helper.getLocalVersionFromGemspec().to_string}"
50
+ puts "Version:#{Helper.getLocalVersion().to_s}"
51
51
  puts "Output Path:#{outputFilePath.getAbsolutePath(nil)}"
52
+
53
+ Helper.printNewVersionMessageIfExists()
52
54
  end
53
55
 
54
56
  end.parse!
data/lib/Helper.rb CHANGED
@@ -11,20 +11,6 @@ require 'zip'
11
11
 
12
12
  class Helper
13
13
 
14
- class Version
15
- attr_accessor :major, :minor, :patch
16
-
17
- def initialize(major, minor, patch)
18
- @major = major.to_i
19
- @minor = minor.to_i
20
- @patch = patch.to_i
21
- end
22
-
23
- def to_string()
24
- "#{major.to_s}.#{minor.to_s}.#{patch.to_s}"
25
- end
26
- end
27
-
28
14
  def self.createDirIfNotExist(dirPath)
29
15
  dirs = dirPath.split("/")
30
16
  currentDir = ""
@@ -46,42 +32,48 @@ class Helper
46
32
  end
47
33
 
48
34
  def self.downloadLatestVersion()
49
- apiPath = 'https://api.github.com/repos/ZhgChgLi/ZMediumToMarkdown/releases'
50
- versions = JSON.parse(Request.URL(apiPath).body).sort { |a,b| b["id"] <=> a["id"] }
51
-
52
- version = nil
53
- index = 0
54
- while version == nil do
55
- thisVersion = versions[index]
56
- if thisVersion["prerelease"] == false
57
- version = thisVersion
58
- next
59
- end
60
- index += 1
61
- end
35
+ rootPath = File.expand_path('../', File.dirname(__FILE__))
62
36
 
63
- zipFilePath = version["zipball_url"]
64
- puts "Downloading latest version from github..."
65
- open('latest.zip', 'wb') do |fo|
66
- fo.print open(zipFilePath).read
67
- end
37
+ if File.file?("#{rootPath}/ZMediumToMarkdown.gemspec")
38
+ apiPath = 'https://api.github.com/repos/ZhgChgLi/ZMediumToMarkdown/releases'
39
+ versions = JSON.parse(Request.URL(apiPath).body).sort { |a,b| b["id"] <=> a["id"] }
40
+
41
+ version = nil
42
+ index = 0
43
+ while version == nil do
44
+ thisVersion = versions[index]
45
+ if thisVersion["prerelease"] == false
46
+ version = thisVersion
47
+ next
48
+ end
49
+ index += 1
50
+ end
51
+
52
+ zipFilePath = version["zipball_url"]
53
+ puts "Downloading latest version from github..."
54
+ open('latest.zip', 'wb') do |fo|
55
+ fo.print open(zipFilePath).read
56
+ end
68
57
 
69
- puts "Unzip..."
70
- Zip::File.open("latest.zip") do |zipfile|
71
- zipfile.each do |file|
72
- fileNames = file.name.split("/")
73
- fileNames.shift
74
- filePath = fileNames.join("/")
75
- if filePath != ''
76
- puts "Unzinp...#{filePath}"
77
- zipfile.extract(file, filePath) { true }
58
+ puts "Unzip..."
59
+ Zip::File.open("latest.zip") do |zipfile|
60
+ zipfile.each do |file|
61
+ fileNames = file.name.split("/")
62
+ fileNames.shift
63
+ filePath = fileNames.join("/")
64
+ if filePath != ''
65
+ puts "Unzinp...#{filePath}"
66
+ zipfile.extract(file, filePath) { true }
67
+ end
78
68
  end
79
69
  end
80
- end
81
- File.delete("latest.zip")
70
+ File.delete("latest.zip")
82
71
 
83
- tagName = version["tag_name"]
84
- puts "Update to version #{tagName} successfully!"
72
+ tagName = version["tag_name"]
73
+ puts "Update to version #{tagName} successfully!"
74
+ else
75
+ system("gem update ZMediumToMarkdown")
76
+ end
85
77
  end
86
78
 
87
79
  def self.createPostInfo(postInfo)
@@ -97,7 +89,7 @@ class Helper
97
89
  end
98
90
 
99
91
  def self.printNewVersionMessageIfExists()
100
- if Helper.compareVersion(Helper.getRemoteVersionFromGithub(), Helper.getLocalVersionFromGemspec())
92
+ if Helper.getRemoteVersionFromGithub() > Helper.getLocalVersion()
101
93
  puts "##########################################################"
102
94
  puts "##### New Version Available!!! #####"
103
95
  puts "##### Please type `bin/ZMediumToMarkdown -n` to update!!##"
@@ -105,7 +97,7 @@ class Helper
105
97
  end
106
98
  end
107
99
 
108
- def self.getLocalVersionFromGemspec()
100
+ def self.getLocalVersion()
109
101
  rootPath = File.expand_path('../', File.dirname(__FILE__))
110
102
 
111
103
  result = nil
@@ -117,8 +109,7 @@ class Helper
117
109
  end
118
110
 
119
111
  if !result.nil?
120
- versions = result.split(".")
121
- Version.new(versions[0],versions[1],versions[2])
112
+ Gem::Version.new(result)
122
113
  else
123
114
  nil
124
115
  end
@@ -140,8 +131,7 @@ class Helper
140
131
  end
141
132
 
142
133
  if !tagName.nil?
143
- versions = (tagName.downcase.gsub! 'v','') .split(".")
144
- Version.new(versions[0],versions[1],versions[2])
134
+ Gem::Version.new(tagName.downcase.gsub! 'v','')
145
135
  else
146
136
  nil
147
137
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ZMediumToMarkdown
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.8
4
+ version: 1.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - ZhgChgLi