hsss 0.1.19 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96bbfca29172fb609c9de7699b81e89c02e0b7539e63a5632f963e2202940031
-  data.tar.gz: 210afcafd9fd2829ae7cc1865150acd329a175d9b9afc1506dd81d3bd10c9778
+  metadata.gz: ab9670f9e9bc65678262837155e1d719ff1229aacf60ddbb252dfc60db21e1e0
+  data.tar.gz: e3fb68fb25dcca408cade5e93428171c43954ae677b8246244740de15f2d0f06
 SHA512:
-  metadata.gz: 1bcda4beaed9ffdd7f9d2e254da451dade55bed7861e6691029d987e0df6e4d469e74091649dbdb3aab77dfb05885c965f03131d7e26174148ecb03ef23aeaf9
-  data.tar.gz: 2530fcf8cfcf4b7a5bff064097f16da2de02fc0db0ea32ba7c7270424b3adfa42854c7d4e561acd137aa79ef4fa0961e702cc67b71f51dc857891ff52758ee78
+  metadata.gz: 29fdbf0eea60e178839c45f95bcb8430cd0d1b195d66c6bb204c1bc7f884cf5004b77db99896b21bab01b6e68d3b1ca0194237dc1b6696786000709ff9f0cbe3
+  data.tar.gz: f72929dd7afcbf6ded15f647d71b6eb13b2adc23c574ae665e41b3984895df72479a87ca0f8064d564bb5d1c611fdef97ab2eca9895dd803273e7cfd2fc58f1f

data/exe/hsss

@@ -14,12 +14,14 @@ 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}
   opts.on("--no-static", "Don't make variables static (file-scoped)"){opt[:no_static]=true}
   opts.on("--header-only", "just the header"){opt[:header_only]=true}
-  opts.on("--header-guard", "header guard string"){|v|opt[:header_guard]=v}
+  opts.on("--header-guard [LUA_SCRIPTS_H]", "header guard string"){|v|opt[:header_guard]=v}
   opts.on("--data-only", "just the data"){opt[:data_only]=true}
   opts.on("--prefix [#{Hsss::DEFAULT_PREFIX}]", "Prefix default names with this"){|v| opt[:prefix]=v}
 end

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.19"
+  VERSION = "0.1.22"
 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,8 +45,10 @@ 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]
+      @header_guard = opt[:header_guard] || "LUA_SCRIPTS_H"
+      @header_guard = false if @header_guard.length == 0
       @include_hash = !!hashes_struct
       
       (Array === files ? files : [ files ]).each do |f|
@@ -85,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
@@ -160,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
       
@@ -233,11 +246,12 @@ module Hsss
           out << "#define #{@header_guard}\n"
         end
         out << sprintf(@headf, @struct.join("\n"))
-        out << "#{@static}#{struct_name} #{scripts_struct};\n"
-        out << "const int #{@count_name};\n" if @include_count
+        out << "extern #{@static}#{struct_name} #{scripts_struct};\n"
+        out << "extern const int #{@count_name};\n" if @include_count
+        out << count_macro
         out << iter_macro
         if @header_guard
-          out << "#endif //#{@header_guard}\n"
+          out << "\n#endif //#{@header_guard}\n"
         end
       elsif @data_only 
         out << "#{@static}#{struct_name} #{scripts_struct} = {\n"
@@ -247,6 +261,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.19
+  version: 0.1.22
 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