effigy_wire 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af2d81261224d5ec6dedf674b2358086bfa60a03
-  data.tar.gz: 300aad4dc0f1246fe8c4d7d1334c7eb2b0b9620c
+  metadata.gz: 6c49aa9c25c929fcaf22e5f0cda7ddb2dfd367eb
+  data.tar.gz: 60120e3e639be3f87095934cac3ac15da4044f42
 SHA512:
-  metadata.gz: fef6e3a8703b242b39f1cd5105beb37d3e2d804369263bd1fbfcc8d993eb5e5f35634996f89d31a716e9607d231feec8b059348ff086288a4b6ad48d8709a8c9
-  data.tar.gz: 94c42144911f82724a18b431a113677f2bfd033466ef91d3d2ee5920995297477b2c27770c29740defe493a4f070f718780d1797c6527dfbf23a1ab2aaae6979
+  metadata.gz: a2944bf1204bf189b7fddf6c2ef7ef49d438b6fdecbe276c252d2ea29ccfa60d44281820743f1d3117990d8c11287cbb0b13ee6a8926e6089d2d9db93256b83d
+  data.tar.gz: d3e49cb2af2386255f7bcb5ea94d115e7b5d135e861b7deb96d1703d97c44438a71acba7cb2e2261043645500b3c17917510347209fc85cb4d25da221e326eb8

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.bundle
 .ruby-version
 *.swp
 *.gem

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'protobuf', github: 'ruby-protobuf/protobuf', branch: 'master'

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: git://github.com/ruby-protobuf/protobuf.git
+  revision: 24a339f4beb328cb5d1e953a9883cb98b4d3af0b
+  branch: master
+  specs:
+    protobuf (3.6.9)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+
 PATH
   remote: .
   specs:
-    effigy_wire (0.0.2)
+    effigy_wire (0.0.3)
       protobuf (~> 3.6.9, >= 3.6.9)
 
 GEM
@@ -17,11 +28,6 @@ GEM
     json (1.8.3)
     middleware (0.1.0)
     minitest (5.9.0)
-    protobuf (3.6.9)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     rake (10.4.2)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -34,6 +40,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   effigy_wire!
+  protobuf!
   rake (~> 10.0)
 
 BUNDLED WITH

data/bin/bundler

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("bundler", "bundler")

data/bin/import

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+EFF_WIRE_ROOT = File.join(__dir__, '..')
+
+EFF_RUBY_VERSION =
+  begin
+    ENV.fetch('EFF_RUBY_VERSION')
+  rescue KeyError
+    File.read(File.join(EFF_WIRE_ROOT, '.ruby-version'))
+  end
+
+script_paths = Dir.glob(File.join(__dir__, 'support', '*')).to_a.sort
+script_paths.each do |script_path|
+  puts <<-EOV
+
+
+
+********************************************************************************
+  Running '#{File.basename(script_path)}'
+********************************************************************************
+  EOV
+
+  status =
+    system(
+      {
+        'RBENV_VERSION'                 => EFF_RUBY_VERSION,
+        'EFF_SKIP_CONFIRM'              => 'true',
+        'EFF_CLARITY_PROTO_ROOT'        => ENV['EFF_CLARITY_PROTO_ROOT'],
+        'EFF_CLARITY_PROTO_BIN_ROOT'    => ENV['EFF_CLARITY_PROTO_BIN_ROOT'],
+        'EFF_CLARITY_PROTO_COMMON_ROOT' => ENV['EFF_CLARITY_PROTO_COMMON_ROOT'],
+        'EFF_PROTO_ROOT'                => ENV['EFF_PROTO_ROOT'],
+        'EFF_LIB_ROOT'                  => ENV['EFF_LIB_ROOT'],
+        'EFF_RUBY_OUT_ROOT'             => ENV['EFF_RUBY_OUT_ROOT'],
+      },
+      "ruby #{script_path}"
+    )
+
+  raise "Something went wrong with #{script_path}" unless !!status
+end
+
+puts <<-EOV
+
+
+All done! Don't forget to manually fix require_relatives and bump VERSION!
+
+EOV
+

data/bin/protoc-gen-ruby

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'protoc-gen-ruby' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("protobuf", "protoc-gen-ruby")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/bin/repath

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+#
+# run this to add binstubs to local executables in project root
+echo "$PWD/bin"
+export PATH="$PWD/bin:$PATH"
+hash -r 2>/dev/null || true

data/bin/rpc_server

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rpc_server' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("protobuf", "rpc_server")

data/bin/support/00-nuke_everything

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_PROTO_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'proto')
+  end
+
+EFF_LIB_ROOT =
+  begin
+    ENV.fetch('EFF_LIB_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'lib')
+  end
+
+
+puts "> Deleting and recreating '#{EFF_LIB_ROOT}'"
+begin
+  FileUtils.rm_rf(EFF_LIB_ROOT)
+rescue Errno::ENOENT
+end
+FileUtils.mkdir(EFF_LIB_ROOT)
+
+
+puts "> Deleting and recreating '#{EFF_PROTO_ROOT}'"
+begin
+  FileUtils.rm_rf(EFF_PROTO_ROOT)
+rescue Errno::ENOENT
+end
+FileUtils.mkdir(EFF_PROTO_ROOT)

data/bin/support/10-clarity_protobuf_copy

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require 'logger'
+
+err_log = Logger.new(STDERR)
+
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_CLARITY_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_CLARITY_PROTO_ROOT')
+  rescue KeyError
+    File.join(
+      EFF_WIRE_ROOT,
+      '..',
+      'clarity-protobuf',
+      'src', 'main', 'proto'
+    )
+  end
+
+EFF_CLARITY_PROTO_BIN_ROOT =
+  begin
+    ENV.fetch('EFF_CLARITY_PROTO_BIN_ROOT')
+  rescue KeyError
+    File.join(EFF_CLARITY_PROTO_ROOT, 'bin')
+  end
+
+EFF_CLARITY_PROTO_COMMON_ROOT =
+  begin
+    ENV.fetch('EFF_CLARITY_PROTO_COMMON_ROOT')
+  rescue KeyError
+    File.join(EFF_CLARITY_PROTO_ROOT, 'common')
+  end
+
+EFF_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_PROTO_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'proto')
+  end
+
+src_package_paths =
+  Dir.glob("#{EFF_CLARITY_PROTO_ROOT}/*").select do |package_path|
+    next(false) if package_path.include?(EFF_CLARITY_PROTO_BIN_ROOT)
+    next(false) if package_path.include?(EFF_CLARITY_PROTO_COMMON_ROOT)
+    true
+  end
+
+if src_package_paths.empty?
+  raise <<-EOV
+
+
+  Provided clarity-protobuf proto root is apparently empty. Exiting.
+
+  EOV
+end
+
+src_package_paths.each do |src_package_path|
+  puts "> Copying '#{src_package_path}'"
+  FileUtils.cp_r(src_package_path, EFF_PROTO_ROOT)
+end
+
+puts "> Copying '#{EFF_CLARITY_PROTO_COMMON_ROOT}'"
+FileUtils.cp(
+  Dir.glob(File.join(EFF_CLARITY_PROTO_COMMON_ROOT, '*.proto')),
+  EFF_PROTO_ROOT
+)

data/bin/support/20-clean_clarity_protobuf

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_PROTO_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'proto')
+  end
+
+EFF_SKIP_CONFIRM =
+  begin
+    !!ENV.fetch('EFF_SKIP_CONFIRM')
+  rescue KeyError
+    false
+  end
+
+unless EFF_SKIP_CONFIRM
+  print "Remove non-proto files in '#{EFF_PROTO_ROOT}'? [yN] > "
+  answer = gets.strip
+
+  unless answer == 'y'
+    puts 'OK, aborting.'
+    exit(0)
+  end
+end
+
+begin
+  bindir_path = File.join(EFF_PROTO_ROOT, 'bin')
+  puts "> Removing #{bindir_path}"
+  FileUtils.rm_rf(bindir_path)
+rescue Errno::ENOENT
+end
+
+proto_paths = Dir.glob("#{EFF_PROTO_ROOT}/**/*")
+
+proto_paths.each do |proto_path|
+  next if File.directory?(proto_path)
+  next if File.extname(proto_path) == '.proto' # keep these
+
+  puts "> Removing #{proto_path}"
+  File.delete(proto_path)
+end

data/bin/{effigy/package → support/30-package_proto}

@@ -4,14 +4,16 @@ require 'logger'
 
 err_log = Logger.new(STDERR)
 
-PROTO_ROOT =
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_PROTO_ROOT =
   begin
-    ENV.fetch('PROTO_ROOT')
+    ENV.fetch('EFF_PROTO_ROOT')
   rescue KeyError
-    File.join(Dir.pwd, 'proto')
+    File.join(EFF_WIRE_ROOT, 'proto')
   end
 
-proto_paths = Dir.glob("#{PROTO_ROOT}/**/*").select do |proto_path|
+proto_paths = Dir.glob("#{EFF_PROTO_ROOT}/**/*").select do |proto_path|
   next(false) if File.directory?(proto_path)
   true
 end
@@ -20,11 +22,11 @@ if proto_paths.empty?
   raise <<-EOV
 
   
-  No definitions found in #{PROTO_ROOT}!
+  No definitions found in #{EFF_PROTO_ROOT}!
 
     Either:
       1. Run ./bin/bootstrap in the project root directory, or
-      2. Set PROTO_ROOT to the location of your proto definitions
+      2. Set EFF_PROTO_ROOT to the location of your proto definitions
 
   EOV
 end
@@ -37,9 +39,9 @@ proto_paths.each do |proto_path|
   end
 
   exclusion_index =
-    proto_path.split('/').length - 1 == PROTO_ROOT.split('/').length ? -3
+    proto_path.split('/').length - 1 == EFF_PROTO_ROOT.split('/').length ? -3
                                                                      : -2
-  rel_path           = proto_path[PROTO_ROOT.length+1..-1]
+  rel_path           = proto_path[EFF_PROTO_ROOT.length+1..-1]
   package_components =
     [
       'effigy',

data/bin/support/40-tweak_proto

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_PROTO_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'proto')
+  end
+
+Dir.glob(File.join(EFF_PROTO_ROOT, '**/*')).each do |proto_path|
+  next if File.directory?(proto_path)
+
+  puts "> Tweaking #{File.basename(proto_path)}"
+  cmd = <<-EOV
+    sed -i \
+        -e '/optional/ s/optional \\./optional /' \
+        -e '/repeated/ s/repeated \\./repeated /' \
+        #{proto_path}
+  EOV
+  status = system(cmd)
+  exit(-1) unless !!status
+end

data/bin/support/50-compile_proto

@@ -0,0 +1,100 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+require 'logger'
+
+err_log = Logger.new(STDERR)
+
+EFF_WIRE_ROOT = File.join(__dir__, '..', '..')
+
+EFF_PROTO_ROOT =
+  begin
+    ENV.fetch('EFF_PROTO_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'proto')
+  end
+
+EFF_LIB_ROOT =
+  begin
+    ENV.fetch('EFF_LIB_ROOT')
+  rescue KeyError
+    File.join(EFF_WIRE_ROOT, 'lib')
+  end
+
+EFF_RUBY_OUT_ROOT =
+  begin
+    ENV.fetch('EFF_RUBY_OUT_ROOT')
+  rescue KeyError
+    File.join(EFF_LIB_ROOT, 'effigy', 'wire')
+  end
+
+EFF_SKIP_CONFIRM =
+  begin
+    !!ENV.fetch('EFF_SKIP_CONFIRM')
+  rescue KeyError
+    false
+  end
+
+unless EFF_SKIP_CONFIRM
+  print "Have you cleaned, packaged, and tweak-proto'ed? [yN] > "
+  answer = gets.strip
+
+  unless answer == 'y'
+    print 'OK, go take care of that.'
+    exit(0)
+  end
+end
+
+puts "> Ensuring output directory exists"
+FileUtils.mkdir_p(EFF_RUBY_OUT_ROOT)
+
+package_paths = []
+proto_paths   = []
+
+Dir.glob("#{EFF_PROTO_ROOT}/*").select do |path|
+  if File.directory?(path)
+    package_paths << path
+  else
+    proto_paths << path
+  end
+end
+
+proto_paths.each do |proto_path|
+  puts "> Compiling '#{File.basename(proto_path)}'"
+  cmd = <<-EOV
+    protoc \
+      --proto_path=#{File.join(EFF_PROTO_ROOT)} \
+      --ruby_out=#{EFF_RUBY_OUT_ROOT} \
+      #{proto_path}
+  EOV
+  status = system(
+    {
+      'PB_UPCASE_ENUMS'    => 'true',
+      'PB_NO_TAG_WARNINGS' => 'true'
+    },
+    cmd
+  )
+  exit(-1) unless !!status
+end
+
+package_paths.each do |package_path|
+  puts "> Package '#{File.basename(package_path)}'"
+
+  Dir.glob(File.join(package_path, '*.proto')).each do |proto_path|
+    puts "  > #{File.basename(proto_path)}"
+    cmd = <<-EOV
+      protoc \
+        --proto_path=#{File.join(EFF_PROTO_ROOT)} \
+        --proto_path=#{package_path} \
+        --ruby_out=#{EFF_RUBY_OUT_ROOT} \
+        #{proto_path}
+    EOV
+    status = system(
+      {
+        'PB_UPCASE_ENUMS'    => 'true',
+        'PB_NO_TAG_WARNINGS' => 'true'
+      },
+      cmd
+    )
+    exit(-1) unless !!status
+  end
+end