Merge pull request #377 from tdeo/require_relative

Add option to have require_relative statements

lib/protobuf/generators/file_generator.rb

@@ -125,7 +125,7 @@ def print_import_requires
         header "Imports"
 
         descriptor.dependency.each do |dependency|
-          print_require(convert_filename(dependency))
+          print_require(convert_filename(dependency), ENV.key?('PB_REQUIRE_RELATIVE'))
         end
 
         puts

lib/protobuf/generators/printable.rb

@@ -127,8 +127,8 @@ def print_module(name, &block)
       #
       #   print_require('foo/bar/baz') -> "require 'foo/bar/baz'"
       #
-      def print_require(file)
-        puts "require '#{file}'"
+      def print_require(file, relative = false)
+        puts "require#{'_relative' if relative} '#{file}'"
       end
 
       # Puts the given message prefixed by the indent level.

spec/lib/protobuf/generators/file_generator_spec.rb

@@ -22,11 +22,18 @@
     end
 
     it 'prints a ruby require for each dependency' do
-      expect(subject).to receive(:print_require).with('test/bar.pb')
-      expect(subject).to receive(:print_require).with('test/baz.pb')
+      expect(subject).to receive(:print_require).with('test/bar.pb', false)
+      expect(subject).to receive(:print_require).with('test/baz.pb', false)
       subject.print_import_requires
     end
 
+    it 'prints a ruby require_relative for each dependency if environment variable was set' do
+      expect(subject).to receive(:print_require).with('test/bar.pb', true)
+      expect(subject).to receive(:print_require).with('test/baz.pb', true)
+      ENV['PB_REQUIRE_RELATIVE'] = 'true'
+      subject.print_import_requires
+      ENV.delete('PB_REQUIRE_RELATIVE')
+    end
   end
 
   describe '#compile' do