hsss 0.1.20 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82312d9d40fe7749258fe1e917963eca868efe1f21a5867b24531c988d9f423
-  data.tar.gz: ef2849d3bd39335bd3e1b19a10b61ca1c613230570db7b7a7792d0154d39943d
+  metadata.gz: cc0e8819378906c8db5c9effc4597d26e6137b9e7f8cc90d4d1205e31d9df882
+  data.tar.gz: 58cf88d785f92d50ce314674f586aa95c0f5767b20b22afb8c4eaf6942a35bf6
 SHA512:
-  metadata.gz: fe53ce199038e44561d0f6dab8e00472618b879a94089d9333b369c4229047870e43139abbe9f53ba2ccd44333255e39370f6f4ea52d96de2e542644dc090475
-  data.tar.gz: 82aa9124e4bc30bd1b42de06715a89ae6af7344afeaf9be5e96d559116875d76c69412434b2d62e68e7ca7a5fb4d41d170b684ed78bf76350282b1b26b319875
+  metadata.gz: eea9225707ba4221fc8e0264284d601078184f434c6917b0528e447b4c7db9b29665e919469aa864eb7ba4ee7e2d4eb33014f194e88bf60d893a6711c9315597
+  data.tar.gz: d66dedb27e22754c3ce56ee8ee1d8ebaa3c3a04c33c0e7ce29617464871d69ab156a8b621b6b7e5c4af4a3289f7502ffb815376af339f2535df8be11b00f7a73

data/exe/hsss

@@ -14,6 +14,10 @@ arg=OptionParser.new do |opts|
   opts.on("--no-names", "Omit script names variable (split format)"){opt[:names_struct]=false}
   opts.on("--count [#{Hsss::DEFAULT_COUNT_NAME}]", "integer script count variable"){|v| opt[:count_name]=v}
   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.20"
+  VERSION = "0.1.23"
 end

data/lib/hsss.rb

@@ -8,12 +8,14 @@ module Hsss
   DEFAULT_NAMES_NAME="lua_script_names"
   DEFAULT_SCRIPTS_NAME="lua_scripts"
   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, :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
@@ -34,7 +36,10 @@ module Hsss
         names_struct: DEFAULT_NAMES_NAME,
         scripts_struct: DEFAULT_SCRIPTS_NAME,
         count_name: DEFAULT_COUNT_NAME,
-        iter_macro_name: DEFAULT_ITER_MACRO_NAME}
+        count_macro_name: DEFAULT_COUNT_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
@@ -43,7 +48,9 @@ module Hsss
       @header_only = opt[:header_only]
       @data_only = opt[:data_only]
       @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
@@ -86,6 +93,16 @@ module Hsss
       end
     end
     
+    def count_macro
+      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)
       ret = system "luac -p #{path}"
       @failed = true unless ret
@@ -161,6 +178,8 @@ 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
       
@@ -236,6 +255,8 @@ 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
           out << "\n#endif //#{@header_guard}\n"
@@ -248,6 +269,8 @@ 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
       out

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.23
 platform: ruby
 authors:
 - Leo P.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2022-04-19 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.1.3
+rubygems_version: 3.3.8
 signing_key:
 specification_version: 4
 summary: Hash-Safe Script Splinterer