cafe_basics_duo 0.0.37 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb796dc17c7d63e185a702a8ff258c1fbea1896b8c268b3bd72ddf259aef8229
-  data.tar.gz: 5eab76415b9122a2ebb4980d68704d2aa928a03746d079d2d1e5a1c6fdb7384e
+  metadata.gz: 7f897fe72200a4eb5048bf8743bbffaa985971fa930ff67a32d51df2b026bc91
+  data.tar.gz: 9c94429b6e70b037974ed48c776095487f81f76731887b186cf82b0cda19d4f2
 SHA512:
-  metadata.gz: b44c8c2796bef4812ad64cf3c01cafe46664d2317b083ac511c18086d8b137f0cde8aa369c54f0f269b019da47d07286f2f528609cc143f03cdbd8771069a7cc
-  data.tar.gz: a6308a54ed876a01868dbabe503a81a4b50b445f41124160ba5c1ca014f5571b288e7398897d7c437d1df142b581957fe7a3761149a036bcc8351610e643d324
+  metadata.gz: ee0cae2823090f316c699afc9948d27d193e7575ed28786a11284d10e68b4fa30148cf78e686459471a0bfd4cc7e3cb2cd546dadd569b1d8976e4432f9722a6c
+  data.tar.gz: 193aa1f21ee97af821c6dabee753e94f9d3b6d0fef43ef1f06b589cfb595e3c15f5f58f0ac44e9621c27b3711adc37aa469e41c94c1070d4708ffa77915cce09

data/lib/cafe_basics_duo.rb

@@ -2190,36 +2190,78 @@ class Wordpress
                     puts table[10]
                     if table[7].to_i > table[10].to_i
                         if @data['포스트설정']['테더링'].checked?
-                            puts 'tedering ip change...'
+                            puts 'tethering ip change...'
+                        
+                            # ADB devices 확인
                             stdout, stderr, status = Open3.capture3('./adb devices')
-                            if status.success?
-                                device_id = stdout.split("\n")[1].split("\t")[0]
-                                puts device_id
-                                puts 'adb -s '+device_id+' shell svc data disable'
-                                stdout2, stderr2, status2 = Open3.capture3('./adb -s '+device_id+' shell svc data disable')
+                              if status.success?
+                              device_id = stdout.split("\n")[1].split("\t")[0]
+                              puts device_id
+                          
+                              # ADB 서버 초기화
+                              puts 'adb kill-server'
+                              Open3.capture3('adb kill-server')
+                              sleep(2)
+                          
+                              # 다시 ADB 서버 실행
+                              puts 'adb start-server'
+                              Open3.capture3('adb start-server')
+                              sleep(2)
+                          
+                              # 데이터를 끄고 켜기
+                              puts 'adb -s ' + device_id + ' shell svc data disable'
+                              stdout2, stderr2, status2 = Open3.capture3('./adb -s ' + device_id + ' shell svc data disable')
+  
+                              if status2.success?
                                 sleep(3)
-                                puts 'adb -s '+device_id+' shell svc data enable'
-                                Open3.capture3('./adb -s '+device_id+' shell svc data enable')
+                                puts 'adb -s ' + device_id + ' shell svc data enable'
+                                Open3.capture3('./adb -s ' + device_id + ' shell svc data enable')
                                 sleep(3)
                                 puts 'adb ok'
                                 sleep(8)
-                                robot_ip = lambda do
+                        
+                                # IP 확인 및 재시도 (반복문 사용)
+                                retry_count = 0
+                                max_retries = 5
+                                current_ip = nil
+                        
+                                # 무한 루프 방지
+                                while retry_count < max_retries
+                                  begin
                                     http = HTTP.get('https://www.findip.kr/')
                                     noko = Nokogiri::HTML(http.to_s)
-                                    if noko.xpath('/html/body/header/h2').text != @my_ip
-                                        @my_ip = noko.xpath('/html/body/header/h2').text
+                                    new_ip = noko.xpath('/html/body/header/h2').text.strip
+                        
+                                    puts "Current IP: #{@my_ip}, New IP: #{new_ip}"
+                        
+                                    # IP가 변경되었으면 @my_ip를 갱신하고 종료
+                                    if new_ip != @my_ip
+                                      @my_ip = new_ip
+                                      puts "IP 변경됨: #{@my_ip}"
+                                      break
                                     else
-                                        puts @my_ip
-                                        puts '재시도...'
-                                        sleep(3)
-                                        robot_ip[]
+                                      puts 'IP가 변경되지 않음. 재시도...'
+                                      retry_count += 1
+                                      sleep(3)  # 3초 후 재시도
                                     end
+                                  rescue => e
+                                    retry_count += 1
+                                    sleep(3)  # 3초 후 재시도
+                                  end
+                        
+                                  # 최대 재시도 횟수를 초과하면 예외 발생시키기
+                                  if retry_count >= max_retries
+                                    raise "최대 재시도 횟수 초과. IP 변경 실패."
+                                  end
                                 end
-                                robot_ip[]
+                              else
+                                puts 'Failed to disable data. Error: ' + stderr2
+                              end
                             else
-                                puts 'adb error pass'
+                              puts 'adb error, unable to get devices. Error: ' + stderr
                             end
-                        end
+                          end
+                    
 
                         check_success = 1
                         @data['table'][index][-1] =  0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cafe_basics_duo
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.50
 platform: ruby
 authors:
 - zon