nblog_zon 0.0.67 → 0.0.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/nblog_zon.rb +26 -9
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ec86b6aa062283df60959225666f4a40b670e20bab4b19d975b0dcaa22e58bfa
4
- data.tar.gz: 456d60dca768623caf8b7a72d56ad45afe387129736e71b3968c2d36743a15bb
3
+ metadata.gz: 78482e43be8ba374f5dea3f420d9307984955330d35877df99dcbb5d01cd324a
4
+ data.tar.gz: 6cd1bbaa990dbec975c36640be202d6611821f04d81484622b164f9224459062
5
5
  SHA512:
6
- metadata.gz: 9608a0376cac1e0f037faac07881f3d218261a39cee45f9f998c9b0b06bb940687b56ad30e0a9e7965f9e0ba8710d4be9ab15dfcd3f9c556d59bebe25ee01215
7
- data.tar.gz: 2fe95554265109c57b12a2523f7bea07dd7f9a3189fb14fe15415cd8006332d5445b5ff541df8fc06acce50a748dd64a6aa3827d3f075517f3aac53e3549a66e
6
+ metadata.gz: ee2d73b65433743bee002f813b5ff7e05b33a714c62fb7f69f5945c36002700b22b430b42fcdb3b18475f9c12cbf2d9db776a9df97b4a78829ef8cb796299e22
7
+ data.tar.gz: bc1715cd0d791bf25ff2ed798fb10a6a766bfbfebff0a95a072f4a38f7e920490f285b8e400928a996e55c9b29ab404844f79f0c3313fc523cd4f591950757ba
data/lib/nblog_zon.rb CHANGED
@@ -2328,38 +2328,50 @@ class Wordpress
2328
2328
  if table[8].to_i > table[11].to_i
2329
2329
  if @data['포스트설정']['테더링'].checked?
2330
2330
  puts 'Tethering IP change...'
2331
-
2332
- stdout, stderr, status = Open3.capture3('./adb devices')
2333
2331
 
2332
+ current_dir = File.dirname(__FILE__)
2333
+ adb_path = File.join(current_dir, 'adb.exe')
2334
+
2335
+ stdout, stderr, status = Open3.capture3("#{adb_path} devices")
2336
+
2334
2337
  if status.success?
2335
2338
  device_id = stdout.split("\n")[1].split("\t")[0]
2336
2339
  puts device_id
2337
2340
 
2338
2341
  # ADB 서버 초기화
2339
2342
  puts 'adb kill-server'
2340
- Open3.capture3('adb kill-server')
2343
+ stdout, stderr, status = Open3.capture3("#{adb_path} kill-server")
2344
+ puts stdout
2345
+ puts stderr
2341
2346
  sleep(2)
2342
2347
 
2343
2348
  # 다시 ADB 서버 실행
2344
2349
  puts 'adb start-server'
2345
- Open3.capture3('adb start-server')
2350
+ stdout, stderr, status = Open3.capture3("#{adb_path} start-server")
2351
+ puts stdout
2352
+ puts stderr
2346
2353
  sleep(2)
2347
2354
 
2348
2355
  # 데이터를 끄고 켜기
2349
- puts 'adb -s ' + device_id + ' shell svc data disable'
2350
- stdout2, stderr2, status2 = Open3.capture3('./adb -s ' + device_id + ' shell svc data disable')
2356
+ puts "adb -s #{device_id} shell svc data disable"
2357
+ stdout2, stderr2, status2 = Open3.capture3("#{adb_path} -s #{device_id} shell svc data disable")
2358
+ puts stdout2
2359
+ puts stderr2
2351
2360
 
2352
2361
  if status2.success?
2353
2362
  sleep(3)
2354
- puts 'adb -s ' + device_id + ' shell svc data enable'
2355
- Open3.capture3('./adb -s ' + device_id + ' shell svc data enable')
2363
+ puts "adb -s #{device_id} shell svc data enable"
2364
+ stdout3, stderr3, status3 = Open3.capture3("#{adb_path} -s #{device_id} shell svc data enable")
2365
+ puts stdout3
2366
+ puts stderr3
2356
2367
  sleep(3)
2357
2368
  puts 'adb ok'
2358
2369
  sleep(8)
2359
2370
 
2360
2371
  # IP 변경을 확인하는 람다 함수
2361
2372
  robot_ip = lambda do
2362
- loop do # 무한 루프
2373
+ retries = 5 # 최대 5번 재시도
2374
+ loop do
2363
2375
  begin
2364
2376
  http = HTTP.get('https://www.findip.kr/')
2365
2377
  noko = Nokogiri::HTML(http.to_s)
@@ -2371,10 +2383,14 @@ class Wordpress
2371
2383
  break # IP가 변경되었으면 루프 종료
2372
2384
  else
2373
2385
  puts 'IP가 변경되지 않음. 재시도...'
2386
+ retries -= 1
2387
+ break if retries <= 0 # 재시도 횟수를 다 사용했으면 루프 종료
2374
2388
  sleep(3) # 3초 후 재시도
2375
2389
  end
2376
2390
  rescue => e
2377
2391
  puts "IP 확인 중 오류 발생: #{e.message}. 재시도 중..."
2392
+ retries -= 1
2393
+ break if retries <= 0 # 재시도 횟수를 다 사용했으면 루프 종료
2378
2394
  sleep(3) # 3초 후 재시도
2379
2395
  end
2380
2396
  end
@@ -2387,6 +2403,7 @@ class Wordpress
2387
2403
  puts 'adb error, unable to get devices. Error: ' + stderr
2388
2404
  end
2389
2405
  end
2406
+
2390
2407
 
2391
2408
  check_success = 1
2392
2409
  @data['table'][index][-1] = 0
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nblog_zon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.67
4
+ version: 0.0.69
5
5
  platform: ruby
6
6
  authors:
7
7
  - zon