mdq 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa40709c2f0dca1610281b05d743cc6676126dd22e0c9ea8ee2a8b6719f97bdd
-  data.tar.gz: ced38027b22c1265d03b635f2530cb79972b8abaf786fcb00228bd59c77d379f
+  metadata.gz: e82ce9d717037c9e6cb77fb68ebc07fbef2d3d1863b9bd9a0e5acde1b4f1ed65
+  data.tar.gz: b88aadd8b8a20ae0a3dc75e0902a29eed5b2c2b79ac00eef4d33161be6203519
 SHA512:
-  metadata.gz: ce4c1cf1a3c96117646be0faac76fcec33e7e43b4badbf04ba7e5bf6dfbc5b9e058614934b51f34b19ec66f5b3fe9d501a91b5296d523d45e8df8b964cb020ea
-  data.tar.gz: 37a99b2f330e2dd227ccb500e038d9d5d28af8c2305a4405b7580b5c230829e50716dba9c7d2b18aa510212ab167572d57da92bb1719919eea2806f597663fef
+  metadata.gz: 410d82e49b9464a9da80fe3be11090e4433135565defeedd7f7ba6b3a3a58067188960fed97116945a30e982cfa80252c82cf6e6c97b65797eab0d0d607d61cf
+  data.tar.gz: 3ceffaccda4efa440a2f1a50ea1d91608a4be64b357eb2928c78a45d7fb782241463a61841e7674b160ed1186f5bac3f5d18285467b86904f7629e49a0eb1267

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
 
@@ -54,9 +62,15 @@ module Mdq
     method_option :query, desc: 'SQL to filter devices or apps', aliases: '-q', required: true
     def list
       db = Mdq::DB.new
-      db.get(is_android: options[:android], is_apple: options[:apple])
-      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 of the physical device.'

data/lib/mdq/db.rb

@@ -3,17 +3,18 @@
 require 'mdq'
 require 'active_record'
 require 'fileutils'
+require 'sql-parser'
 
 # Mdq
 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
 
@@ -30,8 +31,8 @@ module Mdq
     # クエリの実行
     def query(sql)
       ActiveRecord::Base.connection.execute(sql)
-    rescue StandardError
-      []
+    rescue StandardError => e
+      raise e
     end
 
     # Androidデバイスのスクリーンショットを撮る
@@ -115,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

@@ -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?
 
@@ -171,7 +173,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 +195,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 +272,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.4.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - arthur87
 bindir: exe
 cert_chain: []
-date: 2026-06-16 00:00:00.000000000 Z
+date: 2026-06-20 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