hsss 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9670f9e9bc65678262837155e1d719ff1229aacf60ddbb252dfc60db21e1e0
-  data.tar.gz: e3fb68fb25dcca408cade5e93428171c43954ae677b8246244740de15f2d0f06
+  metadata.gz: 9b326a1ea17b5af3b409257a920bf4b34b3574fad92aa5bebd1b1e9936e10442
+  data.tar.gz: d4a828beb961c683c4c8b5b3c4edb08b080f76b99e7a385f7f30217ab6fe06a4
 SHA512:
-  metadata.gz: 29fdbf0eea60e178839c45f95bcb8430cd0d1b195d66c6bb204c1bc7f884cf5004b77db99896b21bab01b6e68d3b1ca0194237dc1b6696786000709ff9f0cbe3
-  data.tar.gz: f72929dd7afcbf6ded15f647d71b6eb13b2adc23c574ae665e41b3984895df72479a87ca0f8064d564bb5d1c611fdef97ab2eca9895dd803273e7cfd2fc58f1f
+  metadata.gz: 0aaa3566110eed57a52c527a9f81d464e4c79f44159449eb027b28c9c758a6f4a4a55ae0d4fe7fdb2fe5095a1502a48f12bce32dc955254bb3cbd6bfd1a39c75
+  data.tar.gz: 8b8da08b03629fbfd86cc4b5f7166d7fa17df28669f6b170826419ff13810e5a940b2083bed8bb6869fca4027d8862f36244e35ecdc59ea6c79d867fcfb14099

data/exe/hsss

@@ -16,6 +16,8 @@ arg=OptionParser.new do |opts|
   opts.on("--no-count", "Omit script count variable"){opt[:skip_count]=true}
   opts.on("--count-macro [#{Hsss::DEFAULT_COUNT_MACRO_NAME}]", "integer script count variable"){|v| opt[:count_macro_name]=v}
   opts.on("--no-count-macro", "Omit script count variable"){opt[:skip_count_macro]=true}
+  opts.on("--all-hashes-string [#{Hsss::DEFAULT_ALL_HASHES_STRING_NAME}]", "all hashes string macro name"){|v| opt[:all_hashes_string_name]=v}
+  opts.on("--no-all-hashes-string", "Omit the string with all the script hashes"){opt[:skip_all_hashes_string]=true}
   opts.on("--each-macro [#{Hsss::DEFAULT_ITER_MACRO_NAME}]", "Iterator macro"){|v| opt[:iter_macro_name]=v}
   opts.on("--no-each", "Omit the iterator macro"){opt[:skip_each]=true}
   opts.on("--no-parse", "Skip using luac to check script syntax"){opt[:no_luac]=true}

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.22"
+  VERSION = "0.1.24"
 end

data/lib/hsss.rb

@@ -10,11 +10,12 @@ module Hsss
   DEFAULT_COUNT_NAME="lua_scripts_count"
   DEFAULT_COUNT_MACRO_NAME="LUA_SCRIPTS_COUNT"
   DEFAULT_ITER_MACRO_NAME="LUA_SCRIPTS_EACH"
+  DEFAULT_ALL_HASHES_STRING_NAME="LUA_SCRIPTS_ALL_HASHES"
   DEFAULT_PREFIX="redis_"
   
   class COutput
     EXT="lua"
-    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name, :count_macro_name, :iter_macro_name, :row_struct_name
+    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name, :count_macro_name, :all_hashes_string_name, :iter_macro_name, :row_struct_name
     
     def cased_prefix(prefix, name)
       if name
@@ -36,7 +37,9 @@ module Hsss
         scripts_struct: DEFAULT_SCRIPTS_NAME,
         count_name: DEFAULT_COUNT_NAME,
         count_macro_name: DEFAULT_COUNT_MACRO_NAME,
-        iter_macro_name: DEFAULT_ITER_MACRO_NAME}
+        iter_macro_name: DEFAULT_ITER_MACRO_NAME,
+        all_hashes_string_name: DEFAULT_ALL_HASHES_STRING_NAME,
+              }
       
       names.each do |var, default|
         send "#{var}=", opt[var]!=false ? opt[var] || cased_prefix(opt[:prefix], default) : false
@@ -47,6 +50,7 @@ module Hsss
       @include_count = !opt[:skip_count]
       @include_count_macro = !opt[:skip_count_macro]
       @include_iter_macro = !opt[:skip_each]
+      @include_all_hashes_macro = !opt[:skip_all_hashes_string]
       @header_guard = opt[:header_guard] || "LUA_SCRIPTS_H"
       @header_guard = false if @header_guard.length == 0
       @include_hash = !!hashes_struct
@@ -90,14 +94,22 @@ module Hsss
     end
     
     def count_macro
-      if @include_count_macro
-        macro = "#define #{count_macro_name} #{@scripts.count}\n"
-      else
-        ""
-      end
+      return "" unless @include_count_macro
+      "#define #{count_macro_name} #{@scripts.count}\n"
     end
     
+    def all_hashes_string_macro
+      return "" unless @include_all_hashes_macro
+      "#define #{all_hashes_string_name} \"#{@hashed_table.join " "}\"\n"
+    end
+      
     def check_script(path)
+      luac_exists_ret = system "command -v luac &>/dev/null"
+      unless luac_exists_ret
+        @failed = true
+        STDERR.puts "luac is missing, cannot check script #{path}"
+        return false
+      end
       ret = system "luac -p #{path}"
       @failed = true unless ret
       ret
@@ -172,6 +184,7 @@ module Hsss
           out << "//no scrpts\n"
         end
         out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+        out << all_hashes_string_macro
         out << count_macro
         out << iter_macro
       end
@@ -248,6 +261,7 @@ module Hsss
         out << sprintf(@headf, @struct.join("\n"))
         out << "extern #{@static}#{struct_name} #{scripts_struct};\n"
         out << "extern const int #{@count_name};\n" if @include_count
+        out << all_hashes_string_macro
         out << count_macro
         out << iter_macro
         if @header_guard
@@ -261,6 +275,7 @@ module Hsss
       else
         out << sprintf(@cout, (@struct || []).join("\n"), (scrapts || []).join(",\n\n"))
         out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+        out << all_hashes_string_macro
         out << count_macro
         out << iter_macro
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Leo P.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.3.25
 signing_key:
 specification_version: 4
 summary: Hash-Safe Script Splinterer