thrifty 0.0.5 → 0.0.6

data/lib/thrifty/manager.rb

@@ -39,4 +39,12 @@ class Thrifty::Manager
       [thrift_file, built]
     end
   end
+
+  def include_path
+    @thrift_files.keys.map {|f| File.dirname(f)}.uniq
+  end
+
+  def require_path
+    @thrift_files.values.map(&:build_directory).uniq
+  end
 end

data/lib/thrifty/thrift_file.rb

@@ -42,7 +42,7 @@ class Thrifty::ThriftFile
     orig_load_path = $:.dup
 
     begin
-      $:[0..-1] = [build_directory, DUMMY_DIRECTORY]
+      $:[0..-1] = @manager.require_path + [DUMMY_DIRECTORY]
       log.info('Requiring', file: generated_file, idl: path, build_directory: build_directory)
       # Global require
       super(generated_file)
@@ -59,7 +59,8 @@ class Thrifty::ThriftFile
         e.message << ' (HINT: this probably means you forgot to precompile your Thrift file, or the relative path has changed between your build and deploy machines)'
         raise e
       end
-      Rubysh('thrift', '--gen', 'rb', '-out', build_directory, path).check_call
+      includes = @manager.include_path.map {|x| ['-I', x]}.flatten
+      Rubysh('thrift', *includes, '--gen', 'rb', '-out', build_directory, path).check_call
     end
   end
 

data/lib/thrifty/version.rb

@@ -1,3 +1,3 @@
 module Thrifty
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/functional/_lib/thrift-includes/including.thrift

@@ -0,0 +1,6 @@
+namespace rb IncludeThriftyTest
+
+include "user_service.thrift"
+
+service IncludingService extends user_service.UserStorage {
+}

data/test/functional/thrifty.rb

@@ -14,8 +14,7 @@ class Thrifty::DynamicTest < Critic::Functional::Test
     it(description) do
       pid = fork do
         method.bind(self).call
-        # This is very lurky, but a natural exit always seems to return 1
-        exec('true')
+        exit!(true)
       end
       _, status = Process.waitpid2(pid)
       assert_equal(0, status.exitstatus)
@@ -24,7 +23,7 @@ class Thrifty::DynamicTest < Critic::Functional::Test
 
   describe 'without a build_root' do
     it_isolated 'can load the service' do
-      Thrifty.register('_lib/thrift/service.thrift', relative_to: __FILE__)
+      Thrifty.register('_lib/thrift/user_service.thrift', relative_to: __FILE__)
       Thrifty.require('user_storage')
       ThriftyTest::UserStorage
     end
@@ -33,19 +32,27 @@ class Thrifty::DynamicTest < Critic::Functional::Test
       expected_root = File.expand_path('../_lib/thrift/build-thrifty', __FILE__)
       FileUtils.rm_rf(expected_root)
 
-      Thrifty.register('_lib/thrift/service.thrift', relative_to: __FILE__)
+      Thrifty.register('_lib/thrift/user_service.thrift', relative_to: __FILE__)
       Thrifty.require('user_storage')
       ThriftyTest::UserStorage
 
       assert(File.exists?(expected_root))
     end
 
+    it_isolated 'can handle included thrift files' do
+      Thrifty.register('_lib/thrift/user_service.thrift', relative_to: __FILE__)
+      Thrifty.register('_lib/thrift-includes/including.thrift', relative_to: __FILE__)
+
+      Thrifty.require('including_service')
+      IncludeThriftyTest::IncludingService
+    end
+
     describe 'without relative_to' do
       it_isolated 'build_root defaults to Dir.tmpdir/thrifty' do
         expected_root = File.join(Dir.tmpdir, 'build-thrifty')
         FileUtils.rm_rf(expected_root)
 
-        Thrifty.register(File.expand_path('../_lib/thrift/service.thrift', __FILE__))
+        Thrifty.register(File.expand_path('../_lib/thrift/user_service.thrift', __FILE__))
         Thrifty.require('user_storage')
         ThriftyTest::UserStorage
 
@@ -81,16 +88,16 @@ class Thrifty::DynamicTest < Critic::Functional::Test
     end
 
     it_isolated 'sets paths appropriately' do
-      thrift_file = Thrifty.register('_lib/thrift/service.thrift',
+      thrift_file = Thrifty.register('_lib/thrift/user_service.thrift',
         relative_to: __FILE__,
         build_root: '_lib/thrift/thrifty')
-      assert_equal(File.expand_path('../_lib/thrift/service.thrift', __FILE__),
+      assert_equal(File.expand_path('../_lib/thrift/user_service.thrift', __FILE__),
         thrift_file.path)
       assert_equal(File.expand_path('../_lib/thrift/thrifty', __FILE__), thrift_file.build_root)
     end
 
     it_isolated 'can load the service' do
-      Thrifty.register('_lib/thrift/service.thrift',
+      Thrifty.register('_lib/thrift/user_service.thrift',
         relative_to: __FILE__,
         build_root: '_lib/thrift/thrifty')
       Thrifty.require('user_storage')
@@ -100,7 +107,7 @@ class Thrifty::DynamicTest < Critic::Functional::Test
     end
 
     it_isolated 'builds a given thrift file once' do
-      Thrifty.register('_lib/thrift/service.thrift',
+      Thrifty.register('_lib/thrift/user_service.thrift',
         relative_to: __FILE__,
         build_root: '_lib/thrift/thrifty')
       results = Thrifty.compile_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrifty
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,9 +178,10 @@ files:
 - lib/thrifty/version.rb
 - test/_lib.rb
 - test/functional/_lib.rb
+- test/functional/_lib/thrift-includes/including.thrift
 - test/functional/_lib/thrift/.gitignore
 - test/functional/_lib/thrift/collision.thrift
-- test/functional/_lib/thrift/service.thrift
+- test/functional/_lib/thrift/user_service.thrift
 - test/functional/thrifty.rb
 - test/integration/_lib.rb
 - test/meta/_lib.rb
@@ -200,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 904017040795247836
+      hash: -2772158143117342826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 904017040795247836
+      hash: -2772158143117342826
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -220,9 +221,10 @@ summary: Begone manual compilation of Thrift definitions! Thrifty makes it easy
 test_files:
 - test/_lib.rb
 - test/functional/_lib.rb
+- test/functional/_lib/thrift-includes/including.thrift
 - test/functional/_lib/thrift/.gitignore
 - test/functional/_lib/thrift/collision.thrift
-- test/functional/_lib/thrift/service.thrift
+- test/functional/_lib/thrift/user_service.thrift
 - test/functional/thrifty.rb
 - test/integration/_lib.rb
 - test/meta/_lib.rb