mchat 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d50f65b48df8f72db33d5b3cc5eaecd00170d0a33f06308c911fec6d0d27b963
-  data.tar.gz: c5be63ca6e5e0245a032d8cbc8070c43bdb019c5c6c1d6e1b0959c5f032fe98c
+  metadata.gz: bd20c228d8f1f1a62cbed21314af7f902681917943e90b28d27f4c735a68b409
+  data.tar.gz: 215269c0de4340528ddbae49604a3eed960c706fa5b874ca4b09ce74205df386
 SHA512:
-  metadata.gz: eddc551d4c07aa58310b0c079b2f3e22dc4798979c2d7298ed2cf5bcf9b2356b389a254da633e0cf04f16026d1a394b4c52bb85416ab3a5145f1f4dc16b5ddaf
-  data.tar.gz: e5dabeda5c37ac25a8636079f5b706d5755ea805b6ab413144e4fea8a5a03b7bdf7b8adcec7ff13fe0f2ffd7361cf58f0945b2f1f64fec167957b5c7e724745b
+  metadata.gz: e6de36a3ed8587149894670a802b84d3e17893c06f9dba0b17a3d935d419b7220737a8aac6414ad96d3c93b47d85b32023c8f6cd34bce521f3e81f8da560adb5
+  data.tar.gz: 50f3e3b8d0bc5d48e33db1bab00a341dd5e7a3415b9829d17484c83e4d81415a62c09f8a79bfbe1ddc0569a75aa0931706b8c1095486447b3a41a2ab00e26b45

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
@@ -13,6 +15,6 @@ RUN bundle config mirror.https://rubygems.org https://gems.ruby-china.com
 # Install gems
 RUN gem install rainbow
 RUN gem install httparty
-RUN gem install mchat
+RUN gem install mchat -v 0.2.1
 
-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

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
+require 'optparse'
 require 'pathname'
+require_relative '../lib/mchat/version.rb'
 require_relative "../lib/mchat/comps/font"
 class String
   include Mchat::Style
@@ -8,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
@@ -30,10 +32,15 @@ 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
+      # https://www.gnu.org/software/screen/manual/screen.html
+      init_config << "screen -t repl mchat_repl --server=#{@server}"
+    else
+      init_config << "screen -t repl mchat_repl"
+    end
     f << init_config
     end
   end
@@ -59,4 +66,24 @@ class MchatApp
 end
 
 
-MchatApp.new.run
+
+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(options).run

data/exe/mchat_repl

@@ -1,7 +1,30 @@
 #!/usr/bin/env ruby
+require 'optparse'
+require_relative '../lib/mchat/version.rb'
 require_relative "../lib/mchat"
 
-repl = Mchat::Repl.new
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: mchat_repl [options]"
+
+  opts.on("--version", "version") do
+
+    puts "MchatRepl 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!
+
+
+repl = Mchat::Repl.new(options)
 
 trap("INT") { repl.quit_command_run }
 

data/exe/mchat_timeline

@@ -1,8 +1,24 @@
 #!/usr/bin/env ruby
+require 'optparse'
+require_relative '../lib/mchat/version.rb'
 require_relative "../lib/mchat/timeline"
 
-  tl = Mchat::Timeline.new
 
-  trap("INT") { tl.hook_close }
+OptionParser.new do |opts|
+  opts.banner = "Usage: mchat [options]"
 
-  tl.run
+  opts.on("--version", "version") do
+    
+    puts "MchatTimeline v#{::Mchat::VERSION}"
+    puts ""
+    puts "author: mark24"
+    puts "mail: mark.zhangyoung@qq.com"
+    return
+  end
+end.parse!
+
+tl = Mchat::Timeline.new
+
+trap("INT") { tl.hook_close }
+
+tl.run

data/exe/mchat_uninstall

@@ -1,8 +1,29 @@
 #!/usr/bin/env ruby
+require 'optparse'
+require_relative '../lib/mchat/version.rb'
 
-puts "[mchat] clean config ..."
-system("rm -rf .mchat")
-puts "[mchat] uninstall mchat ..."
-system("gem uninstall mchat")
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: mchat_uninstall [options]"
 
-puts "[mchat] all files have uninstalled. Bye :D"
+  opts.on("--version", "version") do
+    
+    puts "MchatUninstall v#{::Mchat::VERSION}"
+    puts ""
+    puts "author: mark24"
+    puts "mail: mark.zhangyoung@qq.com"
+    return
+  end
+end.parse!
+
+
+def goodbye_job
+  puts "[mchat] clean config ..."
+  system("rm -rf .mchat")
+  puts "[mchat] uninstall mchat ..."
+  system("gem uninstall mchat")
+
+  puts "[mchat] all files have uninstalled. Bye :D"
+end
+
+goodbye_job

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/timeline.rb

@@ -55,6 +55,7 @@ module Mchat
     def hook_close
       @reader.hook_quit
       system('screen -X quit')
+      exit 0
     end
 
     def dispatch(m)

data/lib/mchat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mchat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 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