thrifty 0.0.3 → 0.0.4

data/lib/thrifty/dummy/thrift.rb

@@ -0,0 +1,4 @@
+# This file exists so that loaded thrift files can successfully
+# require thrift.
+#
+# I'd love a better solution than this.

data/lib/thrifty/thrift_file.rb

@@ -5,6 +5,8 @@ require 'rubysh'
 class Thrifty::ThriftFile
   include Chalk::Log
 
+  DUMMY_DIRECTORY = File.expand_path('../dummy', __FILE__)
+
   attr_reader :relative_path, :options
 
   def initialize(manager, relative_path, options={})
@@ -28,21 +30,24 @@ class Thrifty::ThriftFile
 
   def require(generated_file)
     compile_once
-    $:.unshift(build_directory)
+
+    # This is a bit dicey, as a generated thrift <file> will also
+    # include <file>_types and <file>_constants as well as
+    # 'thrift'. We need to make sure we can handle file names that may
+    # have already been required -- this path munging should
+    # successfully do so.
+
+    super('thrift')
+
+    orig_load_path = $:.dup
 
     begin
-      log.info('Requiring', file: generated_file, idl: path)
+      $:[0..-1] = [build_directory, DUMMY_DIRECTORY]
+      log.info('Requiring', file: generated_file, idl: path, build_directory: build_directory)
       # Global require
       super(generated_file)
     ensure
-      # Not sure what to do if someone changed $: in the
-      # meanwhile. Could happen due a signal handler or something
-      # crazy like that.
-      if $:.first == build_directory
-        $:.shift
-      else
-        log.error('Unexpected first element in load path; not removing', build_directory: build_directory, load_path: $:.inspect)
-      end
+      $:[0..-1] = orig_load_path
     end
   end
 
@@ -53,7 +58,6 @@ class Thrifty::ThriftFile
     end
   end
 
-
   def version_file
     File.join(build_directory, 'VERSION')
   end

data/lib/thrifty/version.rb

@@ -1,3 +1,3 @@
 module Thrifty
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/functional/_lib/thrift/.gitignore

@@ -0,0 +1,2 @@
+/data
+/thrifty

data/test/functional/_lib/thrift/collision.thrift

@@ -0,0 +1,10 @@
+namespace rb ThriftyTest
+struct UserProfile {
+  1: i32 uid,
+  2: string name,
+  3: string blurb
+}
+service Collision {
+  void store(1: UserProfile user),
+  UserProfile retrieve(1: i32 uid)
+}

data/test/functional/thrifty.rb

@@ -6,6 +6,8 @@ require 'chalk-tools'
 # TODO: can we get by without quite so much rm -rf'ing?
 
 class Thrifty::DynamicTest < Critic::Functional::Test
+  DATA_DIR = File.expand_path('../_lib/thrift/data', __FILE__)
+
   def self.it_isolated(description, &blk)
     method = Chalk::Tools::ClassUtils.generate_method('test block', self, blk)
 
@@ -49,6 +51,18 @@ class Thrifty::DynamicTest < Critic::Functional::Test
 
         assert(File.exists?(expected_root))
       end
+
+      it_isolated 'allows thrift services with already-required names' do
+        FileUtils.mkdir_p(DATA_DIR)
+        File.write(File.join(DATA_DIR, 'collision.rb'), '# collision')
+        $:.unshift(DATA_DIR)
+        require 'collision'
+
+        Thrifty.register(File.expand_path('../_lib/thrift/collision.thrift', __FILE__))
+        required = Thrifty.require('collision')
+        assert(required)
+        ThriftyTest::Collision
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrifty
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -172,11 +172,14 @@ files:
 - examples/userdb/server.rb
 - examples/userdb/service.thrift
 - lib/thrifty.rb
+- lib/thrifty/dummy/thrift.rb
 - lib/thrifty/manager.rb
 - lib/thrifty/thrift_file.rb
 - lib/thrifty/version.rb
 - test/_lib.rb
 - test/functional/_lib.rb
+- test/functional/_lib/thrift/.gitignore
+- test/functional/_lib/thrift/collision.thrift
 - test/functional/_lib/thrift/service.thrift
 - test/functional/thrifty.rb
 - test/integration/_lib.rb
@@ -197,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1830425111965813571
+      hash: 287513174984063520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1830425111965813571
+      hash: 287513174984063520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -217,6 +220,8 @@ summary: Begone manual compilation of Thrift definitions! Thrifty makes it easy
 test_files:
 - test/_lib.rb
 - test/functional/_lib.rb
+- test/functional/_lib/thrift/.gitignore
+- test/functional/_lib/thrift/collision.thrift
 - test/functional/_lib/thrift/service.thrift
 - test/functional/thrifty.rb
 - test/integration/_lib.rb