hsss 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288a436bb0034705bb1b98fe83b3e5a15b151654
-  data.tar.gz: be651a66e430447747ce5c3a8232275240029dde
+  metadata.gz: e93d5f3037e8065f5edc447e9b2e36134d52327b
+  data.tar.gz: 265f5c4624f809b0981fa07dbbe979c12ef55a17
 SHA512:
-  metadata.gz: ded3bf0da43d8b97c91fd2b23b270420502a5c7e36d0fae65e0c5e1025a71cf5661ff49d4ebe5d72f5bf2b2a909e68a226d1706a32c0fe0505585464aed92fb8
-  data.tar.gz: 34206d7fb5b451aa6eae3c7d38e9397fe87da3759a1d886a58148bc2daf1559c245d49fa5a1377487f17305760d3bb723a24424e6c8e928d6f9756829cb3857d
+  metadata.gz: 07ec0641c7713ab755c9ae1cd6d1f8cc0a6d65fa6be94a4ef0006dc33732b7e3dbca749d998b5202700310785f6f7406e763cbd320d3416e76bd1dcc22fd411f
+  data.tar.gz: e0f865e15b12e450466139141abe8dcb37bce535146310621680fffe561c46a94e1eba04538a6c575b9aea2e6a0a9935cffe8d88db118f75a315cbe22fe5a136

data/exe/hsss

@@ -18,6 +18,8 @@ arg=OptionParser.new do |opts|
   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("--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
 arg.banner=<<EOS

data/lib/hsss.rb

@@ -39,7 +39,8 @@ module Hsss
       names.each do |var, default|
         send "#{var}=", opt[var]!=false ? opt[var] || cased_prefix(opt[:prefix], default) : false
       end
-      
+      @header_only = opt[:header_only]
+      @data_only = opt[:data_only]
       @include_count = !opt[:skip_count]
       @include_iter_macro = !opt[:skip_each]
       @include_hash = !!hashes_struct
@@ -111,6 +112,7 @@ module Hsss
   class CSplit < COutput
     
     def initialize(files, opt={})
+      @static=opt[:no_static] ? "" : "static "
       super
       @head= <<-EOS.gsub(/^ {8}/, '')
         // don't edit this please, it was auto-generated by hsss
@@ -122,7 +124,7 @@ module Hsss
         
       EOS
       @struct_fmt= <<-EOS.gsub(/^ {8}/, '')
-        #{opt[:no_static] ? "" : "static "}#{struct_name} %s = {
+        #{@static}#{struct_name} %s = {
         %s
         };
         
@@ -139,28 +141,41 @@ module Hsss
     
     def to_s
       out = ""
+      if @header_only 
         out << sprintf(@head, @struct.join("\n"))
-      if @scripts.count > 0
-        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
+        out << "#{@static}#{struct_name} #{hashes_struct};\n" if hashes_struct
+        out << "#{@static}#{struct_name} #{names_struct};\n" if names_struct
+        out << "#{@static}#{struct_name} #{scripts_struct};\n" if scripts_struct
+        out << "const int #{@count_name};\n" if @include_count
+        out << iter_macro
       else
-        out << "//no scrpts\n"
+        out = ""
+        out << sprintf(@head, @struct.join("\n")) unless @data_only
+        if @scripts.count > 0
+          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 << "//no scrpts\n"
+        end
+        out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+        out << iter_macro
       end
       
-      out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
-      
+      out
+    end
+    
+    def iter_macro
       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")
+        macro.join("\n")
+      else
+        ""
       end
-      
-      out
     end
     
-
   end
   
   
@@ -170,7 +185,7 @@ module Hsss
     
     def initialize(files, opt={})
       super
-      @cout= <<-EOS.gsub(/^ {8}/, '')
+      @headf= <<-EOS.gsub(/^ {8}/, '')
         // don't edit this please, it was auto-generated by hsss
         // https://github.com/slact/hsss
         
@@ -182,8 +197,11 @@ module Hsss
         typedef struct {
         %s
         } #{struct_name};
+      EOS
+      @cout= <<-EOS.gsub(/^ {8}/, '')
+        #{@headf}
         
-        #{opt[:no_static] ? "" : "static "}#{struct_name} #{scripts_struct} = {
+        #{@static}#{struct_name} #{scripts_struct} = {
         %s
         };
         
@@ -198,26 +216,42 @@ module Hsss
       cquote(script, "   ")
     end
     def to_s
+      out = ""
+      
       if @scripts.count > 0
         scrapts=[]
         for i in 0...@scripts.count do
           scrapts<< "  {\"#{@name_table[i]}\", #{@include_hash ? "\"#{@hashed_table[i]}\"," : ""}\n#{@script_table[i]}}"
         end
-        out=sprintf @cout, @struct.join("\n"), scrapts.join(",\n\n")
       else
-        out="//nothing here\n"
+        scripties = nil
       end
-      
-      out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
-      
+      if @header_only
+        out << sprintf(@headf, @struct.join("\n"))
+        out << "const int #{@count_name};\n" if @include_count
+        out << iter_macro
+      elsif @data_only 
+        out << "#{@static}#{struct_name} #{scripts_struct} = {\n"
+        out << "#{scrapts.join(",\n\n")}\n"
+        out << "};\n"
+        out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+      else
+        out << sprintf(@cout, (@struct || []).join("\n"), (scrapts || []).join(",\n\n"))
+        out << "const int #{@count_name}=#{@scripts.count};\n" if @include_count
+        out << iter_macro
+      end
+      out
+    end
+    
+    def iter_macro
       if @include_iter_macro
         macro = []
         macro << "#define #{iter_macro_name}(script) \\"
         macro << "for((script)=(#{row_struct_name} *)&#{scripts_struct}; (script) < (#{row_struct_name} *)(&#{scripts_struct} + 1); (script)++) "
-        out << macro.join("\n")
+        macro.join("\n")
+      else
+        ""
       end
-      
-      out
     end
     
     def failed?

data/lib/hsss/version.rb

@@ -1,3 +1,3 @@
 module Hsss
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hsss
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Leo P.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler