fileminer 1.0.0RC2 → 1.0.0RC3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d91beff05e6ea886d8ae759e10c9c2eec3ff68b3956e0fde10feb776508992d
-  data.tar.gz: 3ec5242e111743a162485e276ede29b35ad86eb9946305b0c40fe73aed6fe6fd
+  metadata.gz: 6899adc461f156ac6e112c5d6e72b45baf51f71d0fd480812b150f112538b6d3
+  data.tar.gz: cd461fe3a027047a9ffa63c8aedbe7352d1e700c14d243823080350649103fbc
 SHA512:
-  metadata.gz: df1266173e4fa6e7a0afa87c64b186113e51da3b67f0a66e7f524428ec57489d723e31f6203f91e36d9ea1fe0e40431e888dea204372fc6fd8a33a68ee9959a3
-  data.tar.gz: 1ba61ef7e12ac9163a98f15a50c896a6ae012a47b86435b974411e3cfd7e9f9cd6b7d847c82cad05c44a95dea3884bf504a5ce128a8afde75451bdd617cecfa3
+  metadata.gz: b6b00dbaaafabfc8869d2971cb5ce39977b48ee713b4acbd9910336e69f610c95930c68f6ad82f214b1d7696f7cf1cd836113bf5ba4f0d0846e5d4ee71de3aae
+  data.tar.gz: f7bebce4c3a21351f737651b0ea15f8292021a35a94055e8048f36430d9dd316931588b66d5bbb27390e69db828cd7277e744b267281a31dda1f03b3f9983247

data/bin/fileminer

@@ -10,8 +10,9 @@ logger = Logger.new STDERR
 
 begin
   # Usage:
-  #   ruby -Ilib ./bin/fileminer /path/to/fileminer.yml
-  yml = File.open(ARGV[0]) { |io| io.read }
+  #   fileminer [/path/to/fileminer.yml]
+  path = ARGV.empty? ? '/etc/fileminer/fileminer.yml' : ARGV[0]
+  yml = File.open(path) { |io| io.read }
   conf = YAML.load yml
   # create fileminer instance
   fileminer = FileMiner.new conf
@@ -23,9 +24,6 @@ begin
   fileminer.start_mining
 rescue => e
   logger.error e
-  usage = <<-EOS
-  Usage:
-    ruby -Ilib ./bin/fileminer /path/to/fileminer.yml
-  EOS
+  usage = 'Usage: fileminer [/path/to/fileminer.yml]'
   puts usage
 end

data/bin/fileminer-genconf

@@ -1,20 +1,93 @@
 #!/usr/bin/env ruby
 
 
+require 'optparse'
 require_relative '../lib/fileminer/tools/io'
 
-current_path = File.absolute_path __FILE__
-bin_path = File.dirname current_path
-project_path = File.dirname bin_path
-default_file_path = File.join project_path, 'conf', 'fileminer_default.yml'
 
-dst =  ARGV.empty? ? '/etc/fileminer/fileminer.yml' : File.absolute_path(ARGV[0])
-unless dst.end_with?('.yml') || dst.end_with?('.yaml')
-  dst = File.join dst, 'fileminer.yml'
+def gen_fileminer_conf(options)
+  current_path = File.absolute_path __FILE__
+  bin_path = File.dirname current_path
+  project_path = File.dirname bin_path
+  default_file_path = File.join project_path, 'conf', 'fileminer_default.yml'
+  if options.key? :out
+    out = options[:out]
+    dst = out.nil? ? '/etc/fileminer/fileminer.yml' : File.absolute_path(out)
+    unless dst.end_with?('.yml') || dst.end_with?('.yaml')
+      dst = File.join dst, 'fileminer.yml'
+    end
+
+    dst_dir = File.dirname dst
+    Dir.mkdirs dst_dir unless Dir.exist? dst_dir
+
+    File.copy_stream default_file_path, dst
+    puts "generated config file: #{dst}"
+  else
+    content = File.open(default_file_path) { |io| io.read }
+    puts content
+  end
+end
+
+def gen_supervisor_conf(options)
+  wrapper_home = File.join ENV['GEM_HOME'], 'wrappers'
+  content = <<-EOS
+[program:fileminer]
+command=#{wrapper_home}/fileminer
+autostart=true
+autorestart=true
+stopsinal=INT
+user=root
+  EOS
+  if options.key? :out
+    out = options[:out]
+    dst = out.nil? ? './fileminer.ini' : File.absolute_path(out)
+    unless dst.end_with?('.ini') || dst.end_with?('.conf')
+      dst = File.join dst, 'fileminer.ini'
+    end
+
+    dst_dir = File.dirname dst
+    Dir.mkdirs dst_dir unless Dir.exists? dst_dir
+    File.open(dst, 'w') { |io| io.write content }
+  else
+    puts content
+  end
 end
 
-dst_dir = File.dirname dst
-Dir.mkdirs dst_dir unless Dir.exist? dst_dir
 
-File.copy_stream default_file_path, dst
-puts "generated config file: #{dst}"
+options = Hash.new
+OptionParser.new do |opts|
+  # banner
+  opts.banner = "Usage: fileminer-genconf [options]"
+  opts.separator ''
+  opts.separator 'Options:'
+
+  # help
+  opts.on_tail('-h', '--help', 'Print help') do
+    puts opts
+    puts ''
+    exit
+  end
+
+  # type
+  options[:type] = :fileminer
+  opts.on('-t', '--type fileminer|supervisor', [:fileminer, :supervisor],
+          'Type of the config file to be generated', 'Default is fileminer') do |value|
+    options[:type] = value
+  end
+
+  # out
+  opts.on('-o', '--out [path]',
+          'Output content to a file',
+          'For type fileminer, default is /etc/fileminer/fileminer.yml',
+          'For type supervisor, default is ./fileminer.ini') do |value|
+    options[:out] = value
+  end
+
+end.parse!
+
+case options[:type]
+when :fileminer
+  gen_fileminer_conf options
+when :supervisor
+  gen_supervisor_conf options
+end

data/lib/fileminer/version.rb

@@ -1,5 +1,5 @@
 class FileMiner
 
-  VERSION = '1.0.0RC2'
+  VERSION = '1.0.0RC3'
 
-end
+end

data/lib/fileminer.rb

@@ -1,6 +1,3 @@
-#!/usr/bin/env ruby
-
-
 require 'logger'
 require_relative 'fileminer/miner'
 require_relative 'fileminer/plugins'
@@ -215,15 +212,3 @@ class FileMiner
   end
 
 end
-
-
-if __FILE__ == $0
-  # Usage:
-  #     ruby fileminer.rb /etc/fileminer/fileminer.yml
-  require 'yaml'
-  yml = File.open(ARGV[0]) { |io| io.read }
-  conf = YAML.load yml
-  fileminer = FileMiner.new conf
-  trap(:INT) { fileminer.stop_mining }
-  fileminer.start_mining
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileminer
 version: !ruby/object:Gem::Version
-  version: 1.0.0RC2
+  version: 1.0.0RC3
 platform: ruby
 authors:
 - Fang MinJie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies: []
 description: A simple file/log transfer tool coding by ruby.
 email: