storazzo 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6478359f1db5708d42ebe8251f985481629d4255a119ce5a52952572863c94e5
-  data.tar.gz: 8832a4178e0ed56687e6f494898f1902069c195c20f6474d20fd0981ad0bd3e7
+  metadata.gz: 7af080e9d4d71c7ceb558b4b4cbd1f13345fa3c4dbea5d6060da8fb9d5b21cc0
+  data.tar.gz: fe4fd90e12756dbe535e96f0c7c42834ce44c452839890d381a0e43a78ce926e
 SHA512:
-  metadata.gz: df7a71868983eef6299a94dc4af98e232519d79414c15321c6548411ee8590b9bcb2b8c1418a94aae46993093850156bd595b1293396d55e1e0c0db891085095
-  data.tar.gz: a69cc8ffc1ab17409df2635ff7aa58af329d7572498ecef00d215dca31d3c92314ae2e0c975c74eddbd5f2e69e34807b91b4ecd2bed4519e1a9dbddb31bfacaf
+  metadata.gz: 7f753c4e14018803a731de9cf992dcfcf4f4cac601fb0b978de6d16c83c8ab0f06430e0cdd2a203b025a714f168c08f0e6107606b9b354fcf792e0041be8d727
+  data.tar.gz: 072da4e8a2b24fedd83e1cd04b41f695a38a49e623cef5bd1643a11dfc8813604d32c7950976b6b5500839d2a2580293623ab7b32070d9e162db6a753f2d8d02

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/storazzo/ric_disk.rb

@@ -16,8 +16,13 @@ module Storazzo
 
     # in order of finding, so the first will be the one we actually READ and use. I could looknat the date but cmon...
     # These are the files I do accept.
-    ConfigFiles = %W{ ricdisk.yaml .ricdisk  } 
-    RicdiskVersion = '2.0'
+    ConfigFiles = %W{ ricdisk.yaml .ricdisk storazzo.yaml } 
+    DefaultConfigFile = "storazzo.yaml" # .ricdisk } 
+    RicdiskVersion = '2.1'
+    RicdiskHistory = [
+      '2022-07-29 2.1 Added timestamp',
+      '2022-07-28 2.0 Added tags, siz, unique_hash, cmputation_hostname, wr, ...',
+  ]
     DefaultGemfileTestDiskFolder = Storazzo.root + "/var/test/disks/" # was: @@default_gemfile_test_disks_folder
     # Immutable
     DefaultMediaFolders = %w{ 
@@ -26,7 +31,7 @@ module Storazzo
      }.append(DefaultGemfileTestDiskFolder ).append("/media/#{ENV["USER"]}/" )
 
      #     # todo substitute with protobuf..
-    attr_accessor :name, :description, :ricdisk_file,:ricdisk_file_full, :local_mountpoint, :wr, :path, 
+    attr_accessor :name, :description, :ricdisk_file, :ricdisk_file_full, :local_mountpoint, :wr, :path, 
                   :ricdisk_file_empty, :size, :active_dirs, :ricdisk_version, 
                   :unique_hash # new 202207
 
@@ -38,7 +43,6 @@ module Storazzo
 
     def initialize(path, opts={})
       deb "RicDisk initialize.. path=#{path}"
-#      @local_mountpoint = path
       @local_mountpoint = File.expand_path(path)
       @description = "This is an automated RicDisk description from v.#{RicdiskVersion}. Created on #{Time.now}'"
       @ricdisk_version = RicdiskVersion
@@ -52,6 +56,7 @@ module Storazzo
       @size = `du -s '#{path}'`.split(/\s/)[0] # self.size
       @unique_hash = "MD5::" + Digest::MD5.hexdigest(File.expand_path(path)) #   hash = Digest::MD5.hexdigest(File.expand_path(get_local_mountpoint))
       @computation_hostname = Socket.gethostname
+      @created_at = Time.now
 
       @ricdisk_file_empty = ricdisk_file_empty?
       
@@ -97,8 +102,10 @@ module Storazzo
     def writeable?() 
       return @wr unless @wr.nil? 
       # Otherwise I can do an EXPENSIVE calculation
-      puts "TODO(ricc): Do expensive calculation if this FS is writeable: #{path}"
-      @wr = File.writable?(File.expand_path(@ricdisk_file)) # rescue false
+      puts yellow("TODO(ricc): Do expensive calculation if this FS is writeable: #{path}")
+      #@wr = File.writable?(File.expand_path(@ricdisk_file)) # rescue false
+      raise "for some reason an important info (ricdisk_file='#{absolute_path}') is missing!" if ricdisk_file.nil?
+      @wr = File.writable?(absolute_path) # rescue false
       return @wr
       #:boh_todo_fix_me_and_compute
       #false
@@ -123,9 +130,9 @@ module Storazzo
     end
 
     def absolute_path
-      @local_mountpoint + "/" +  @ricdisk_file
+      #@local_mountpoint + "/" +  @ricdisk_file
+      "#{local_mountpoint}/#{ricdisk_file}"
     end
-
   
     def self.find_active_dirs(base_dirs=nil, also_mountpoints=true)
       if base_dirs.nil?
@@ -172,9 +179,26 @@ module Storazzo
         #return ".ricdisk" if File.exist?("#{path}/.ricdisk") # and File.empty?( "#{path}/.ricdisk")
         return papable_config_filename if File.exist?("#{path}/#{papable_config_filename}") # and File.empty?( "#{path}/.ricdisk")
       end
-      return nil
+      deb "File not found! Neither #{ConfigFiles} exist.."
+#      return nil
+      return DefaultConfigFile
     end
 
+
+    # def self.compute_ricdisk_file_by_path_once(path)
+    #   # unless @ricdisk_file.nil?
+    #   #   deb "[CACHE HIT] ricdisk_file (didnt have to recompute it - yay!)"
+    #   #   return @ricdisk_file
+    #   # end
+    #   warn "RICC_WARNING This requires cmputation I wanna do it almost once"
+    #   ConfigFiles.each do |papable_config_filename|
+    #     #return ".ricdisk.yaml" if File.exist?("#{path}/.ricdisk.yaml") #and File.empty?( "#{path}/.ricdisk.yaml")
+    #     #return ".ricdisk" if File.exist?("#{path}/.ricdisk") # and File.empty?( "#{path}/.ricdisk")
+    #     return papable_config_filename if File.exist?("#{path}/#{papable_config_filename}") # and File.empty?( "#{path}/.ricdisk")
+    #   end
+    #   return nil
+    # end
+
     
     # # new
     # def self.get_ricdisk_file_obsolete(path)
@@ -234,11 +258,16 @@ module Storazzo
       #   puts(yellow disk_info.to_yaml)
       # end
       if disk_info.is_a?(RicDisk)
-        deb("disk_info.class: #{disk_info.class}")
-        if File.empty?(disk_info.absolute_path) and (disk_info.wr)
+        puts yellow("DEB disk_info.class: #{disk_info.class}")
+        if File.empty?(disk_info.absolute_path) # and (disk_info.wr)
           puts(green("yay, we can now write the file '#{disk_info.absolute_path}' (which is R/W, I just checked!) with proper YAML content.."))
-          ret = File.write(disk_info.absolute_path, disk_info.to_yaml)
-          puts("Written file! ret=#{ret}")
+          if disk_info.wr
+            ret = File.write(disk_info.absolute_path, disk_info.obj_to_yaml)
+            puts green("Written file! ret=#{ret}")
+          else
+            raise "TODO_IMPLEMENT: write in proper place in config dir"
+            puts red("TODO implement me")
+          end
         else
           puts(red("Something not right here: either file is NOT empty or disk is NOT writeable.. #{File.empty?(disk_info.absolute_path)}"))
           puts("File size: #{File.size(disk_info.absolute_path)}")
@@ -246,28 +275,37 @@ module Storazzo
           puts(disk_info.obj_to_hash)
           puts(disk_info.obj_to_yaml)
         end
-      else 
+      else # not a RicDisk..
         puts "[write_config_yaml_to_disk] No DiskInfo found across #{ConfigFiles}. I leave this function empty-handed."
       end
-      if File.exists?( "#{subdir}/.ricdisk") and ! File.empty?( "#{subdir}/.ricdisk")
-        puts("Config File found with old-style name: '#{subdir}/.ricdisk' ! Please move it to .ricdisk.yaml!")
-        puts(white `cat "#{subdir}/.ricdisk"`)
-      else
-        puts "WRITING NOW. disk_info.obj_to_yaml .. to #{compute_ricdisk_file}"
-        File.open(ricdisk_file_full, 'w').write(disk_info.obj_to_yaml)
-      end
+
+      #disk_info.absolute_path
+      #if File.exists?( "#{subdir}/.ricdisk") and ! File.empty?( "#{subdir}/.ricdisk")
+      # if File.exists?(disk_info.absolute_path) and ! File.empty?(disk_info.absolute_path)
+      #   puts("Config File found with old-style name: '#{subdir}/.ricdisk' ! Please move it to .ricdisk.yaml!")
+      #   puts(white `cat "#{disk_info.absolute_path}"`)
+      # else
+      #   puts "WRITING NOW. [I BELIEVE THIS IS DUPE CODE - see a few lines above!] disk_info.obj_to_yaml .. to #{compute_ricdisk_file}"
+      #   File.open(ricdisk_file_full, 'w').write(disk_info.obj_to_yaml)
+      # end
     end
 
     # TODO obsolete this as i should NOT be calling it from clas, but from method.
     def self.ok_dir?(subdir)
       File.exists?( "#{subdir}/.ricdisk") or File.exists?( "#{subdir}/.ricdisk.yaml")
     end
+
+    def compute_stats_files(opts={})
+      puts azure("TODO implement natively. Now I'm being lazy")
+      Storazzo::RicDisk.calculate_stats_files(path, opts)
+    end
   
 
 
     # Create RDS file.
     def self.calculate_stats_files(dir, opts={})
-      opts_upload_to_gcs = opts.fetch :upload_to_gcs, true 
+      opts_upload_to_gcs = opts.fetch :upload_to_gcs, true
+      
       full_file_path = "#{dir}/#{$stats_file}"
       return "This refacgtor is for another day"
   

data/lib/storazzo/ric_disk_config.rb

@@ -41,7 +41,7 @@ public
             verbose = opts.fetch :verbose, false
 
             if already_loaded? # and not self.config.nil?
-                puts "[#{self.class}] load: already loaded"
+                puts "[#{self.class}] VERBOSE load: already loaded" if verbose
                 return self.config
             end
 
@@ -175,7 +175,7 @@ public
                         rd.write_config_yaml_to_disk(dir)
                         #RicDisk.write_config_yaml_to_disk(dir)
                         #RicDisk.calculate_stats_files (CLASS) => will become OBJECT compute_stats_files
-                        compute_stats_files(dir) # dir is inutile # TODO
+                        rd.compute_stats_files() # dir is inutile # TODO
                     else
                         deb red("Doesnt seem a legit dir to me: #{dir}")
                     #     deb "Figghiu ri buttana: doesnt exist #{red dir}" 

data/lib/storazzo/ric_disk_sample_config.rb

@@ -21,7 +21,7 @@ module Storazzo
 
         public
         def load # _sample_version
-            puts white("[RicDiskSampleConfig] Wheew 1! We're NOT destroying the world here. We're actually instancing a second Singleton which is a child of the mother, and this time doing things nicely and Rubily.")
+            deb("[RicDiskSampleConfig] Wheew 1! We're NOT destroying the world here. We're actually instancing a second Singleton which is a child of the mother, and this time doing things nicely and Rubily.")
 #            super.load DefaultGemLocationForTests #super.load(DefaultGemLocationForTests, :verbose => true )
             super(DefaultGemLocationForTests, :verbose => false )
         end

data/test/test_gcs_bucket.rb

@@ -21,24 +21,27 @@ class GcsBucketTest < Minitest::Test
 
     include Storazzo::Common
 
-    def TODO_setup # tear_up 
+    def setup # tear_up 
         deb "[GcsBucketTest] TEAR_UP with sample Config"
         #removeme = Storazzo::RicDiskConfig.instance()
         config_obj = Storazzo::RicDiskSampleConfig.instance()
+        config_obj.load()
         deb "[GcsBucketTest] TEAR_UP config_obj: '''#{config_obj}'''"
     end
 
-    def TODO_test_buckets_are_the_two_i_know
+    def test_buckets_are_the_two_i_know
         expected_list = %w{
             gs://my-local-backup/storazzo/backups/
             gs://my-other-bucket/
         }
         actual_list = Storazzo::RicDisk::GcsBucket.list_all
-        assert_equal(expected_list, actual_list,
+        assert_equal(
+            expected_list.sort, 
+            actual_list.sort,
             "These are the two lists from Sample Storazzo Config")
     end
 
-    def TODO_test_import 
+    def test_import_sample_class_correctly
         #require "storazzo/ric_disk_sample_config" rescue nil
         #require "storazzo/ric_disk_config"
 

data/test/test_local_folder.rb

@@ -11,8 +11,8 @@ require "storazzo/media/local_folder"
 
 #puts yellow("DISABLING FOR NOW TODO restore")
 
-class LocalFolderTest # < Minitest::Test
-    extend Storazzo::Colors
+class LocalFolderTest < Minitest::Test
+    include Storazzo::Colors
     # def test_fail_on_purpOSE # test_storazzo_hi_with_argument
     #     assert_match 42, 42 , "change me when it failes from makefile" 
     #     #"Hello from Storazzo", Storazzo::Main.hi("ruby this should fail")
@@ -43,27 +43,57 @@ class LocalFolderTest # < Minitest::Test
 
     # To only test this:
     # $ ruby -I test test/test_local_folder.rb -n test_first_directory_parsing_actually_works
-    def test_first_directory_parsing_actually_works()
+    def test_1_first_directory_parsing_actually_works()
         # include module 
 
         #p $vediamo_se_funge
         puts("(#{__FILE__}) WEIRD THING: This test is flaky. SKipping for now until I complete the LocalFolder.parse() code")
         folders = Storazzo::Media::LocalFolder.list_all
         puts "Folders: #{folders}"
-        config = Storazzo::RicDiskConfig.instance()
-        puts "config: #{config}"
+        config = Storazzo::RicDiskSampleConfig.instance()
+        puts "config1: #{config}"
+        config.load
+        puts "config2: #{config.load}"
         test_dir = folders.first
-        # puts "test_first_directory_parsing_actually_works() TestDir: #{test_dir}"
-        # puts yellow "TEST S:M:LF methods: #{folders}"  # methods
-        # disk = Storazzo::Media::LocalFolder.new(test_dir)
-        # stats_file = disk.stats_filename_default_fullpath
-        # puts "stats_file: #{stats_file}"
-        # disk.parse()
+        puts "test_first_directory_parsing_actually_works() TestDir: #{test_dir}"
+        puts yellow "TEST S:M:LF methods: #{folders}"  # methods
+        
+        disk = Storazzo::Media::LocalFolder.new(test_dir)
+        stats_file = disk.stats_filename_default_fullpath
+        puts "stats_file: #{stats_file}"
+        disk.parse()
         puts "[DEB] config: ''#{config}''"
+        # config.iterate_through_file_list_for_disks([test_dir])
+        # assert(
+        #     File.exists?(stats_file),
+        #     "parse on LocalFolder should create file '#{stats_file}'"
+        # )
+    end
+
+    def test_2_iterate_through_file_list_for_disks
+        #p $vediamo_se_funge
+        puts("(#{__FILE__}) WEIRD THING: This test is flaky. SKipping for now until I complete the LocalFolder.parse() code")
+        folders = Storazzo::Media::LocalFolder.list_all
+        puts "Folders: #{folders}"
+        config = Storazzo::RicDiskSampleConfig.instance()
+        puts "config1: #{config}"
+        config.load
+        puts "config2: #{config.load}"
+        test_dir = folders.first
+        puts "test_first_directory_parsing_actually_works() TestDir: #{test_dir}"
+        puts "TEST S:M:LF methods: #{folders}"  # methods
+
+        disk = Storazzo::Media::LocalFolder.new(test_dir)
+        stats_file = disk.stats_filename_default_fullpath
+        #puts "stats_file: #{stats_file}"
+        #disk.parse()
+        #puts "[DEB] config: ''#{config}''"
+
+        #TEST2: config + iterate
         config.iterate_through_file_list_for_disks([test_dir])
         assert(
-             File.exists?(stats_file),
-             "parse on LocalFolder should create file '#{stats_file}'"
+            File.exists?(stats_file),
+            "parse on LocalFolder should create file '#{stats_file}'"
         )
     end
 end

data/test/test_storazzo.rb

@@ -1,11 +1,11 @@
-# require "minitest/autorun"
-# require "storazzo"
+require "minitest/autorun"
+require "storazzo"
 
-# class StorazzoTest < Minitest::Test
-#     def test_storazzo_hi_with_argument
-#         assert_match "Hello from Storazzo", Storazzo::Main.say_hi("ruby this should fail")
-#         assert_match "ruby this should fail", Storazzo::Main.say_hi("ruby this should fail")
-#     end
+class StorazzoTest < Minitest::Test
+    def test_storazzo_hi_with_argument
+        assert_match "Hello from Storazzo", Storazzo::Main.say_hi("ruby this should fail")
+        assert_match "ruby this should fail", Storazzo::Main.say_hi("ruby this should fail")
+    end
 #     def test_storazzo_hi_without_argument
 #         assert_match "Hello from Storazzo", Storazzo::Main.say_hi()
 #     end
@@ -30,5 +30,5 @@
 # #   def test_spanish_hello
 # #     assert_equal "hola mundo",
 # #       Hola.hi("spanish")
-# #   end
-# end
+#   end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storazzo
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Riccardo Carlesso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies: []
 description: A simple gem to manage your external hard drives and extract MD5 and
   common stuff from them.