mdq 0.5.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f15383d8943cba2f10e8204a31fde8117580ad57a94d0141ad898a5ed50b6a
-  data.tar.gz: ff937fc11de10ff1a1f97176a19cafa0aea59bf3cfeb18dd183ff79b5592868c
+  metadata.gz: eb4e645a90b2083463ab42641ac31601a9b433a1ab8c163bac6c50ad8f23ea83
+  data.tar.gz: f9ee18ecb1ba26fc5c22be56cbef9488a56c10881b911d3895eb0a37191e7f96
 SHA512:
-  metadata.gz: 10a89282279e49ebf393d06d9af0e2d1483a958901f3f40b0a321e2c59f0ff16e9388f1d186f7af2c75556d33994e14f9228b258c7453dd819c7fbb36c509006
-  data.tar.gz: '09a80da76956894938b457d9c4ff1ab5d24093d84f5069e7e43ff79ecf3952c3d57888f16eaf75845cd3b51b6e1cdaf17dc8fc731d99f36fa2fb979333535c4f'
+  metadata.gz: 1cb781ce60a3916842174e8da0f76dc63deb92d4a4f3f2e58e1bafe76f34c2d1947a6ae169690a380d4541b33733f0adb2377eeac257124ead43839b4dfa6bb6
+  data.tar.gz: 574b835238868b31e97871e259d3f3d8e9155b1dcf2b6d1e0561f329dc057e6e80054a69d0f3e327cdf0f68e44a7c6fced9e175c9ebcdab652367801df98d124

data/README.base.md

@@ -22,12 +22,12 @@ Check the software installation status.
 $ mdq check
 ```
 
-## List
+## Devices
 
-It's easy to use.
+Show mobile devices.
 
 ```
-$ mdq list
+$ mdq devices
 [
   {
     "id": 1,
@@ -80,6 +80,17 @@ $ mdq list
 ]
 ```
 
+## Apss
+
+Show apps.
+
+```
+$ mdq apps
+```
+
+
+## List
+
 You can filter using SQL.
 
 ```
@@ -122,20 +133,20 @@ $ mdq list -q='select * from apps'
 Take a screenshot on Android.
 
 ```
-$ mdq list --cap='/Users/xxxxx/'
+$ mdq cap -o='/Users/xxxxx/' -u='UDID'
 ```
 
 Install the app.
 
 ```
-$ mdq list --install='/Users/xxxxx/example.apk'
-$ mdq list --install='/Users/xxxxx/example.ipa'
+$ mdq install -i='/Users/xxxxx/example.apk' -u='UDID'
+$ mdq install -i=='/Users/xxxxx/example.ipa' -u='UDID'
 ```
 
 Uninstall the app.
 
 ```
-$ mdq list --uninstall='com.example.app'
+$ mdq uninstall -i='com.example.app' -u='UDID'
 ```
 
 

data/README.ja.md

@@ -17,12 +17,12 @@ Check the software installation status.
 $ mdq check
 ```
 
-## List
+## Devices
 
-It's easy to use.
+Show mobile devices.
 
 ```
-$ mdq list
+$ mdq devices
 [
   {
     "id": 1,
@@ -75,6 +75,17 @@ $ mdq list
 ]
 ```
 
+## Apss
+
+Show apps.
+
+```
+$ mdq apps
+```
+
+
+## List
+
 You can filter using SQL.
 
 ```
@@ -117,20 +128,20 @@ $ mdq list -q='select * from apps'
 Take a screenshot on Android.
 
 ```
-$ mdq list --cap='/Users/xxxxx/'
+$ mdq cap -o='/Users/xxxxx/' -u='UDID'
 ```
 
 Install the app.
 
 ```
-$ mdq list --install='/Users/xxxxx/example.apk'
-$ mdq list --install='/Users/xxxxx/example.ipa'
+$ mdq install -i='/Users/xxxxx/example.apk' -u='UDID'
+$ mdq install -i=='/Users/xxxxx/example.ipa' -u='UDID'
 ```
 
 Uninstall the app.
 
 ```
-$ mdq list --uninstall='com.example.app'
+$ mdq uninstall -i='com.example.app' -u='UDID'
 ```
 
 

data/README.md

@@ -17,12 +17,12 @@ Check the software installation status.
 $ mdq check
 ```
 
-## List
+## Devices
 
-It's easy to use.
+Show mobile devices.
 
 ```
-$ mdq list
+$ mdq devices
 [
   {
     "id": 1,
@@ -75,6 +75,17 @@ $ mdq list
 ]
 ```
 
+## Apss
+
+Show apps.
+
+```
+$ mdq apps
+```
+
+
+## List
+
 You can filter using SQL.
 
 ```
@@ -117,20 +128,20 @@ $ mdq list -q='select * from apps'
 Take a screenshot on Android.
 
 ```
-$ mdq list --cap='/Users/xxxxx/'
+$ mdq cap -o='/Users/xxxxx/' -u='UDID'
 ```
 
 Install the app.
 
 ```
-$ mdq list --install='/Users/xxxxx/example.apk'
-$ mdq list --install='/Users/xxxxx/example.ipa'
+$ mdq install -i='/Users/xxxxx/example.apk' -u='UDID'
+$ mdq install -i=='/Users/xxxxx/example.ipa' -u='UDID'
 ```
 
 Uninstall the app.
 
 ```
-$ mdq list --uninstall='com.example.app'
+$ mdq uninstall -i='com.example.app' -u='UDID'
 ```
 
 

data/lib/mdq/cli.rb

@@ -19,17 +19,69 @@ module Mdq
 
     desc 'check', 'Check the software installation status'
     def check
-      Mdq::Check.new
+      db = Mdq::DB.new
+      puts "adb is installed: #{db.android_discoverable?}"
+      puts "Xcode is installed: #{db.apple_discoverable?}"
     end
 
-    desc 'list', 'Show mobile devices'
-    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(apk, ipa)'
-    method_option :uninstall, desc: 'Uninstalling the app(Package Name, Bundle Identifier)'
+    desc 'devices', 'Show mobile devices'
+    method_option :android, desc: 'Show Android devices', default: true,
+                            type: :boolean
+    method_option :apple, desc: 'Show Apple devices', default: true,
+                          type: :boolean
+    def devices
+      db = Mdq::DB.new
+      db.get(is_android: options[:android], is_apple: options[:apple], is_apps: false)
+      puts(JSON.pretty_generate(Device.all.as_json))
+    end
+
+    desc 'apps', 'Show mobile apps'
+    method_option :android, desc: 'Show Android devices', default: true,
+                            type: :boolean
+    method_option :apple, desc: 'Show Apple devices', default: true,
+                          type: :boolean
+    def apps
+      db = Mdq::DB.new
+      db.get(is_android: options[:android], is_apple: options[:apple])
+      puts(JSON.pretty_generate(App.all.as_json))
+    end
+
+    desc 'list', 'Show mobile devices or apps'
+    method_option :query, desc: 'SQL to filter devices or apps', aliases: '-q', required: true
     def list
-      Mdq::List.new(options)
+      db = Mdq::DB.new
+      db.get
+      result = db.query(options['query'])
+      puts(JSON.pretty_generate(result.as_json))
+    end
+
+    desc 'cap', 'Path to save screenshots(Android only)'
+    method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
+    method_option :output, desc: 'Save to file', aliases: '-o', required: true
+    def cap
+      db = Mdq::DB.new
+      db.get(is_apps: false)
+      db.device_screencap(options[:output], options[:udid])
+    end
+
+    desc 'install', 'Installing the app(apk, apex, ipa)'
+    method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
+    method_option :input, desc: 'Path to the app file', aliases: '-i', required: true
+    method_option :replace, desc: 'Replace the app if it is already installed', aliases: '-r', default: false,
+                            type: :boolean
+    def install
+      db = Mdq::DB.new
+      db.get(is_apps: false)
+      db.app_install(options[:input], options[:udid], options[:replace])
+    end
+
+    desc 'uninstall', 'Uninstalling the app'
+    method_option :udid, desc: 'Specify the device UDID', aliases: '-u', required: true
+    method_option :input, desc: 'Path to the app', aliases: '-i', required: true
+    def uninstall
+      db = Mdq::DB.new
+      db.get(is_apps: false)
+      db.app_uninstall(options[:input], options[:udid])
     end
   end
 end

data/lib/mdq/db.rb

@@ -8,63 +8,86 @@ require 'fileutils'
 module Mdq
   # DB
   class DB < Discovery
-    # クエリの実行
-    def get(sql)
+    # デバイスとアプリの取得
+    def get(is_android: true, is_apple: true, is_apps: true)
       reset
       # デバイスの発見
-      android_discover
-      apple_discover
+      android_discover if is_android
+      apple_discover if is_apple
 
-      if sql
-        Device.all.each do |model|
-          # インストール済みAppの取得
-          if model.android?
-            android_apps(model.udid)
-          else
-            apple_apps(model.udid)
-          end
-        end
+      return unless is_apps
 
-        begin
-          ActiveRecord::Base.connection.execute(sql)
-        rescue StandardError => e
-          { result: e }
+      Device.all.each do |model|
+        # インストール済みAppの取得
+        if model.android?
+          android_apps(model.udid)
+        else
+          apple_apps(model.udid)
         end
-      else
-        Device.all
       end
     end
 
+    # クエリの実行
+    def query(sql)
+      ActiveRecord::Base.connection.execute(sql)
+    rescue StandardError
+      []
+    end
+
     # Androidデバイスのスクリーンショットを撮る
-    def device_screencap(output, udid, is_android)
-      return unless is_android
+    def device_screencap(output, udid)
+      device = Device.find_by(udid: udid)
+      if device.nil? || !device.android?
+        warn 'Device not found or not an Android device.'
+        return
+      end
 
       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}")
-
-      { command: 'cap', udid: udid, result: nil }
+      file = "#{udid}-#{Time.now.strftime('%y%m%d-%H%M%S')}.png"
+      full_path = "/sdcard/#{file}"
+      adb_command("shell screencap -p #{full_path}", udid)
+      adb_command("pull #{full_path} #{output}", udid)
+      adb_command("shell rm #{full_path}", udid)
     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')
+    def app_install(input, udid, is_replace)
+      device = Device.find_by(udid: udid)
+      if device.nil?
+        warn 'Device not found.'
+        return
+      end
 
-      { command: 'install', udid: udid, result: output }
+      if device.android?
+        if is_replace
+          output, error = adb_command("install -r #{input}", udid)
+        else
+          output, error = adb_command("install #{input}", udid)
+        end
+      else
+        output, error = apple_command("device install app #{input}", udid)
+      end
+
+      puts output unless output.empty?
+      warn error unless error.empty?
     end
 
     # Appをアンインストールする
-    def app_uninstall(input, udid, is_android)
-      if is_android
-        output, = adb_command("uninstall #{input}", udid)
+    def app_uninstall(input, udid)
+      device = Device.find_by(udid: udid)
+      if device.nil?
+        warn 'Device not found.'
+        return
+      end
+
+      if device.android?
+        output, error = adb_command("uninstall #{input}", udid)
       else
-        output, = apple_command("device uninstall app #{input}", udid)
+        output, error = apple_command("device uninstall app #{input}", udid)
       end
 
-      { command: 'uninstall', udid: udid, result: output }
+      puts output unless output.empty?
+      warn error unless error.empty?
     end
   end
 end

data/lib/mdq/discovery.rb

@@ -135,7 +135,7 @@ module Mdq
                           total_disk: total_disk,
                           available_disk: available_disk,
                           used_disk: used_disk,
-                          capacity: (used_disk / total_disk) * 100,
+                          capacity: (used_disk.to_f / total_disk) * 100,
                           human_readable_total_disk: number_to_human_size(total_disk, k),
                           human_readable_available_disk: number_to_human_size(available_disk, k),
                           human_readable_used_disk: number_to_human_size(used_disk, k),

data/lib/mdq/version.rb

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

data/lib/mdq.rb

@@ -2,9 +2,6 @@
 
 require_relative 'mdq/version'
 require 'mdq/cli'
-require 'mdq/check'
-require 'mdq/list'
-require 'mdq/output_builder'
 require 'mdq/discovery'
 require 'mdq/db'
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mdq
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.1
 platform: ruby
 authors:
 - arthur87
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2026-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -85,12 +84,9 @@ files:
 - Rakefile
 - exe/mdq
 - lib/mdq.rb
-- lib/mdq/check.rb
 - lib/mdq/cli.rb
 - lib/mdq/db.rb
 - lib/mdq/discovery.rb
-- lib/mdq/list.rb
-- lib/mdq/output_builder.rb
 - lib/mdq/version.rb
 homepage: https://github.com/arthur87/mdq
 licenses:
@@ -98,7 +94,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/arthur87/mdq
   source_code_uri: https://github.com/arthur87/mdq
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: mdq is a command line tool for displaying information about Android and Apple
   devices.

data/lib/mdq/check.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'mdq'
-
-# Mdq
-module Mdq
-  # Check
-  class Check
-    def initialize
-      ob = Mdq::OutputBuilder.new
-
-      db = Mdq::DB.new
-      ob.add(show_message('adb', db.android_discoverable?))
-      ob.add(show_message('Xcode', db.apple_discoverable?))
-
-      ob.print
-    end
-
-    private
-
-    def show_message(name, discoverable)
-      if discoverable
-        { result: "#{name} is installed." }
-      else
-        { result: "#{name} is not installed." }
-      end
-    end
-  end
-end

data/lib/mdq/list.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'mdq'
-
-# Mdq
-module Mdq
-  # List
-  class List
-    def initialize(options)
-      db = Mdq::DB.new
-
-      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|
-          f.write(output)
-        end
-      end
-
-      ob = Mdq::OutputBuilder.new
-
-      models.each do |device|
-        model = Device.find_by(udid: device.udid)
-        udid = model.udid
-        is_android = model.android?
-
-        ob.add(db.device_screencap(options[:cap], udid, is_android)) if options[:cap]
-        ob.add(db.app_install(options[:install], udid, is_android)) if options[:install]
-        ob.add(db.app_uninstall(options[:uninstall], udid, is_android)) if options[:uninstall]
-      rescue StandardError
-        # none
-      end
-
-      ob.print
-    end
-  end
-end

data/lib/mdq/output_builder.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'mdq'
-
-# Mdq
-module Mdq
-  # OutputBuilder
-  class OutputBuilder
-    def initialize
-      @result = []
-    end
-
-    def clear
-      @result = []
-    end
-
-    def add(new_result)
-      @result << new_result
-    end
-
-    def print
-      return if @result == []
-
-      puts JSON.pretty_generate(@result.as_json)
-    end
-  end
-end