poke-your-api 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5faa734fd975687e4ceab01ce080d11a92596e416c3f6a679a77b38218cd34c0
-  data.tar.gz: b2ffcd2e5334dc9225df1faf80a66893f97e8cfad5218a6c4e3341a32aae1d63
+  metadata.gz: d6a613b0c63a4be50edfad9b34c11a1848646d47dc46a56e4acffe2cdc92ef4d
+  data.tar.gz: 1e1dbd044df43b89665c309ad6e0852a45be81ba2cb2f3892bd453a06cb902a9
 SHA512:
-  metadata.gz: 6b4ccd07aea0d9fa0c0b3d6f1be466a7e63b51cab05768796a654c0e138fb135b478d3a5441b4a08766abfc400674f3306cf6e50e7bf8b1c92e39c414ca003cc
-  data.tar.gz: 14369f4b14072e17ef14d86bf89aeb70f4d3b8498cf0dc427dd9333abc11732e07afd0ebbe4821cfa368670c091a7af1fa9a00b8bb367a99fce8bc4c401902fd
+  metadata.gz: cbaf6b1dc9d4d05fe70790aefe912cf2c045bbf7ad4f9806783873c1f6f2440a77b457c928f7b5c68ff8ac43c221c704c6c4b83874dde5e5b0ffb786c65e8dcd
+  data.tar.gz: 4f91178f36bc0783745696d19d7701a7d6205cb0b841c4247718ec679c921968a279f67e9e703cf6fbf6036c05c2294376ed9f8d83a0b4082abe9396fbc7114d

data/lib/poke/commands/curl.rb

@@ -5,6 +5,7 @@ require_relative '../group'
 require_relative '../config'
 require_relative '../paint'
 require_relative '../last_recently_used'
+require_relative '../curl_parser'
 
 require 'pathname'
 require 'pastel'
@@ -96,16 +97,14 @@ module Poke
       end
 
       def build_command(path)
-        out = TTY::Command.new(printer: :null).run("cat #{path}").out
-        out << "\n" unless out[-1] == "\n"
-
-        command_lines = out.split(/ \\\n|\n/).map(&:strip)
-
-        comments = command_lines.filter { |line| line.start_with?('#') }.join(" \\\n")
-        command_lines = command_lines.reject { |line| line.start_with?('#') }
-        command_lines += additional_curl_params
-
-        [command_lines.join(" \\\n  "), comments]
+        content = File.read(path)
+        parser = CurlParser.new(content)
+        
+        # Add our additional curl parameters
+        parser.add_argument("-o #{Poke::Config.response_path}")
+        parser.add_argument('-w "%{json}"')
+        
+        [parser.to_command_with_line_continuation, parser.comments.join("\n")]
       end
 
       # rubocop:disable Style/FormatStringToken

data/lib/poke/commands/speed.rb

@@ -5,6 +5,7 @@ require_relative '../group'
 require_relative '../config'
 require_relative '../paint'
 require_relative '../last_recently_used'
+require_relative '../curl_parser'
 
 require 'pathname'
 require 'pastel'
@@ -76,18 +77,15 @@ module Poke
         errors << "Run count: #{count}\nAverage time: #{format('%.2fms', (times.sum / times.size * 1000))}\n\n"
       end
 
-      # extract
       def build_command(path)
-        out = TTY::Command.new(printer: :null).run("cat #{path}").out
-        out << "\n" unless out[-1] == "\n"
-
-        command_lines = out.split(" \\\n").map(&:strip)
-
-        comments = command_lines.filter { |line| line.start_with?('#') }.join(" \\\n")
-        command_lines = command_lines.reject { |line| line.start_with?('#') }
-        command_lines += additional_curl_params
-
-        [command_lines.join(" \\\n  "), comments]
+        content = File.read(path)
+        parser = CurlParser.new(content)
+        
+        # Add our additional curl parameters
+        parser.add_argument("-o #{Poke::Config.response_path}")
+        parser.add_argument('-w "%{json}"')
+        
+        [parser.to_command_with_line_continuation, parser.comments.join("\n")]
       end
 
       # rubocop:disable Style/FormatStringToken

data/lib/poke/curl_parser.rb

@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Poke
+  class CurlParser
+    attr_reader :comments, :arguments, :url
+
+    def initialize(content)
+      @content = content
+      @comments = []
+      @arguments = []
+      @url = nil
+      parse
+    end
+
+    def to_command
+      parts = ['curl']
+      parts.concat(@arguments)
+      parts << @url if @url
+      parts.join(' ')
+    end
+
+    def to_command_with_line_continuation
+      parts = ['curl']
+      parts.concat(@arguments)
+      parts << @url if @url
+      
+      # Join with line continuation for better readability
+      parts.join(" \\\n  ")
+    end
+
+    def add_argument(arg)
+      @arguments << arg
+    end
+
+    def remove_argument(pattern)
+      @arguments.reject! { |arg| arg.match?(pattern) }
+    end
+
+    def replace_argument(pattern, replacement)
+      @arguments.map! do |arg|
+        arg.match?(pattern) ? replacement : arg
+      end
+    end
+
+    private
+
+    def parse
+      # Normalize line endings and ensure content ends with newline
+      content = @content.gsub(/\r\n/, "\n").gsub(/\r/, "\n")
+      content += "\n" unless content.end_with?("\n")
+
+      # First, extract comments
+      extract_comments(content)
+      
+      # Then parse the curl command
+      parse_curl_content(content)
+    end
+
+    def extract_comments(content)
+      content.each_line do |line|
+        stripped = line.strip
+        @comments << stripped if stripped.start_with?('#')
+      end
+    end
+
+    def parse_curl_content(content)
+      # Remove comments and empty lines
+      curl_lines = content.lines.reject do |line|
+        line.strip.empty? || line.strip.start_with?('#')
+      end
+      
+      return if curl_lines.empty?
+      
+      # Join lines with continuations
+      curl_content = join_continuations(curl_lines)
+      
+      # Parse the curl command
+      parse_curl_command(curl_content)
+    end
+
+    def join_continuations(lines)
+      result = ""
+      i = 0
+      
+      while i < lines.length
+        line = lines[i].chomp
+        
+        # Check if this line ends with continuation
+        if line.end_with?('\\')
+          result += line[0...-1] + " "
+          i += 1
+        else
+          result += line + " "
+          i += 1
+        end
+      end
+      
+      result.strip
+    end
+
+    def parse_curl_command(content)
+      # Remove 'curl' command if present
+      content = content.sub(/^\s*curl\s+/, '')
+      
+      # Split arguments while preserving quoted strings
+      args = split_arguments(content)
+      
+      args.each do |arg|
+        if arg.start_with?('-')
+          @arguments << arg
+        elsif @url.nil?
+          @url = arg
+        else
+          # Additional arguments after URL
+          @arguments << arg
+        end
+      end
+    end
+
+    def split_arguments(line)
+      args = []
+      current_arg = ""
+      in_quotes = false
+      quote_char = nil
+      i = 0
+      
+      while i < line.length
+        char = line[i]
+        
+        if !in_quotes && char.match?(/\s/)
+          if !current_arg.empty?
+            args << current_arg
+            current_arg = ""
+          end
+        elsif !in_quotes && (char == '"' || char == "'")
+          in_quotes = true
+          quote_char = char
+          current_arg += char
+        elsif in_quotes && char == quote_char
+          in_quotes = false
+          quote_char = nil
+          current_arg += char
+        else
+          current_arg += char
+        end
+        
+        i += 1
+      end
+      
+      args << current_arg unless current_arg.empty?
+      args
+    end
+  end
+end 

data/lib/poke/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poke-your-api
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Bator
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -132,6 +132,7 @@ files:
 - lib/poke/commands/response.rb
 - lib/poke/commands/speed.rb
 - lib/poke/config.rb
+- lib/poke/curl_parser.rb
 - lib/poke/group.rb
 - lib/poke/group_config.rb
 - lib/poke/last_recently_used.rb