mdq 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa40709c2f0dca1610281b05d743cc6676126dd22e0c9ea8ee2a8b6719f97bdd
-  data.tar.gz: ced38027b22c1265d03b635f2530cb79972b8abaf786fcb00228bd59c77d379f
+  metadata.gz: 8ba84c3f7c666c4f32a57802aec86dc14dd3c213cc056bdb86b2ee2fa1bc7a1a
+  data.tar.gz: 16dffbcf4e63038c4976c95fe0763939b0c6c4736f24802a594f17a30f7e91b9
 SHA512:
-  metadata.gz: ce4c1cf1a3c96117646be0faac76fcec33e7e43b4badbf04ba7e5bf6dfbc5b9e058614934b51f34b19ec66f5b3fe9d501a91b5296d523d45e8df8b964cb020ea
-  data.tar.gz: 37a99b2f330e2dd227ccb500e038d9d5d28af8c2305a4405b7580b5c230829e50716dba9c7d2b18aa510212ab167572d57da92bb1719919eea2806f597663fef
+  metadata.gz: 5339784eaa9049ce0322ca19199c83d5ef6fd010db98f7ce67f40307861c92b33b9fd715494c440824c396406eff44190d169f955972dff1c920a079422eb4a3
+  data.tar.gz: cf3ff9fcc28b265b0f4616e9dae9f0afd714f3b05045c73ee6c8752f49791a3e11dead60f759a1befe048bd6f912271324f1a3fb93ae19bf0cffd8c61c9301db

data/lib/mdq/cli.rb

@@ -54,9 +54,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,6 +3,7 @@
 require 'mdq'
 require 'active_record'
 require 'fileutils'
+require 'sql-parser'
 
 # Mdq
 module Mdq
@@ -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/version.rb

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

metadata

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