hsss 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab7c750dbb0557910fd637a4a29df79cb40db04
-  data.tar.gz: 5286db254bacd9b9288795d52a1c842992ac7b59
+  metadata.gz: 30090ea6931a2c431bd7c0df476eb4b761d84b8a
+  data.tar.gz: 6e666a9c89b623aa5ecbc6ea1219357a03013e8e
 SHA512:
-  metadata.gz: 24693aa14136f137c4d20f6472ce88200c288d677260ea25aead6eff9055449ea42de5de0ae4334bce38d90027169275947e0837ce59c8ee659c30bc5f8ef32d
-  data.tar.gz: c2700387cb67d163119f1d081a38ebd2ee8969f550665bed4e012f73e5b19b9a939f7fffbf396350fbfc6912416b8ce900e5b655900381887ae7f74b85bef233
+  metadata.gz: 818b34ffb2ff332eaa50b75da63108f51b92f98c8579c48064e58a482182eb0ef0fa891d3488842c20743fb09e0905aca5b25ea3d8e0ea224308a79495cfb3ca
+  data.tar.gz: 44db3e7e91073b2af12e94c6e56d8f2375690e9c6acc75c1f63e930445d3b610dd0ae38e190ff7cfeaf26b257c6802702be496ba02537cf5d5530575f48bd677

data/README.md

@@ -4,7 +4,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
-        --format [whole|split]       Output as separate or a single struct
+        --format [split|whole]       Output as separate or a single struct
         --struct [redis_lua_scripts_t]
                                      C struct name
         --row-struct [redis_lua_script_t]
@@ -12,8 +12,10 @@ Usage: hsss [options] files
         --scripts [redis_lua_scripts]
                                      Scripts variable (split or whole format)
         --hashes [redis_lua_hashes]  Hashes variable (split format)
+        --no-hashes                  Omit hashes variable (split format)
         --names [redis_lua_script_names]
                                      Script names variable (split format)
+        --no-names                   Omit script names variable (split format)
         --count [redis_lua_scripts_count]
                                      integer script count variable
         --no-count                   Omit script count variable
@@ -21,6 +23,7 @@ Usage: hsss [options] files
                                      Iterator macro
         --no-each                    Omit the iterator macro
         --no-parse                   Skip using luac to check script syntax
+        --no-static                  Don't make variables static (file-scoped)
         --prefix PREFIX              Prefix default names with this
 ```
 
@@ -43,7 +46,7 @@ redis.call('del', KEYS[1])
 ```
 
 
-running `hsss example/*.lua` ("whole" format produces
+running `hsss example/*.lua` ("whole" format) produces
 ```c
 // don't edit this please, it was auto-generated by hsss
 // https://github.com/slact/hsss
@@ -78,7 +81,7 @@ const int redis_lua_scripts_count=2;
 for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++)
 ```
 
-running `hsss --format split example/*.lua` outputs
+running `hsss --format split example/*.lua` produces
 ```c
 // don't edit this please, it was auto-generated by hsss
 // https://github.com/slact/hsss

data/exe/hsss

@@ -9,12 +9,15 @@ arg=OptionParser.new do |opts|
   opts.on("--row-struct [#{Hsss::DEFAULT_ROW_STRUCT_NAME}]", "Hash+name+script struct for 'whole' format."){|v| opt[:row_struct_name]= v}
   opts.on("--scripts [#{Hsss::DEFAULT_SCRIPTS_NAME}]", "Scripts variable (split or whole format)"){|v| opt[:scripts_struct]=v}
   opts.on("--hashes [#{Hsss::DEFAULT_HASHES_NAME}]", "Hashes variable (split format)"){|v| opt[:hashes_struct]=v}
+  opts.on("--no-hashes", "Omit hashes variable (split format)"){opt[:hashes_struct]=false}
   opts.on("--names [#{Hsss::DEFAULT_NAMES_NAME}]", "Script names variable (split format)"){|v| opt[:names_struct]=v}
+  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("--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("--prefix PREFIX", "Prefix default names with this"){|v| opt[:prefix]=v}
 end
 arg.banner=<<EOS
@@ -27,9 +30,9 @@ arg.version=Hsss::VERSION
 rest = arg.parse!
 
 case opt[:format]
-when nil, "split"
+when "split"
   hsss = Hsss::CSplit.new(rest, opt)
-when "whole"
+when "whole", nil
   hsss = Hsss::CWhole.new(rest, opt)
 else
   STDERR.puts "Invalid format #{opt[:format]}."

data/lib/hsss.rb

@@ -23,12 +23,12 @@ module Hsss
         scripts_struct: DEFAULT_SCRIPTS_NAME,
         count_name: DEFAULT_COUNT_NAME,
         iter_macro_name: DEFAULT_ITER_MACRO_NAME}.each do |var, default|
-        send "#{var}=", opt[var] || default
+        send "#{var}=", opt[var]!=false ? opt[var] || default : false
       end
       
       if opt[:prefix]
         [:struct_name, :hashes_struct, :names_struct, :scripts_struct].each do |var|
-          send "#{var}=", "#{opt[:prefix]}#{send var}"
+          send "#{var}=", "#{opt[:prefix]}#{send var}" if send(var)
         end
       end
       @include_count = !opt[:skip_count]
@@ -98,7 +98,7 @@ module Hsss
     
     def initialize(files, opt={})
       super
-      @cout= <<-EOS.gsub(/^ {8}/, '')
+      @head= <<-EOS.gsub(/^ {8}/, '')
         // don't edit this please, it was auto-generated by hsss
         // https://github.com/slact/hsss
         
@@ -106,15 +106,9 @@ module Hsss
         %s
         } #{struct_name};
         
-        static #{struct_name} #{hashes_struct} = {
-        %s
-        };
-        
-        static #{struct_name} #{names_struct} = {
-        %s
-        };
-        
-        static #{struct_name} #{scripts_struct} = {
+      EOS
+      @struct_fmt= <<-EOS.gsub(/^ {8}/, '')
+        #{opt[:no_static] ? "" : "static "}#{struct_name} %s = {
         %s
         };
         
@@ -130,10 +124,14 @@ module Hsss
     end
     
     def to_s
+      out = ""
+        out << sprintf(@head, @struct.join("\n"))
       if @scripts.count > 0
-        out=sprintf @cout, @struct.join("\n"), @hashed_table.map{|v|"  \"#{v}\""}.join(",\n"),  @name_table.map{|v|"  \"#{v}\","}.join("\n"), @script_table.join(",\n\n")
+        out << sprintf(@struct_fmt, hashes_struct, @hashed_table.map{|v|"  \"#{v}\""}.join(",\n")) if hashes_struct
+        out << sprintf(@struct_fmt, names_struct, @name_table.map{|v|"  \"#{v}\","}.join("\n")) if names_struct
+        out << sprintf(@struct_fmt, scripts_struct, @script_table.join(",\n\n")) if scripts_struct
       else
-        out="//nothing here\n"
+        out << "//no scrpts\n"
       end
       
       out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
@@ -172,7 +170,7 @@ module Hsss
         %s
         } #{struct_name};
         
-        static #{struct_name} #{scripts_struct} = {
+        #{opt[:no_static] ? "" : "static "}#{struct_name} #{scripts_struct} = {
         %s
         };
         

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler