mchat 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5b2f2c8f81c468432b3956d94cb55771ab176dcf253b0189f94913b849cb78
-  data.tar.gz: e072da17f7a5d5bd68c9a742889565d55eeb85b1bc0ec3b8bc55d0fe20e1a4a0
+  metadata.gz: 6aefb6d9811fd9c32d4d2d4245bb28830c4660e4a9e8b4c83371cd0c97cf3b69
+  data.tar.gz: af93fe1a94375326e7a20cf141bb0e4936e317eb53398c874deb10d20d025480
 SHA512:
-  metadata.gz: 0a13929cc01794eeb6ad087d7071e382ad3a5ab9fb34310a540c2c333b8e234bd2b4de34b39974eeafdfa7e6a7f36e5218764cbdcc1e14cacaa9e339d06847fa
-  data.tar.gz: d3e62adf2c158acc533279cb5fbf99d3d8d12cb1212f2e4309797190392ca17121d57e55b94d14f484385deba1fdec3aa87b29a49e79a56463303cdb188ecee7
+  metadata.gz: '076984b05f9c3482cc520fb95ef31c9a29c1630fea35e7d946741e949f8883ea883981f4888d840e9b49fd675e6e202585d7c264c59a475e80271b5416f5cd80'
+  data.tar.gz: 02d42e72ad4619dafe0e069861c9d60af8f14c49f8f23f03e2d88cda199c9281f4ab282636e9cd5543b9b01dbf9fce59f2f8147e1f3b9faf496fcf2d82193553

data/Dockerfile

@@ -1,5 +1,7 @@
 FROM ruby:3.1-buster
 
+ENV LANG=C.UTF-8
+
 RUN apt update -y
 RUN apt install screen -y
 RUN apt install vim -y
@@ -15,4 +17,4 @@ RUN gem install rainbow
 RUN gem install httparty
 RUN gem install mchat
 
-CMD ["bash"]
+CMD ["bash"]

data/README.md

@@ -30,7 +30,7 @@ mchat
 
 直接使用
 
-`docker run -it mark24code/mchat env LANG=C.UTF-8 /bin/bash`
+`docker run -it mark24code/mchat`
 
 
 

data/Rakefile

@@ -13,9 +13,17 @@ end
 
 # RuboCop::RakeTask.new
 
-Rake::TestTask.new(:preview) do |t|
+desc 'build gem & local install it'
+task :preview do
   system("gem build mchat.gemspec && gem install ./mchat-#{Mchat::VERSION}.gem")
 end
 
+desc 'build docker images & push'
+task :docker_pd do
+  system("docker build -t mark24code/mchat:latest .")
+  system("docker push mark24code/mchat")
+  system("docker build -t mark24code/mchat:#{Mchat::VERSION} .")
+  system("docker push mark24code/mchat:#{Mchat::VERSION}")
+end
 
 task default: %i[test]

data/exe/mchat

@@ -10,8 +10,8 @@ require_relative "../lib/mchat/comps/user_config"
 class MchatApp
   include Mchat::UserConfig
 
-  def initialize
-    first_time_use
+  def initialize(opts={})
+    @server = opts.fetch(:server, nil)
     @screenrc_dir = Pathname.new(Dir.home).join('.mchat')
     @screenrc = Pathname.new(Dir.home).join('.mchat').join('screenrc')
   end
@@ -32,10 +32,16 @@ class MchatApp
   init_config = %Q(
   split -v
 
-  screen -t timeline 'mchat_timeline'
+  screen -t timeline mchat_timeline
   focus
-  screen -t repl 'mchat_repl'
   )
+    if @server
+      # search `eval` 接受完整参数
+      # https://www.gnu.org/software/screen/manual/screen.html
+      init_config << "screen -t repl eval mchat_repl --server=#{@server}"
+    else
+      init_config << "screen -t repl mchat_repl"
+    end
     f << init_config
     end
   end
@@ -62,18 +68,23 @@ end
 
 
 
-# options = {}
+options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: mchat [options]"
 
   opts.on("--version", "version") do
-    
+
     puts "Mchat v#{::Mchat::VERSION}"
     puts ""
     puts "author: mark24"
     puts "mail: mark.zhangyoung@qq.com"
     return
   end
+
+  opts.on("--server=SERVER", "server") do |server|
+    options[:server] = server
+  end
+
 end.parse!
 
-MchatApp.new.run
+MchatApp.new(options).run

data/exe/mchat_repl

@@ -9,7 +9,7 @@ OptionParser.new do |opts|
   opts.banner = "Usage: mchat_repl [options]"
 
   opts.on("--version", "version") do
-    
+
     puts "MchatRepl v#{::Mchat::VERSION}"
     puts ""
     puts "author: mark24"
@@ -17,11 +17,15 @@ OptionParser.new do |opts|
     return
   end
 
+  opts.on("--server=SERVER", "server") do |server|
+    options[:server] = server
+  end
+
 end.parse!
 
 
-repl = Mchat::Repl.new
+repl = Mchat::Repl.new(options)
 
 trap("INT") { repl.quit_command_run }
 
-repl.run
+repl.run

data/lib/mchat/comps/user_config.rb

@@ -18,7 +18,7 @@ init_config = %Q(
 wait_prefix: ">>"
 display_welcome: true
 clear_repl_everytime: true
-server: "localhost:4567"
+# server: "localhost:4567"
 
 )
       f << init_config
@@ -35,20 +35,33 @@ server: "localhost:4567"
       return opt
     end
 
-    def first_time_use
-      if !user_config_exist?
-        read_user_config
-        puts "Mchat first run TIPS".style.jade
+    def check_server_before_all
+      if !@server
+        puts "Mchat about `Server` Tips".style.jade
+        puts ""
+        puts "your server: `#{@server}`"
         puts ""
-        puts "Mchat not found user config, maybe this is your first time run Mchat."
         init_config = "~/.mchat".style.warn
         puts "Mchat has help your create config to #{init_config}"
         server_field = "<server> field".style.warn
         puts "Before you run mchat, edit your config file, change #{server_field} to yours:"
         puts "vim #{CONFIG_PATH.to_s}".style.warn
-        puts "make sure your server works, before run Mchat. :D"
-
-        exit 0
+        puts "make sure your server works, before run Mchat."
+        puts ""
+        puts "If you have server address, you can also run like this:"
+        puts "mchat --server='http://<your host>'"
+        puts "e.g.  mchat --server='http://localhost:4567'"
+        puts "so you will not need to edit mchatrc." + " :)".style.warn
+        puts ""
+        puts "Confirm? (y/yes)"
+        while true
+          confirm = gets
+          confirm = confirm.strip
+          if confirm == 'y' || confirm == 'yes'
+            system('screen -X quit')
+          end
+          sleep 0.1
+        end
       end
     end
   end

data/lib/mchat/repl.rb

@@ -104,14 +104,16 @@ module Mchat
 
     # Instance ########################3
 
-    def initialize
-      first_time_use
+    def initialize(opts = {})
 
       @config = read_user_config
-      @server = @config.fetch("server") || 'localhost:4567'
+
+      @server = opts.fetch(:server, nil) || @config.fetch("server", nil) || nil
+
+      check_server_before_all
 
       @api = ::Mchat::Request.new(@server)
-  
+
       @wait_prefix = @config.fetch("wait_prefix") || ">>"
       @display_welcome = @config.fetch("display_welcome") || true
 
@@ -215,7 +217,7 @@ module Mchat
       startup_msg = resp.fetch("data")
       return Message.new(startup_msg).display
     end
-  
+
     def before_loop_setup
       # cli
       _puts welcome(@display_welcome)

data/lib/mchat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mchat
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mchat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark24
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow