reaver 0.7.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32fb1834d726c5f6883514c899661f2a3ad42ed4dd53c5ab64fc0a97bcafe96e
-  data.tar.gz: fd73c58c53c159e86cc523960b795b30e3ca91a4333ef5340207bc438d71f6e9
+  metadata.gz: bdd577808ca0bae2cded787b089161dc9edf442705c2676ed89c8fb696a7190f
+  data.tar.gz: 9e83785bfffdc7a792ff630261cb39e30a165b0f3b58162015dc617f65d182b9
 SHA512:
-  metadata.gz: 54ce812f876370d2579221723c9d005abfd6abb1568ff8617f2272016287a4cc98990e2a55202a8ab4a791d4d1148c7c5b0715e3d8fd3b4e74064687dde84c15
-  data.tar.gz: 1e247b45ec3a47c90fa161c8e2677ae90dc8bea56b81e615db2a2c3f9c2ca68af82dc706825d412941b5aaabb398d5d06393bfd51c87c7780cadc638ecb2720f
+  metadata.gz: fd900ba9a85d977377b8ad011efcab4e1957b5a5334916e08245774ec8f6d15cff279e19a0fc0a35532fafceaa0acc47c67e1204f9019b67f171aa538ff4586e
+  data.tar.gz: 0dbf7794f0ae570ed6f742c77cbb417211dae02642951d27a77eab164859db62f8e1c7c3dcca9120aacaa8beacef54b3cbd7791d9b2135b2d1a99c1f056de62d

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.10.1
+- For `all_to_dir_path` or `things.dest_dir`, all paths are relative to `$HOME` (or
+  /home/<name>), so don't include shell variable `~` or `$HOME`.
+- unzip not interactive with `-o`.
+
+## 0.10.0, release 10/2024
+- New variable for collections, all_into_dir, things.dest_dir, keep_name and
+  force_download.
+-** Use [Marcel](https://github.com/rails/marcel) to detect file mime.
+- Can decompress archive `zip` or `tar.gz (gzip)` using unzip and tar from `unix`.
+- Cam move files to specific directory.
+
 ## 0.7.0, release 12/24/22
 
 * Each collections download things in separate directory.

data/README.md

@@ -1,7 +1,12 @@
 # reaver
 
 A tool that allows to download and track the latest version of stuff on the net.
-Define your collections in .yml and launch Reaver to retrieve everything.
+Define your collections in .yml and launch Reaver to retrieve everything and
+move things to the right spot.
+
+## Dependencies
+
+Reaver need only `unzip` and `tar`.
 
 ## Collections
 
@@ -30,10 +35,26 @@ things:
   - name: nerdtree.tar.gz
     url: https://github.com/preservim/nerdtree/archive/refs/heads/master.tar.gz
 time: 86000
+all_into_dir: .config/pack/myvimpluggins/start
+keep_name: true
 ```
 
-`time: 86000` (in second) is for search every day ( 60 * 60 * 24 ).  
-The `name` must contain the path extension for now.
+To see more examples, go
+[here](https://github.com/szorfein/dots/tree/ansible/home/private_dot_config/reaver)
+
+A collection can include:
+- `all_into_dir: <dirname>` if all files go in a directory. Directory is created
+  if not exist.
+- `keep_name: <boolean>`, if `true`, use the name of the thing for the dest, e.g, for a name `ombre.tar.gz`, the final dest will be `all_into_dir/ombre` or `dest_dir/ombre`.
+- `force_download: <boolean>`, if you make change and want to download now, change to `true`.
+- `things.dest_dir: <dirname>`, if each files go in differents directory, use this.
+- `things.name` the new name after download, may include the file extension.
+- `things.url: <string>`
+- `time: 86000` (in second) is for search every day ( 60 * 60 * 24 ).
+
+If `all_into_dir` is defined, `things.dest_dir` is not used.  
+All paths given are relative to `$HOME` so don't include `~` or any shell
+variables.
 
 And start reaver simply with:
 

data/bin/reaver

@@ -7,4 +7,4 @@ puts Reaver.banner
 
 Reaver.main
 
-puts "\nReaver v" + Reaver::VERSION
+puts "\nReaver v#{Reaver::VERSION}"

data/lib/reaver/collection.rb

@@ -5,6 +5,7 @@ require 'time'
 require 'digest'
 
 module Reaver
+  # Loading collection from ~/.config/reaver/<filename.yml> and threat them
   class Collection
     attr_reader :tasks
 
@@ -15,39 +16,59 @@ module Reaver
 
     def load_yaml
       puts ">> Loading #{@file}..."
-      if RUBY_VERSION >= '3.0'
-        @tasks = YAML.load_file(@file,  permitted_classes: [Time, Symbol])
-      else
-        @tasks = YAML.load_file(@file)
-      end
-    rescue => error
-      raise error, "loading YAML fail for #{@file}: #{error.message}"
+      @tasks = if RUBY_VERSION >= '3.0'
+                 YAML.load_file(@file, permitted_classes: [Time, Symbol])
+               else
+                 @tasks = YAML.load_file(@file)
+               end
+    rescue => e
+      raise e, "loading YAML fail for #{@file}: #{e.message}"
+    end
+
+    def save_yaml
+      in_yaml = YAML.dump(@tasks)
+      File.write(@file, in_yaml)
     end
 
     def launch(metadata)
-      return unless @tasks
+      return unless @tasks || @tasks['things'].length.zero?
 
-      if @tasks['things'].length >= 1
-        @tasks['things'].each do |t|
-          if File.exist? t['name']
-            old_hash = Digest::MD5.file t['name']
-          else
-            @changed = true
-          end
+      @tasks['things'].each do |task|
+        do_thing(task)
+        metadata.info['changed'] = @changed
+      end
+    end
 
-          Reaver.download(t['url'], t['name']) 
-          compare_hash(t['name'], old_hash) if old_hash
+    protected
 
-          metadata.info['changed'] = @changed
-        end
-      end
+    def do_thing(task)
+      hash_exist(task['name'])
+      Reaver.download(task['url'], task['name'])
+      compare_to_old_hash(task['name']) if @old_hash
+      need_to_do_something_with(task) if @changed || !@old_hash
+      @tasks['force_download'] = false
+      @changed = false
     end
 
     private
 
-    def compare_hash(filename, old_hash)
+    def hash_exist(file)
+      if File.exist? file
+        @old_hash = Digest::MD5.file file
+      else
+        @changed = true
+      end
+    end
+
+    def compare_to_old_hash(filename)
       hash = Digest::MD5.file filename
-      @changed = true if old_hash.hexdigest != hash.hexdigest
+      @changed = true if @old_hash.hexdigest != hash.hexdigest
+    end
+
+    def need_to_do_something_with(file)
+      dest = @tasks['all_to_dest_dir'] || file['dest_dir']
+      keep_name = @tasks['keep_name'] || false
+      Reaver::Walk.new(file['name'], dest, keep_name) if dest
     end
   end
 end

data/lib/reaver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reaver
-  VERSION = '0.7.1'
+  VERSION = '0.10.1'
 end

data/lib/reaver/walk.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'marcel'
+require 'fileutils'
+
+module Reaver
+  # extract, move file if need
+  class Walk
+    def initialize(filename, dest, keep_name)
+      @filename = filename
+      @dest = dest
+      @keep_name = keep_name || false
+      check_extension
+      check_name
+      x
+    end
+
+    def x
+      case @extension
+      when %r{^image/jpeg} || %r{^image/png}
+        copy_file
+      when %r{^application/zip}
+        extract_zip
+      when %r{^application/gzip}
+        extract_gzip
+      when %r{^font/ttf}
+        copy_file
+      else
+        puts "Filetype #{@extension} not yet supported, skipping..."
+      end
+    end
+
+    private
+
+    def check_extension
+      File.open @filename do |f|
+        @extension = Marcel::MimeType.for f
+      end
+    end
+
+    def check_name
+      name = @filename.split('.').first
+      @final_dest = if @keep_name
+                      "#{ENV['HOME']}/#{@dest}/#{name}"
+                    else
+                      "#{ENV['HOME']}/#{@dest}"
+                    end
+    end
+
+    def copy_file
+      puts "Copying file #{@filename} at #{@final_dest}..."
+      FileUtils.mkdir_p @final_dest
+      FileUtils.cp @filename, "#{@final_dest}/#{@filename}"
+    end
+
+    def extract_zip
+      puts "Extracting zip archive #{@filename} at #{@final_dest}..."
+      FileUtils.mkdir_p @final_dest
+      `unzip -o -j #{@filename} -d #{@final_dest}`
+    end
+
+    def extract_gzip
+      puts "Extracting gzip archive #{@filename} at #{@final_dest}..."
+      FileUtils.mkdir_p @final_dest
+      `tar -x --strip-components=1 -f #{@filename} --one-top-level=#{@final_dest}`
+    end
+  end
+end

data/lib/reaver.rb

@@ -5,6 +5,7 @@ require_relative 'reaver/banner'
 require_relative 'reaver/download'
 require_relative 'reaver/metadata'
 require_relative 'reaver/collection'
+require_relative 'reaver/walk'
 
 require 'whirly'
 require 'fileutils'
@@ -22,8 +23,8 @@ module Reaver
 
   # Configure Whirly
   Whirly.configure spinner: 'bouncingBar',
-    color: true,
-    ambiguous_characters_width: 1
+                   color: true,
+                   ambiguous_characters_width: 1
 
   def self.main
     FileUtils.mkdir_p(WORKDIR)
@@ -40,22 +41,27 @@ module Reaver
       collection = Collection.new(f)
       collection.load_yaml
 
-      if collection.tasks
-        metadata = MetaData.new(workdir, collection)
-        metadata.load_yaml
-        next_download = metadata.info['next']
+      #puts collection.tasks
 
-        if next_download < Time.new
+      next unless collection.tasks
+
+      metadata = MetaData.new(workdir, collection)
+      metadata.load_yaml
+      next_download = metadata.info['next']
+      force_download = collection.tasks['force_download'] || false
+      #puts "should we force #{force_download}"
+
+      if next_download < Time.new || force_download
           #puts ' >> Download time for ' + name
-          FileUtils.chdir(workdir)
-          #puts "  > chdir #{workdir}"
-          collection.launch(metadata)
-        else
-          puts " > Next download > #{next_download}"
-        end
-
-        metadata.save_yaml
+        FileUtils.chdir(workdir)
+        #puts "  > chdir #{workdir}"
+        collection.launch(metadata)
+        collection.save_yaml if force_download
+      else
+        puts " > Next download > #{next_download}"
       end
+
+      metadata.save_yaml
     end
   end
 end

data/reaver.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     'changelog_uri' => 'https://github.com/szorfein/reaver/blob/main/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/szorfein/reaver',
     'wiki_uri' => 'https://github.com/szorfein/reaver/wiki',
-    'funding_uri' => 'https://patreon.com/szorfein',
+    'funding_uri' => 'https://patreon.com/szorfein'
   }
 
   s.files = Dir.glob('{lib,bin}/**/*', File::FNM_DOTMATCH).reject do |f|
@@ -38,10 +38,11 @@ Gem::Specification.new do |s|
   s.executables << 'reaver'
   s.extra_rdoc_files = %w[README.md]
 
-  s.cert_chain = %w[certs/szorfein.pem]
-  s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+  # s.cert_chain = %w[certs/szorfein.pem]
+  # s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
 
   s.required_ruby_version = '>=2.6'
-  s.add_dependency 'whirly', '~> 0.3'
+  s.add_dependency 'marcel'
   s.add_dependency 'paint', '~> 2.3'
+  s.add_dependency 'whirly', '~> 0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reaver
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.10.1
 platform: ruby
 authors:
 - szorfein
@@ -12,46 +12,46 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  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
-  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
-  LLknX69FN7/G
+  AQsFAAOCAYEAFjnBWWfaMeA8hP0Q76WmBCFckGN5I42X5RQkVYRRXIaeXIS1td/t
+  O1v1iQLo6ABfASMi6We7T16+ita68xwNOmSkMNHHXBr/fdGbHExxFSX7BXNRbwla
+  SS6Vy0bXKMDJbXcvkrmIolpYhEFm1218FCRCT6ogM1oWAJAfhfF9pMeRxrxjQYFn
+  ko8XgjIHxb83miOILgdq/lgJ4gfD7PsGfJtLCLiCKCcxIb4TtmKAzRwCDVpb6wqM
+  5xJZffAmHI7v8lVer53sPzm3INPu5xFZyfZ/SXYXPKKwln0efH63K5vuXYwEN7NI
+  SBSRTN03Hb65t86m6/r084SrNnLntQjCSqApzFBt1QwJ5cmiVilODN4V7y2hZpyK
+  hSk3b2VOotDPiWIm1p/IPXQDfm5x67Z5fJQPAlBTsse4jKyVyW1lZLmERSBuRZ2O
+  urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
+  NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: whirly
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: whirly
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: |2
       A tool that allows to download and track the latest version of stuff on the net.
       Define your collections in .yml and launch Reaver to retrieve everything.
@@ -86,6 +100,7 @@ files:
 - lib/reaver/download.rb
 - lib/reaver/metadata.rb
 - lib/reaver/version.rb
+- lib/reaver/walk.rb
 - reaver.gemspec
 homepage: https://github.com/szorfein/reaver
 licenses:
@@ -111,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: A tool to downloads and track updates of things on the Net.