smartdust-client 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626d11e60ef6fec0b2bb5427799e640f4241fa2ef58ab4adf94af2f73140e730
-  data.tar.gz: '072582406d885803b8afb8f724b2f0a297d8b62ca88cc7e8e6c80c41d52aca7f'
+  metadata.gz: 2ccb2e501ce1536eae8f61f60f29d58763d645fcf5598a0a5ddb990cf0a62f70
+  data.tar.gz: 65454900a8aa8915fe2bafb0bc363b1610fc49beaa16b276c4161ec71bcd2e58
 SHA512:
-  metadata.gz: 9c82d5bf891b09ba4e174abaf599770fe22b4b8ca66d6b5f6b953a553272bdcb8a7f88a38dd1682c5de7bc0f7867bc405378ae93541ea8dd8532bad57abc67e9
-  data.tar.gz: e636958492f295494cecdefe74cb85ce8a1c8eb82c103ccb3b9a00f3d85d0622dc9921dab83cb03294794049ba8888e94673c1551e017a5c4510c4b4107796d8
+  metadata.gz: 46bebb841cb1fce67e37d9d6513b96aa617e4b9d876acefd9cc0e43507d8d993a24d4100c322be07c0fa060e1d542563c734d5b7f905fc4668c19d8fe787edd2
+  data.tar.gz: ee49a28b2ee17791af1278083495c1093f927898166899476793bdbd320fc152faf2a7297164bc661976a4640c001d7c4fe5edd015d309b9137309a090330043

data/.github/workflows/docker-build.yml

@@ -0,0 +1,31 @@
+name: Docker Image
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: docker/setup-qemu-action@v3
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: smartdust/smartdust-cli

data/.github/workflows/ruby-build.yml

@@ -0,0 +1,32 @@
+name: Rubygem build and upload
+
+on:
+  push:
+#    branches:
+#      - main
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+
+      - run: bundle install
+
+      - run: gem build smartdust-client.gemspec
+
+      - name: Push gem to Nexus
+        run: |
+          gem install nexus
+          gem nexus --url https://repository.smartdust.me/repository/ruby/ --credential ruby-write:${{ secrets.NEXUS_CREDS }} smartdust-client-*.gem
+
+      - name: Push gem to RubyGems
+        run: |
+          gem push smartdust-client-*.gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}

data/.gitignore

@@ -101,3 +101,6 @@ build-iPhoneSimulator/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+.idea
+.DS_Store

data/Dockerfile

@@ -0,0 +1,17 @@
+FROM ruby:3.0
+
+RUN apt-get update && apt-get install -y android-tools-adb
+
+WORKDIR /app
+
+COPY . .
+
+RUN bundle install
+
+RUN gem build smartdust-client.gemspec
+
+RUN gem install smartdust-client-*.gem
+
+RUN cd / && rm -rf /app
+
+ENTRYPOINT ["smartdust-client"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smartdust-client (1.3.1)
+    smartdust-client (1.3.3)
       ADB (~> 0.5)
       dante (~> 0.2.0)
       dry-configurable (~> 0.1.4)
@@ -34,7 +34,7 @@ GEM
       ostruct
     hashdiff (1.0.1)
     json (2.6.3)
-    logger (1.6.6)
+    logger (1.7.0)
     ostruct (0.6.1)
     public_suffix (5.0.1)
     rack (1.6.13)

data/README.md

@@ -4,7 +4,7 @@
 
 # Smartdust CLI client
 ![smartdust-logo-text-2021.png](smartdust-logo-text-2021.png)
-Documentation: https://docs.smartdust.me/docs/cli-client.
+Documentation: https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3
 
 Automation client for connecting to Smartdust Lab devices via adb from a terminal.
 Designed with the following scenario in mind:
@@ -26,7 +26,6 @@ e.g. all unique names of devices in the lab instance.
 - Android dependencies: 
   - adb (Android Debug Bridge)
 - iOS dependencies:
-  - idevice_id (libimobiledevice)
   - usbfluxd (https://github.com/corellium/usbfluxd/tree/master) (this needs to be patched to connect to multiple devices from the same Lab instance)
 
 ## Installation
@@ -39,13 +38,15 @@ e.g. all unique names of devices in the lab instance.
 - "cd" into the directory where the repository is cloned
 - Run the following commands: (adding "sudo" might be needed)
 - ```gem build smartdust-client.gemspec```
-- ```gem install smartdust-client-1.2.0.gem``` (or different version, see output of the previous command)
+- ```gem install smartdust-client-1.3.3.gem``` (or different version, see output of the previous command)
+
+- Run it by simply entering ```smartdust-client``` 
 
 ## Usage
 
 ```
 NAME
-    smartdust-client - Smartdust Lab client (version 1.2.0)
+    smartdust-client - Smartdust Lab client (version 1.3.3)
 
 SYNOPSIS
     smartdust-client [global options] command [command options] [arguments...]

data/lib/stf/client.rb

@@ -55,7 +55,7 @@ module Stf
     end
 
     def destroy_tunnel(ip, port)
-      response = execute "/api/v1/tunnel/{ip}/{port}", Net::HTTP::Delete, {ipAddress: ip, port: port}.to_json
+      response = execute "/api/v1/tunnel/#{ip}/#{port}", Net::HTTP::Delete
       return response.success
     end
 

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -11,35 +11,20 @@ module Stf
 
     def execute(device)
 
-      if DI[:connect_ios].ios_serials_to_urls.keys.include? device.serial
+      if DI[:connect_ios].ios_serials_to_urls.has_key? device.serial
         DI[:connect_ios].disconnect(DI[:connect_ios].ios_serials_to_urls[device.serial])
       elsif devices.include? device.serial
         execute_adb_with 30, "disconnect #{remote_connect_url}"
       end
 
       if DeviceList.new(DI[:stf].get_user_devices).asArray.map {|d| d.serial}.include? device.serial
-        success = false
-          1..10.times do
-            begin
-              success = DI[:stf].stop_debug(device.serial)
-              break if success
-            rescue
-            end
-
-            logger.error 'Can\'t stop debug session. Retrying'
-          end
-
-        1..10.times do
-          begin
-            success = DI[:stf].remove_device(device.serial)
-            break if success
-          rescue
-          end
-          logger.error 'Can\'t remove device from user devices. Retrying'
-        end
+
+        success = close_tunnel(device)
+        success = stop_debug(device)
+        success = release_control(device)
 
         if success
-          logger.info "Successfully removed #{device.serial}"
+          logger.info "Removed #{device.serial}"
         else
           logger.error "Error removing #{device.serial}"
         end
@@ -47,6 +32,46 @@ module Stf
 
       success
     end
+
+    def close_tunnel(device)
+      provider_ip = device.getValue("provider")["ip"]
+      port = device.getValue("remoteConnectUrl").split(":")[1].to_i
+      success = false
+      1..10.times do
+        begin
+          success = DI[:stf].destroy_tunnel(provider_ip, port)
+          break if success
+        rescue
+        end
+        logger.error "Can't close tunnel for device #{device.serial}. Retrying"
+      end
+      success
+    end
+
+    def stop_debug(device)
+      success = false
+      1..10.times do
+        begin
+          success = DI[:stf].stop_debug(device.serial)
+          break if success
+        rescue
+        end
+        logger.error 'Can\'t stop debug session. Retrying'
+      end
+      success
+    end
+
+    def release_control(device)
+      1..10.times do
+        begin
+          success = DI[:stf].remove_device(device.serial)
+          break if success
+        rescue
+        end
+        logger.error 'Can\'t remove device from user devices. Retrying'
+      end
+    end
+
   end
 
 end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/smartdust-client.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version  = Stf::VERSION
   spec.authors  = ['Smartdust']
   spec.email    = ['jordan@smartdust.me']
-  spec.summary  = %q{Connect to devices from Smartdust Lab via adb from cli}
-  spec.homepage = 'https://docs.smartdust.me/docs/cli-client'
+  spec.summary  = %q{Connect to devices from Smartdust Lab from cli}
+  spec.homepage = 'https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3'
   spec.license  = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartdust-client
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Smartdust
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-28 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -206,7 +206,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: 
+description:
 email:
 - jordan@smartdust.me
 executables:
@@ -214,10 +214,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/docker-build.yml"
+- ".github/workflows/ruby-build.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -247,11 +250,11 @@ files:
 - lib/stf/view/cli.rb
 - smartdust-client.gemspec
 - smartdust-logo-text-2021.png
-homepage: https://docs.smartdust.me/docs/cli-client
+homepage: https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,8 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
-summary: Connect to devices from Smartdust Lab via adb from cli
+summary: Connect to devices from Smartdust Lab from cli
 test_files: []