flumtter 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7bccd88a92ccf666c865cf935c59081731b376b
-  data.tar.gz: e015b1507854aa262a43b4f2bf902cb27cf93799
+  metadata.gz: 156f65c65db5ef313d2d8faf580365d26c407d79
+  data.tar.gz: 85bd0502b9aedf977fac5c3b83ac2b6c52547efa
 SHA512:
-  metadata.gz: 2ca9c23c0845eeaded563f009ed8c3ad2bf04dbe2e37e21786d245c1e449f8bc1065075f37fec43fa6d3f5ed9e298357213131ddcd76e311837e6cb1ba0d2760
-  data.tar.gz: 0600975f192ced2aa1a81b927119ecb361b4dbb93e88780c3febda58c73c1668121b8c25e4f78111552a3002379b46a77975e1218666e2a168c758369d186cfb
+  metadata.gz: a2e8eea4c8236284e7738f3487dc8ce765bd1b658ee415f0514f4e517646340386038dd92537481499270d37a2035fcbb939fa5d64545fab1da2ae9d6a1df25f
+  data.tar.gz: 724c7d1536ed2f6aa86d27432902d485147d4989f8ac8f1927a646ba083f2be653d1272fdda50dc96fa37c7aaf2da174588c3f177910a365f13dccf1cd9cb632

data/lib/flumtter/app/core/core.rb

@@ -1,7 +1,9 @@
 require 'pry'
 require 'json'
+require 'logger'
 
 module Flumtter
+  StartTime = Time.now
   SourcePath = File.expand_path('../../', __FILE__)
   UserPath = File.expand_path('~/.flumtter')
   [SourcePath, UserPath].each do |path|
@@ -13,6 +15,12 @@ module Flumtter
     FileUtils.cp_r(SourcePath.join(".flumtter"), UserPath)
   end
 
+  Logger = Logger.new(UserPath.join('flumtter.log'))
+  Logger.level = ARGV.include?('--debug') ? ::Logger::DEBUG : ::Logger::INFO
+  Logger.datetime_format = "%Y-%m-%d %H:%M:%S.%L "
+
+  Logger.debug("Start: #{ARGV.join(" ")}")
+
   data_path = UserPath.join("data", "data.bin")
   Config = Marshal.load(File.read(data_path)) rescue {}
   at_exit {
@@ -22,14 +30,24 @@ module Flumtter
   Thread.abort_on_exception = true
 
   module_function
-  def sarastire(path, file=nil)
-    path = file.nil? ? SourcePath.join(path, '*.rb') : SourcePath.join(path, file)
-    Dir.glob(path).each{|plugin|require plugin}
+  def logger
+    Logger
+  end
+
+  def load_plugin(source, path, file=nil)
+    path = file.nil? ? source.join(path, '*.rb') : source.join(path, file)
+    Dir.glob(path).each do |plugin|
+      logger.debug("Load: #{plugin}")
+      require plugin
+    end
   end
 
-  def sarastire_user(path, file=nil)
-    path = file.nil? ? UserPath.join(path, '*.rb') : UserPath.join(path, file)
-    Dir.glob(path).each{|plugin|require plugin}
+  def sarastire(*args)
+    load_plugin(SourcePath, *args)
+  end
+
+  def sarastire_user(*args)
+    load_plugin(UserPath, *args)
   end
 
   @events = Hash.new{|h,k|h[k] = []}
@@ -49,12 +67,22 @@ module Flumtter
   sarastire 'plugins'
   sarastire_user 'plugins'
 
+  logger.debug("Plugin load complete.")
+
   TITLE.terminal_title
 
+  logger.debug("Initialization time(#{Time.now-StartTime}s)")
+
   def start
     options = Initializer.optparse
     Setting.merge!(options)
     Client.new AccountSelector.select(options)
   rescue Interrupt
+  rescue Exception => ex
+    logger.fatal(<<~EOS)
+      #{ex.backtrace.shift}: #{ex.message} (#{ex.class})
+      #{ex.backtrace.join("\n")}
+    EOS
+    raise ex
   end
 end

data/lib/flumtter/app/core/util.rb

@@ -5,10 +5,13 @@ module Flumtter
 
   module Util
     def error(e)
-      print <<~EOF.color(Setting[:color][:error])
+      text = <<~EOF
         #{e.backtrace.shift}: #{e.message} (#{e.class})
         #{e.backtrace.join("\n")}
       EOF
+      e.class.ancestors.include?(StandardError) ? logger.error(text) : logger.fatal(text)
+      print text.color(Setting[:color][:error])
+
     end
 
     def parse_time(time)
@@ -102,6 +105,10 @@ module Flumtter
       end
     end
 
+    def logger
+      Flumtter.logger
+    end
+
     def sarastire(*args)
       Flumtter.sarastire(*args)
     end

data/lib/flumtter/version.rb

@@ -1,3 +1,3 @@
 module Flumtter
-  VERSION = "5.9.0"
+  VERSION = "5.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flumtter
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - flum1025