proto-convert 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f67f667815700542bc0c6521ea0e4fff322ecfb22d13a0786d21cfef2b20bce
-  data.tar.gz: 93f0f6e903b2fc6611d639a03d466dc7a5c0634e0a63220e66c5d8c1446616b5
+  metadata.gz: 5538e9d2c6050048c066b5694afe9bced0bdf8f3a8bf383aee963a1a0cc39034
+  data.tar.gz: 1e0bf071c4b5b6e493a7bf966cb8a795cfe04d3323d66982195cdb1cb0bd42e7
 SHA512:
-  metadata.gz: d534c44b363c47b670b76b54e36dbc5e2460418ab18d43c243c5ed256d133a216c14916ca75e0b4d78e14da7e9611e8d33f74b08370b78066bbca21379ac3c1e
-  data.tar.gz: 7f455edf6d20dd47cc3800c44cad5a98b6ed2642f36cbc24ef9b7539a117c101b4b6c45827741f9571ef2e0294851e416a7e2719c15f2517d0f077025dc97125
+  metadata.gz: 462d652162fc52893b8b7799afceba2f595b0b9aba813d4c38abc0c4f37b48f10b13ba9b03c4ce644905ed1da179f5845506728b6f2b019f5dd976f260a32af7
+  data.tar.gz: c7e225689e68e81e9fceab2c8a861eab48c134a65204a7113856b19e1c95583ce24fcd1f4387099f26496ae2ae7458bf57499097200f0c4b5a960941bd416349

data/bin/proto-convert

@@ -32,26 +32,54 @@
 require 'optparse'
 require 'English'
 
-VERSION = '0.2.0'
+VERSION = '0.3.0'
 AUTHOR_NAME = 'Azeem Sajid'
 AUTHOR_EMAIL = '<azeem.sajid@gmail.com>'
 AUTHOR_INFO = "Author: #{AUTHOR_NAME} #{AUTHOR_EMAIL}"
 AUTHOR_GITHUB = 'GitHub: https://github.com/iamAzeem/proto-convert'
 
+$debug = false
+
 def compile_proto(filename)
+  puts "\n>> Compiling [#{filename}]" if $debug
+
   file_path = File.expand_path(filename)
   file_dir = File.dirname(file_path)
 
-  `protoc --ruby_out=#{file_dir} --proto_path=#{file_dir} #{file_path}`
+  if $debug
+    puts "   File path: #{file_path}"
+    protoc_version = `protoc --version`.chomp.split(' ')[1]
+    puts "   Running protoc #{protoc_version}:"
+  end
+
+  protoc_cmd =
+    "     protoc \\\n" \
+    "       --ruby_out=#{file_dir} \\\n" \
+    "       --proto_path=#{file_dir} \\\n" \
+    "       #{file_path}"
+
+  puts "\n#{protoc_cmd}" if $debug
+
+  `#{protoc_cmd}`
   raise StandardError, "Invalid schema! [#{filename}] Resolve error(s)." unless $CHILD_STATUS.success?
 
+  puts "\n   Compiled [#{file_path}] " if $debug
+
   compiled_proto = "#{file_dir}/#{File.basename(file_path, '.proto')}_pb.rb"
+  puts "   Validating [#{compiled_proto}]" if $debug
   raise StandardError, "Compiled schema not found! [#{compiled_proto}]" unless File.file?(compiled_proto)
 
+  if $debug
+    puts "   Validatd [#{compiled_proto}]"
+    puts "<< Compilion and validation complete! [#{file_path} => #{compiled_proto}]"
+  end
+
   compiled_proto
 end
 
 def valid_msgtype?(compiled_proto, msg_type)
+  puts "\n>> Validating msgtype [#{msg_type}] in [#{compiled_proto}]" if $debug
+
   msg_types = []
   File.foreach(compiled_proto) do |line|
     if line.lstrip.start_with?('add_message')
@@ -60,7 +88,19 @@ def valid_msgtype?(compiled_proto, msg_type)
     end
   end
 
-  msg_types.include?(msg_type)
+  is_valid = msg_types.include?(msg_type)
+
+  if $debug
+    puts "   msgtype [#{msg_type}] available? #{is_valid ? 'yes' : 'no'}"
+    puts '   Available types:'
+    msg_types.each do |t|
+      puts "   - #{t}"
+    end
+  end
+
+  puts "<< Validation of msgtype [#{msg_type}] complete!" if $debug
+
+  is_valid
 end
 
 def msg_class(compiled_proto, msg_type)
@@ -70,6 +110,8 @@ def msg_class(compiled_proto, msg_type)
 end
 
 def convert(compiled_proto, msg_type, conversion_mode, input_file, output_file)
+  puts "\n>> Converting [#{input_file}], mode: #{conversion_mode}" if $debug
+
   pb_msg_class = msg_class(compiled_proto, msg_type)
   raise StandardError, "Message type ['#{msg_type}'] not registered!'" if pb_msg_class.nil?
 
@@ -99,6 +141,8 @@ def convert(compiled_proto, msg_type, conversion_mode, input_file, output_file)
   rescue StandardError
     raise StandardError, "Conversion failed! #{$ERROR_INFO}"
   end
+
+  puts ">> Converion complete! [#{input_file}] => [#{output_file}]" if $debug
 end
 
 def start
@@ -145,9 +189,9 @@ def start
       options[:output] = filename
     end
 
-    opts.on('-v', '--version', 'prints version information') do
-      puts "#{$PROGRAM_NAME} #{VERSION}\n#{AUTHOR_INFO}\n#{AUTHOR_GITHUB}"
-      exit
+    opts.on('-d', '--debug', 'prints debugging information') do
+      options[:debug] = true
+      $debug = true
     end
 
     opts.on('-h', '--help', 'prints help') do
@@ -159,11 +203,20 @@ def start
   begin
     parser.parse!
 
+    puts ">> #{$PROGRAM_NAME} #{VERSION} [debug mode]" if $debug
+
     # Validate missing mandatory arguments
     missing_args = mandatory_args.select { |arg| options[arg].nil? }
     raise OptionParser::MissingArgument, 'No arguments provided!' if missing_args.length == mandatory_args.length
     raise OptionParser::MissingArgument, "--#{missing_args.join(', --')}" unless missing_args.empty?
 
+    if $debug
+      puts "\n>> Arguments:"
+      options.each do |arg, val|
+        puts format('   %<arg>8s : %<val>s', arg: arg, val: val)
+      end
+    end
+
     # Compile and validate proto and msgtype
     compiled_proto = compile_proto(options[:proto])
     msg_type = options[:msgtype]
@@ -179,7 +232,7 @@ def start
     puts "\n#{$PROGRAM_NAME} #{VERSION}\n\n#{parser}\n#{AUTHOR_INFO}"
     exit 1
   rescue LoadError
-    puts "Possible 'import' issue! Use a single self-contianed .proto file! #{$ERROR_INFO}"
+    puts "ERROR: Possible 'import' issue! #{$ERROR_INFO}"
     exit 1
   rescue StandardError
     puts "ERROR: #{$ERROR_INFO}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proto-convert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Azeem Sajid