mdq 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9f4ec5652eddd07350b8957261163db13ce51c1d36c7e7e109c8eb0836dc0a
-  data.tar.gz: 9bfbf94ee8f84849beb7a719b3170dc4b989dc1b988cb1b4b6b2dba0bab41ea2
+  metadata.gz: 7cac0bbdd587c39245b20565f173c940cc3820d013e85ea49cdeef449fbba699
+  data.tar.gz: 13ccafb7f07a7e52425f350d26315a0e6638cbd2f6cf07a83d3c2e58501b6293
 SHA512:
-  metadata.gz: a26e2f9fdb44629c5e478845bc227fe2efe7354b1e1e01f84214e9b2c36fe6edaea6d95e17c25a333ecad911bb203e5321192ffd5a3ebd9d66da283413a70608
-  data.tar.gz: b936990fa4c104841742c5cc1bb11c791e7c96b98585ffe29cb08dc42729eece6aaa06c8ca935545e7e5ad67d3d3c933673c1ea7f3e92f49097f20b75d6c68dc
+  metadata.gz: 7dc6da32e3ab760db20aa66e1c744506eacee4ab46f210f212742faac3622bddc9b340d9565c31466b20104fcec674f61eca9d5a26ab8d87343b5404a5745669
+  data.tar.gz: 853b11146f7ea736f48ef558e7d88eae4f43d4d55da1056dfaa00d1179fcba0cfea1812df5edc4e0a7ecc6f8784706fef394c4d58405c263e6ce8abb52c66b1e

data/.rubocop_todo.yml

@@ -9,18 +9,18 @@
 # Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 38
+  Max: 50
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 46
+  Max: 70
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 160
+  Max: 180
 
 # Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns.

data/README.base.md

@@ -7,6 +7,8 @@
 
 # mdq - Mobile Device Query
 
+[![Gem Version](https://badge.fury.io/rb/mdq.svg)](https://badge.fury.io/rb/mdq)
+
 MDQ stands for Mobile Device Query and is a command line tool for displaying information about Android and Apple devices.  
 
 # Usage
@@ -83,6 +85,34 @@ $ mdq list -q="select * from devices where platform='iOS'"
 ]
 ```
 
+View apps installed on your device.
+Apple Devices displays the apps installed with Xcode.
+
+```
+$ mdq list -q='select * from apps'
+```
+
+Take a screenshot on Android.
+
+```
+$ mdq list --cap='/Users/xxxxx/'
+```
+
+Install the app.
+
+```
+$ mdq list --install='/Users/xxxxx/example.apk'
+$ mdq list --install='/Users/xxxxx/example.ipa'
+```
+
+Uninstall the app.
+
+```
+$ mdq list --uninstall='com.example.app'
+```
+
+
+
 # Specification
 
 Details of the devices table.
@@ -99,5 +129,16 @@ Details of the devices table.
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
-| total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
+| free_capacity | df | Always "null" |
+
+
+Details of the apps table.
+Apple Devices displays the apps installed with Xcode.
+
+| name | android | apple devices |
+| -- | -- | -- |
+| udid | Serial number | hardwareProperties.udid |
+| name | Always "null" | name |
+| package_name | Package name | bundleIdentifier |
+| version | Always "null" | version |

data/README.ja.md

@@ -2,6 +2,8 @@
 
 # mdq - Mobile Device Query
 
+[![Gem Version](https://badge.fury.io/rb/mdq.svg)](https://badge.fury.io/rb/mdq)
+
 MDQ stands for Mobile Device Query and is a command line tool for displaying information about Android and Apple devices.  
 
 # Usage
@@ -78,6 +80,34 @@ $ mdq list -q="select * from devices where platform='iOS'"
 ]
 ```
 
+View apps installed on your device.
+Apple Devices displays the apps installed with Xcode.
+
+```
+$ mdq list -q='select * from apps'
+```
+
+Take a screenshot on Android.
+
+```
+$ mdq list --cap='/Users/xxxxx/'
+```
+
+Install the app.
+
+```
+$ mdq list --install='/Users/xxxxx/example.apk'
+$ mdq list --install='/Users/xxxxx/example.ipa'
+```
+
+Uninstall the app.
+
+```
+$ mdq list --uninstall='com.example.app'
+```
+
+
+
 # Specification
 
 Details of the devices table.
@@ -94,5 +124,16 @@ Details of the devices table.
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
-| total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
+| free_capacity | df | Always "null" |
+
+
+Details of the apps table.
+Apple Devices displays the apps installed with Xcode.
+
+| name | android | apple devices |
+| -- | -- | -- |
+| udid | Serial number | hardwareProperties.udid |
+| name | Always "null" | name |
+| package_name | Package name | bundleIdentifier |
+| version | Always "null" | version |

data/README.md

@@ -2,6 +2,8 @@
 
 # mdq - Mobile Device Query
 
+[![Gem Version](https://badge.fury.io/rb/mdq.svg)](https://badge.fury.io/rb/mdq)
+
 MDQ stands for Mobile Device Query and is a command line tool for displaying information about Android and Apple devices.  
 
 # Usage
@@ -78,6 +80,34 @@ $ mdq list -q="select * from devices where platform='iOS'"
 ]
 ```
 
+View apps installed on your device.
+Apple Devices displays the apps installed with Xcode.
+
+```
+$ mdq list -q='select * from apps'
+```
+
+Take a screenshot on Android.
+
+```
+$ mdq list --cap='/Users/xxxxx/'
+```
+
+Install the app.
+
+```
+$ mdq list --install='/Users/xxxxx/example.apk'
+$ mdq list --install='/Users/xxxxx/example.ipa'
+```
+
+Uninstall the app.
+
+```
+$ mdq list --uninstall='com.example.app'
+```
+
+
+
 # Specification
 
 Details of the devices table.
@@ -94,5 +124,16 @@ Details of the devices table.
 | build_version | ro.build.version.release | deviceProperties.osVersionNumber |
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
-| total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
+| free_capacity | df | Always "null" |
+
+
+Details of the apps table.
+Apple Devices displays the apps installed with Xcode.
+
+| name | android | apple devices |
+| -- | -- | -- |
+| udid | Serial number | hardwareProperties.udid |
+| name | Always "null" | name |
+| package_name | Package name | bundleIdentifier |
+| version | Always "null" | version |

data/lib/mdq/check.rb

@@ -7,9 +7,19 @@ module Mdq
   # Check
   class Check
     def initialize
-      ddb = Mdq::DDB.new
-      ddb.show_version('adb', 'adb version')
-      ddb.show_version('Xcode', 'xcrun devicectl --version')
+      db = Mdq::DB.new
+      show_message('adb', db.android_discoverable?)
+      show_message('Xcode', db.apple_discoverable?)
+    end
+
+    private
+
+    def show_message(name, discoverable)
+      if discoverable
+        puts "# #{name} is installed."
+      else
+        puts "# #{name} is not installed."
+      end
     end
   end
 end

data/lib/mdq/db.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'mdq'
+require 'active_record'
+require 'fileutils'
+
+# Mdq
+module Mdq
+  # DB
+  class DB < Discovery
+    # クエリの実行
+    def get(sql)
+      reset
+      # デバイスの発見
+      android_discover
+      apple_discover
+
+      if sql
+        Device.all.each do |model|
+          # インストール済みAppの取得
+          if model.android?
+            android_apps(model.udid)
+          else
+            apple_apps(model.udid)
+          end
+        end
+
+        begin
+          ActiveRecord::Base.connection.execute(sql)
+        rescue StandardError
+          warn 'SQL Syntax Error.'
+          exit
+        end
+      else
+        Device.all
+      end
+    end
+
+    # Androidデバイスのスクリーンショットを撮る
+    def device_screencap(output, udid, is_android)
+      return unless is_android
+
+      FileUtils.mkdir_p(output)
+      file = "/sdcard/#{udid}.png"
+      adb_command("shell screencap -p #{file}", udid)
+      adb_command("pull #{file} #{output}", udid)
+      adb_command("adb shell rm #{file}")
+
+      puts "# Screenshot of #{udid} to #{output}"
+    end
+
+    # Appをインストールする
+    def app_install(input, udid, is_android)
+      output, = adb_command("install #{input}", udid) if is_android && input.end_with?('.apk')
+      output, = apple_command("device install app #{input}", udid) if !is_android && input.end_with?('.ipa')
+
+      return unless output
+
+      puts "# Install #{input} to #{udid}"
+      puts output
+    end
+
+    # Appをアンインストールする
+    def app_uninstall(input, udid, is_android)
+      if is_android
+        output, = adb_command("uninstall #{input}", udid)
+      else
+        output, = apple_command("device uninstall app #{input}", udid)
+      end
+
+      return unless output
+
+      puts "# Uninstall #{input} from #{udid}"
+      puts output
+    end
+  end
+end

data/lib/mdq/{ddb.rb → discovery.rb}

@@ -6,73 +6,18 @@ require 'fileutils'
 
 # Mdq
 module Mdq
-  # DDB
-  class DDB
-    def initializ; end
-
-    # 接続中のデバイスを取得する
-    def get(sql)
-      ActiveRecord::Schema.verbose = false
-      InitialSchema.migrate(:up)
-
-      android_discover
-      apple_discover
-
-      if sql
-        begin
-          ActiveRecord::Base.connection.execute(sql)
-        rescue StandardError
-          warn 'SQL Syntax Error.'
-          exit
-        end
-      else
-        Device.all
-      end
-    end
-
-    # 指定したソフトウェアのインストール状況を表示する
-    def show_version(name, command)
-      output, = Open3.capture3(command)
-      puts "# #{name} installed."
-      puts output
-    rescue StandardError
-      puts "# #{name} is not installed."
-    end
-
-    # Androidデバイスのスクリーンショットを撮る
-    def device_screencap(output, udid, is_android)
-      return unless is_android
-
-      FileUtils.mkdir_p(output)
-      file = "/sdcard/#{udid}.png"
-      adb_command("shell screencap -p #{file}", udid)
-      adb_command("pull #{file} #{output}", udid)
-      adb_command("adb shell rm #{file}")
-
-      puts "# Screenshot of #{udid} to #{output}"
+  # Discovery
+  class Discovery
+    def initialize
+      @home = FileUtils.mkdir_p([Dir.home, '.mdq'].join(File::Separator))
     end
 
-    def app_install(input, udid, is_android)
-      output, = adb_command("install #{input}", udid) if is_android && input.end_with?('.apk')
-      output, = apple_command("device install app #{input}", udid) if !is_android && input.end_with?('.ipa')
-
-      return unless output
-
-      puts "# Install #{input} to #{udid}"
-      puts output
+    def android_discoverable?
+      adb_command('version').present?
     end
 
-    def app_uninstall(input, udid, is_android)
-      if is_android
-        output, = adb_command("uninstall #{input}", udid)
-      else
-        output, = apple_command("device uninstall app #{input}", udid)
-      end
-
-      return unless output
-
-      puts "# Uninstall #{input} from #{udid}"
-      puts output
+    def apple_discoverable?
+      apple_command('--version').present?
     end
 
     private
@@ -108,7 +53,7 @@ module Mdq
     end
 
     # Androidデバイス一覧を取得する
-    def android_discover # rubocop:disable Metrics/AbcSize
+    def android_discover
       output, = adb_command('devices -l')
       return if output.nil?
 
@@ -160,6 +105,7 @@ module Mdq
                           free_capacity: free_capacity,
                           platform: 'Android'
                         })
+
         else
           Device.create({
                           udid: udid,
@@ -173,16 +119,17 @@ module Mdq
 
     # Appleデバイス一覧を取得する
     def apple_discover
-      file = [Dir.home, '.mdq.json'].join(File::Separator)
+      file = [@home, 'mdq.json'].join(File::Separator)
       result = apple_command("list devices -v -j #{file}")
-      return if result.nil?
+
       return unless File.exist?(file)
 
       File.open(file, 'r') do |f|
         result = JSON.parse(f.read)
         result['result']['devices'].each do |device|
+          udid = device['hardwareProperties']['udid']
           Device.create({
-                          udid: device['hardwareProperties']['udid'],
+                          udid: udid,
                           serial_number: device['hardwareProperties']['serialNumber'],
                           name: device['deviceProperties']['name'],
                           authorized: true,
@@ -190,44 +137,94 @@ module Mdq
                           marketing_name: device['hardwareProperties']['marketingName'],
                           model: device['hardwareProperties']['productType'],
                           build_version: device['deviceProperties']['osVersionNumber'],
-                          build_id: device['deviceProperties']['osBuildUpdate']
+                          build_id: device['deviceProperties']['osBuildUpdate'],
+                          total_capacity: device['hardwareProperties']['internalStorageCapacity']
                         })
         end
 
         File.delete(file)
       end
     end
+
+    # Androidのアプリを取得する
+    def android_apps(udid)
+      apps, = adb_command('shell pm list packages', udid)
+      apps.split("\n").each do |line3|
+        App.create({
+                     udid: udid,
+                     package_name: line3.gsub('package:', '')
+                   })
+      end
+    end
+
+    # Appleデバイスのアプリを取得する
+    def apple_apps(udid)
+      file = [@home, 'mdq-apps.json'].join(File::Separator)
+      apple_command("device info apps -j #{file}", udid)
+      File.open(file, 'r') do |f|
+        result = JSON.parse(f.read)
+        begin
+          result['result']['apps'].each do |app|
+            App.create({
+                         udid: udid,
+                         package_name: app['bundleIdentifier'],
+                         name: app['name'],
+                         version: app['version']
+                       })
+          end
+        rescue StandardError
+          # none
+        end
+      end
+      File.delete(file)
+    end
+
+    def reset
+      Device.destroy_all
+      App.destroy_all
+      ActiveRecord::Base.connection.execute("delete from sqlite_sequence where name='devices'")
+      ActiveRecord::Base.connection.execute("delete from sqlite_sequence where name='apps'")
+    end
   end
 end
 
+ActiveRecord::Schema.verbose = false
+ActiveRecord::Migration.verbose = false
+
 ActiveRecord::Base.establish_connection(
   adapter: 'sqlite3',
   database: ':memory:'
 )
 
-# スキーマの設定
-class InitialSchema < ActiveRecord::Migration[5.1]
-  def self.up
-    create_table :devices do |t|
-      t.string :udid
-      t.string :serial_number
-      t.string :name
-      t.boolean :authorized
-      t.string :platform
-      t.string :marketing_name
-      t.string :model
-      t.string :build_version
-      t.string :build_id
-      t.integer :battery_level
-      t.integer :total_capacity
-      t.integer :free_capacity
-    end
-  end
+ActiveRecord::Migration.create_table :devices do |t|
+  t.string :udid
+  t.string :serial_number
+  t.string :name
+  t.boolean :authorized
+  t.string :platform
+  t.string :marketing_name
+  t.string :model
+  t.string :build_version
+  t.string :build_id
+  t.integer :battery_level
+  t.integer :total_capacity
+  t.integer :free_capacity
+end
 
-  def self.down
-    drop_table :devices
-  end
+ActiveRecord::Migration.create_table :apps do |t|
+  t.string :udid
+  t.string :name
+  t.string :package_name
+  t.string :version
 end
 
+# Device
 class Device < ActiveRecord::Base
+  def android?
+    platform == 'Android'
+  end
+end
+
+# App
+class App < ActiveRecord::Base
 end

data/lib/mdq/list.rb

@@ -7,10 +7,12 @@ module Mdq
   # List
   class List
     def initialize(options)
-      ddb = Mdq::DDB.new
-      devices = ddb.get(options['query'])
+      db = Mdq::DB.new
 
-      output = JSON.pretty_generate(devices.as_json)
+      query = options['query']
+      models = db.get(query)
+
+      output = JSON.pretty_generate(models.as_json)
       puts output
       if options['output']
         File.open(options['output'], 'w') do |f|
@@ -18,10 +20,10 @@ module Mdq
         end
       end
 
-      devices.each do |device|
+      models.each do |device|
         model = Device.find_by(udid: device.udid)
         udid = model.udid
-        is_android = model.platform == 'Android'
+        is_android = model.android?
 
         ddb.device_screencap(options[:cap], udid, is_android) if options[:cap]
         ddb.app_install(options[:install], udid, is_android) if options[:install]

data/lib/mdq/version.rb

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

data/lib/mdq.rb

@@ -4,7 +4,9 @@ require_relative 'mdq/version'
 require 'mdq/cli'
 require 'mdq/check'
 require 'mdq/list'
-require 'mdq/ddb'
+require 'mdq/discovery'
+require 'mdq/db'
+
 require 'open3'
 require 'active_record'
 require 'json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - arthur87
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -87,7 +87,8 @@ files:
 - lib/mdq.rb
 - lib/mdq/check.rb
 - lib/mdq/cli.rb
-- lib/mdq/ddb.rb
+- lib/mdq/db.rb
+- lib/mdq/discovery.rb
 - lib/mdq/list.rb
 - lib/mdq/version.rb
 homepage: https://github.com/arthur87/mdq