xcurl 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00dbbfa82619c1c3f8277f83f3f40517e9bf80dd004f30d93b61178a9e8b1dea
-  data.tar.gz: 8a71222f33550a6c107fbf55ca366a2d10e75bc39f3939de62ea766cd33091b0
+  metadata.gz: 98cc4b306bc2f9a3adabed89c1b02ddb30fc8dede6014bd3b4954225a117f10a
+  data.tar.gz: fce824351babef049d78e2c01f6195afc0806caabfdd45c509b09c685074d85b
 SHA512:
-  metadata.gz: 69e9152ede089f4253656b3b96ef9feeda084ac19c1b33bc90278ea547bca5e75c45ab5b07ab01be6ed83a364ffec5f1ae11b735a2c0cecccbb9d27fdc0dd925
-  data.tar.gz: 308ab10c2fa45968f11163b3fef1d65a4fe9dd18dcb98f53f6f64be0e2c5696470319d3f67b3258a66cfa3d13188800b17e34799695a48e3c5d961367f802559
+  metadata.gz: 55a36d198d603eb23bc8586b1522b92ce0eef07292527e0c56e1da099f20bac3ea6ebb1fa3380b8417a3568c44dfc9c6137875b13a23856a8ee91eabd8adcc7b
+  data.tar.gz: b49335f6021f537c6e14f11ab59083e74b89b73b14b727f6f1748fe0b3b139717434e9e0f1a81f9e2a8563fc4e8586666b2cdd395798d08b74ec55a38514cac3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xcurl (1.0.7)
+    xcurl (1.0.10)
       pastel (~> 0.8)
 
 GEM

data/lib/add_part_command.rb

@@ -0,0 +1,7 @@
+class AddPartCommand < Command
+  def execute(session, cmd, log)
+    part = cmd.scan(/add (.*)/).flatten.first
+    session['parts'] << part
+    log.cmd_success('added', part)
+  end
+end

data/lib/command.rb

@@ -0,0 +1,2 @@
+class Command
+end

data/lib/delete_part_command.rb

@@ -0,0 +1,7 @@
+class DeletePartCommand < Command
+  def execute(session, cmd, log)
+    index_part = cmd.scan(/delete (.*)/).flatten.first.to_i
+    deleted = session['parts'].delete_at(index_part)
+    log.cmd_success('part deleted', deleted)
+  end
+end

data/lib/execute_command.rb

@@ -0,0 +1,24 @@
+class ExecuteCommand < Command
+  def execute(session, cmd, log)
+    path = cmd.scan(/curl (.*)/).flatten.first
+
+    curl_cmd = "curl #{session['url']}/#{path} #{session['parts'].join(' ')}"
+
+    out, err, status = Open3.capture3(curl_cmd)
+
+    log.log_cmd(curl_cmd)
+
+    if status.success?
+      data =
+        begin
+          JSON.pretty_generate(JSON.parse(out))
+        rescue JSON::ParserError => e
+          out
+        end
+
+      log.log_data_success(data)
+    else
+      log.log_data_error(err)
+    end
+  end
+end

data/lib/load_command.rb

@@ -0,0 +1,6 @@
+class LoadCommand < Command
+  def execute(sessions, cmd)
+    id = cmd.scan(/load (.*)/).flatten.first
+    sessions.load_session(id)
+  end
+end

data/lib/log.rb

@@ -5,35 +5,33 @@ class Log
     @p = Pastel.new
   end
 
-  def deleted(d)
-    puts @p.green("part deleted #{@p.yellow(d)}")
+  def cmd_success(label, value)
+    puts @p.green("#{label} #{@p.yellow(value)}")
   end
 
-  def url_set(u)
-    puts @p.green("url set #{@p.yellow(u)}")
+  def log_key_value(key, value)
+    puts @p.green.bold("#{key}: #{@p.yellow(value)}")
   end
 
-  def added(a)
-    puts @p.green("added #{@p.yellow(a)}")
-  end
+  def log_key_values(key, values)
+    puts @p.green.bold(key)
 
-  def show_current_session(session)
-    puts @p.green.bold("URL:\n  #{@p.yellow(session['url'])}")
-    puts @p.green.bold("Parts:")
-    session['parts'].each_with_index do |part, index|
-      puts "  #{@p.blue(index)} - #{@p.yellow(part)}"
+    values.each_with_index do |value, index|
+      puts "  #{@p.blue(index)} - #{@p.yellow(value)}"
     end
   end
 
-  def result(cmd, data)
+  def log_cmd(cmd)
     puts @p.cyan("==> #{cmd}")
+  end
+
+  def log_data_success(data)
     puts ''
     puts @p.green(data)
     puts ''
   end
 
-  def error(cmd, data)
-    puts @p.cyan("==> #{cmd}")
+  def log_data_error(data)
     puts ''
     puts @p.red(data)
     puts ''

data/lib/save_command.rb

@@ -0,0 +1,6 @@
+class SaveCommand < Command
+  def execute(sessions, session, cmd)
+    new_id = cmd.scan(/save (.*)/).flatten.first
+    sessions.save_session(new_id, session)
+  end
+end

data/lib/sessions.rb

