paster 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ea9d39b00350a67bb06330b79e73de23eeb33a
-  data.tar.gz: 56bac197e3adbf7926a3752ed10d99489826eb9e
+  metadata.gz: 676a5ebef7ac14324c4d2cd1d2098292d221c5e3
+  data.tar.gz: 8fbd93f4e2a726b0ec0501fa344b02e653f313f1
 SHA512:
-  metadata.gz: 103ee1d96ee2f622f5c0bdfa73847e9ad64c2484b770f4f21dcaedb7c7c597701af76384d3b40e4a67b1c8c2ea867487c9257123029b3589c394fdac95d80fb9
-  data.tar.gz: ef11f98d2ca13044b6bb6260bad3aef22a262ed4e7f50c2d797b0a7c0bbfced11b7efc309cc0dae915a671a0e241ca140d8b7e1836ad26d22bc9acc9266c8f6d
+  metadata.gz: e4871746f43300dd4cda17a2e90a7626c61d7e173d86ffe0783f58607a5752a8c231387b36ca7c4d538dc1380d8567d4827804475551f40daf132712e005cba2
+  data.tar.gz: 2c179c21bdbe6b248777e56fd94bf8b7f2c48dde3c2dd9a962bb21667b13a0387a368f3a6436bcb49cc3575f49073630e55a437a75b42807daea05b4d3d1154c

data/bin/paster

@@ -1,44 +1,87 @@
 #!/usr/bin/env ruby
-Signal.trap(:INT){ abort "\n(interrupted by SIGINT)" }
 puts ""
-puts "(press ^C to abort)"
+# puts "(press ^C to abort)"
+
+paste = (!STDIN.tty? && !STDIN.closed? || ARGF.filename != ?-) ? ARGF.read : (require "clipboard"; Clipboard.paste)
+# https://stackoverflow.com/a/68673623/322020
 
-paste = ARGF.read
 $stdin = open "/dev/tty"
 puts "paste size: #{paste.size}"
 require_relative "../lib/paster"
 paster = Paster paste
+puts "preview: #{inspected = paste[0,30].inspect; inspected.size <= 30 ? inspected : inspected[0,27] + "..."}"
 puts "detected language: #{paster.lang || "unknown"}"   # change 'detected' to 'assumed' if we make it guess by file extension
 puts ""
 
-require "tty-prompt"
-begin
-  services = {
-    "burn after reading": ["burn"],
-    "5 minutes": [5],
-    "1 hour": [60, 3600],
-    "1 day": [1440, 86400],
-    "3 days": [nil, 259200],
-    "1 week": [10080],
-    "1 month": [40320],
-    "3 months": [nil, 7776000],
-    "1 year": [483840],
-    "keep forever": [0, -1],
-  }.map{ |name, value|
-    paster = paster.dup
-    paster.expire = value
-    size = paster.services.size
-    size.zero? ?
-      [size, {name: "#{name}", value: paster, disabled: "(no pastebins)"}] :
-      [size, {name: "#{name} (#{size})", value: paster}]
-  }
+require "tty-prompt"  # if we delay this the rescue matcher may say 'uninitialized constant TTY'
+begin  # TODO: we overwrite this identifier, why not?
+  options = [
+    [
+      {
+        "burn after reading": ["burn"],
+        "5 minutes": [5],
+        "1 hour": [60, 3600],
+        "1 day": [1440, 86400],
+        "3 days": [nil, 259200],
+        "1 week": [10080],
+        "1 month": [40320],
+        "3 months": [nil, 7776000],
+        "1 year": [483840],
+        "virtually forever": [0, -1],
+      },
+      :expire,
+      "expiration",
+    ],
+    [
+      {
+        "unlisted": true,
+        "public": false,
+      },
+      :unlist,
+      "visibility",
+    ],
+  ]
+  apply_variants = lambda do |paster, variants, option_name, _|
+    variants.map do |variant_name, value|
+      [variant_name, paster.dup.tap{ |_| _[option_name] = value }]
+    end
+  end
 
-  abort "no pastebin for such size" if services.all?{ |__, _| _[:disabled] }   # TODO: better error message
-  # otherwise tty-prompt fails with an unhandled exception, lol
+  names, paster = options.reduce [[[], paster]] do |pasters, option|
+    pasters.flat_map do |names, paster|
+      apply_variants.call(paster, *option).map do |variant_name, paster|
+        [[*names, variant_name], paster]
+      end
+    end
+  end.max_by{ |_, paster| paster.services.size }
+  abort "no pastebin for such size" if paster.services.size.zero?  # otherwise tty-prompt fails with an unhandled exception, lol
 
-  TTY::Prompt.new.select "expiration:", services.map(&:last),
-    default: services.max_by(&:first).last[:name],
-    filter: true, cycle: true, per_page: 100
+  loop do
+    option, index = TTY::Prompt.new.select "change current options if needed:", [
+      *options.map.with_index{ |option, i| {name: "#{option[2]}: #{names[i]}", value: [option, i]} },
+      {name: "proceed", value: nil},
+    ], default: "proceed",
+      filter: true, cycle: true, per_page: 100
+    break unless option
+    paster, names[index] = TTY::Prompt.new.select "#{option[2]}:",
+      apply_variants.call(paster, *option).map{ |name, paster|
+        size = paster.services.size
+        size.zero? ?
+          {name: "#{name}",           value: [paster, name], disabled: "(no pastebins)"} :
+          {name: "#{name} (#{size})", value: [paster, name]}
+      },
+      default: option[0].keys.index(names[index]) + 1,
+      filter: true, cycle: true, per_page: 100
+  end
 rescue TTY::Reader::InputInterrupt
-  abort ""  # we don't use TTY::Prompt.new(interrupt: :exit) because it does not finish the line
-end.paste
+  # we don't use TTY::Prompt.new(interrupt: :exit) because it does not finish the last printed line
+  abort "\n\n(interrupted by SIGINT)"
+end
+if ENV.include? "DRYRUN"
+  require "pp"
+  pp paster
+else
+  paster.paste
+end
+
+puts ""

data/lib/paster.rb

@@ -6,8 +6,10 @@ NetHTTPUtils.class_variable_get(:@@_405).add "paste.debian.net"
 # TODO: upgrade the NetHTTPUtils gem finally to switch to no HEAD calls by default
 
 def Paster paste
-  Struct.new :expire, :lang do
+  Struct.new :lang, :expire, :unlist do
     @paste = paste
+    # TODO: write the reasons why we use Struct and differ its attrs from the instance variables
+    # one of them is that we don't want to see @paste in .inspect (but that's not the only way to do it though)
 
     def initialize
       STDOUT.sync = true
@@ -25,8 +27,8 @@ def Paster paste
       end
       [
         [
-          10000000, [nil], nil,
-          nil,
+          10000000, [0], nil,
+          expire[0], false,
           "http://sprunge.us", "sprunge", nil,
           nil,
           ->resp{
@@ -39,7 +41,7 @@ def Paster paste
         ],
         [
           15000000, ["burn", 0, 5, 60, 1440, 10080, 40320, 483840], nil,
-          expire[0],
+          expire[0], true,
           "https://paste.the-compiler.org/api/create", "text", nil,
           File.read("lib/genshi.txt").scan(/'([a-z_0-9-]+)' => '([^']+)',/).rassoc(lang)&.first,
           ->resp{
@@ -57,7 +59,7 @@ def Paster paste
         ],
         [
           150000, [-1, 3600, 86400, 259200, 7776000], ->_{ 2 > _.count("\n") },
-          expire[1],
+          expire[1], true,
           "https://paste.debian.net", "code", :multipart,
           File.read("lib/pygments.txt").scan(/([^']+)', \(([^)]*)/).map{ |_, __| [_, __[/(?<=')[^']*/]] }.assoc(lang)&.last || "-1",
           ->resp{
@@ -84,11 +86,11 @@ def Paster paste
     end
 
     def paste
-      services.map do |_, _, _, expire, url, field, multipart, lang, callback, no_redirect = true, extra = nil|
+      services.map do |_, _, _, expire, unlistable, url, field, multipart, lang, callback, no_redirect = true, extra = {}|
         Thread.new do
           puts begin
             callback.call NetHTTPUtils.request_data url, :post, *multipart, no_redirect: no_redirect,
-              form: {"lang" => lang, "expire" => expire}.map{ |k, v| [k, v.to_s] if v }.compact.to_h.merge(extra || {}).merge({field => self.class.instance_variable_get(:@paste)})
+              form: {lang: lang, expire: expire}.merge({private: (1 if unlistable && unlist)}).map{ |k, v| [k.to_s, v.to_s] if v }.compact.to_h.merge(extra).merge({field => self.class.instance_variable_get(:@paste)})
             # if we .strip the response before sending to callback it won't haev the last_response instance_variable
           rescue => e
             "failed to paste to #{url}: #{e} -- consider reporting this issue to GitHub"

data/paster.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = "paster"
-  spec.version      = "0.0.2"
+  spec.version      = "0.0.3"
   spec.summary      = "universal asynchronous pastebin CLI"
 
   spec.author       = "Victor Maslov aka Nakilon"
@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
   spec.license      = "MIT"
   spec.metadata     = {"source_code_uri" => "https://github.com/nakilon/paster"}
 
+  spec.add_dependency "clipboard"
   spec.add_dependency "nethttputils", "~>0.4.1.3"
   spec.add_dependency "github-linguist"
   spec.add_dependency "oga"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: paster
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Victor Maslov aka Nakilon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-08-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: clipboard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nethttputils
   requirement: !ruby/object:Gem::Requirement