cafe_basics 0.0.37 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9076d66ab295d8bff24c25d9c6ef9491188a8fe2ec1ef0a580230989a527f8b3
-  data.tar.gz: ca38f98b1421f51f08d80a1c2218e7b2ac7e44dd2f4e41722a1ddb2102b88d8c
+  metadata.gz: c0d42592e75b24fb39c3052fc0bd7ff55cb1af18d95dd46a7acc0228decbee2b
+  data.tar.gz: 1365b7e16a2225dd5ceeda0ec6298eb4497fbc26a039c4bb09d6e2a13739ce69
 SHA512:
-  metadata.gz: af0cd6a2b838c835838022be97e9aabd69b6bfffce34e95919e2d7ca042edeeccf8f28108d321a4dd23100fbd9be9336da14d3dfed43618779f72cce836e7898
-  data.tar.gz: be1fcfc56e05eab719f71678019bd5bb8f8ff7d40c2b7e5634a182dc4fa015afad72f4c13ea80cbe50a31a79ae43a7025f1c1dfa209df2535aaa47a9ab5bdeed
+  metadata.gz: 96f4f2074dbbbf3ff2000b7938352bbd104e4b8ca008ddb6ded5fdea24694e52a84e47e1eb1c8f8ed005caaacb92c1d9c3800286f5eee0242ea986690d1bed32
+  data.tar.gz: 7a46539da88ca48ae1345d141e08084736cb037b940646948bfe9646d87fcdddf146760cd9f8ff994f1df1a16a189c3e384433bbc769424165d4e4c3c5414658

data/lib/cafe_basics.rb

@@ -2122,36 +2122,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
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.50
 platform: ruby
 authors:
 - zon