hsss 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7995c7ac8902ac28e088b5198e9d8d99b2d18e
-  data.tar.gz: fc97fa7f070d4d7719aeb4fe165614533b778244
+  metadata.gz: c214ad328e8c64a680d183de71a3d70ecfc4033e
+  data.tar.gz: 8f94f9e93cceb204226fdfbe975d2d12473d5814
 SHA512:
-  metadata.gz: 37ea09a827591c0cb921a04a1ea7633de8df7997df1910b70593dc60f0f416819a39e02566e6dbc1adddcea34a0a558d487c1f45f82afe6215e4336b00e05e6b
-  data.tar.gz: 96e3d1e0011ede646153d37361a0b64edab1c2e6806b91628cadcb976ba8ddbfd8df62371535b1db4ed3c6e1fefee692073e608853838acb15d6d7eb3212c2d9
+  metadata.gz: 58c666e386a44a976090f939b9c88006909f3ab3cb2fb6f31a47294bf4193298b2e5af67195fbe2cc83f9cb4bad98c8b30f8f8627fcec05d2bb9bbfd196efdec
+  data.tar.gz: 36eb952a2a3ad64a5481895a715cecad71d10a1c0a9f534008bd1b5640ff6ce434334a29d1f0658464adbbdb2649ab3ace0b3c863e8858037c81dc56b46be992

data/exe/hsss

@@ -10,6 +10,8 @@ arg=OptionParser.new do |opts|
   opts.on("--names [#{Hsss::DEFAULT_NAMES_NAME}]", "Script names variable"){|v| opt[:names_struct]=v}
   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("--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("--prefix PREFIX", "Prefix default names with this"){|v| opt[:prefix]=v}
 end
@@ -18,6 +20,7 @@ Hash-Safe Script Splinterer, a Lua Script and hash embedder into C source.
 Good for putting Redis Lua scripts in your C headers.
 Usage: hsss [options] files
 EOS
+arg.version=Hsss::VERSION
 
 rest = arg.parse!
 

data/hsss.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Leo P."]
   spec.email         = ["junk@slact.net"]
 
-  spec.summary       = %q{Hash-Safe Script Splinter}
-  spec.description   = %q{Transforms Lua files into structs of C-strings and associated headers. Great for embedding Redis Lua scripts.}
+  spec.summary       = %q{Hash-Safe Script Splinterer}
+  spec.description   = %q{Hash-Safe Script Splinterer: Transforms Lua files into structs of C-strings and associated headers. Great for embedding Redis Lua scripts.}
   spec.homepage      = "https://github.com/slact/hsss"
   spec.license       = "MIT"
 

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/hsss.rb

@@ -7,11 +7,12 @@ module Hsss
   DEFAULT_NAMES_NAME="redis_lua_script_names"
   DEFAULT_SCRIPTS_NAME="redis_lua_scripts"
   DEFAULT_COUNT_NAME="redis_lua_scripts_count"
+  DEFAULT_ITER_MACRO_NAME="REDIS_LUA_SCRIPTS_EACH"
   
   class Hsss
     EXT="lua"
     
-    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name
+    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name, :iter_macro_name
     def initialize(files, opt={})
       @scripts={}
       
@@ -19,7 +20,8 @@ module Hsss
         hashes_struct: DEFAULT_HASHES_NAME,
         names_struct: DEFAULT_NAMES_NAME,
         scripts_struct: DEFAULT_SCRIPTS_NAME,
-        count_name: DEFAULT_COUNT_NAME}.each do |var, default|
+        count_name: DEFAULT_COUNT_NAME,
+        iter_macro_name: DEFAULT_ITER_MACRO_NAME}.each do |var, default|
         send "#{var}=", opt[var] || default
       end
       
@@ -29,6 +31,7 @@ module Hsss
         end
       end
       @include_count = !opt[:skip_count]
+      @include_iter_macro = !opt[:skip_each]
       
       (Array === files ? files : [ files ]).each do |f|
         begin
@@ -114,7 +117,15 @@ module Hsss
         out="//nothing here\n"
       end
       
-      out<< "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+      out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+      
+      if @include_iter_macro
+        macro = []
+        macro << "#define #{iter_macro_name}(script_src, script_name, script_hash) \\"
+        macro << "for((script_src)=(char **)&#{scripts_struct}, (script_hash)=(char **)&#{hashes_struct}, (script_name)=(char **)&#{names_struct}; (script_src) < (char **)(&#{scripts_struct} + 1); (script_src)++, (script_hash)++, (script_name)++) "
+        out << macro.join("\n")
+      end
+      
       out
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Leo P.
@@ -66,8 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Transforms Lua files into structs of C-strings and associated headers.
-  Great for embedding Redis Lua scripts.
+description: 'Hash-Safe Script Splinterer: Transforms Lua files into structs of C-strings
+  and associated headers. Great for embedding Redis Lua scripts.'
 email:
 - junk@slact.net
 executables:
@@ -111,5 +111,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Hash-Safe Script Splinter
+summary: Hash-Safe Script Splinterer
 test_files: []