poke-your-api 0.2.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c406973279d9a2c5d5045a0897a2f9fa944d6954cb036586189dfcd85d13ac8
-  data.tar.gz: 278140c048ff323f8bbab40d20a04a0fafc68a31b3441187158a733ec6b62f20
+  metadata.gz: 54d9c5d820d46a25b19322bf0b8208a79bff75aff71854354a1f755e3ed998f5
+  data.tar.gz: f343b6aa3e2d9e4c44f5e4a1273d7d3632fbb5799f67c0d56091254c524174a7
 SHA512:
-  metadata.gz: f7e9e8c28fcf44d52bac31d27f3a9d243771d221bb801790b5323417856059af953e1039bc90fa73d651f295a47e1ca852069683cbd34ece5fa3e1137ea7cd1c
-  data.tar.gz: 6ea22db23dc5754718b53dc01c45f77800f1da7615e591ed6f0d92dbe76d8feb814c5106acb803e695d83627832681c7444b74081a52c2d0380eb539c93cea62
+  metadata.gz: 5f1809cfd27e99c1a1f1742b79f3b405b548ea0d87fe1e1b403b557677c4f60b41beab68d5613271b5891b8b4532e8f961421d6bdb8f958ee2529e8b25bebed8
+  data.tar.gz: d89ddcce79212dfafe919eceb3106aef349ce15209ce39c10d4424d2c80bf690dede87b5e485b5b96397a07ab81a254515ee72ff39d618a505b644a02cc3fd4f

data/lib/poke/cli.rb

@@ -24,6 +24,8 @@ module Poke
     desc 'env', 'Display and edit environments'
     method_option :help, aliases: '-h', type: :boolean,
                          desc: 'Display usage information'
+    method_option :open, aliases: '-o', type: :boolean,
+                        desc: 'Open config in the editor'
     def env(*)
       if options[:help]
         invoke :help, ['env']
@@ -33,6 +35,17 @@ module Poke
       end
     end
 
+    desc 'new', 'Create a new request'
+    method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
+    def new(*)
+      if options[:help]
+        invoke :help, ['new']
+      else
+        require_relative 'commands/new'
+        Poke::Commands::New.new(options).execute
+      end
+    end
+
     desc 'curl', 'Find and execute a request'
     method_option :help, aliases: '-h', type: :boolean, desc: 'Display usage information'
     method_option :env, aliases: '-e', type: :string, desc: 'Set target environment'

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/env.rb

@@ -2,16 +2,10 @@
 
 require_relative '../command'
 require_relative '../group'
-require_relative '../paint'
 
-require 'pastel'
-
-require 'tty-box'
-require 'tty-command'
-require 'tty-cursor'
+require 'json'
 require 'tty-editor'
 require 'tty-prompt'
-require 'tty-table'
 
 module Poke
   module Commands
@@ -23,60 +17,10 @@ module Poke
         group_name = TTY::Prompt.new.select('Select the group', groups.map(&:name), filter: true, quiet: true)
         group = groups.find { |g| g.name == group_name }
 
-        manage_group_config(output:, group:)
-      end
-
-      def cursor
-        @cursor ||= TTY::Cursor
-      end
-
-      def pastel
-        @pastel ||= Pastel.new
-      end
-
-      def manage_group_config(output:, group:)
-        output << cursor.save
-
-        render(output, group)
-
-        loop do
-          case TTY::Prompt.new.keypress('', quiet: true)
-          when 'c'
-            group.config.default_env = TTY::Prompt.new.select(
-              'Select new default environment', group.config.envs,
-              filter: true, quiet: true
-            )
-            group.save_config!
-
-            render(output, group)
-          when 'e'
-            TTY::Editor.open(group.config_path)
-            break
-          when 'q'
-            break
-          end
-        end
-      end
-
-      def render(output, group)
-        output << cursor.restore
-        output << cursor.clear_screen_down
-
-        title = ['| ', pastel.decorate(group.name.upcase, :yellow, :underline, :bold), ' |'].join
-        footer = '| q → quit | c → change default env | e → edit config file |'
-        table = TTY::Table.new(
-          header: ['env \\ var', *group.config.variables(group.config.default_env).keys],
-          rows: group.config.envs.map do |name|
-            [name, *group.config.variables(name).values]
-          end
-        )
-
-        # output << "\n"
-        output << TTY::Box.frame(align: :center, title: { top_center: title, bottom_center: footer }) do
-          [
-            "(default env: #{group.config.default_env})\n\n",
-            table.render(:unicode, multiline: true, padding: [0, 1, 0, 1])
-          ].join('')
+        if @options[:open]
+          TTY::Editor.open(group.config_path)
+        else
+          output.puts JSON.pretty_generate(group.config.to_h)
         end
       end
     end

data/lib/poke/commands/new.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+require_relative '../command'
+require_relative '../config'
+
+require 'fileutils'
+require 'pathname'
+require 'tty-editor'
+require 'tty-prompt'
+
+module Poke
+  module Commands
+    class New < Poke::Command
+      CREATE_NEW_DIR = :create_new_dir
+      TEMPLATE = "curl $BASE_URL/get -G -d foo=bar\n".freeze
+
+      private
+
+      def run(output: $stdout, errors: $stderr)
+        unless Config.valid?
+          errors << "Config not initialized. Run `poke init` first.\n"
+          return
+        end
+
+        prompt = TTY::Prompt.new(interrupt: :exit)
+        directory = choose_directory(prompt)
+        filename = choose_filename(prompt)
+        request_path = build_request_path(directory, filename)
+
+        if File.exist?(request_path) && !prompt.yes?('Request exists. Overwrite?')
+          output << "Canceled.\n"
+          return
+        end
+
+        File.write(request_path, TEMPLATE)
+        TTY::Editor.open(request_path)
+        output << "Created request: #{request_path}\n"
+      rescue ArgumentError => e
+        errors << "#{e.message}\n"
+      end
+
+      def choose_directory(prompt)
+        choices = discover_directories
+        labeled_choices = choices.map { |path| { name: relative_path(path), value: path } }
+        labeled_choices << { name: '[Create new directory]', value: CREATE_NEW_DIR }
+
+        selection = prompt.select(
+          'Select directory under ~/.poke',
+          labeled_choices,
+          filter: true,
+          quiet: true
+        )
+
+        return selection unless selection == CREATE_NEW_DIR
+
+        input = prompt.ask('New directory path under ~/.poke', required: true)
+        target = build_target_path(input)
+        FileUtils.mkdir_p(target)
+        target
+      end
+
+      def choose_filename(prompt)
+        input = prompt.ask('Request name', required: true)&.strip
+        raise ArgumentError, 'Request name cannot be empty' if input.nil? || input.empty?
+        raise ArgumentError, 'Request name must not include path separators' if input.include?('/')
+
+        name = input.gsub(/\.curl\z/, '')
+        "#{name}.curl"
+      end
+
+      def discover_directories
+        root = File.expand_path(Config.root_path)
+
+        Dir.glob("#{root}/**/")
+          .map { |path| File.expand_path(path).sub(%r{/\z}, '') }
+          .uniq
+          .reject { |path| path == root }
+          .sort
+      end
+
+      def build_request_path(directory, filename)
+        target = Pathname.new(File.join(directory, filename)).cleanpath.to_s
+        ensure_inside_root!(target)
+        target
+      end
+
+      def build_target_path(relative_input)
+        target = Pathname.new(File.expand_path(File.join(Config.root_path, relative_input.to_s))).cleanpath.to_s
+
+        raise ArgumentError, 'Directory must be a subdirectory of ~/.poke' if target == File.expand_path(Config.root_path)
+
+        ensure_inside_root!(target)
+        target
+      end
+
+      def ensure_inside_root!(path)
+        root = File.expand_path(Config.root_path)
+        root_prefix = "#{root}/"
+        return if path.start_with?(root_prefix)
+
+        raise ArgumentError, 'Path must stay inside ~/.poke'
+      end
+
+      def relative_path(path)
+        Pathname.new(path).relative_path_from(Pathname.new(File.expand_path(Config.root_path))).to_s
+      end
+    end
+  end
+end

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|\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/group_config.rb

@@ -39,5 +39,9 @@ module Poke
     def variables(env)
       @values['envs'][env]
     end
+
+    def to_h
+      @values
+    end
   end
 end

data/lib/poke/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poke-your-api
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Bator
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -129,9 +129,11 @@ files:
 - lib/poke/commands/lru.rb
 - lib/poke/commands/lru/cat.rb
 - lib/poke/commands/lru/reset.rb
+- lib/poke/commands/new.rb
 - 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