storazzo 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9055989b612babb7a7d19c5c3edad19504541e1c9f65086e62676041826490
-  data.tar.gz: 7747d21ba2b2fc9ad046bc46b4aef95c5ff3ed0f9c3bf08e0d220a8b79725352
+  metadata.gz: 6478359f1db5708d42ebe8251f985481629d4255a119ce5a52952572863c94e5
+  data.tar.gz: 8832a4178e0ed56687e6f494898f1902069c195c20f6474d20fd0981ad0bd3e7
 SHA512:
-  metadata.gz: 14dca4f3c57b21e8a8a7b45a9a8ff6746eca5b53041bab8b5542ecb4343dadac38e575c8a3142aa530eae985d5ada6898881006fe89617533a22dd5f2481385e
-  data.tar.gz: 77ac0db74bc3f55ca77ed5d3ae791a0e8e5bf6d0ad34aae8e5bb6ad850797894a6983a6f86de8c4216096a776a8e25bfa4d6a6c40b77f13b69a165e36c378966
+  metadata.gz: df7a71868983eef6299a94dc4af98e232519d79414c15321c6548411ee8590b9bcb2b8c1418a94aae46993093850156bd595b1293396d55e1e0c0db891085095
+  data.tar.gz: a69cc8ffc1ab17409df2635ff7aa58af329d7572498ecef00d215dca31d3c92314ae2e0c975c74eddbd5f2e69e34807b91b4ecd2bed4519e1a9dbddb31bfacaf

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.7

data/lib/storazzo/media/local_folder.rb

@@ -13,7 +13,8 @@ module Storazzo::Media
             raise "Sorry local mount doesnt exist!" unless File.exist?(@local_mountpoint)
             @wr = File.writable?(stats_filename_default_fullpath) # .writeable? stats_file_smart_fullpath
 
-            super.initialize(local_mount) rescue "SUPER_ERROR: #{$!}"
+            #super.initialize(local_mount) rescue "SUPER_ERROR: #{$!}"
+            super(local_mount) rescue "SUPER_ERROR: #{$!}"
         end
         
         def self.list_all

data/lib/storazzo/ric_disk.rb

@@ -9,6 +9,7 @@ module Storazzo
     include Hashify
     include Storazzo::Common 
     extend Storazzo::Colors
+    require 'socket'
 
  
       ## Instance variables
@@ -43,7 +44,6 @@ module Storazzo
       @ricdisk_version = RicdiskVersion
       @ricdisk_file = compute_ricdisk_file() # Storazzo::RicDisk.get_ricdisk_file(path)
       @ricdisk_file_full = "#{@local_mountpoint}/#{@ricdisk_file}"
-      @ricdisk_file_empty = ricdisk_file_empty?
       @label = path.split("/").last
       @name = path.split("/").last
       #@wr = File.writable?("#{path}/#{ricdisk_file}" ) # .writeable?
@@ -52,6 +52,9 @@ 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
+
+      @ricdisk_file_empty = ricdisk_file_empty?
+      
       # @config = RicDiskConfig.instance.get_config
       # #puts @config if @config
       # find_info_from_mount(path)
@@ -61,7 +64,8 @@ module Storazzo
 
     def ricdisk_file_empty?()
       #      File.empty?("#{local_mountpoint}/.ricdisk.yaml")
-      File.empty?(compute_ricdisk_file) # was (get_ricdisk_file)
+      puts "compute_ricdisk_file: #{compute_ricdisk_file}"
+      File.empty?(compute_ricdisk_file.to_s) # was (get_ricdisk_file)
     end
 
     def ok_dir?
@@ -93,9 +97,9 @@ module Storazzo
     def writeable?() 
       return @wr unless @wr.nil? 
       # Otherwise I can do an EXPENSIVE calculation
-      deb "TODO(ricc): Do expensive caluylation if this FS is writeable: #{path}"
-      wr = File.writable?(ricdisk_file)
-      wr
+      puts "TODO(ricc): Do expensive calculation if this FS is writeable: #{path}"
+      @wr = File.writable?(File.expand_path(@ricdisk_file)) # rescue false
+      return @wr
       #:boh_todo_fix_me_and_compute
       #false
     end
@@ -172,20 +176,20 @@ module Storazzo
     end
 
     
-    # new
-    def self.get_ricdisk_file_obsolete(path)
-      if @ricdisk_file
-        puts "[CACHE HIT] ricdisk_file"
-        return @ricdisk_file
-      end
-      puts "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)
+    #   if @ricdisk_file
+    #     puts "[CACHE HIT] ricdisk_file"
+    #     return @ricdisk_file
+    #   end
+    #   puts "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
 
   
     def self.interesting_mount_points(opts={})

data/lib/storazzo/ric_disk_config.rb

@@ -40,6 +40,11 @@ public
         def load(config_path=nil, opts={})
             verbose = opts.fetch :verbose, false
 
+            if already_loaded? # and not self.config.nil?
+                puts "[#{self.class}] load: already loaded"
+                return self.config
+            end
+
             puts "[VERBOSE] Storazzo::RicDiskConfig.load(): BEGIN " if verbose
             # trying default location
             raise "DefaultConfigLocation is not a string" unless DefaultConfigLocation.is_a?(String)
@@ -72,8 +77,8 @@ public
                     #pp @config if verbose
                     config_ver = @config["apiVersion"]
                     #puts @config[:ConfigVersion]
-                    puts white("OK. Storazzo::RicDiskConfig v'#{config_ver}' parsed correctly")
-                    puts "[VERBOSE] RicDiskConfig.to_s: #{self}" if verbose
+                    deb("OK. Storazzo::RicDiskConfig v'#{config_ver}' parsed correctly")
+                    #puts "[VERBOSE] RicDiskConfig.to_s: #{self}" if verbose
                     @load_called = true
                     return self.config
                 end
@@ -91,7 +96,7 @@ public
         end
 
         def config_ver
-            raise "I cant compute Version since I cant compute @config. Are you sure you didnt instance this Singleton without calling load?" unless @config
+            raise "I cant compute Version since I cant compute @config. Are you sure you didnt instance this Singleton without calling load?" if @config.nil?
             @config['apiVersion'] # rescue :StillUnknown
             #config['ConfigVersion']
         end
@@ -99,6 +104,10 @@ public
             #self.
             @config['Config']['DefaultFolder'] #rescue "Unknown config_default_folder: #{$!}"
         end
+        def already_loaded?
+            #return 
+            load_called == true
+        end
 
         def to_s
             size = File.size(@config_file) rescue -1
@@ -140,7 +149,8 @@ public
         end
 
         # UGLY CODE, copipasted from binary for ARGV, ex autosbrodola
-        def iterate_through_file_list_for_disks(files_list=[])
+        def iterate_through_file_list_for_disks(files_list=[], opts={})
+            verbose = opts.fetch :verbose, true
             # I decided i wont accept an emopty list, this is not how you use the gem, you lazy XXX!
             # if files_list == [] # or files_list.nil?  # empty -> ALL
             #     deb "iterate_through_file_list_for_disks(): no args provided"
@@ -151,17 +161,21 @@ public
             #         RicDisk.calculate_stats_files(dir) # dir is inutile
             #     } # TODO refactor in option sbrodola_afterwards=true. :)
             # else
-                deb "iterate_through_file_list_for_disks(): I consider files_list as a list of directories to parse :)"
+                raise "Wrong input: #{files_list} " unless files_list.is_a?(Array)
+   
+                puts "iterate_through_file_list_for_disks(): I consider files_list as a list of directories to parse :)" if verbose
+
                 #dirs = RicDisk.find_active_dirs()
                 files_list.each do |dir| 
                     dir = File.expand_path(dir)
                     if File.directory?(dir)
                     #if dirs.include?(dir)
-                        deb "iterate_through_file_list_for_disks() Legit dir: #{green dir}"
+                        puts "iterate_through_file_list_for_disks() Legit dir: #{green dir}" if verbose
                         rd = RicDisk.new(dir)
                         rd.write_config_yaml_to_disk(dir)
                         #RicDisk.write_config_yaml_to_disk(dir)
-                        RicDisk.calculate_stats_files(dir) # dir is inutile
+                        #RicDisk.calculate_stats_files (CLASS) => will become OBJECT compute_stats_files
+                        compute_stats_files(dir) # dir is inutile # TODO
                     else
                         deb red("Doesnt seem a legit dir to me: #{dir}")
                     #     deb "Figghiu ri buttana: doesnt exist #{red dir}" 
@@ -169,46 +183,17 @@ public
                 end
             #end
         end #/iterate_through_file_list_for_disks
+
+        def config_hash 
+            config['Config']
+        end
         
 
         def self.get_config 
+            self.instance.load unless self.instance.load_called
             self.instance.get_config
         end
     end #     class Storazzo::RicDiskConfig
 
-    # class Storazzo::SampleRicDiskConfig < Storazzo::RicDiskConfig
-    #     include Singleton
-
-    #     def load # _sample_version
-    #         puts white("Wheew! 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, :verbose => true )
-    #     end
-
-    # end
-
-    puts "[REMOVEME]1 Storazzo::RicDiskConfig was read"
-
-#end # module Storazzo
-
-puts "[REMOVEME]2 Storazzo::RicDiskConfig was read"
-
-
-
-#module Storazzo
-    
-    # ric_disk_sample_config
-    #class Pincopallo # Storazzo::Blah #RicDiskSampleConfig #  < Storazzo::RicDiskConfig
-    class Storazzo::Pincopallo # RicDiskSampleConfig
-
-    #include Singleton
-    # public
-    #     def load # _sample_version
-    #         puts white("Wheew! 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, :verbose => true )
-    #     end
-    end
-
-    puts "[REMOVEME]1 Storazzo::RicDiskSampleConfig was read"
 end # module Storazzo
 
-puts "[REMOVEME]2 Storazzo::RicDiskSampleConfig was read"

data/lib/storazzo/ric_disk_sample_config.rb

@@ -17,15 +17,19 @@ module Storazzo
     class Storazzo::RicDiskSampleConfig < Storazzo::RicDiskConfig
         #include Storazzo::Common
 
-        include Singleton
+        #include Singleton
+
         public
-            def load # _sample_version
-                puts white("Wheew! 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, :verbose => true )
-            end
-     end
+        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.")
+#            super.load DefaultGemLocationForTests #super.load(DefaultGemLocationForTests, :verbose => true )
+            super(DefaultGemLocationForTests, :verbose => false )
+        end
+        def load_sample_version
+            puts white("[RicDiskSampleConfig] Wheew 2! 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(DefaultGemLocationForTests, :verbose => false )
+        end
+end
 
-    #puts "[REMOVEME]1 Storazzo::RicDiskSampleConfig was read"
 end # module Storazzo
 
-#puts "[REMOVEME]2 Storazzo::RicDiskSampleConfig was read"

data/lib/storazzo.rb

@@ -43,9 +43,9 @@ require 'storazzo/media/local_folder'
 require 'storazzo/ric_disk_ugly'     # OLD and 90% working
 require 'storazzo/ric_disk_config'         # => RicDiskConfif
 require 'storazzo/ric_disk_sample_config'   # => NOTHING!!
-require 'storazzo/ric_disk_config_example'  # => NEW!!!
+#require 'storazzo/ric_disk_config_example'  # => NEW!!!
 require 'storazzo/ric_disk_statsfile'
 require 'storazzo/main'
-require 'storazzo/translator'
+#require 'storazzo/translator'
 
 #puts Storazzo::Main.say_hi 

data/test/test_gcs_bucket.rb

@@ -21,14 +21,14 @@ class GcsBucketTest < Minitest::Test
 
     include Storazzo::Common
 
-    def TODO_RENAME_MEsetup # tear_up 
+    def TODO_setup # tear_up 
         deb "[GcsBucketTest] TEAR_UP with sample Config"
-        removeme = Storazzo::RicDiskConfig.instance()
+        #removeme = Storazzo::RicDiskConfig.instance()
         config_obj = Storazzo::RicDiskSampleConfig.instance()
         deb "[GcsBucketTest] TEAR_UP config_obj: '''#{config_obj}'''"
     end
 
-    def TODO_RENAME_MEtest_buckets_are_the_two_i_know
+    def TODO_test_buckets_are_the_two_i_know
         expected_list = %w{
             gs://my-local-backup/storazzo/backups/
             gs://my-other-bucket/
@@ -38,21 +38,22 @@ class GcsBucketTest < Minitest::Test
             "These are the two lists from Sample Storazzo Config")
     end
 
-    def test_import 
-        require "storazzo/ric_disk_sample_config" rescue nil
-        require "storazzo/ric_disk_config"
+    def TODO_test_import 
+        #require "storazzo/ric_disk_sample_config" rescue nil
+        #require "storazzo/ric_disk_config"
 
         #puts Storazzo.class
-        puts Storazzo.constants
+        puts " Storazzo.constants: #{ Storazzo.constants}"
         #puts Storazzo::RicDiskSampleConfig
         config_obj = Storazzo::RicDiskSampleConfig.instance()
-        puts config_obj
+        l = config_obj.load
+        puts "config_obj: #{config_obj}"
         config_obj.load # _sample_version
     end
 
 
     def teardown
-        #puts :TEAR_DOWN_TODO
+        puts :TEAR_DOWN_TODO
     end
 
 end

data/test/test_local_folder.rb

@@ -11,7 +11,7 @@ require "storazzo/media/local_folder"
 
 #puts yellow("DISABLING FOR NOW TODO restore")
 
-class LocalFolderTest < Minitest::Test
+class LocalFolderTest # < Minitest::Test
     extend Storazzo::Colors
     # def test_fail_on_purpOSE # test_storazzo_hi_with_argument
     #     assert_match 42, 42 , "change me when it failes from makefile" 
@@ -41,13 +41,17 @@ class LocalFolderTest < Minitest::Test
         end
     end
 
+    # 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()
         # 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}"
         test_dir = folders.first
         # puts "test_first_directory_parsing_actually_works() TestDir: #{test_dir}"
         # puts yellow "TEST S:M:LF methods: #{folders}"  # methods
@@ -56,10 +60,10 @@ class LocalFolderTest < Minitest::Test
         # 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}'"
-        # )
+        config.iterate_through_file_list_for_disks([test_dir])
+        assert(
+             File.exists?(stats_file),
+             "parse on LocalFolder should create file '#{stats_file}'"
+        )
     end
 end

data/test/test_ric_disk_config.rb

@@ -15,7 +15,6 @@ require "storazzo"
 #require "storazzo/ric_disk/gcs_bucket"
 #require "storazzo/media/local_folder"
 
-puts :TODO
 
 class RicDiskConfigTest < Minitest::Test
 
@@ -24,14 +23,13 @@ class RicDiskConfigTest < Minitest::Test
         #puts :sofar_so_good
         config_obj = Storazzo::RicDiskSampleConfig.instance()
         puts "config_obj.class: #{config_obj.class}"
-        l = config_obj.load # _sample_version
-        puts l
+        config = config_obj.load # _sample_version
+        puts "Config: #{config}"
         #puts '[RicDiskConfigTest] TODO lets make sure the gem being imported is actually in /etc/storazz-config.smaple blah blah'
         #puts "[RicDiskConfigTest] config_file: ", config_obj.config_file
         assert_equal(
             config_obj.config_file,
-            # Rails.root  + 
-            "etc/",
+            Storazzo.root + "/etc/storazzo_config.sample.yaml",
             "Config file expected to be here.."
         )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storazzo
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Riccardo Carlesso
@@ -39,11 +39,9 @@ files:
 - lib/storazzo/parser/parser.rb
 - lib/storazzo/ric_disk.rb
 - lib/storazzo/ric_disk_config.rb
-- lib/storazzo/ric_disk_config_example.rb
 - lib/storazzo/ric_disk_sample_config.rb
 - lib/storazzo/ric_disk_statsfile.rb
 - lib/storazzo/ric_disk_ugly.rb
-- lib/storazzo/translator.rb
 - lib/storazzo/version.rb
 - storazzo.gemspec
 - test/test_gcs_bucket.rb

data/lib/storazzo/ric_disk_config_example.rb

@@ -1,9 +0,0 @@
-
-module Storazzo
-
-    class Storazzo::RicDiskConfigExample # < Storazzo::RicDiskConfig
-
-    end
-end
-
-puts "[REMOVEME]2 Storazzo::RicDiskSampleConfig was read"

data/lib/storazzo/translator.rb

@@ -1,17 +0,0 @@
-# todo remove
-# class Storazzo::Translator
-
-# def initialize(language)
-#     @language = language
-#   end
-
-#   def hi
-#     case @language
-#     when "spanish"
-#       "hola mundo"
-#     else
-#       "hello world"
-#     end
-#   end
-
-# end