cafe_basics_duo 0.0.37 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb796dc17c7d63e185a702a8ff258c1fbea1896b8c268b3bd72ddf259aef8229
-  data.tar.gz: 5eab76415b9122a2ebb4980d68704d2aa928a03746d079d2d1e5a1c6fdb7384e
+  metadata.gz: c7ea78320bab5a2a6d1f35a574aab41c67fbc22b51cb8bf6dcb4f9f194a555fd
+  data.tar.gz: 2bbc4ee8ce16396133bcfed9da180eb1588379f4bd21511273e902eade0c1c1e
 SHA512:
-  metadata.gz: b44c8c2796bef4812ad64cf3c01cafe46664d2317b083ac511c18086d8b137f0cde8aa369c54f0f269b019da47d07286f2f528609cc143f03cdbd8771069a7cc
-  data.tar.gz: a6308a54ed876a01868dbabe503a81a4b50b445f41124160ba5c1ca014f5571b288e7398897d7c437d1df142b581957fe7a3761149a036bcc8351610e643d324
+  metadata.gz: 5feb9d123e8e22613fa35029d9c20be5cce9761fdb218b1ba58a5548400c149e02c86644e46a8a5168b11da6175750ad462a0c04b48bd6930a0edf5aba45b51b
+  data.tar.gz: ee1221949df05ce7d63d106f73c1728a13a31ef9b050aebdf3a9a310a26eb1fd7cfaa9a3b906b75234a02deef7e1888104e4dfc7fe6fc90d150cb9b1342d42a7

data/lib/cafe_basics_duo.rb

@@ -2190,36 +2190,66 @@ class Wordpress
                     puts table[10]
                     if table[7].to_i > table[10].to_i
                         if @data['포스트설정']['테더링'].checked?
-                            puts 'tedering ip change...'
-                            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')
-                                sleep(3)
-                                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
-                                    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
-                                    else
-                                        puts @my_ip
-                                        puts '재시도...'
-                                        sleep(3)
-                                        robot_ip[]
-                                    end
+                          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 status2.success?
+                              sleep(3)
+                              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)
+                      
+                              # 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)
+                                  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 'IP가 변경되지 않음. 재시도...'
+                                    retry_count += 1
+                                    sleep(3)  # 3초 후 재시도
+                                  end
+                                rescue => e
+                                  retry_count += 1
+                                  sleep(3)  # 3초 후 재시도
                                 end
-                                robot_ip[]
+                      
+                                # 최대 재시도 횟수를 초과하면 예외 발생시키기
+                                if retry_count >= max_retries
+                                  raise "최대 재시도 횟수 초과. IP 변경 실패."
+                                end
+                              end
                             else
-                                puts 'adb error pass'
+                              puts 'Failed to disable data. Error: ' + stderr2
                             end
+                          else
+                            puts 'adb error, unable to get devices. Error: ' + stderr
+                          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.39
 platform: ruby
 authors:
 - zon