@@ -0,0 +1,35 @@
+require 'pastel'
+
+class Sessions
+  def load_session(id)
+    ensure_home
+
+    if File.exist?("#{dir}/#{id}")
+      JSON.parse(File.read("#{dir}/#{id}"))
+    else
+      {
+        'id' => 'untitled',
+        'url' => nil,
+        'parts' => []
+      }
+    end
+  end
+
+  def save_session(id, session)
+    ensure_home
+
+    session['id'] = id
+
+    File.write("#{dir}/#{id}", JSON.pretty_generate(session))
+
+    session
+  end
+
+  def dir
+    "#{ENV['HOME']}/.xcurl"
+  end
+
+  def ensure_home
+    Dir.mkdir(dir) unless Dir.exist?(dir)
+  end
+end

data/lib/set_url_command.rb

@@ -0,0 +1,7 @@
+class SetUrlCommand < Command
+  def execute(session, cmd, log)
+    url = cmd.scan(/url (.*)/).flatten.first
+    session['url'] = url
+    log.cmd_success('url set', url)
+  end
+end

data/lib/show_command.rb

@@ -0,0 +1,6 @@
+class ShowCommand < Command
+  def execute(session, log)
+    log.log_key_value('URL', session['url'])
+    log.log_key_values('Parts', session['parts'])
+  end
+end

data/lib/xcurl.rb

@@ -1,14 +1,26 @@
 # frozen_string_literal: true
 
-require 'ostruct'
 require 'open3'
 require 'json'
 require_relative './log'
+require_relative './sessions'
+require_relative './command'
+require_relative './save_command'
+require_relative './load_command'
+require_relative './show_command'
+require_relative './delete_part_command'
+require_relative './add_part_command'
+require_relative './set_url_command'
+require_relative './execute_command'
 
 class Xcurl
   def self.start(session_id = nil)
+    puts "// loading '#{session_id}'" if session_id
+
     log = Log.new
-    session = load_session(session_id || 'untitled')
+    sessions = Sessions.new
+
+    session = sessions.load_session(session_id || 'untitled')
 
     while true
       print "[#{session['id']}] "
@@ -16,95 +28,33 @@ class Xcurl
       cmd = gets.chomp
 
       case cmd
+      when 'exit'
+        break
+
       when 'quit'
         break
 
       when /save /
-        new_id = cmd.scan(/save (.*)/).flatten.first
-
-        session = save_session(new_id, session)
+        session = SaveCommand.new.execute(sessions, session, cmd)
 
       when /load /
-        id = cmd.scan(/load (.*)/).flatten.first
-
-        session = load_session(id)
+        session = LoadCommand.new.execute(sessions, cmd)
 
       when 'show'
-        log.show_current_session(session)
+        ShowCommand.new.execute(session, log)
 
       when /^delete /
-        index_part = cmd.scan(/delete (.*)/).flatten.first.to_i
-
-        deleted = session['parts'].delete_at(index_part)
-
-        log.deleted(deleted)
+        DeletePartCommand.new.execute(session, cmd, log)
 
       when /^url /
-        url = cmd.scan(/url (.*)/).flatten.first
-
-        session['url'] = url
-
-        log.url_set(url)
+        SetUrlCommand.new.execute(session, cmd, log)
 
       when /^add /
-        part = cmd.scan(/add (.*)/).flatten.first
-
-        session['parts'] << part
-
-        log.added(part)
+        AddPartCommand.new.execute(session, cmd, log)
 
       when /^curl /
-        path = cmd.scan(/curl (.*)/).flatten.first
-
-        curl_cmd = "curl #{session['url']}/#{path} #{session['parts'].join(' ')}"
-
-        out, err, status = Open3.capture3(curl_cmd)
-
-        if status.success?
-          data =
-            begin
-              JSON.pretty_generate(JSON.parse(out))
-            rescue JSON::ParserError => e
-              out
-            end
-
-          log.result(curl_cmd, data)
-        else
-          log.error(curl_cmd, data)
-        end
+        ExecuteCommand.new.execute(session, cmd, log)
       end
     end
   end
-
-  def self.load_session(id)
-    ensure_home
-
-    if File.exist?("#{dir}/#{id}")
-      JSON.parse(File.read("#{dir}/#{id}"))
-    else
-      {
-        'id' => 'untitled',
-        'url' => nil,
-        'parts' => []
-      }
-    end
-  end
-
-  def self.save_session(id, session)
-    ensure_home
-
-    session['id'] = id
-
-    File.write("#{dir}/#{id}", JSON.pretty_generate(session))
-
-    session
-  end
-
-  def self.dir
-    "#{ENV['HOME']}/.xcurl"
-  end
-
-  def self.ensure_home
-    Dir.mkdir(dir) unless Dir.exist?(dir)
-  end
 end

data/xcurl.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "xcurl"
-  spec.version = '1.0.9'
+  spec.version = '1.0.11'
   spec.authors = ["Andrew S Aguiar"]
   spec.email = ["andrewaguiar6@gmail.com"]
   spec.summary = "Convenient wrapper for curl"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcurl
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Andrew S Aguiar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -45,7 +45,16 @@ files:
 - bin/setup
 - bin/xcurl
 - generate-gem
+- lib/add_part_command.rb
+- lib/command.rb
+- lib/delete_part_command.rb
+- lib/execute_command.rb
+- lib/load_command.rb
 - lib/log.rb
+- lib/save_command.rb
+- lib/sessions.rb
+- lib/set_url_command.rb
+- lib/show_command.rb
 - lib/xcurl.rb
 - xcurl.gemspec
 homepage: https://github.com/andrewaguiar/xcurl