talk 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17af9791fad56df5e635906a3eebd9b2a0ac668b
-  data.tar.gz: fce31b459bb50cda0529202c6243621a1ffe1008
+  metadata.gz: 2867b96702e4938d5cc4b642e420ccc7bee2fb01
+  data.tar.gz: 57a9ed9e7ecb012ea495f4b2357b37fdcc940dd8
 SHA512:
-  metadata.gz: fd168905d6edaae2941893cc76434f06bc38f63e08c942927b841cc10a79e28b606aca5a6cf5e95a68fc4185bba80053fe6b621ca7c1c9d049811603d309f0cd
-  data.tar.gz: 521827ceadf656d198a33840b4d7da62b344bf684d8afd9c228648ffb3beac736799f5d8cf0a06f7795c898b51afd4b05c2034b4c0eeb846278b260d7e9bcee5
+  metadata.gz: 3d7c0f0296e92b774cf0151d0ca9f4f85b3985be1db4045a4e3264789b7f76f948e12f1f11fb3ce033936cb5c8dcad5dad2c57f2a528d6256a13b412bc400bd8
+  data.tar.gz: 0784ca710682082c0dfa13e1435e3271c3eaeb6ade3c3d1f3d815d3cbba5651bf8ece14f6b716895456fd2af2704c4ea2d58a188b96046f9343854cd240d290a

data/bin/maketalk

@@ -10,7 +10,7 @@ require 'trollop'
 require 'pp'
 
 $opts = Trollop::options do
-  version "Talk 2.0 (c) 2013 Jonas Acres"
+  version "Talk #{Talk::VERSION} (c) 2013 Jonas Acres"
   banner <<-EOS
 Talk is a compile-to-source protocol specification language.
 
@@ -26,6 +26,7 @@ EOS
   opt :no, "Do not render specified tag type at any level", :type => :string, :multi => true
   opt :json, "Dump raw JSON to console"
   opt :upgrade, "Upgrade old-style protocols to new-style"
+  opt :version, "Show Talk version"
 end
 
 Trollop::die :omit, "cannot be combined with include" if $opts[:omit].length > 0 and $opts[:include].length > 0

data/lib/languages/java/java.rb

@@ -11,7 +11,7 @@ def make_source
   end
   @base[:protocol].each do |current|
     @current = current
-    generate_template("com/acres4/common/protocol/#{current[:name]}.java", "TalkProtocol.java.erb")
+    generate_template("com/acres4/common/protocol/#{current[:name].split('/').first}/#{current[:name].split('/').last.capitalize}.java", "TalkProtocol.java.erb")
   end
 end
 

data/lib/languages/java/templates/TalkProtocol.java.erb

@@ -1,7 +1,7 @@
 <%= autogenerated_warning %>
-package com.acres4.common.protocol;
-public class <%= truncated_name(@current[:name]) %> {
-<% @current[:method].each do |method| %>
+package com.acres4.common.protocol.<%= @current[:name].gsub('/', '.').split('.')[0...-1].join('.') %>;
+public class <%= truncated_name(@current[:name]).split('/')[-1].capitalize %> {
+<% (@current[:method].uniq { |m| m[:name] }).each do |method| %>
     /**
     <%= method[:description] %>
     */

data/lib/talk.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
 
+require 'version.rb'
 require 'parser'
 require 'languages/language.rb'
-

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Talk
+  VERSION = "2.3.1"
+end

data/talk.gemspec

@@ -1,7 +1,11 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'version'
+
 Gem::Specification.new do |s|
   s.name        = 'talk'
   s.executables << 'maketalk'
-  s.version     = '2.3.0'
+  s.version     = Talk::VERSION
   s.date        = '2014-06-12'
   s.summary     = "Compile-to-source protocol contract specification language"
   s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, Javascript, ObjC and Ruby."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jonas Acres
@@ -120,6 +120,7 @@ files:
 - lib/parser.rb
 - lib/registry.rb
 - lib/talk.rb
+- lib/version.rb
 - talk.gemspec
 homepage: http://github.com/jonasacres/talk
 licenses: