htb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad35da07fd9b2867d488dbf3559f26f7a4d892accd93f7787ef318e0c6ab4d6d
-  data.tar.gz: 77ae561b2b972ca331fe42b1dacfda49909bbd177d6f92406b659f19079974e2
+  metadata.gz: 1c61e897e5256a77995c2c6b07d1990805855cc59495576e5925d13196192b92
+  data.tar.gz: 686ab280f44de1aa5d59ef2b6bd28607b3aefdbd9db3807152f89d3533f22ca5
 SHA512:
-  metadata.gz: 8af38c52092bf0738dc64d9752624bd4b996389e730561a6a4c54809e3752350847aabb8a16a4ff120e8e6132ea9fd8ea15b95518b7ef4fc8f5cfa02bebe2ba1
-  data.tar.gz: dc43a9683115267a1d0e9f2370cf69ed0c7d329ad2d09bafd50487a33a8fdb7f479484dad4f2e2404198bdd6c7ad03c2a7e6fac46a08da8c40c1cdd0acc6b948
+  metadata.gz: 1ff67688442edf583e9d1b81961199e078ebfa9425efc981c23e254af7cc26ddfd08fcfffca5dac4f3eea380cac20c8bf55720fdf4bf5109428d1c949243de25
+  data.tar.gz: e1a7c7efb65dbff32c972a040c83db23041665d7df32f610c8497f209bfe93ef933f32ec3f7a451b5fae4fadc96f37e0e909bad83c8f6e007b2c2fd45d81ca8c

data/lib/htb/cli/machines.rb

@@ -7,9 +7,11 @@ module HTB
         true
       end
 
-      desc "list", "List all active machines"
+      desc "list", "List machines"
       option :retired, type: :boolean, desc: "Show retired machines instead"
       option :sp, type: :boolean, desc: "Show Starting Point machines"
+      option :unsolved, type: :boolean, desc: "Show only unsolved machines"
+      option :difficulty, type: :string, desc: "Filter by difficulty (Easy, Medium, Hard, Insane)"
       def list
         client = CLI.client
 
@@ -24,23 +26,42 @@ module HTB
         end
 
         if machines && machines["info"]
-          rows = machines["info"].map do |m|
+          machine_list = machines["info"]
+
+          if options[:unsolved]
+            machine_list = machine_list.reject do |m|
+              m["authUserInUserOwns"] && m["authUserInRootOwns"]
+            end
+          end
+
+          if options[:difficulty]
+            diff = options[:difficulty].downcase
+            machine_list = machine_list.select do |m|
+              (m["difficultyText"] || "").downcase == diff
+            end
+          end
+
+          rows = machine_list.map do |m|
             difficulty = m["difficultyText"] || m["difficulty"] || "N/A"
             os = m["os"] || "N/A"
+            user_own = m["authUserInUserOwns"] ? CLI.pastel.green("Y") : CLI.pastel.red("-")
+            root_own = m["authUserInRootOwns"] ? CLI.pastel.green("Y") : CLI.pastel.red("-")
             [
               m["id"],
               m["name"],
               os,
               difficulty,
-              m["user_owns_count"] || 0,
-              m["root_owns_count"] || 0,
-              m["release"] || "N/A"
+              user_own,
+              root_own,
+              m["release"]&.slice(0, 10) || "N/A"
             ]
           end
 
-          puts CLI.pastel.bold("\nMachines:")
+          label = options[:retired] ? "Retired" : options[:sp] ? "Starting Point" : "Active"
+          label += " (unsolved)" if options[:unsolved]
+          puts CLI.pastel.bold("\n#{label} Machines:")
           CLI.print_table(
-            ["ID", "Name", "OS", "Difficulty", "User Owns", "Root Owns", "Released"],
+            ["ID", "Name", "OS", "Difficulty", "User", "Root", "Released"],
             rows
           )
           puts "\nTotal: #{rows.size} machines"

data/lib/htb/machines.rb

@@ -6,10 +6,16 @@ module HTB
       @client = client
     end
 
-    # List all machines
-    # GET /api/v4/machine/list
+    # List active machines (current season)
+    # GET /api/v4/machine/paginated
     def list
-      @client.get("/machine/list")
+      paginate("/machine/paginated")
+    end
+
+    # List all retired machines (full VIP+ back catalog)
+    # GET /api/v4/machine/list/retired/paginated
+    def retired
+      paginate("/machine/list/retired/paginated")
     end
 
     # Get machine profile by ID or name
@@ -38,9 +44,6 @@ module HTB
 
     # Submit flag for machine ownership
     # POST /api/v4/machine/own
-    # @param machine_id [Integer] Machine ID
-    # @param flag [String] The flag to submit
-    # @param difficulty [Integer] Difficulty rating (10-100)
     def own(machine_id:, flag:, difficulty: 50)
       @client.post("/machine/own", {
         id: machine_id,
@@ -87,10 +90,6 @@ module HTB
 
     # Submit machine review
     # POST /api/v4/machine/review
-    # @param machine_id [Integer] Machine ID
-    # @param stars [Integer] Star rating (1-5)
-    # @param headline [String] Review headline
-    # @param review [String] Review text
     def review(machine_id:, stars:, headline:, review:)
       @client.post("/machine/review", {
         id: machine_id,
@@ -112,31 +111,37 @@ module HTB
       @client.get("/machine/spawned")
     end
 
-    # Get retired machines
-    # GET /api/v4/machine/list/retired
-    def retired
-      @client.get("/machine/list/retired")
-    end
-
     # Get starting point machines
     # GET /api/v4/machine/list/sp
     def starting_point
       @client.get("/machine/list/sp")
     end
 
-    # Get paginated machine list
-    # GET /api/v4/machine/paginated
-    def paginated(page: 1, per_page: 20, sort_by: nil, sort_type: nil)
-      params = { page: page, per_page: per_page }
-      params[:sort_by] = sort_by if sort_by
-      params[:sort_type] = sort_type if sort_type
-      @client.get("/machine/paginated", params)
-    end
-
     # Search machines
     # GET /api/v4/search/fetch?query={query}&tags=[]
     def search(query, tags: [])
       @client.get("/search/fetch", { query: query, tags: tags })
     end
+
+    private
+
+    # Fetch all pages from a paginated endpoint and return unified hash
+    # with "info" key for CLI compatibility
+    def paginate(path)
+      all_machines = []
+      page = 1
+      loop do
+        result = @client.get(path, { page: page, per_page: 100 })
+        data = result["data"] || []
+        break if data.empty?
+
+        all_machines.concat(data)
+        last_page = result.dig("meta", "last_page") || 1
+        break if page >= last_page
+
+        page += 1
+      end
+      { "info" => all_machines }
+    end
   end
 end

data/lib/htb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTB
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - usiegj00
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-17 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday