arvicco-avalon 0.0.26 → 0.0.27

data/avalon.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Avalon miners monitor}
   gem.summary       = %q{Avalon miners monitor and set of helper scripts}
   gem.homepage      = "https://github.com/arvicco/avalon"
+  gem.licenses      = ['MIT', 'GPL-2']
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -18,5 +19,4 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'faraday', '~> 0.8'
-
 end

data/lib/avalon/config.rb

@@ -25,7 +25,15 @@ module Avalon
         File.expand_path('~/.avalon/blocks.yml')
 
       # Setting defaults
-      @config[:alert_sounds] = DEFAULT_SOUNDS.merge(@config[:alert_sounds] || {})
+      @config[:alert_sounds] = 
+        case @config[:alert_sounds]
+        when Symbol, false
+          @config[:alert_sounds]
+        when Hash  
+          DEFAULT_SOUNDS.merge @config[:alert_sounds]
+        when true, nil
+          DEFAULT_SOUNDS  
+        end  
       @config[:alert_last_share] ||= 2
       @config[:alert_after] ||= @config[:status_fails_to_alarm] || 2
       @config[:alert_temp_high] ||= @config[:alert_temp] || 55

data/lib/avalon/miner.rb

@@ -154,7 +154,8 @@ module Avalon
     end
 
     def to_s
-      "#{num}: " + FIELDS.map {|key, (width, _, _ )| @data[key].to_s.rjust(width)}.join(" ")
+      num.to_s.rjust(3) + ": " + 
+        FIELDS.map {|key, (width, _, _ )| @data[key].to_s.rjust(width)}.join(" ")
     end
 
   end

data/lib/avalon/utils.rb

@@ -11,17 +11,21 @@ module Avalon
 
     # Helper method: play a sound file
     def play what
-      tunes = [Avalon::Config[:alert_sounds][what] || what].compact.flatten
-
-      tunes.each do |tune|
-        file = find_file( tune, "../../../sound/#{tune}",
-                          "~/.avalon/sound/#{tune}", "/System/Library/Sounds/#{tune}")
-        case system
-        when 'Darwin'
-          `afplay #{file}`
-        when 'Linux'
-          raise 'Please install sox package: sudo apt-get install sox' if `which sox`.empty?
-          `play -q #{file}`
+      case Avalon::Config[:alert_sounds]
+      when false, :none, :no
+      when Hash
+        tunes = [Avalon::Config[:alert_sounds][what] || what].compact.flatten
+
+        tunes.each do |tune|
+          file = find_file( tune, "../../../sound/#{tune}",
+                            "~/.avalon/sound/#{tune}", "/System/Library/Sounds/#{tune}")
+          case system
+          when 'Darwin'
+            `afplay #{file}`
+          when 'Linux'
+            raise 'Please install sox package: sudo apt-get install sox' if `which sox`.empty?
+            `play -q #{file}`
+          end
         end
       end
     end
@@ -29,7 +33,7 @@ module Avalon
     # Helper method: sound alarm with message
     def alarm message, sound=:failure
       puts message
-      play sound
+      play sound 
     end
 
     # Helper method: from time string 'hh:mm:ss' to duration in minutes

data/lib/avalon/version.rb

@@ -1,3 +1,3 @@
 module Avalon
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvicco-avalon
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -69,7 +69,9 @@ files:
 - sound/Ping.aiff
 - sound/Purr.aiff
 homepage: https://github.com/arvicco/avalon
-licenses: []
+licenses:
+- MIT
+- GPL-2
 post_install_message: 
 rdoc_options: []
 require_paths: