hsss 0.1.18 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b4cfbeb48000c60ccc92946c71bbefe9732e44c8
-  data.tar.gz: 7dbb7590b50b940a18a3d01c74d401db53879c52
+SHA256:
+  metadata.gz: ffc48f97f746816651fcaf8eecfb1bb572adabafd97059e64260dcc13d88c66d
+  data.tar.gz: ff6c1ccad571b8e13f0ac51503ab200799ef4ea39286f83a51f00d5c414e5426
 SHA512:
-  metadata.gz: 4a1d6e92e2b97508cb32879d0be317c011e5343e702a7680cb725b911cf6cb4f96feda30d4a531aa22eac272a7ff77b90dce66ce24f667e67d18f8267bacd1db
-  data.tar.gz: d4424e547089c26757f55337e494ef90e244b2a72f33f1043a2c6defd2e4a4dbeb41a5b9b9cff74dc644b1f0d9b95d8e323daf657b452d28d42f0018de778dcf
+  metadata.gz: 43a0baa1f428595f27e48f93ee74ff8f6f0b2a60a719f51836af43f06eb9ec2ed33adde283e17dc602f8e1de44eb500d9a25c5af0282e5b04c080d530b7ddf2a
+  data.tar.gz: 7eaa26210dbeb3590cfd9dffbb976af7141c27e5b193640a06675c2807befaf34abf55b71c3e14f118aeaea5ef4a5fc8f0f35fedf21139bde35e4bf1768e8362

data/exe/hsss

@@ -14,11 +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 [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.18"
+  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,7 +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] || "LUA_SCRIPTS_H"
+      @header_guard = false if @header_guard.length == 0
       @include_hash = !!hashes_struct
       
       (Array === files ? files : [ files ]).each do |f|
@@ -84,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
@@ -159,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
       
@@ -227,10 +241,17 @@ module Hsss
         scripties = nil
       end
       if @header_only
+        if @header_guard
+          out << "#ifndef #{@header_guard}\n"
+          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 << iter_macro
+        if @header_guard
+          out << "\n#endif //#{@header_guard}\n"
+        end
       elsif @data_only 
         out << "#{@static}#{struct_name} #{scripts_struct} = {\n"
         out << "#{scrapts.join(",\n\n")}\n"
@@ -239,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.18
+  version: 0.1.21
 platform: ruby
 authors:
 - Leo P.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Hash-Safe Script Splinterer
 test_files: []