mdq 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11207ffa243aa9925a945ecf3e989f3ef136a36d3ef3d574e32372528097e09f
-  data.tar.gz: 642365689def13a8c56769d3f070954b123f3c6ebf7ca23f2a781415a1a44f5d
+  metadata.gz: 84a0f2929127bcd9631e862124b937660ab2f8e578d93213d08c792ae49a029a
+  data.tar.gz: b9c0cb1eb1eb10f74614a52c2fb8bbc3fc8be3b13cbfb213c21bb870a75b8a21
 SHA512:
-  metadata.gz: 9b8812fd72184096df44cec5361a071e7b3c6f0175768efb32ecd9e1149e9d73d9d334c82ea83764fab67415a7680c854ec97d9f31508649c7265a3db62b2358
-  data.tar.gz: 74ff17f9a43ff731d42fff94055c718ce85408e1dc641d5d70bed51e4fff6cd8be3dcd39ddca65fed082ed8e2bda7e018c0a750bbff3009eb80aba79f2922a3f
+  metadata.gz: 190b46a81fd4e4a7bf02439bdbd93e3399e75335db6bfbbd6cf9567e36ccb2656db6aba030a08320ad8e38527ce207db2b1c6790650e244ee99c8d785ef69518
+  data.tar.gz: be7aef474231155add2e325570eaaa0d6f2e31acfcb53afb0cb9a75ba8c3a5470481a7779066601940142857a52f6614f7ca95120c5898364af2981ceca18ed0

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
@@ -127,7 +129,7 @@ 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" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
 | free_capacity | df | Always "null" |
 
 

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
@@ -122,7 +124,7 @@ 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" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
 | free_capacity | df | Always "null" |
 
 

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
@@ -122,7 +124,7 @@ 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" |
+| total_capacity | df | hardwareProperties.internalStorageCapacity |
 | free_capacity | df | Always "null" |
 
 

data/lib/mdq/check.rb

@@ -8,8 +8,18 @@ module Mdq
   class Check
     def initialize
       db = Mdq::DB.new
-      db.show_version('adb', 'adb version')
-      db.show_version('Xcode', 'xcrun devicectl --version')
+      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

@@ -10,8 +10,7 @@ module Mdq
   class DB < Discovery
     # クエリの実行
     def get(sql)
-      InitialSchema.migrate(:reset)
-
+      reset
       # デバイスの発見
       android_discover
       apple_discover
@@ -37,15 +36,6 @@ module Mdq
       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

data/lib/mdq/discovery.rb

@@ -9,8 +9,15 @@ module Mdq
   # Discovery
   class Discovery
     def initialize
-      ActiveRecord::Schema.verbose = false
-      InitialSchema.migrate(:up)
+      @home = FileUtils.mkdir_p([Dir.home, '.mdq'].join(File::Separator))
+    end
+
+    def android_discoverable?
+      adb_command('version').present?
+    end
+
+    def apple_discoverable?
+      apple_command('--version').present?
     end
 
     private
@@ -112,9 +119,9 @@ module Mdq
 
     # Appleデバイス一覧を取得する
     def apple_discover
-      file = [Dir.home, '.mdq'].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|
@@ -130,7 +137,8 @@ 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
 
@@ -151,7 +159,7 @@ module Mdq
 
     # Appleデバイスのアプリを取得する
     def apple_apps(udid)
-      file = [Dir.home, '.mdq-apps'].join(File::Separator)
+      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)
@@ -170,44 +178,44 @@ module Mdq
       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
-
-    create_table :apps do |t|
-      t.string :udid
-      t.string :name
-      t.string :package_name
-      t.string :version
-    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
-    drop_table :apps
-  end
+ActiveRecord::Migration.create_table :apps do |t|
+  t.string :udid
+  t.string :name
+  t.string :package_name
+  t.string :version
 end
 
 # Device

data/lib/mdq/list.rb

@@ -25,9 +25,9 @@ module Mdq
         udid = model.udid
         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]
-        ddb.app_uninstall(options[:uninstall], udid, is_android) if options[:uninstall]
+        db.device_screencap(options[:cap], udid, is_android) if options[:cap]
+        db.app_install(options[:install], udid, is_android) if options[:install]
+        db.app_uninstall(options[:uninstall], udid, is_android) if options[:uninstall]
       rescue StandardError
         # none
       end

data/lib/mdq/version.rb

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

metadata

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