can_cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f07d677961d3cacd7883588248a12abc8cc704e43e404dca8f8e57b5732cd6
-  data.tar.gz: bcc9de955586c990221b7d1c1bd271740552ae28f50bf8bf0bccf0ed39194641
+  metadata.gz: 802816b1df3e8c6731ea2bc7d8fd6cfcecc563e148e5036d9ae5cc7c39322225
+  data.tar.gz: 1d9edb9f93abdff569f55c4642fd20ac124b7375c64731545b22559bcd8efbf2
 SHA512:
-  metadata.gz: 2e43c013bef3784c96fb479fc79277edbe75626ea83f12460fbeacd87b2d1cf3437fbb840a14de3f01805a53315a69b97b84ea106a628240f1fd2b99ddb0385f
-  data.tar.gz: a9a59c4e8f4bd049011eee27589a573dc85ee272d15e010fbf3f17b645d22d11e68e9493dc2acfaef18dd0e8ebac572d2ca4a18830d1adb03591153239ebf0d9
+  metadata.gz: fe0f322150b2b80ab2625848e211df9e5b987f15daa07ea0edd5795d95d91fec004cbe96656311ea42e0fc6cb5ff4de2157be574a52ca5cf784bf510bfeac4b6
+  data.tar.gz: 4648ca8f4fe19bdda8c87492fb523d0168897803ad944703bdb72408c4ba6819c669b4803bed5000b5c2d2b380965c145b9c5cac364f23dfce50dfad9af5afe3

data/README.md

@@ -1,4 +1,5 @@
-# can
+<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).
@@ -6,42 +7,42 @@ specification](https://specifications.freedesktop.org/trash-spec/trashspec-lates
 Can seeks to follow the behavior of the GNOME Files
 (Nautilus) trash implementation.
 
-As of now, it is partially implemented. You can use Can on
-multiple files---it will create an info file for each and
-move each to the trash directory.
+## Installation
 
-# Usage
+Can is available as a
+[Gem](https://rubygems.org/gems/can_cli) and as an [AUR
+package](https://aur.archlinux.org/packages/can).
 
-**Does not cover all options**
+Install Gem:
+`gem install can`
 
-## Trash files
+Install on AUR:
+`paru -S can`
 
-`can foo.txt bar.txt`
+## Usage
+
+**Does not cover all options**
 
-## Trash directories and files
+**Trash files**
+`can foo.txt bar.txt`
 
+**Trash directories and files**
 `can -r foo.txt bar.d`
 
-## List files in trashcan
-
+**List files in trashcan**
 `can -l`
 
-## List files in trashcan that match a regex
-
+**List files in trashcan that match a regex**
 `can -l '^foo'`
 
-## View trashinfo of files
-
+**View trashinfo of files**
 `can -n foo.txt bar.d`
 
-## Untrash files
-
+**Untrash files**
 `can -u foo.txt bar.d`
 
-## Empty files from trashcan
-
+**Empty files from trashcan**
 `can -e foo.txt bar.d`
 
-## Empty entire trashcan
-
+**Empty entire trashcan**
 `can -e`

data/can.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/can/version'
 
 Gem::Specification.new do |s|
@@ -26,5 +28,6 @@ Gem::Specification.new do |s|
   ]
   s.homepage    = 'https://github.com/sawshep/can'
   s.license     = 'GPL-3.0'
+  s.required_ruby_version = '>= 3.0'
   s.add_runtime_dependency 'highline', '~> 2.0'
 end

data/lib/can/argparse.rb

@@ -4,7 +4,6 @@ require 'optparse'
 require 'set'
 require 'can/version'
 
-$options = Set.new
 
 # This needs to be here because OptParse only looks
 # at `Version` and @version for the version number,
@@ -43,27 +42,31 @@ module Can
   module ArgParse
     Version = VERSION
     def self.init_args
+      options = Set.new
+
       OptionParser.new do |opts|
         opts.banner = USAGE
 
         ALL_FLAGS.each do |mode, _v|
           opts.on(short_opt(mode), long_opt(mode), help_string(mode)) do |_opt|
-            $options << mode
+            options << mode
           end
         end
       end.parse!
 
-      Error.fatal 'Too many mode arguments' if ArgParse.incompatible_opts?
+      Error.fatal 'Too many mode arguments' if ArgParse.incompatible_opts?(options)
+
+      options
     end
 
-    # Sees if $options has incompatible items
-    def self.incompatible_opts?
+    # Sees if options has incompatible items
+    def self.incompatible_opts?(options)
       modes = MODES.keys
-      ($options & modes).length > 1
+      (options & modes).length > 1
     end
 
-    def self.mode
-      ($options & MODES.keys).first || :trash
+    def self.mode(options)
+      (options & MODES.keys).first || :trash
     end
 
     def self.short_opt(mode)

data/lib/can/version.rb

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

data/lib/can.rb

@@ -26,14 +26,14 @@ module Can
   end
 
   def self.can
-    ArgParse.init_args
+    @options = ArgParse.init_args
 
-    mode = ArgParse.mode
+    mode = ArgParse.mode @options
 
     init_dirs
 
     send mode
 
-    $exit = EXIT_SUCCESS if $options.include? :force
+    $exit = EXIT_SUCCESS if @options.include?(:force)
   end
 end

data/lib/trash.rb

@@ -23,7 +23,7 @@ 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|
       # TODO: If both `-f` and `-i` are used, can should
@@ -31,7 +31,7 @@ module Can
       # can should not prompt trashings. This follows the
       # behavior of rm.
       unless File.exist?(path)
-        Error.nonfatal "cannot trash '#{path}': No such file or directory" unless $options.include? :force
+        Error.nonfatal "cannot trash '#{path}': No such file or directory" unless @options.include? :force
         next
       end
 
@@ -39,14 +39,14 @@ module Can
       # argument, a non-zero error code should be returned
       # regardless if --force is used.
       if File.directory?(path) && !File.symlink?(path)
-        Error.nonfatal "cannot remove '#{path}': Is a directory" unless $options.include? :recursive
+        Error.nonfatal "cannot remove '#{path}': Is a directory" unless @options.include? :recursive
         next
       end
 
       # TODO: Highline.agree prints to stdout, when it should
       # print to stderr. It also uses `puts`, while this use
       # case should use `print`.
-      next if $options.include?(:prompt) && !(HighLine.agree "can: remove file '#{path}'?")
+      next if @options.include?(:prompt) && !(HighLine.agree "can: remove file '#{path}'?")
 
       filename = File.basename path
 

data/lib/untrash.rb

@@ -6,7 +6,7 @@ module Can
       file_path = File.join(HOME_TRASH_FILES_DIRECTORY, filename)
 
       unless File.exist? file_path
-        unless $options.include? :force
+        unless @options.include? :force
           Error.nonfatal "cannot untrash '#{filename}': No such file or directory in trash"
         end
         next

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: can_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sawyer Shepherd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -58,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="