mdq 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6ccf8139b087e853fd80d2f993a1ed23f36fdb9f00e91a9cdfbe139ad925cc
-  data.tar.gz: 27be35859eb50189dfc0a892340f66c135f0b5071eacf4ef8b3d775a58397fcc
+  metadata.gz: 8a9f4ec5652eddd07350b8957261163db13ce51c1d36c7e7e109c8eb0836dc0a
+  data.tar.gz: 9bfbf94ee8f84849beb7a719b3170dc4b989dc1b988cb1b4b6b2dba0bab41ea2
 SHA512:
-  metadata.gz: e667d4599d3a713d5eccfa134559d73b58c62ad7a86421dd02522cc3302925884e36785be34937b27ec39f243e466cdd4841bd9e0a75aa2619f88dd28b99688d
-  data.tar.gz: 9ed7bf1a7bde453757d2924eb9b9b64b9ee0289a76baa1720ffcfcd53a2d1f88cc37990d67ae11adcbc31a0e29beb28bb9f2ab64363ae8420a73659b308c7c88
+  metadata.gz: a26e2f9fdb44629c5e478845bc227fe2efe7354b1e1e01f84214e9b2c36fe6edaea6d95e17c25a333ecad911bb203e5321192ffd5a3ebd9d66da283413a70608
+  data.tar.gz: b936990fa4c104841742c5cc1bb11c791e7c96b98585ffe29cb08dc42729eece6aaa06c8ca935545e7e5ad67d3d3c933673c1ea7f3e92f49097f20b75d6c68dc

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/ddb.rb

@@ -48,28 +48,67 @@ module Mdq
       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
 
     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)
-      end
+      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
 
     def app_uninstall(input, udid, is_android)
       if is_android
-        adb_command("uninstall #{input}", udid)
+        output, = adb_command("uninstall #{input}", udid)
       else
-        apple_command("device uninstall app #{input}", udid)
+        output, = apple_command("device uninstall app #{input}", udid)
       end
+
+      return unless output
+
+      puts "# Uninstall #{input} from #{udid}"
+      puts output
     end
 
     private
 
+    # ADBコマンド
+    def adb_command(arg, udid = nil)
+      command = if udid.nil?
+                  "adb #{arg}"
+                else
+                  "adb -s #{udid} #{arg}"
+                end
+
+      begin
+        Open3.capture3(command)
+      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
+        Open3.capture3(command)
+      rescue StandardError
+        nil
+      end
+    end
+
     # Androidデバイス一覧を取得する
-    def android_discover
+    def android_discover # rubocop:disable Metrics/AbcSize
       output, = adb_command('devices -l')
       return if output.nil?
 
@@ -82,10 +121,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,11 +150,11 @@ 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,
@@ -132,48 +171,11 @@ 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
-
+      result = apple_command("list devices -v -j #{file}")
+      return if result.nil?
       return unless File.exist?(file)
 
       File.open(file, 'r') do |f|

data/lib/mdq/list.rb

@@ -24,7 +24,7 @@ module Mdq
         is_android = model.platform == '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.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - arthur87
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop