proto-convert 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50391f8c109fde552acc487acc6eac0683753ab4151d69bbc34acbe88368edd5
-  data.tar.gz: cf799c6473fbd87e3ae97f6381fa64742864ac3a1b14291e828ae9b5e3d4602a
+  metadata.gz: 220848a40cd878c344d691e50d67579e73b41bfb650c6fdb8f2572c5a2cb262a
+  data.tar.gz: d3bdb5b6097182ef7988be3e05607a548ce03ec98c33b339b8581464b9f0185e
 SHA512:
-  metadata.gz: 6d129c25316819ae34f2238267bf92113967f144bfbc9e80c74182a1b851cf92188766cabdadb19805db141e287df4a81355989457be15247d7f6b2b36a3d034
-  data.tar.gz: 9836ade35781300dc5b3b42d88b8e88a22e8dc1ec162edff70cde18618b58bd7cc74585f65d9531391d81804976074f8b329e2ca8e2b162bdd6f54d572f778e0
+  metadata.gz: da1981ab5bee08c2ade94f8ebfd9ed56a2d71872ea25ea835d6ba7dfdb9fac01bfc7d8977a9f1fdab1fdaa8c87a4ab80ac1cd5ae5b8a8807a386a14f8c4e2d5e
+  data.tar.gz: a17b91557fc355ea5a6ae55f6e1e5526cb19f8ff1900571cf52e825ba999fe051e64981d764421bcf1223ebbc847a941cc160b4cbdc8f830703eb940fcdf8383

data/bin/proto-convert

@@ -32,7 +32,7 @@
 require 'optparse'
 require 'English'
 
-VERSION = '0.4.0'
+VERSION = '0.4.2'
 AUTHOR_NAME = 'Azeem Sajid'
 AUTHOR_EMAIL = '<azeem.sajid@gmail.com>'
 AUTHOR_INFO = "Author: #{AUTHOR_NAME} #{AUTHOR_EMAIL}"
@@ -52,13 +52,9 @@ def compile_proto(filename)
     puts "   proto file path : #{file_path}"
   end
 
-  protoc_cmd =
-    "     protoc \\\n" \
-    "       --ruby_out=#{file_dir} \\\n" \
-    "       --proto_path=#{file_dir} \\\n" \
-    "       #{file_path}"
+  protoc_cmd = "protoc --ruby_out=\"#{file_dir}\" --proto_path=\"#{file_dir}\" \"#{file_path}\""
 
-  puts "\n#{protoc_cmd}" if $verbose
+  puts "\n     #{protoc_cmd}" if $verbose
 
   `#{protoc_cmd}`
   abort "ERROR: Invalid schema! [#{filename}] Resolve error(s)." unless $CHILD_STATUS.success?
@@ -72,20 +68,22 @@ def compile_proto(filename)
 end
 
 def valid_msgtype?(compiled_proto, msg_type)
-  if $verbose
-    puts "\n>> Validate msgtype"
-    puts "   msgtype : #{msg_type}"
-    puts "   pb file : #{compiled_proto}"
-  end
-
   msg_types = []
   File.foreach(compiled_proto) do |line|
-    if line.lstrip.start_with?('add_message')
-      extracted_msg_type = line[/"([^"]*)"/, 1].freeze # regex: <add_message> 'msg_type' <do>
+    line.strip!
+    if line.include?('::Google::Protobuf::DescriptorPool.generated_pool.lookup') && line.end_with?('.msgclass')
+      extracted_msg_type = line[/"([^"]*)"/, 1].freeze
       msg_types.push(extracted_msg_type) unless extracted_msg_type.nil?
     end
   end
 
+  if $verbose
+    puts "\n>> Validate msgtype"
+    puts "   msgtype : #{msg_type}"
+    puts "   pb file : #{compiled_proto}"
+    puts "   pb types: #{msg_types}"
+  end
+
   is_valid = msg_types.include?(msg_type)
   unless is_valid
     puts "ERROR: Invalid msgtype! [#{msg_type}]"
@@ -173,7 +171,7 @@ def start
       args[:mode] = mode
     end
 
-    opts.on('-p', '--proto [FILENAME]', String, 'protobuf schema (.proto)') do |filename|
+    opts.on('-p', '--proto [FILENAME]', String, 'protobuf schema (.proto file)') do |filename|
       abort 'ERROR: Missing schema filename!' if filename.nil?
       abort "ERROR: Protobuf schema not found! [#{filename}]" unless File.file?(filename)
 

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: proto-convert
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Azeem Sajid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2023-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,11 +44,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.12.2
-description: A command-line tool to convert protobuf messages from binary to JSON
-  and vice versa
+description: a CLI tool to convert protobuf messages from binary to JSON and vice
+  versa
 email:
 - azeem.sajid@gmail.com
 executables:
@@ -64,7 +58,7 @@ homepage: https://github.com/iamAzeem/proto-convert
 licenses:
 - MIT
 metadata: {}
-post_install_message: Thanks for installing! :)
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -79,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Protobuf Message Converter [Binary <-> JSON]