hsss 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3be3af3e7c4718d68489fc13e9237d645ce63453
-  data.tar.gz: ca2a4a2841d6ebfbe36825cc85c8a14db8d4ffed
+  metadata.gz: e8a272e42a10b7a98238cae56b00cf7902ccd319
+  data.tar.gz: 1848f5e3f163ac181bff90e93d2e26e2225cd308
 SHA512:
-  metadata.gz: 2cb43611d0d02bfad67c04a0a2f50f840a04dd630e07bd0dbba32f720cb9bdaf99c7c3e022aea63b294063a94dd28d3037df7d1b1a2e65da9c8b39bc3ae0a0e0
-  data.tar.gz: 8663b83515003c2f28dd8803e6f767cf10b4ef37ef7bf07d9f5490ab66ffe7c07df5f7958ade88caf440f7c1f515d0c9ccb60142cb16b9ddd365d554b75511c1
+  metadata.gz: aa8a75586ff0d0dcc1f2adac6e25653feb3a5d676d85b622240130e71da95075cb8fb90b0b6ba64791cf7f9ea6089d6da56c0a18df5dd09216b9cc9abdb578c7
+  data.tar.gz: 9c36341b6e51df94c6214420a59690eac694b9ec5d1f22cf20457dce781bca2f7b5bddb382e3138f55d621fa93bae98e723ff8085465273db845e4678fdc16a3

data/exe/hsss

@@ -8,6 +8,8 @@ arg=OptionParser.new do |opts|
   opts.on("--scripts [#{Hsss::DEFAULT_SCRIPTS_NAME}]", "Scripts variable"){|v| opt[:scripts_struct]=v}
   opts.on("--hashes [#{Hsss::DEFAULT_HASHES_NAME}]", "Hashes variable"){|v| opt[:hashes_struct]=v}
   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("--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

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/hsss.rb

@@ -6,18 +6,20 @@ module Hsss
   DEFAULT_HASHES_NAME="redis_lua_hashes"
   DEFAULT_NAMES_NAME="redis_lua_script_names"
   DEFAULT_SCRIPTS_NAME="redis_lua_scripts"
+  DEFAULT_COUNT_NAME="redis_lua_scripts_count"
   
   class Hsss
     EXT="lua"
     
-    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct
+    attr_accessor :struct_name, :hashes_struct, :names_struct, :scripts_struct, :count_name
     def initialize(files, opt={})
       @scripts={}
       
       { struct_name: DEFAULT_STRUCT_NAME, 
         hashes_struct: DEFAULT_HASHES_NAME,
         names_struct: DEFAULT_NAMES_NAME,
-        scripts_struct: DEFAULT_SCRIPTS_NAME }.each do |var, default|
+        scripts_struct: DEFAULT_SCRIPTS_NAME,
+        count_name: DEFAULT_COUNT_NAME}.each do |var, default|
         send "#{var}=", opt[var] || default
       end
       
@@ -26,6 +28,7 @@ module Hsss
           send "#{var}=", "#{opt[:prefix]}#{send var}"
         end
       end
+      @include_count = !opt[:skip_count]
       
       (Array === files ? files : [ files ]).each do |f|
         begin
@@ -50,8 +53,6 @@ module Hsss
         %s
         };
         
-        #define REDIS_LUA_HASH_LENGTH %i
-        
         static #{struct_name} #{names_struct} = {
         %s
         };
@@ -59,6 +60,7 @@ module Hsss
         static #{struct_name} #{scripts_struct} = {
         %s
         };
+        
       EOS
       
       @struct=[]
@@ -105,10 +107,12 @@ module Hsss
     
     def to_s
       if @scripts.count > 0
-        out=sprintf @cout, @struct.join("\n"), @hashed_table.join(",\n"), Digest::SHA1.hexdigest("foo").length, @name_table.join("\n"), @script_table.join(",\n\n")
+        out=sprintf @cout, @struct.join("\n"), @hashed_table.join(",\n"),  @name_table.join("\n"), @script_table.join(",\n\n")
       else
         out="//nothing here\n"
       end
+      
+      out<< "const int #{@count_name}=#{@scripts.count};\n" if @include_count
       out
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Leo P.