can_cli 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d045fc55d52033bff2f1545671627292f4c9cfc31577d6895c1eecf92b023a4
-  data.tar.gz: 5e64a110561d1772c9655c69abe168258555265f2c85ed25d3e13de52f20ae9a
+  metadata.gz: 9dbd9171ffb0acfa035abd758884336a5b7e716b56b5c80692ae3a490c1e7673
+  data.tar.gz: d960d2e4d646b2297b9ba98750d4004c303033f6541ae90e8c3a02602fc35a2e
 SHA512:
-  metadata.gz: d116038236f64812a1f6ffd1039b2212cd6d0636277be91c7b2a85ee903a1adb8a7c6a70ac16abe3643f627566955b0bcd4daa4d8a4382bbe916fecd3ca31d1b
-  data.tar.gz: c6641f08b8e26caebe3d83634875597d358edb86d3b3612b6eb4d6f8dfcad54d7830dd4fdecc86239771c6f9f4185a591ab8fa3cb5dadc36426d10a78f1548a3
+  metadata.gz: e38eece364cbc9d16a67347aeac363239e1f4351158d9b228bd2553f3de57033e749a4517aaadb01c9a811df29968fa938b4707d067b72d8fb393d5a1b39445b
+  data.tar.gz: c740ebaed2650dfd6770b34fb3f87686aba7ceef378c175de2caba28f02acc5a24c716031fbfd96f3471502d5bcd3c15a22440a5f0fde5aa6e2fe5df1a988b70

data/README.md

@@ -1,5 +1,4 @@
 <h1 style="text-align: center;">can</h1>
------------------------------
 
 A command line implementation of the [Freedesktop XDG trash
 specification](https://specifications.freedesktop.org/trash-spec/trashspec-latest.html).
@@ -23,26 +22,26 @@ Install on AUR:
 
 **Does not cover all options**
 
-**Trash files**
-`can foo.txt bar.txt`
+Trash files
+:   `can foo.txt bar.txt`
 
-**Trash directories and files**
-`can -r foo.txt bar.d`
+Trash directories and files
+:   `can -r foo.txt bar.d`
 
-**List files in trashcan**
-`can -l`
+List files in trashcan
+:   `can -l`
 
-**List files in trashcan that match a regex**
-`can -l '^foo'`
+List files in trashcan that match a regex
+:   `can -l '^foo'`
 
-**View trashinfo of files**
-`can -n foo.txt bar.d`
+View trashinfo of files
+:   `can -n foo.txt bar.d`
 
-**Untrash files**
-`can -u foo.txt bar.d`
+Untrash files
+:   `can -u foo.txt bar.d`
 
-**Empty files from trashcan**
-`can -e foo.txt bar.d`
+Empty files from trashcan**
+:   `can -e foo.txt bar.d`
 
-**Empty entire trashcan**
-`can -e`
+Empty entire trashcan
+:   `can -e`

data/bin/can

@@ -3,4 +3,4 @@
 
 require 'can'
 
-Can.can
+Can.cli

data/can.gemspec

@@ -10,21 +10,21 @@ Gem::Specification.new do |s|
   s.description = 'A command-line trashcan interface implementing the FreeDesktop trash specification as a drop-in replacement for rm.'
   s.authors     = ['Sawyer Shepherd']
   s.email       = 'contact@sawyershepherd.org'
-  s.files       = [
-    'LICENSE',
-    'README.md',
-    'bin/can',
-    'can.gemspec',
-    'lib/can/argparse.rb',
-    'lib/can/version.rb',
-    'lib/can.rb',
-    'lib/empty.rb',
-    'lib/error.rb',
-    'lib/info.rb',
-    'lib/list.rb',
-    'lib/trash.rb',
-    'lib/trashinfo.rb',
-    'lib/untrash.rb'
+  s.files       = %w[
+    LICENSE
+    README.md
+    bin/can
+    can.gemspec
+    lib/can.rb
+    lib/can/argparse.rb
+    lib/can/empty.rb
+    lib/can/info.rb
+    lib/can/list.rb
+    lib/can/trash.rb
+    lib/can/untrash.rb
+    lib/can/version.rb
+    lib/error.rb
+    lib/trashinfo.rb
   ]
   s.homepage    = 'https://github.com/sawshep/can'
   s.license     = 'GPL-3.0'

data/lib/can/argparse.rb

@@ -40,7 +40,7 @@ module Can
 
   module ArgParse
     Version = VERSION
-    def self.init_args
+    def self.init_args(argv)
       options = Set.new
 
       OptionParser.new do |opts|
@@ -51,11 +51,11 @@ module Can
             options << mode
           end
         end
-      end.parse!
+      end.parse!(argv)
 
       Error.fatal 'Too many mode arguments' if ArgParse.incompatible_opts?(options)
 
-      options
+      return options, argv
     end
 
     # Sees if options has incompatible items

data/lib/{empty.rb → can/empty.rb}

@@ -7,7 +7,7 @@ module Can
       FileUtils.rm_r Dir.glob("#{HOME_TRASH_INFO_DIRECTORY}/*"), secure: true
       FileUtils.rm_r Dir.glob("#{HOME_TRASH_FILES_DIRECTORY}/*"), secure: true
     else
-      ARGV.each do |filename|
+      @argv.each do |filename|
         trashinfo_filename = "#{filename}.trashinfo"
 
         file_path = File.join(HOME_TRASH_FILES_DIRECTORY, filename)

data/lib/{info.rb → can/info.rb}

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
 module Can
-  # TODO: Parse the .trashinfo files to make them more human
-  # readable. Also, display the filename above the information
-  # with empty lines between consecutive info blocks.
   def self.info
     # Fails with a fatal error even with --force, intended
     # behavior.
-    if ARGV.empty?
+    if @argv.empty?
       Error.fatal 'missing operand'
     else
-      ARGV.each_with_index do |file, i|
+      @argv.each_with_index do |file, i|
         trashinfo_filename = "#{file}.trashinfo"
         trashinfo_path = File.join(HOME_TRASH_INFO_DIRECTORY, trashinfo_filename)
 

data/lib/{list.rb → can/list.rb}

@@ -3,13 +3,13 @@
 module Can
   def self.list
     # Given no args, show every trashed file
-    if ARGV.empty?
+    if @argv.empty?
       puts Dir.children(HOME_TRASH_FILES_DIRECTORY)
 
     # Given a regex pattern as an arg, print trashed files
     # that fit
-    elsif ARGV.length == 1
-      regex = Regexp.new(ARGV[0])
+    elsif @argv.length == 1
+      regex = Regexp.new(@argv[0])
       puts(
         Dir.children(HOME_TRASH_FILES_DIRECTORY).select do |file|
           regex =~ file
@@ -17,7 +17,7 @@ module Can
       )
 
     else
-      raise StandardError, "can: mode --list expects 0 to 1 arguments, given #{ARGV.length}"
+      raise StandardError, "can: mode --list expects 0 to 1 arguments, given #{@argv.length}"
     end
   end
 end

data/lib/{trash.rb → can/trash.rb}

@@ -23,9 +23,9 @@ end
 
 module Can
   def self.trash
-    Error.fatal 'missing operand' if ARGV.empty? && !@options.include?(:force)
+    Error.fatal 'missing operand' if @argv.empty? && !@options.include?(:force)
 
-    ARGV.each do |path|
+    @argv.each do |path|
       # TODO: If both `-f` and `-i` are used, can should
       # prompt if `-i` is used last. If `-f` is used last,
       # can should not prompt trashings. This follows the

data/lib/{untrash.rb → can/untrash.rb}

@@ -2,7 +2,7 @@
 
 module Can
   def self.untrash
-    ARGV.each do |filename|
+    @argv.each do |filename|
       file_path = File.join(HOME_TRASH_FILES_DIRECTORY, filename)
 
       unless File.exist? file_path
@@ -18,7 +18,6 @@ module Can
 
       original_path = trashinfo[:path]
 
-      # TODO: Implement more thorough error handling
       if File.exist? original_path
         Error.nonfatal "cannot untrash '#{filename}' to '#{original_path}': File exists"
         next

data/lib/can/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Can
-  VERSION = '0.1.8'
+  VERSION = '0.2.0'
 end

data/lib/can.rb

@@ -2,15 +2,15 @@
 
 require 'fileutils'
 
-require 'can/argparse'
 require 'trashinfo'
 require 'error'
 
-require_relative 'empty'
-require_relative 'info'
-require_relative 'list'
-require_relative 'untrash'
-require_relative 'trash'
+require 'can/argparse'
+require 'can/empty'
+require 'can/info'
+require 'can/list'
+require 'can/untrash'
+require 'can/trash'
 
 module Can
   XDG_DATA_HOME_DEFAULT = File.join(ENV['HOME'], '.local/share')
@@ -25,8 +25,13 @@ module Can
     FileUtils.mkpath HOME_TRASH_INFO_DIRECTORY
   end
 
-  def self.can
-    @options = ArgParse.init_args
+  def self.cli
+    can ARGV
+  end
+
+
+  def self.can(argv)
+    @options, @argv = ArgParse.init_args(argv)
 
     mode = ArgParse.mode @options
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Sawyer Shepherd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -38,14 +38,14 @@ files:
 - can.gemspec
 - lib/can.rb
 - lib/can/argparse.rb
+- lib/can/empty.rb
+- lib/can/info.rb
+- lib/can/list.rb
+- lib/can/trash.rb
+- lib/can/untrash.rb
 - lib/can/version.rb
-- lib/empty.rb
 - lib/error.rb
-- lib/info.rb
-- lib/list.rb
-- lib/trash.rb
 - lib/trashinfo.rb
-- lib/untrash.rb
 homepage: https://github.com/sawshep/can
 licenses:
 - GPL-3.0