hsss 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d82312d9d40fe7749258fe1e917963eca868efe1f21a5867b24531c988d9f423
-  data.tar.gz: ef2849d3bd39335bd3e1b19a10b61ca1c613230570db7b7a7792d0154d39943d
+  metadata.gz: ffc48f97f746816651fcaf8eecfb1bb572adabafd97059e64260dcc13d88c66d
+  data.tar.gz: ff6c1ccad571b8e13f0ac51503ab200799ef4ea39286f83a51f00d5c414e5426
 SHA512:
-  metadata.gz: fe53ce199038e44561d0f6dab8e00472618b879a94089d9333b369c4229047870e43139abbe9f53ba2ccd44333255e39370f6f4ea52d96de2e542644dc090475
-  data.tar.gz: 82aa9124e4bc30bd1b42de06715a89ae6af7344afeaf9be5e96d559116875d76c69412434b2d62e68e7ca7a5fb4d41d170b684ed78bf76350282b1b26b319875
+  metadata.gz: 43a0baa1f428595f27e48f93ee74ff8f6f0b2a60a719f51836af43f06eb9ec2ed33adde283e17dc602f8e1de44eb500d9a25c5af0282e5b04c080d530b7ddf2a
+  data.tar.gz: 7eaa26210dbeb3590cfd9dffbb976af7141c27e5b193640a06675c2807befaf34abf55b71c3e14f118aeaea5ef4a5fc8f0f35fedf21139bde35e4bf1768e8362

data/exe/hsss

@@ -14,6 +14,8 @@ 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("--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.21"
 end

data/lib/hsss.rb

@@ -8,12 +8,13 @@ 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_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, :iter_macro_name, :row_struct_name
     
     def cased_prefix(prefix, name)
       if name
@@ -34,6 +35,7 @@ module Hsss
         names_struct: DEFAULT_NAMES_NAME,
         scripts_struct: DEFAULT_SCRIPTS_NAME,
         count_name: DEFAULT_COUNT_NAME,
+        count_macro_name: DEFAULT_COUNT_MACRO_NAME,
         iter_macro_name: DEFAULT_ITER_MACRO_NAME}
       
       names.each do |var, default|
@@ -43,6 +45,7 @@ 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]
       @header_guard = opt[:header_guard] || "LUA_SCRIPTS_H"
       @header_guard = false if @header_guard.length == 0
@@ -86,6 +89,14 @@ module Hsss
       end
     end
     
+    def count_macro
+      if @include_count_macro
+        macro = "#define #{count_macro_name} #{@scripts.count}\n"
+      else
+        ""
+      end
+    end
+    
     def check_script(path)
       ret = system "luac -p #{path}"
       @failed = true unless ret
@@ -161,6 +172,7 @@ module Hsss
           out << "//no scrpts\n"
         end
         out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+        out << count_macro
         out << iter_macro
       end
       
@@ -248,6 +260,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 << 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.21
 platform: ruby
 authors:
 - Leo P.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2022-04-18 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