mdq 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c2666a8e5e31b2291afd0f587e36248c1180bf03fe1aa727c3a41ab27cb3a4c
-  data.tar.gz: fc60f852a4a72bbd99d1a755f17cd9cbef82dd757d4ad3cfadb8b69fe57a76b1
+  metadata.gz: 8ba84c3f7c666c4f32a57802aec86dc14dd3c213cc056bdb86b2ee2fa1bc7a1a
+  data.tar.gz: 16dffbcf4e63038c4976c95fe0763939b0c6c4736f24802a594f17a30f7e91b9
 SHA512:
-  metadata.gz: 5da43c0af4704135bc5fa9b6d94b71f31555c3921b8df271acec69eac15af1d53a41e48655e8a4b88370c13258a9a625729d81db957f7f0dba82753394b0171b
-  data.tar.gz: e7f994e262a4ca24ad6b334d44b06c3b93b759d47d31f2ebeb7abfdbbf4ba4b41fa88c961239ce198939c8480dc07a3da14db6241880d13fdf52fe65488251ab
+  metadata.gz: 5339784eaa9049ce0322ca19199c83d5ef6fd010db98f7ce67f40307861c92b33b9fd715494c440824c396406eff44190d169f955972dff1c920a079422eb4a3
+  data.tar.gz: cf3ff9fcc28b265b0f4616e9dae9f0afd714f3b05045c73ee6c8752f49791a3e11dead60f759a1befe048bd6f912271324f1a3fb93ae19bf0cffd8c61c9301db

data/.rubocop.yml

@@ -1 +1,4 @@
 inherit_from: .rubocop_todo.yml
+
+AllCops:
+  NewCops: disable

data/README.base.md

@@ -22,6 +22,21 @@ Check the software installation status.
 $ mdq check
 ```
 
+The following versions have been tested and confirmed to work.
+
+```
+$ adb --version
+Android Debug Bridge version 1.0.41
+Version 35.0.1-11580240
+Installed as /opt/homebrew/bin/adb
+Running on Darwin 25.5.0 (arm64)
+```
+
+```
+$ xcrun --version
+xcrun version 72.
+```
+
 ## Devices
 
 Show mobile devices.
@@ -38,6 +53,7 @@ $ mdq devices
     "platform": "Android",
     "marketing_name": null,
     "model": "Pixel 7",
+    "physical", true,
     "build_version": "16",
     "build_id": "BP31.250502.008",
     "battery_level": 88,
@@ -62,6 +78,7 @@ $ mdq devices
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -105,6 +122,7 @@ $ mdq list -q="select * from devices where platform='iOS'"
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -132,7 +150,8 @@ $ mdq list -q='select * from apps'
 
 ## Screenshot of a physical device
 
-Take a screenshot on Android.
+Take a screenshot of the physical device.
+For Apple devices, the physical column should be true.
 
 ```
 $ mdq cap -o='/Users/xxxxx/' -u='UDID'
@@ -190,6 +209,7 @@ Details of the devices table.
 | platform | Always "Android" | hardwareProperties.platform |
 | marketing_name | Always "null" | hardwareProperties.marketingName |
 | model | ro.product.model | hardwareProperties.productType |
+| physical | Always true | hardwareProperties.reality |
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |

data/README.ja.md

@@ -17,6 +17,21 @@ Check the software installation status.
 $ mdq check
 ```
 
+The following versions have been tested and confirmed to work.
+
+```
+$ adb --version
+Android Debug Bridge version 1.0.41
+Version 35.0.1-11580240
+Installed as /opt/homebrew/bin/adb
+Running on Darwin 25.5.0 (arm64)
+```
+
+```
+$ xcrun --version
+xcrun version 72.
+```
+
 ## Devices
 
 Show mobile devices.
@@ -33,6 +48,7 @@ $ mdq devices
     "platform": "Android",
     "marketing_name": null,
     "model": "Pixel 7",
+    "physical", true,
     "build_version": "16",
     "build_id": "BP31.250502.008",
     "battery_level": 88,
@@ -57,6 +73,7 @@ $ mdq devices
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -100,6 +117,7 @@ $ mdq list -q="select * from devices where platform='iOS'"
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -127,7 +145,8 @@ $ mdq list -q='select * from apps'
 
 ## Screenshot of a physical device
 
-Take a screenshot on Android.
+Take a screenshot of the physical device.
+For Apple devices, the physical column should be true.
 
 ```
 $ mdq cap -o='/Users/xxxxx/' -u='UDID'
@@ -185,6 +204,7 @@ Details of the devices table.
 | platform | Always "Android" | hardwareProperties.platform |
 | marketing_name | Always "null" | hardwareProperties.marketingName |
 | model | ro.product.model | hardwareProperties.productType |
+| physical | Always true | hardwareProperties.reality |
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |

data/README.md

@@ -17,6 +17,21 @@ Check the software installation status.
 $ mdq check
 ```
 
+The following versions have been tested and confirmed to work.
+
+```
+$ adb --version
+Android Debug Bridge version 1.0.41
+Version 35.0.1-11580240
+Installed as /opt/homebrew/bin/adb
+Running on Darwin 25.5.0 (arm64)
+```
+
+```
+$ xcrun --version
+xcrun version 72.
+```
+
 ## Devices
 
 Show mobile devices.
@@ -33,6 +48,7 @@ $ mdq devices
     "platform": "Android",
     "marketing_name": null,
     "model": "Pixel 7",
+    "physical", true,
     "build_version": "16",
     "build_id": "BP31.250502.008",
     "battery_level": 88,
@@ -57,6 +73,7 @@ $ mdq devices
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -100,6 +117,7 @@ $ mdq list -q="select * from devices where platform='iOS'"
     "platform": "iOS",
     "marketing_name": "iPhone 16 Pro",
     "model": "iPhone17,1",
+    "physical", true,
     "build_version": "18.4.1",
     "build_id": "22E252",
     "battery_level": null,
@@ -127,7 +145,8 @@ $ mdq list -q='select * from apps'
 
 ## Screenshot of a physical device
 
-Take a screenshot on Android.
+Take a screenshot of the physical device.
+For Apple devices, the physical column should be true.
 
 ```
 $ mdq cap -o='/Users/xxxxx/' -u='UDID'
@@ -185,6 +204,7 @@ Details of the devices table.
 | platform | Always "Android" | hardwareProperties.platform |
 | marketing_name | Always "null" | hardwareProperties.marketingName |
 | model | ro.product.model | hardwareProperties.productType |
+| physical | Always true | hardwareProperties.reality |
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |

data/lib/mdq/cli.rb

@@ -12,19 +12,19 @@ module Mdq
       end
     end
 
-    desc 'version', 'Show Version'
+    desc 'version', 'Show Version.'
     def version
       puts(Mdq::VERSION)
     end
 
-    desc 'check', 'Check the software installation status'
+    desc 'check', 'Check the software installation status.'
     def check
       db = Mdq::DB.new
       puts "adb is installed: #{db.android_discoverable?}"
       puts "Xcode is installed: #{db.apple_discoverable?}"
     end
 
-    desc 'devices', 'Show mobile devices'
+    desc 'devices', 'Show mobile devices.'
     method_option :android, desc: 'Show Android devices', default: true,
                             type: :boolean
     method_option :apple, desc: 'Show Apple devices', default: true,
@@ -35,7 +35,7 @@ module Mdq
       puts(JSON.pretty_generate(Device.all.as_json))
     end
 
-    desc 'apps', 'Show mobile apps'
+    desc 'apps', 'Show mobile apps.'
     method_option :android, desc: 'Show Android devices', default: true,
                             type: :boolean
     method_option :apple, desc: 'Show Apple devices', default: true,
@@ -46,17 +46,27 @@ module Mdq
       puts(JSON.pretty_generate(App.all.as_json))
     end
 
-    desc 'list', 'Show mobile devices or apps'
+    desc 'list', 'Show mobile devices or apps.'
+    method_option :android, desc: 'Show Android devices', default: true,
+                            type: :boolean
+    method_option :apple, desc: 'Show Apple devices', default: true,
+                          type: :boolean
     method_option :query, desc: 'SQL to filter devices or apps', aliases: '-q', required: true
     def list
       db = Mdq::DB.new
-      db.get
-      result = db.query(options['query'])
-      puts(JSON.pretty_generate(result.as_json))
+      is_apps = db.query_contains_apps_table?(options[:query])
+      db.get(is_android: options[:android], is_apple: options[:apple], is_apps: is_apps)
+
+      begin
+        result = db.query(options['query'])
+        puts(JSON.pretty_generate(result.as_json))
+      rescue StandardError => e
+        warn e.message
+      end
     end
 
-    desc 'cap', 'Path to save screenshots(Android only)'
-    method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
+    desc 'cap', 'Path to save screenshots of the physical device.'
+    method_option :udid, desc: 'Specify the device UDID', aliases: '-u'
     method_option :output, desc: 'Save to file', aliases: '-o', required: true
     def cap
       db = Mdq::DB.new
@@ -73,7 +83,7 @@ module Mdq
       db.sim_screencap(options[:output], is_android: options[:platform] == 'android')
     end
 
-    desc 'install', 'Installing the app(apk, apex, ipa)'
+    desc 'install', 'Installing the app(apk, apex, ipa).'
     method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
     method_option :input, desc: 'Path to the app file', aliases: '-i', required: true
     method_option :replace, desc: 'Replace the app if it is already installed', aliases: '-r', default: false,
@@ -84,7 +94,7 @@ module Mdq
       db.app_install(options[:input], options[:udid], options[:replace])
     end
 
-    desc 'uninstall', 'Uninstalling the app'
+    desc 'uninstall', 'Uninstalling the app.'
     method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
     method_option :input, desc: 'Path to the app', aliases: '-i', required: true
     def uninstall

data/lib/mdq/db.rb

@@ -3,6 +3,7 @@
 require 'mdq'
 require 'active_record'
 require 'fileutils'
+require 'sql-parser'
 
 # Mdq
 module Mdq
@@ -30,24 +31,39 @@ module Mdq
     # クエリの実行
     def query(sql)
       ActiveRecord::Base.connection.execute(sql)
-    rescue StandardError
-      []
+    rescue StandardError => e
+      raise e
     end
 
     # Androidデバイスのスクリーンショットを撮る
-    def device_screencap(output, udid)
-      device = Device.find_by(udid: udid)
-      if device.nil? || !device.android?
-        warn 'Device not found or not an Android device.'
+    def device_screencap(output, udid = nil)
+      devices = if udid.nil?
+                  Device.where(physical: true)
+                else
+                  Device
+                    .where('udid LIKE ?', "#{udid}%")
+                    .where(physical: true)
+                end
+
+      if devices.empty?
+        warn 'Device not found.'
         return
       end
 
       FileUtils.mkdir_p(output)
-      file = "#{udid}-#{Time.now.strftime('%y%m%d-%H%M%S')}.png"
-      full_path = "/sdcard/#{file}"
-      adb_command("shell screencap -p #{full_path}", udid)
-      adb_command("pull #{full_path} #{output}", udid)
-      adb_command("shell rm #{full_path}", udid)
+
+      devices.each do |device|
+        file = "#{device.udid}-#{Time.now.strftime('%y%m%d-%H%M%S')}.png"
+
+        if device.android?
+          full_path = "/sdcard/#{file}"
+          adb_command("shell screencap -p #{full_path}", device.udid)
+          adb_command("pull #{full_path} #{output}", device.udid)
+          adb_command("shell rm #{full_path}", device.udid)
+        else
+          apple_command("device capture screenshot --destination #{output}/#{file}", device.udid)
+        end
+      end
     end
 
     def sim_screencap(output, is_android: true)
@@ -100,5 +116,31 @@ module Mdq
       puts output unless output.empty?
       warn error unless error.empty?
     end
+
+    # クエリにappsテーブルが含まれているかを判定する
+    def query_contains_apps_table?(query)
+      parser = SQLParser::Parser.new
+      ast = parser.scan_str(query)
+      find_tables(ast).uniq.include?('apps')
+    rescue StandardError
+      false
+    end
+
+    private
+
+    def find_tables(node)
+      tables = []
+      if node.is_a?(SQLParser::Statement::Table)
+        tables << node.name
+      elsif node.respond_to?(:each)
+        node.each { |child| tables += find_tables(child) }
+      elsif node.instance_variables.any?
+        node.instance_variables.each do |var|
+          val = node.instance_variable_get(var)
+          tables += find_tables(val)
+        end
+      end
+      tables
+    end
   end
 end

data/lib/mdq/discovery.rb

@@ -154,7 +154,8 @@ module Mdq
                           mac_address: mac_address,
                           ip_address: ip_address,
                           ipv6_address: ipv6_address.join(','),
-                          wifi_network: wifi_network
+                          wifi_network: wifi_network,
+                          physical: true
                         })
 
         else
@@ -162,7 +163,8 @@ module Mdq
                           udid: udid,
                           serial_number: udid,
                           authorized: false,
-                          platform: 'Android'
+                          platform: 'Android',
+                          physical: true
                         })
         end
       end
@@ -181,6 +183,16 @@ module Mdq
         result['result']['devices'].each do |device|
           udid = device['hardwareProperties']['udid']
           total_disk = device['hardwareProperties']['internalStorageCapacity']
+
+          # 物理デバイスかどうか
+          # 判定できないときはnilにする
+          reality = device['hardwareProperties']['reality']
+          physical = if reality.nil?
+                       nil
+                     else
+                       reality == 'physical'
+                     end
+
           Device.create({
                           udid: udid,
                           serial_number: device['hardwareProperties']['serialNumber'],
@@ -192,7 +204,8 @@ module Mdq
                           build_version: device['deviceProperties']['osVersionNumber'],
                           build_id: device['deviceProperties']['osBuildUpdate'],
                           total_disk: total_disk,
-                          human_readable_total_disk: number_to_human_size(total_disk, k)
+                          human_readable_total_disk: number_to_human_size(total_disk, k),
+                          physical: physical
                         })
         end
 
@@ -274,6 +287,7 @@ ActiveRecord::Migration.create_table :devices do |t|
   t.string :platform
   t.string :marketing_name
   t.string :model
+  t.boolean :physical
   t.string :build_version
   t.string :build_id
   t.integer :battery_level

data/lib/mdq/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.0
 platform: ruby
 authors:
 - arthur87
 bindir: exe
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sql-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement