mdq 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba84c3f7c666c4f32a57802aec86dc14dd3c213cc056bdb86b2ee2fa1bc7a1a
-  data.tar.gz: 16dffbcf4e63038c4976c95fe0763939b0c6c4736f24802a594f17a30f7e91b9
+  metadata.gz: eec98441746fbb4662ed354d93d0f228e07b71bb51e1c6e377ad999e13b6b97e
+  data.tar.gz: f08772d007547d4b559d29de26fd15197c69f845eff048fe4343cb23f9ce5148
 SHA512:
-  metadata.gz: 5339784eaa9049ce0322ca19199c83d5ef6fd010db98f7ce67f40307861c92b33b9fd715494c440824c396406eff44190d169f955972dff1c920a079422eb4a3
-  data.tar.gz: cf3ff9fcc28b265b0f4616e9dae9f0afd714f3b05045c73ee6c8752f49791a3e11dead60f759a1befe048bd6f912271324f1a3fb93ae19bf0cffd8c61c9301db
+  metadata.gz: f8224cf564bad8c026f5f7ea9f5615ce582a014a7c0659dd4f467503acc31c2a1cb411017f5933218fdb679ed0673c52ac0c8e8ef8477a8a64721ec458b94b28
+  data.tar.gz: f3b50616a7cad1eb9179ad5dd30c65f888c2339dcb197ad5612b365026c526e3945af0af75d387343ea30cb3c480d0e8be4223249e04f04a7e1c56b68d779e97

data/lib/mdq/cli.rb

@@ -29,9 +29,17 @@ module Mdq
                             type: :boolean
     method_option :apple, desc: 'Show Apple devices', default: true,
                           type: :boolean
+    method_option :physical, desc: 'Show physical devices', default: true,
+                             type: :boolean
+    method_option :simulated, desc: 'Show simulated devices', default: true,
+                              type: :boolean
     def devices
       db = Mdq::DB.new
-      db.get(is_android: options[:android], is_apple: options[:apple], is_apps: false)
+      db.get(is_android: options[:android],
+             is_apple: options[:apple],
+             is_apps: false,
+             is_physical: options[:physical],
+             is_simulated: options[:simulated])
       puts(JSON.pretty_generate(Device.all.as_json))
     end
 

data/lib/mdq/db.rb

@@ -10,11 +10,11 @@ module Mdq
   # DB
   class DB < Discovery
     # デバイスとアプリの取得
-    def get(is_android: true, is_apple: true, is_apps: true)
+    def get(is_android: true, is_apple: true, is_apps: true, is_physical: true, is_simulated: true)
       reset
       # デバイスの発見
-      android_discover if is_android
-      apple_discover if is_apple
+      android_discover(is_physical) if is_android
+      apple_discover(is_physical, is_simulated) if is_apple
 
       return unless is_apps
 

data/lib/mdq/discovery.rb

@@ -64,7 +64,9 @@ module Mdq
     end
 
     # Androidデバイス一覧を取得する
-    def android_discover # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    def android_discover(is_physical = true) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Style/OptionalBooleanParameter
+      return if skip_device?(true, is_physical, false)
+
       output, = adb_command('devices -l')
       return if output.nil?
 
@@ -90,17 +92,16 @@ module Mdq
           mac_address = nil
           ip_address = nil
           ipv6_address = []
-          wifi_network = nil
 
           # バッテリー
-          lines1, = adb_command('shell dumpsys battery', udid)
-          if (match = lines1.match(/level: (\d*)/))
+          battery_lines, = adb_command('shell dumpsys battery', udid)
+          if (match = battery_lines.match(/level: (\d*)/))
             battery_level = match[1].to_i
           end
 
           # ストレージ
-          lines2, = adb_command('shell df', udid)
-          lines2.split("\n").each_with_index do |line, index|
+          df_lines, = adb_command('shell df', udid)
+          df_lines.split("\n").each_with_index do |line, index|
             next if index.zero?
 
             columns = line.split
@@ -112,8 +113,8 @@ module Mdq
           end
 
           # MACアドレスとIPアドレス
-          lines3, = adb_command('shell ip addr show wlan0', udid)
-          lines3.split("\n").each do |line|
+          ip_lines, = adb_command('shell ip addr show wlan0', udid)
+          ip_lines.split("\n").each do |line|
             match = line.match('link/ether (.*?) ')
             mac_address = match[1] unless match.nil?
 
@@ -125,13 +126,15 @@ module Mdq
           end
 
           # Wi-Fi
-          lines4, = adb_command("shell dumpsys netstats | grep -E 'iface=wlan0'", udid)
-          lines4.split("\n").each do |line|
-            match = line.match(' wifiNetworkKey="(.*?)"')
-            next if match[1].nil?
-
-            wifi_network = match[1]
-            break
+          wifi_network = nil
+          wifi_lines, = adb_command("shell dumpsys netstats | grep -E 'iface=wlan0'", udid)
+          wifi_lines.split("\n").each do |line|
+            if line.include?('wifiNetworkKey=') && (match = line.match(/(wifiNetworkKey="(.*?)")/))
+              wifi_network = match[2]
+            end
+            if line.include?('networkId=') && (match = line.match(/(networkId="(.*?)")/))
+              wifi_network = match[2]
+            end
           end
 
           Device.create({
@@ -171,7 +174,7 @@ module Mdq
     end
 
     # Appleデバイス一覧を取得する
-    def apple_discover
+    def apple_discover(is_physical = true, is_simulated = true) # rubocop:disable Style/OptionalBooleanParameter
       file = [@home, 'mdq.json'].join(File::Separator)
       result = apple_command("list devices -v -j #{file}")
       k = 1000.0
@@ -193,6 +196,8 @@ module Mdq
                        reality == 'physical'
                      end
 
+          next if skip_device?(physical, is_physical, is_simulated)
+
           Device.create({
                           udid: udid,
                           serial_number: device['hardwareProperties']['serialNumber'],
@@ -268,6 +273,14 @@ module Mdq
 
       "#{(size * 100).round / 100.0}#{units[i]}"
     end
+
+    # デバイスの物理/シミュレートのフラグをスキップするかどうか
+    # 物理デバイスの場合: is_physical が true ならスキップしない（false）、false ならスキップする（true）。
+    # シミュレータの場合: is_simulated が true ならスキップしない（false）、false ならスキップする（true）。
+    # 判定不能（nil）の場合: シミュレータとして扱い、is_simulated の設定に従う。
+    def skip_device?(physical, is_physical, is_simulated)
+      !((physical && is_physical) || (!physical && is_simulated))
+    end
   end
 end
 

data/lib/mdq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mdq
-  VERSION = '1.5.0'
+  VERSION = '1.5.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - arthur87
 bindir: exe
 cert_chain: []
-date: 2026-06-18 00:00:00.000000000 Z
+date: 2026-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop