mdq 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6ccf8139b087e853fd80d2f993a1ed23f36fdb9f00e91a9cdfbe139ad925cc
-  data.tar.gz: 27be35859eb50189dfc0a892340f66c135f0b5071eacf4ef8b3d775a58397fcc
+  metadata.gz: 11207ffa243aa9925a945ecf3e989f3ef136a36d3ef3d574e32372528097e09f
+  data.tar.gz: 642365689def13a8c56769d3f070954b123f3c6ebf7ca23f2a781415a1a44f5d
 SHA512:
-  metadata.gz: e667d4599d3a713d5eccfa134559d73b58c62ad7a86421dd02522cc3302925884e36785be34937b27ec39f243e466cdd4841bd9e0a75aa2619f88dd28b99688d
-  data.tar.gz: 9ed7bf1a7bde453757d2924eb9b9b64b9ee0289a76baa1720ffcfcd53a2d1f88cc37990d67ae11adcbc31a0e29beb28bb9f2ab64363ae8420a73659b308c7c88
+  metadata.gz: 9b8812fd72184096df44cec5361a071e7b3c6f0175768efb32ecd9e1149e9d73d9d334c82ea83764fab67415a7680c854ec97d9f31508649c7265a3db62b2358
+  data.tar.gz: 74ff17f9a43ff731d42fff94055c718ce85408e1dc641d5d70bed51e4fff6cd8be3dcd39ddca65fed082ed8e2bda7e018c0a750bbff3009eb80aba79f2922a3f

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

@@ -83,6 +83,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.
@@ -100,4 +128,15 @@ Details of the devices table.
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
 | total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| 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

@@ -78,6 +78,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.
@@ -95,4 +123,15 @@ Details of the devices table.
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
 | total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| 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

@@ -78,6 +78,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.
@@ -95,4 +123,15 @@ Details of the devices table.
 | build_id | ro.build.id | deviceProperties.osBuildUpdate | 
 | battery_level | battery | Always "null" |
 | total_capacity | df | Always "null" |
-| free_capacity | df | Always "null" |
+| 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,9 @@ 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
+      db.show_version('adb', 'adb version')
+      db.show_version('Xcode', 'xcrun devicectl --version')
     end
   end
 end

data/lib/mdq/cli.rb

@@ -26,8 +26,8 @@ module Mdq
     method_option :output, desc: 'Save the results as a JSON file', aliases: '-o'
     method_option :query, desc: 'SQL to filter devices', aliases: '-q'
     method_option :cap, desc: 'Path to save screenshots(Android only)'
-    method_option :install, desc: 'Installing the app'
-    method_option :uninstall, desc: 'Uninstalling the app'
+    method_option :install, desc: 'Installing the app(apk, ipa)'
+    method_option :uninstall, desc: 'Uninstalling the app(Package Name, Bundle Identifier)'
     def list
       Mdq::List.new(options)
     end

data/lib/mdq/db.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+require 'mdq'
+require 'active_record'
+require 'fileutils'
+
+# Mdq
+module Mdq
+  # DB
+  class DB < Discovery
+    # クエリの実行
+    def get(sql)
+      InitialSchema.migrate(: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
+
+    # 指定したソフトウェアのインストール状況を表示する
+    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}"
+    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,68 +6,45 @@ require 'fileutils'
 
 # Mdq
 module Mdq
-  # DDB
-  class DDB
-    def initializ; end
-
-    # 接続中のデバイスを取得する
-    def get(sql)
+  # Discovery
+  class Discovery
+    def initialize
       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
+    private
 
-      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}")
-    end
+    # ADBコマンド
+    def adb_command(arg, udid = nil)
+      command = if udid.nil?
+                  "adb #{arg}"
+                else
+                  "adb -s #{udid} #{arg}"
+                end
 
-    def app_install(input, udid, is_android)
-      if is_android && input.end_with?('.apk')
-        adb_command("install #{input}", udid)
-      else
-        apple_command("device install app #{input}", udid)
+      begin
+        Open3.capture3(command)
+      rescue StandardError
+        nil
       end
     end
 
-    def app_uninstall(input, udid, is_android)
-      if is_android
-        adb_command("uninstall #{input}", udid)
-      else
-        apple_command("device uninstall app #{input}", udid)
+    # devicectlコマンド
+    def apple_command(arg, udid = nil)
+      command = if udid.nil?
+                  "xcrun devicectl #{arg}"
+                else
+                  "xcrun devicectl #{arg} --device #{udid}"
+                end
+
+      begin
+        Open3.capture3(command)
+      rescue StandardError
+        nil
       end
     end
 
-    private
-
     # Androidデバイス一覧を取得する
     def android_discover
       output, = adb_command('devices -l')
@@ -82,10 +59,10 @@ module Mdq
         authorized = line.index('unauthorized').nil?
 
         if authorized
-          model = adb_command('shell getprop ro.product.model', udid)
-          build_version = adb_command('shell getprop ro.build.version.release', udid)
-          build_id = adb_command('shell getprop ro.build.id', udid)
-          name = adb_command('shell settings get global device_name', udid)
+          model, = adb_command('shell getprop ro.product.model', udid)
+          build_version, = adb_command('shell getprop ro.build.version.release', udid)
+          build_id, = adb_command('shell getprop ro.build.id', udid)
+          name, = adb_command('shell settings get global device_name', udid)
           battery_level = nil
           total_capacity = nil
           free_capacity = nil
@@ -111,16 +88,17 @@ module Mdq
           Device.create({
                           udid: udid,
                           serial_number: udid,
-                          name: name,
+                          name: name.strip,
                           authorized: true,
-                          model: model,
-                          build_version: build_version,
-                          build_id: build_id,
+                          model: model.strip,
+                          build_version: build_version.strip,
+                          build_id: build_id.strip,
                           battery_level: battery_level,
                           total_capacity: total_capacity,
                           free_capacity: free_capacity,
                           platform: 'Android'
                         })
+
         else
           Device.create({
                           udid: udid,
@@ -132,55 +110,19 @@ module Mdq
       end
     end
 
-    # ADBコマンド
-    def adb_command(arg, udid = nil)
-      command = if udid.nil?
-                  "adb #{arg}"
-                else
-                  "adb -s #{udid} #{arg}"
-                end
-
-      begin
-        output, = Open3.capture3(command)
-        output.strip
-      rescue StandardError
-        nil
-      end
-    end
-
-    # devicectlコマンド
-    def apple_command(arg, udid = nil)
-      command = if udid.nil?
-                  "xcrun devicectl #{arg}"
-                else
-                  "xcrun devicectl #{arg} --device #{udid}"
-                end
-
-      begin
-        output, = Open3.capture3(command)
-        output.strip
-      rescue StandardError
-        nil
-      end
-    end
-
     # Appleデバイス一覧を取得する
     def apple_discover
-      file = [Dir.home, '.mdq.json'].join(File::Separator)
-
-      begin
-        Open3.capture3("xcrun devicectl list devices -v -j #{file}")
-      rescue StandardError
-        return
-      end
-
+      file = [Dir.home, '.mdq'].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,
@@ -195,6 +137,39 @@ module Mdq
         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 = [Dir.home, '.mdq-apps'].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
   end
 end
 
@@ -220,12 +195,28 @@ class InitialSchema < ActiveRecord::Migration[5.1]
       t.integer :total_capacity
       t.integer :free_capacity
     end
+
+    create_table :apps do |t|
+      t.string :udid
+      t.string :name
+      t.string :package_name
+      t.string :version
+    end
   end
 
   def self.down
     drop_table :devices
+    drop_table :apps
   end
 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,13 +20,13 @@ 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) if options[:install]
+        ddb.app_install(options[:install], udid, is_android) if options[:install]
         ddb.app_uninstall(options[:uninstall], udid, is_android) if options[:uninstall]
       rescue StandardError
         # none

data/lib/mdq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mdq
-  VERSION = '0.1.0'
+  VERSION = '0.3.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.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - arthur87
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-05-21 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