alain 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 213428bef56bf0641963627713eca28d2241896e06b243f621df2f2b684264a4
-  data.tar.gz: 0a44b8ff46020206fcabb472e675da7ee7d9938146b6fc98c6c5bdb7e42b4530
+  metadata.gz: ded83488c4bf5771cf60b3b9bd5a9123b532b0577d28a1f4a0728d52e1608f13
+  data.tar.gz: caeedafa0b1c639cff4a2c31c8a6ecbb124495f74773e777759b5a66c97b883e
 SHA512:
-  metadata.gz: f1f1fb5b832aa94b150505b20939291ca67445a816ae888bb4a0641eb8ab65744f9c853a349351bea2a9c7b963b69987f939b2678c4b606a889e5ba573d1997f
-  data.tar.gz: 785870f203ac9fd17311665479125524245329e3413ea7b6c1e36c44bc2b70f2c9db4b28a8c46cb8c19b2e597fd48034b7396c1f7142cb36959bcb6606edea94
+  metadata.gz: 3cc991d45321665d51523edac56822cd9114989573fbc33afd80869b7383794c718e698da63b112e58412cc6b31275ee220c14fceee0b316429c578159ef9fa2
+  data.tar.gz: 2b00bd94f99a8ba77b369f922e6f868939813c3a2b917e2bd97f646d707745e7401ae94c80b6978efa4d21de31f3c030aa7b7f140c1aca7f02565ea351762875

data/exe/alain

@@ -7,7 +7,7 @@ require 'alain'
 class AlainCmd
   def self.generate(args, params)
     if check_git || params[:force_overwrite]
-      Alain::Driver.new(args[0]).generate(params[:update_server])
+      Alain::Driver.new(args[0]).generate(params[:update_server], params[:server_conf])
     else
       exit 1
     end
@@ -19,15 +19,15 @@ class AlainCmd
     rescue
     end
     unless s == 0
-      puts "Requires git repository. If your sure, you can use '--force' option"
-      puts 'Exit'
+      STDERR.puts "Requires git repository. If your sure, you can use '--force' option"
+      STDERR.puts 'Exit'
       return false
     end
 
     o, _, _ = Open3.capture3('git status -s | wc -l')
     unless o.to_i == 0
-      puts "Commit working diffs before running. If your sure, you can use '--force' option."
-      puts 'Exit'
+      STDERR.puts "Commit working diffs before running. If your sure, you can use '--force' option."
+      STDERR.puts 'Exit'
       return false
     end
     true
@@ -41,6 +41,7 @@ OptionParser.new do |opt|
   opt.banner = 'Usage: alain [options] proto_file'
   opt.on('--force', 'force generate files') { |_v| params[:force_overwrite] = true }
   opt.on('--update-server', 'Overwrite main.rs/lib.rs with reference server') { |_v| params[:update_server] = true }
+  opt.on('--use-server-conf', 'introduce github.com/chumaltd/server-util') { |_v| params[:server_conf] = true }
   args = opt.parse!(ARGV)
   AlainCmd.generate(args, params)
 end

data/lib/alain/cargo.rb

@@ -8,20 +8,20 @@ module Alain #:nodoc:
     def initialize(dir = '.')
       toml = Pathname(dir) / 'Cargo.toml'
       unless File.exist? toml
-        puts "./Cargo.toml not found. 'cargo new' first."
+        STDERR.puts "./Cargo.toml not found. 'cargo init' first."
         exit 1
       end
       @cargo = Tomlrb.load_file toml
     end
 
-    def add_dependencies
+    def add_dependencies(server_conf: false)
       toml = Pathname('.') / 'Cargo.toml'
       origin = File.read toml
       File.open(toml, 'w') do |f|
         origin.each_line do |line|
           if /^\[dependencies\]/.match(line)
             f.puts line
-            dependencies.each do |k, entry|
+            dependencies(server_conf).each do |k, entry|
               next if @cargo['dependencies'].keys.include? k
               f.puts entry
             end
@@ -48,23 +48,28 @@ module Alain #:nodoc:
 
     private
 
-    def dependencies
+    def dependencies(server_conf)
       {
-        'once_cell' => %(once_cell = "1.5"),
-        'prost' => %(prost = "0.7"),
-        'prost-types' => %(prost-types = "0.7"),
+        'prost' => %(prost = "0.9"),
+        'prost-types' => %(prost-types = "0.9"),
         'signal-hook' => %(signal-hook = "0.3.9"),
         'signal-hook-tokio' => %(signal-hook-tokio = { version = "0.3.0", features = ["futures-v0_3"] }),
         'tokio' => %(tokio = { version = "1.0", features = ["full"] }),
         'tokio-stream' => %(tokio-stream = "0.1.2"),
-        'tonic' => %(tonic = "0.4.0"),
-        'triggered' => %(triggered = "0.1.1")
-      }
+        'tonic' => %(tonic = "0.6"),
+        'triggered' => %(triggered = "0.1.2")
+      }.tap do |dep|
+        if server_conf
+          dep['server-conf'] = %(server-conf = { git = "https://github.com/chumaltd/server-util.git" })
+        else
+          dep['once_cell'] = %(once_cell = "1.5")
+        end
+      end
     end
 
     def build_dependencies
       {
-        'tonic-build' => %(tonic-build = { version = "0.4", features = ["prost"] }),
+        'tonic-build' => %(tonic-build = { version = "0.6", features = ["prost"] }),
       }
     end
   end

data/lib/alain/driver.rb

@@ -16,32 +16,33 @@ module Alain #:nodoc:
       @svc_code = SvcCode.new proto.service_name(:snake)
     end
 
-    def generate(update_server = false)
+    def generate(update_server = false, server_conf = false)
+      @server_conf = server_conf
       if @svc_code.exist?
-        puts 'Already exists service definition. Only update methods...'
+        STDERR.puts 'Already exists service definition. Only update methods...'
         update_svc
       else
         update_server = true
-        puts 'No service definition yet...'
-        puts 'Generate service definition'
+        STDERR.puts 'No service definition yet...'
+        STDERR.puts 'Generate service definition'
         parse_svc
       end
       if update_server
-        puts 'Overwrite main.rs'
+        STDERR.puts 'Overwrite main.rs'
         parse_erb 'main.rs'
-        puts 'Overwrite lib.rs'
+        STDERR.puts 'Overwrite lib.rs'
         parse_erb 'lib.rs'
-        puts 'Generate build.rs'
+        STDERR.puts 'Generate build.rs'
         parse_erb 'build.rs', '', '.'
-        puts 'Generate tests/common/mod.rs'
+        STDERR.puts 'Generate tests/common/mod.rs'
         FileUtils.mkdir_p 'tests/common/'
         parse_erb 'mod.rs', '', 'tests/common'
-        puts 'Generate tests/integration_test.rs'
+        STDERR.puts 'Generate tests/integration_test.rs'
         parse_erb 'integration_test.rs', '', 'tests'
-        puts 'Update Cargo.toml'
-        cargo.add_dependencies
+        STDERR.puts 'Update Cargo.toml'
+        cargo.add_dependencies(server_conf: @server_conf)
       end
-      puts 'Done'
+      STDERR.puts 'Done'
     end
 
     private

data/lib/alain/proto.rb

@@ -10,7 +10,7 @@ module Alain #:nodoc:
 
     def initialize(service, package, proto_path)
       unless File.exist? proto_path
-        puts "#{proto_path} not found. Exit"
+        STDERR.puts "#{proto_path} not found. Exit"
         exit 1
       end
       @path = proto_path

data/lib/alain/templates/integration_test.rs.erb

@@ -1,13 +1,12 @@
 mod common;
 use common::setup;
-use triggered::trigger;
 
 <%= proto.use_def(cargo.crate_name) %>
+use <%= cargo.crate_name %>::<%= proto.package %>::<%= proto.service_name(:snake) %>_client::<%= proto.service_name %>Client;
 
 #[tokio::test]
 async fn it_returns_ok_response() {
-    let (shutdown_trigger, shutdown_signal) = trigger();
-    let (jh, channel) = setup(shutdown_signal).await.unwrap();
+    let (jh, channel, shutdown_trigger) = setup().await.unwrap();
 
     let mut client = <%= proto.service_name %>Client::new(channel);
     // TODO: implement gRPC client request

data/lib/alain/templates/lib.rs.erb

@@ -13,17 +13,13 @@ mod <%= proto.service_name :snake %>_service;
 use self::<%= proto.service_name :snake %>_service::<%= proto.service_name %>Service;
 
 pub async fn start_server(addr: SocketAddr, signal: Listener) -> Result<(), Box<dyn std::error::Error>> {
-    println!("ready");
-    create_router().await
-        .serve_with_shutdown(addr, signal).await.unwrap();
-
-    Ok(())
-}
-
-pub async fn create_router() -> Router<<%= proto.service_name %>Server<<%= proto.service_name %>Service>, tonic::transport::server::Unimplemented> {
     let server = <%= proto.service_name %>Service{};
+    println!("{} {} ready", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
     Server::builder()
         .add_service(<%= proto.service_name %>Server::new(server))
+        .serve_with_shutdown(addr, signal).await.unwrap();
+
+    Ok(())
 }
 
 pub async fn handle_signals(signals: Signals, trigger: triggered::Trigger) {

data/lib/alain/templates/main.rs.erb

@@ -1,12 +1,15 @@
-use once_cell::sync::Lazy;
 use signal_hook::consts::signal::*;
 use signal_hook_tokio::Signals;
 use <%= cargo.crate_name %>::{start_server, handle_signals};
-
+<% if @server_conf -%>
+use server_conf::SERVER_BIND;
+<% else -%>
+use once_cell::sync::Lazy;
 pub static SERVER_BIND: Lazy<std::net::SocketAddr> = Lazy::new(|| {
     format!("{}:{}", "0.0.0.0", 50051)
     .parse().unwrap()
 });
+<% end -%>
 
 #[tokio::main]
 pub async fn main() {

data/lib/alain/templates/mod.rs.erb

@@ -2,13 +2,14 @@
 use std::time::Duration;
 use tokio::task::JoinHandle;
 use tonic::{transport::Channel, Status};
-use <%= cargo.crate_name %>::create_router;
+use triggered::{trigger, Trigger};
+use <%= cargo.crate_name %>::start_server;
 
-pub async fn setup(signal: triggered::Listener) -> Result<(JoinHandle<()>, Channel), Box<dyn std::error::Error>> {
+pub async fn setup() -> Result<(JoinHandle<()>, Channel, Trigger), Box<dyn std::error::Error>> {
+    let (shutdown_trigger, signal) = trigger();
     let srv: JoinHandle<()> = tokio::spawn(async move {
     // Launch gRPC server
-    create_router().await
-        .serve_with_shutdown("127.0.0.1:50051".parse().unwrap(), signal)
+    start_server("127.0.0.1:50051".parse().unwrap(), signal)
         .await.unwrap()
     });
 
@@ -18,8 +19,7 @@ pub async fn setup(signal: triggered::Listener) -> Result<(JoinHandle<()>, Chann
     let channel = Channel::from_static("http://127.0.0.1:50051")
         .timeout(Duration::from_secs(30))
         .concurrency_limit(20)
-        .connect_lazy()
-        .or_else(|_e| Err(Status::cancelled("client connection error")))?;
+        .connect_lazy();
 
-    Ok((srv, channel))
+    Ok((srv, channel, shutdown_trigger))
 }

data/lib/alain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alain
-  VERSION = "0.4.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alain
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomlrb
@@ -53,7 +53,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/alain
   source_code_uri: https://github.com/chumaltd/alain
   changelog_uri: https://github.com/chumaltd/alain/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -68,8 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Code generator for rust prost
 test_files: []