fluxbox_apps_menu 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299c16c1c64506b78ab3c7d9cdf87f0c7b035315
-  data.tar.gz: a5ed2130437276cdc9329db41b91725ff3a260ba
+  metadata.gz: dbe89b0ebddb88a2ad0b7d136d23d92033e23122
+  data.tar.gz: 4d9a9f61fe7e78d89d5fe166c356bd7272b01e1b
 SHA512:
-  metadata.gz: 5268a846daa828e7f7bff6751f42cbb1ba46e00a9e24cfa960d5f88b2728e2093b1e87a42c847509aee474eb728ece1de165973fab0fe6f33450cefe01930cf2
-  data.tar.gz: b3954afe8f8967aba09b1f265551c3c21c680a4ab99808d010b6e22eb2406c5e1886ae18a4bda75bb69e2f97bf33e16b3f8d6fd891d6b2893e0eb837015e424c
+  metadata.gz: 03563fe3b2285cf53d134e7163a431eb609fd7b682013777beaed6a4b57a1a17b40d9d597be329cf85e21504ab0b9a825d383ab46a9e649b4d9b5a059660021a
+  data.tar.gz: a5bb559edcbfad3a7bd40bf74b00ddb4a753cf872c1f7aa001dc9bdc4448c6d049f2b299244deca1e4a98dd2aaa0b7850cbe9cb33b7b2980fa1334d3b89452a9

data/Gemfile.lock

@@ -2,13 +2,13 @@ PATH
   remote: .
   specs:
     fluxbox_apps_menu (1.3.0)
-      inifile (~> 3.0)
+      iniparse
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    inifile (3.0.0)
+    iniparse (1.4.2)
     rake (12.0.0)
     thor (0.19.4)
 

data/fluxbox_apps_menu.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   
-  spec.add_runtime_dependency "inifile", "~> 3.0"
+  spec.add_runtime_dependency "iniparse"
   spec.add_runtime_dependency "thor"
 end

data/lib/fluxbox_apps_menu.rb

@@ -17,11 +17,8 @@ module FluxboxAppsMenu
     end
 
     def create_menu
-      if @overwrite == false
-        if File.exists?(File.expand_path("~/.fluxbox/#{@filename}"))
-          STDERR.puts 'Fatal Error! '.bold.red "The file #{@filename} already exists!"
-          exit
-        end
+      unless @overwrite
+        raise FileExists, "~/.fluxbox/#{@filename}" if File.exists?(File.expand_path("~/.fluxbox/#{@filename}"))
       end
 
       scan_app_folder
@@ -31,10 +28,7 @@ module FluxboxAppsMenu
 
     def init_config
       unless @overwrite
-        if File.exists?(File.expand_path("~/.fluxbox/fluxbox_apps_menu.yaml"))
-          STDERR.puts 'Fatal Error! '.bold.red + "The file 'fluxbox_apps_menu.yaml' already exists in '#{File.expand_path('~/.fluxbox')}'"
-          exit
-        end
+        raise FileExists, '~/.fluxbox/fluxbox_apps_menu.yaml' if File.exists?(File.expand_path("~/.fluxbox/fluxbox_apps_menu.yaml"))
       end
       FileUtils.copy(File.dirname(__FILE__) + '/fluxbox_apps_menu.yaml', File.expand_path('~/.fluxbox/'))
     end
@@ -46,6 +40,8 @@ module FluxboxAppsMenu
 
         Dir.glob(File.expand_path(d + '/*.desktop')) do |f|
 
+          Messages.examining f if @verbose
+
           ini = DesktopFile.new(f, @cfg)
 
           next if ini.banned_file?
@@ -53,47 +49,35 @@ module FluxboxAppsMenu
           name = ini.name
 
           if ini.hidden? 
-            puts '[H] '.bold.gray + "\"#{name}\" (#{f})" if @verbose
+            Messages.hidden(name, f) if @verbose
             next
           end
 
           cat = ini.categories
           if cat.nil?
-            puts '[C] '.bold.red + "\"#{name}\" (#{f})" if @verbose
+            Messages.no_category(name, f) if @verbose
             next
           end
 
-          begin
-            submenu = @fmenu.assign_menu(cat, name)
-          rescue NoCategoriesError => e
-            STDERR.puts 'Fatal Error! '.bold.red + "The \"#{e.message}\" menu item doesn't have any category, fix it to your \"fluxbox_menu_apps.yaml\""
-            exit
-          end
+          submenu = @fmenu.assign_menu(cat, name)
 
-          unless submenu.nil?
-            icon = ini.icon
+          raise NoMappedCategories, {:name => name, :categories => ini.categories} if submenu.nil?
+
+          icon = ini.icon
+
+          submenu[name] = MenuItem.new(:label => name, :icon  => icon, :command => ini.exec)
+
+          if @verbose 
             if icon.nil?
-              puts '[I] '.bold.yellow + "\"#{name}\" (#{f})" if @verbose
+              Messages.no_icon(name, f)
+            else
+              Messages.ok(name, f)
             end
-
-            submenu[name] = MenuItem.new(:label => name, :icon  => icon, :command => ini.exec)
-            puts '[V]'.bold.green + " \"#{name}\" (#{f})" if @verbose
-          else
-            STDERR.puts 'Warning! '.bold.yellow + "\"#{name}\" doesn't have any mapped category among: #{ini.categories.join(', ')}, fix it to your \"fluxbox_menu_apps.yaml\" " 
           end
         end
       end
 
-      if @verbose
-        puts ''
-        puts 'Quick Help:'
-        puts ''
-        puts '  [V]: Everything is ok'.bold.green
-        puts '  [H]: Hidden app'.bold.gray
-        puts '  [I]: App without icon'.bold.yellow
-        puts '  [C]: App without categories'.bold.red
-        puts ''
-      end
+      Messages.help if @verbose
     end
 
   end

data/lib/fluxbox_apps_menu.yaml

@@ -1,6 +1,4 @@
 ---
-# other options: kdesu and gnomesu
-:switch_user: 'xdg-su'
 :terminal: 'xdg-terminal'
 :icons: 
   App Name: 'icon-name'
@@ -98,11 +96,15 @@
       :categories:
       - Yast
       Hardware:
-        :icon: package_yast_hardware
+        :icon:
+        - package_yast_hardware
+        - yast-hardware
         :categories:
         - X-SuSE-YaST-Hardware
       Miscellaneous:
-        :icon: package_yast_misc
+        :icon: 
+        - package_yast_misc
+        - yast-misc
         :categories:
         - X-SuSE-YaST-Misc
       Network Devices:
@@ -118,7 +120,9 @@
         :categories:
         - X-SuSE-YaST-Security
       System:
-        :icon: package_yast_system
+        :icon: 
+        - package_yast_system
+        - yast-system
         :categories:
         - X-SuSE-YaST-System
       Software:

data/lib/fluxbox_apps_menu/cli.rb

@@ -50,6 +50,15 @@ EOL
       end
     end
 
+    def self.start
+      begin
+        super
+      rescue => e
+        Messages.error e
+        exit 1
+      end
+    end
+
 #     default_task :build
   end
 

data/lib/fluxbox_apps_menu/config.rb

@@ -18,13 +18,13 @@ module FluxboxAppsMenu
 
       yaml = YAML.load_file(@filename)
 
-      @banned_files = yaml[:banned_files]
-      @unhide_files = yaml[:unhide_files]
-      @icon_paths = yaml[:icon_paths]
-      @app_paths = yaml[:app_paths]
-      @menu = yaml[:menu]
-      @icons = yaml[:icons]
-      @terminal = yaml[:terminal]
+      @banned_files = yaml[:banned_files] || []
+      @unhide_files = yaml[:unhide_files] || []
+      @icon_paths = yaml[:icon_paths] || []
+      @app_paths = yaml[:app_paths] || []
+      @menu = yaml[:menu] || {}
+      @icons = yaml[:icons] || {}
+      @terminal = yaml[:terminal] || 'xdg-terminal'
 
       @lang = ENV['LANG'].split('.')[0]
       @lang = { :short => @lang.split('_')[0], :long => @lang }
@@ -35,16 +35,19 @@ module FluxboxAppsMenu
       iname = icon_name        if iname.nil?
 
       return nil if iname.to_s.empty?
-      return iname if iname.to_s.match('/') && File.exists?(iname)
+      return iname if iname.class == String && iname =~ /^\// && File.exists?(iname)
 
-      iname.gsub!(/\.png$/, '')
+      iname = [iname] if iname.class == String
 
-      @icon_paths.each do |p|
-        return "#{p}/#{iname}.png" if File.exists?("#{p}/#{iname}.png")
-      end
+      iname.each do |i|
+        i = File.basename(i, File.extname(i))
 
-      return nil
+        @icon_paths.each do |p|
+          return "#{p}/#{i}.png" if File.exists?("#{p}/#{i}.png")
+        end
+      end
 
+      nil
     end
   end
 end

data/lib/fluxbox_apps_menu/desktop_file.rb

@@ -1,11 +1,11 @@
-require 'inifile'
-#require 'fluxbox_apps_menu/config'
+require 'iniparse'
+
 module FluxboxAppsMenu
 
   class DesktopFile
 
     def initialize(filename, cfg = nil)
-      @ini = IniFile.new(:filename => filename, :comment => '#', :encoding => 'UTF-8')
+      @ini = IniParse.parse(File.read(filename))
       @cfg = cfg.nil? ? FluxboxAppsMenu::Config.new : cfg
       @filename = filename
     end

data/lib/fluxbox_apps_menu/menu.rb

@@ -112,7 +112,7 @@ module FluxboxAppsMenu
             selected, selected_index = result, index unless result.nil?
           end
 
-          raise NoCategoriesError, key unless info.has_key? :categories
+          raise NoMenuCategories, key unless info.has_key? :categories
 
           categories = info[:categories].map { |s| s.downcase unless s.nil? }
 

data/lib/fluxbox_apps_menu/utils.rb

@@ -1,24 +1,97 @@
-class String
-  def black;          "\033[30m#{self}\033[0m" end
-  def red;            "\033[31m#{self}\033[0m" end
-  def green;          "\033[32m#{self}\033[0m" end
-  def yellow;         "\033[33m#{self}\033[0m" end
-  def blue;           "\033[34m#{self}\033[0m" end
-  def magenta;        "\033[35m#{self}\033[0m" end
-  def cyan;           "\033[36m#{self}\033[0m" end
-  def gray;           "\033[37m#{self}\033[0m" end
-  def bg_black;       "\033[40m#{self}\0330m"  end
-  def bg_red;         "\033[41m#{self}\033[0m" end
-  def bg_green;       "\033[42m#{self}\033[0m" end
-  def bg_brown;       "\033[43m#{self}\033[0m" end
-  def bg_blue;        "\033[44m#{self}\033[0m" end
-  def bg_magenta;     "\033[45m#{self}\033[0m" end
-  def bg_cyan;        "\033[46m#{self}\033[0m" end
-  def bg_gray;        "\033[47m#{self}\033[0m" end
-  def bold;           "\033[1m#{self}\033[22m" end
-  def reverse_color;  "\033[7m#{self}\033[27m" end
-end
+module FluxboxAppsMenu
+
+  class ::String
+    def black;          "\033[30m#{self}\033[0m" end
+    def red;            "\033[31m#{self}\033[0m" end
+    def green;          "\033[32m#{self}\033[0m" end
+    def yellow;         "\033[33m#{self}\033[0m" end
+    def blue;           "\033[34m#{self}\033[0m" end
+    def magenta;        "\033[35m#{self}\033[0m" end
+    def cyan;           "\033[36m#{self}\033[0m" end
+    def gray;           "\033[37m#{self}\033[0m" end
+    def bg_black;       "\033[40m#{self}\0330m"  end
+    def bg_red;         "\033[41m#{self}\033[0m" end
+    def bg_green;       "\033[42m#{self}\033[0m" end
+    def bg_brown;       "\033[43m#{self}\033[0m" end
+    def bg_blue;        "\033[44m#{self}\033[0m" end
+    def bg_magenta;     "\033[45m#{self}\033[0m" end
+    def bg_cyan;        "\033[46m#{self}\033[0m" end
+    def bg_gray;        "\033[47m#{self}\033[0m" end
+    def bold;           "\033[1m#{self}\033[22m" end
+    def reverse_color;  "\033[7m#{self}\033[27m" end
+    def cr;             "\r#{self}" end
+    def clean;          "\e[K#{self}" end
+    def new_line;       "\n#{self}" end
+  end
+
+  class Messages
+    def self.error(e)
+      if e.class.to_s =~ /^FluxboxAppsMenu/
+        STDERR.puts e.message.new_line
+      else
+        STDERR.puts 'Error! '.bold.red.new_line + e.message
+      end
+    end
+
+    def self.examining(filename)
+      print '[-] '.bold.blue + "Examining #{filename}... "
+      STDOUT.flush
+      sleep 0.01
+    end
+
+    def self.hidden(name, filename)
+      puts '[H] '.bold.gray.clean.cr + "\"#{name}\" (#{filename})"
+    end
+
+    def self.no_icon(name, filename)
+      puts '[I] '.bold.yellow.clean.cr + "\"#{name}\" (#{filename})"
+    end
+
+    def self.ok(name, filename)
+      puts '[V]'.bold.green.clean.cr + " \"#{name}\" (#{filename})"
+    end
+
+    def self.no_category(name, filename)
+      puts '[C] '.bold.red.clean.cr + "\"#{name}\" (#{filename})" 
+    end
+
+    def self.help
+      puts ''
+      puts 'Quick Help:'
+      puts ''
+      puts '  [V]: Everything is ok'.bold.green
+      puts '  [H]: Hidden app'.bold.gray
+      puts '  [I]: App without icon'.bold.yellow
+      puts '  [C]: App without categories'.bold.red
+      puts ''
+    end
+  end
+
+  class NoMenuCategories < StandardError
+    def initialize(item)
+      super 'Error! '.bold.red + "The menu item \"#{item}\" doesn't have any category, fix it to \"fluxbox_apps_menu.yaml\""
+    end
+  end
+
+  class NoMappedCategories < StandardError
+    def initialize(params)
+      super 'Error! '.bold.red + "The item \"#{params[:name]}\" doesn't have any mapped category among #{params[:categories].join(', ')}, fix it to \"fluxbox_apps_menu.yaml\""
+    end
+  end
+
+  class FileExists < StandardError
+    def initialize(filename)
+      super 'Error! '.bold.red + "The file #{filename} already exists, use the --overwrite switch to avoid this error."
+    end
+  end
+
+  class Interruption < StandardError
+    def initialize
+      super '[X] Ok ok... Exiting!'.bold.blue
+    end
+  end
+
+  Signal.trap('INT') { raise Interruption }
 
-class NoCategoriesError < StandardError
-  
+  Signal.trap('TERM') { raise Interruption }
 end

data/lib/fluxbox_apps_menu/version.rb

@@ -1,3 +1,3 @@
 module FluxboxAppsMenu
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluxbox_apps_menu
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: iniparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement