stark 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,17 @@
+=== 0.9.1 / 2013-08-29
+
+* 1 bugfix:
+
+  * Exclude thrift 0.9.1 from gem dependency
+
+=== 0.9.0 / 2013-06-11
+
+* 3 upgrades: 
+
+  * Recursive #to_hash on Structs
+  * Better path searching for includes in .thrift files
+  * Don't require final newline
+
 === 0.8.0 / 2013-05-22
 
 * 9 new features:

data/Rakefile

@@ -9,11 +9,19 @@ Hoe.plugin :travis
 Hoe.plugin :gemspec
 Hoe.plugin :git
 
-Hoe.spec 'stark' do
+Hoe.spec 'stark' do |spec|
   developer('Evan Phoenix', 'evan@phx.io')
 
-  dependency "thrift", "~> 0.9.0"
+  # thrift 0.9.1 had an unnecessary runtime dependency on thin
+  version = ["~> 0.9.0", "!= 0.9.1"]
+  # this is to hack hoe to generate the correct gem install command
+  def version.to_s
+    self.join("' --version '")
+  end
+  dependency "thrift", version
   readme_file = "README.md"
+
+  spec.testlib = :testunit if spec.respond_to?(:testlib)
 end
 
 desc 'Run kpeg to generate new parser'

data/lib/stark.rb

@@ -2,7 +2,7 @@ require 'thrift'
 require 'logger'
 
 module Stark
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 
   def self.logger
     @logger ||= ::Logger.new($stdout)

data/lib/stark/parser.rb

@@ -34,11 +34,17 @@ class Stark::Parser
   def self.read_file(file)
     @@include_path ||= Set.new([Dir.pwd])
     if file.respond_to?(:read)
-      @@include_path << File.dirname(File.expand_path(file.path, Dir.pwd)) if file.respond_to?(:path)
+      if file.respond_to?(:path) && file.path
+        @@include_path << File.dirname(File.expand_path(file.path, Dir.pwd))
+      end
       return file.read
     else
       @@include_path << File.dirname(File.expand_path(file, Dir.pwd))
-      fn = (@@include_path.map { |path| File.expand_path(file, path) }.detect { |fn| File.exist?(fn) }) || file
+      fn = (@@include_path.map {|path|
+              File.expand_path(file, path)
+            }.detect { |fn|
+              File.exist?(fn)
+            }) || file
       File.read fn
     end
   end

data/stark.gemspec

@@ -2,17 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "stark"
-  s.version = "0.8.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-05-22"
+  s.date = "2013-08-29"
   s.description = "Optimized thrift bindings for ruby."
   s.email = ["evan@phx.io"]
   s.executables = ["stark"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "examples/README.md"]
   s.files = [".autotest", ".gemtest", ".travis.yml", "History.txt", "Manifest.txt", "README.md", "Rakefile", "bin/stark", "examples/README.md", "examples/client.rb", "examples/health.thrift", "examples/server.rb", "lib/stark.rb", "lib/stark/ast.rb", "lib/stark/client.rb", "lib/stark/exception.rb", "lib/stark/log_transport.rb", "lib/stark/parser.rb", "lib/stark/processor.rb", "lib/stark/protocol_helpers.rb", "lib/stark/raw_parser.rb", "lib/stark/ruby.rb", "lib/stark/struct.rb", "lib/stark/thrift.kpeg", "stark.gemspec", "test/ThriftSpec.thrift", "test/blah.thrift", "test/comments.thrift", "test/gen-rb/profile_constants.rb", "test/gen-rb/profile_types.rb", "test/gen-rb/user_storage.rb", "test/include_blah.thrift", "test/leg.rb", "test/legacy_profile/profile_constants.rb", "test/legacy_profile/profile_types.rb", "test/legacy_profile/user_storage.rb", "test/parsing_error.thrift", "test/profile.thrift", "test/properties.thrift", "test/test_client.rb", "test/test_coerce_strings.rb", "test/test_helper.rb", "test/test_marshal.rb", "test/test_parser.rb", "test/test_ruby.rb", "test/test_server.rb", "test/test_stark.rb", "test/types.thrift", "test/users.thrift"]
   s.homepage = "http://github.com/evanphx/stark"
+  s.licenses = ["MIT"]
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "stark"
@@ -24,17 +25,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<thrift>, ["!= 0.9.1", "~> 0.9.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.7"])
     else
-      s.add_dependency(%q<thrift>, ["~> 0.9.0"])
+      s.add_dependency(%q<thrift>, ["!= 0.9.1", "~> 0.9.0"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.6"])
+      s.add_dependency(%q<hoe>, ["~> 3.7"])
     end
   else
-    s.add_dependency(%q<thrift>, ["~> 0.9.0"])
+    s.add_dependency(%q<thrift>, ["!= 0.9.1", "~> 0.9.0"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.6"])
+    s.add_dependency(%q<hoe>, ["~> 3.7"])
   end
 end

data/test/test_stark.rb

@@ -24,52 +24,40 @@ class TestStark < Test::Unit::TestCase
 
   def test_materialize_service_with_struct_list
     file_path = File.join(File.dirname(__FILE__), 'properties.thrift')
-    assert_nothing_raised do
-      Stark.materialize file_path, @m
-    end
+    Stark.materialize file_path, @m
     assert @m.const_defined?(:Property)
   end
 
   def test_materialize_service_with_struct_set
     file_path = File.join(File.dirname(__FILE__), 'users.thrift')
-    assert_nothing_raised do
-      Stark.materialize file_path, @m
-    end
+    Stark.materialize file_path, @m
     assert @m.const_defined?(:User)
     assert @m.const_defined?(:FavoriteUsers)
   end
 
   def test_materialize_service_with_comments_and_no_ending_newline
     file_path = File.join(File.dirname(__FILE__), 'comments.thrift')
-    assert_nothing_raised do
-      Stark.materialize file_path, @m
-    end
+    Stark.materialize file_path, @m
     assert @m.const_defined?(:Foo)
   end
 
   def test_materialize_service_with_throws
     file_path = File.join(File.dirname(__FILE__), 'types.thrift')
-    assert_nothing_raised do
-      Stark.materialize file_path, @m
-    end
+    Stark.materialize file_path, @m
     assert @m.const_defined?(:Types)
   end
 
   def test_materialize_with_stringio
     file_path = File.join(File.dirname(__FILE__), 'types.thrift')
     io = StringIO.new(File.read(file_path))
-    assert_nothing_raised do
-      Stark.materialize io, @m
-    end
+    Stark.materialize io, @m
     assert @m.const_defined?(:Types)
   end
 
   def test_include_in_same_dir_not_working_dir
     Dir.chdir(File.dirname(__FILE__) + '/../') do
       file_path = File.join(File.dirname(__FILE__), 'include_blah.thrift')
-      assert_nothing_raised do
-        Stark.materialize file_path, @m
-      end
+      Stark.materialize file_path, @m
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stark
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -19,6 +19,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,6 +30,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +40,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +48,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +56,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +64,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: Optimized thrift bindings for ruby.
 email:
 - evan@phx.io
@@ -68,6 +74,8 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
+- README.md
+- examples/README.md
 files:
 - .autotest
 - .gemtest
@@ -119,7 +127,8 @@ files:
 - test/types.thrift
 - test/users.thrift
 homepage: http://github.com/evanphx/stark
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --main
@@ -140,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: stark
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Optimized thrift bindings for ruby.