grouse 1.1.5.1 → 1.1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41770eefde2d6f9fc4067234083572fc10af5e0da10621efb9a324363a484c7
-  data.tar.gz: b8c9bb7abd5c3475bc7505c57d4fc1771a1c7b729272a4ba15d7a4bdae706e7d
+  metadata.gz: 29ee29e02e790e2d4576f5f19a5ba21d669c7e57027e6c80fe88a3151cbb9297
+  data.tar.gz: a314e96b9a41d53a0b943c49f89838bd04b06ab7a8281afc08b26f4998368446
 SHA512:
-  metadata.gz: aafeffdb3ec3d2b1765dc4f8601f06b4968f50b563cedd74e94aedbd02f0158917ff12d2d3a6fbe59a36c72f80c15799c45cea9528b1346b861d44673fec3c85
-  data.tar.gz: 1059ac5f2eb686f01fb3922b465ec810e34f04d50c6ef571b4aff5f7bc7e510d28557c09332867503297a3c5c65843280a6cfa3a9a84cb775e496039a00f8771
+  metadata.gz: 1760763f84e7ad3bd1ef2181286ac0079307100b8553e528bcd4e4104ddf5f0b13e1ab47fb5996b42821063a87d2c40cbe6ec158f61cbc61bfc21a3cf3149edf
+  data.tar.gz: 047bfa481963e29e54bd1b3574015269e8afa6fd33fa2b1401626d1096d35e8d5fc03a8f6526984eec019e1387d043b55505237a0a2b62de484cb8501d92696e

data/bin/enaga

@@ -2,39 +2,12 @@
 # frozen_string_literal: true
 # vim: filetype=ruby
 
-require 'socket'
 require 'grouse'
+require 'socket'
 require 'tanraku'
 
 # Enaga core in Grouse/lib
 class Enaga
-  def self.udp_socket
-    udp = UDPSocket.new
-    udp.connect("128.0.0.0", 7)
-    adrs = Socket.unpack_sockaddr_in(udp.getsockname)[1]
-    udp.close
-    adrs
-  end
-
-  def self.list_socket
-    Socket.ip_address_list.find do |intf|
-      intf.ipv4? && !intf.ipv4_loopback? && !intf.ipv4_multicast?
-    end.ip_address
-  end
-
-  def self.eq_socket
-    Socket.ip_address_list.find do |ai|
-      ai.ipv4? && !ai.ipv4_loopback?
-    end.ip_address
-  end
-
-  def self.koyomi
-    dt = Time.new.getlocal('+09:00')
-    week = %w(日 月 火 水 木 金 土)[dt.wday]
-    himekuri = "#{dt.year}年" + "#{dt.month}月" + "#{dt.day}日" + ' : '.to_s + "#{dt.hour}時"+"#{dt.min}分"+"#{dt.sec}秒" + ' : '.to_s + week + "曜日"
-    himekuri
-  end
-
   def self.version
     puts 'Enaga core in Grouse VERSION: ' + core_version
   end
@@ -48,19 +21,19 @@ class Enaga
     puts ''
     puts 'enaga -a'
     puts ''
-    puts Enaga.udp_socket
+    puts "#{udp_socket}"
     puts ''
     puts 'enaga -b'
     puts ''
-    puts Enaga.list_socket
+    puts "#{list_socket}"
     puts ''
     puts 'enaga -c'
     puts ''
-    puts Enaga.eq_socket
+    puts "#{eq_socket}"
     puts ''
     puts 'enaga -d'
     puts ''
-    puts Enaga.koyomi
+    puts "#{koyomi}"
     puts ''
     puts 'HELP'.center(60, '-')
   end
@@ -78,15 +51,17 @@ begin
   if one.nil?
     Enaga.version
   elsif one.match?(a)
-    puts Enaga.udp_socket
+    puts "#{udp_socket}"
   elsif one.match?(b)
-    puts Enaga.list_socket
+    puts "#{list_socket}"
   elsif one.match?(c)
-    puts Enaga.eq_socket
+    puts "#{eq_socket}"
   elsif one.match?(d)
-    puts Enaga.koyomi
+    puts "#{koyomi}"
   elsif one.match?(h)
     Enaga.help
+  else
+    puts 'Not Found Commands, Please enaga -h commad.'
   end
 rescue Exception => e
   puts e.backtrace

data/lib/grouse.rb

@@ -70,7 +70,7 @@ module Grouse
       yield
     rescue
       @failure.to_i << (Time.now).to_i
-      nil
+      @failure = nil
     end
   end
 
@@ -99,10 +99,14 @@ module Grouse
           if f.eof?
             f.close
           elsif !f.eof
-            tanraku_execute
+            return
           end
         end
       end
+    rescue Exception => cep
+      puts cep.backtrace
+      puts cep.backtrace_locations
+      tanraku_execute
     rescue StandardError => a
       puts a.backtrace
       tanraku_execute
@@ -113,7 +117,7 @@ module Grouse
 
   # grouse version
   def core_version
-    '1.1.5.1'.to_s
+    '1.1.5.3'.to_s
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grouse
 version: !ruby/object:Gem::Version
-  version: 1.1.5.1
+  version: 1.1.5.3
 platform: ruby
 authors:
 - Takayuki Kamiyama