mchat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0aebc0b0bcebdc9caad7172d05d3474fef6b0064023f280401a8736f19fbb6
-  data.tar.gz: dda796643faa8e779b12a9e4ce1714edc4625563848dfef30af3e1e93acd4276
+  metadata.gz: 6aefb6d9811fd9c32d4d2d4245bb28830c4660e4a9e8b4c83371cd0c97cf3b69
+  data.tar.gz: af93fe1a94375326e7a20cf141bb0e4936e317eb53398c874deb10d20d025480
 SHA512:
-  metadata.gz: db62700957058f56b4ad13ea5b4f5d2e7e8b2508316e31365c11bbebf646e6ac7b053f499bf0cdf2f7a096a4c95a69e701b416e2b1eab5bf453f2ab42a55bd47
-  data.tar.gz: 4965daf82bc576a79ac1a05cd86ff925b9daebf4e22ce904a61814af39ae2a91c245a58da436d8e746185ded5b9947d2a74a609fa8058a510c763b95f306ed32
+  metadata.gz: '076984b05f9c3482cc520fb95ef31c9a29c1630fea35e7d946741e949f8883ea883981f4888d840e9b49fd675e6e202585d7c264c59a475e80271b5416f5cd80'
+  data.tar.gz: 02d42e72ad4619dafe0e069861c9d60af8f14c49f8f23f03e2d88cda199c9281f4ab282636e9cd5543b9b01dbf9fce59f2f8147e1f3b9faf496fcf2d82193553

data/Dockerfile

@@ -0,0 +1,20 @@
+FROM ruby:3.1-buster
+
+ENV LANG=C.UTF-8
+
+RUN apt update -y
+RUN apt install screen -y
+RUN apt install vim -y
+RUN apt install nano -y
+
+RUN gem sources --add https://gems.ruby-china.com/ --remove https://rubygems.org/
+RUN gem install bundler
+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
+
+CMD ["bash"]

data/README.md

@@ -2,6 +2,8 @@
 
 Mchat is IRC like chat client.
 
+[Doc: 用Ruby打造一个命令行Slack](https://mark24code.github.io/ruby/2022/08/15/%E7%94%A8Ruby%E6%89%93%E9%80%A0%E4%B8%80%E4%B8%AA%E5%91%BD%E4%BB%A4%E8%A1%8CSlack.html)
+
 ![preview](./assets/preview.png)
 
 This is Mchat client repo, server repo:
@@ -24,6 +26,12 @@ mchat
 /h
 ```
 
+或者使用Docker
+
+直接使用
+
+`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,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
@@ -59,4 +67,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.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mchat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark24
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
-dependencies: []
+date: 2022-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 description: IRC like chat client power by ruby
 email:
 - mark.zhangyoung@qq.com
@@ -21,6 +49,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt