fluxbox_apps_menu 1.1.2 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d0396fb427fa3641352a8803e034f697afac4d60
+  data.tar.gz: 7b53ce6ad5c763e07cd42706933320dd6bbcbe6d
+SHA512:
+  metadata.gz: 883eaeab6f1e6f6e8b76b5c1783856065c64d9923cb2a83b39ef8e9310934da7d977e00b6202da034643975bad3395cec7571cd0302cc510ccf066af9b9545cd
+  data.tar.gz: 020895fcbc7c2527015bb3c5e672d830bb9286933870802e4e99fd0f277cd222a805ca2cb01a82db9382fbeb341126c491f92ebc787bccdb9fec934d84e8258c

data/Gemfile.lock

@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     inifile (3.0.0)
-    rake (10.1.1)
+    rake (10.1.0)
     thor (0.19.1)
 
 PLATFORMS

data/lib/fluxbox_apps_menu.rb

@@ -56,26 +56,32 @@ module FluxboxAppsMenu
           name = ini.name
 
           if ini.hidden? 
-            puts '[Hidden] '.bold.green + "The application #{name} is hidden" unless @silent
+            puts '[Hidden] '.bold.green + "The application \"#{name}\" is hidden" unless @silent
             next
           end
 
           cat = ini.categories
           if cat.nil?
-            puts '[No Category] '.bold.red + "The application #{name} doesn't have any category" unless @silent
+            puts '[No Category] '.bold.red + "The application \"#{name}\" doesn't have any category" unless @silent
             next
           end
 
-          submenu = @fmenu.assign_menu(cat, name)
+          begin
+            submenu = @fmenu.assign_menu(cat, name)  
+          rescue NoCategoriesError => e
+            puts '[No category] '.bold.red + "The \"#{e.message}\" menu item doesn't have any categoty, check your \"fluxbox_menu_apps.yaml\""
+            exit
+          end
+
           unless submenu.nil?
             icon = ini.icon
             if icon.nil?
-              puts '[No Icon] '.bold.yellow + "#{name} doesn't have any icon" unless @silent
+              puts '[No Icon] '.bold.yellow + "The application \"#{name}\" doesn't have any icon" unless @silent
             end
 
             submenu[name] = @fmenu.item_exec(name, icon, ini.exec)
           else
-            puts "[No mapped category] #{name} doesn't have any mapped category within the menu".bold.red unless @silent
+            puts '[No mapped category] '.bold.red + "The application \"#{name}\" doesn't have any mapped category among: #{ini.categories.join(', ')}" unless @silent
           end
         end
       end

data/lib/fluxbox_apps_menu.yaml

@@ -14,6 +14,8 @@
 - /usr/share/pixmaps
 - /usr/share/icons/hicolor/32x32/apps
 - /usr/share/icons/oxygen/16x16/categories
+- /usr/share/icons/oxygen/16x16/status
+- /usr/share/icons/oxygen/16x16/devices
 - /usr/share/icons/hicolor/48x48/apps
 - /usr/share/icons/hicolor/128x128/apps
 :app_paths:
@@ -68,8 +70,26 @@
     - System
     - DesktopSettings
     - Documentation
+    '. / Gnome /':
+      :icon:
+      :mandatory_categories:
+      - X-GNOME-Settings-Panel
+      :categories:
+      - X-GNOME-Settings-Panel
+      Desktop:
+        :icon: 
+        :categories:
+        - X-GNOME-PersonalSettings
+      Hardware:
+        :categories:
+        - HardwareSettings
+      System:
+        :categories:
+        - X-GNOME-SystemSettings
     '. / Yast /':
-      :icon: yast-mascot
+      :icon: yast
+      :mandatory_categories:
+      - X-SuSE-YaST
       :categories:
       - Yast
       Hardware:
@@ -109,6 +129,17 @@
     :categories:
     - Archiving
     - Utility
+    '. / Emulators /':
+      :icon: cpu
+      :categories:
+      -
+      -
+      - Emulator
+      Wine: 
+        :icon: wine
+        :categories:
+        - Wine
+        - Wine-Programs-Accessories
     '. / Text Files /':
       :icon: accessories-text-editor
       :categories:

data/lib/fluxbox_apps_menu/desktop_file.rb

@@ -22,7 +22,7 @@ module FluxboxAppsMenu
     end
 
     def hidden?
-      @ini['Desktop Entry']['NoDisplay'] == true
+       %w(true 1).include? @ini['Desktop Entry']['NoDisplay'].to_s
     end
 
     def banned_file?
@@ -31,20 +31,6 @@ module FluxboxAppsMenu
     end
 
     def icon
-=begin      
-      iname = @cfg.icons[name(false)]
-      iname = @ini['Desktop Entry']['Icon'] if iname.nil?
-
-      return nil if iname.to_s.empty?
-      return iname if iname.to_s.match('/') && File.exists?(iname)
-
-      iname.gsub!(/\.png$/, '')
-
-      @cfg.icon_paths.each do |p|
-        return "#{p}/#{iname}.png" if File.exists?("#{p}/#{iname}.png")
-      end
-      return nil
-=end
       @cfg.expand_icon(name(false), @ini['Desktop Entry']['Icon'])
     end
 
@@ -60,7 +46,7 @@ module FluxboxAppsMenu
     def exec
       com = @ini['Desktop Entry']['Exec'].to_s.gsub('%c', name).gsub('%F', '')
         .gsub('%i', '').gsub('%U', '').gsub('%f', '').gsub('%m', '')
-        .gsub('%u', '').gsub(/[ ]{2,}/, ' ').gsub(/\ }/, '}')
+        .gsub('%u', '').gsub(/[ ]{2,}/, ' ').gsub(/\ }/, '}').strip
 
       terminal? ? @cfg.terminal + ' ' + com : com
     end

data/lib/fluxbox_apps_menu/menu.rb

@@ -7,7 +7,7 @@ module FluxboxAppsMenu
     end
 
     def assign_menu(cat, label)
-      traverse_menu(@cfg.menu, cat, label)[0]
+      traverse_menu(@cfg.menu, cat.map(&:downcase), label)[0]
     end
 
     def render
@@ -36,7 +36,6 @@ module FluxboxAppsMenu
       str << "{#{command}}" unless command.nil?
       str << "<#{icon}>" unless icon.to_s.empty?
 
-      # "[#{type}]#{label}#{command}#{icon}"
       str.join(' ')
     end
 
@@ -54,20 +53,30 @@ module FluxboxAppsMenu
           # when a label is set the path has high priority 
           return [info, 0] if info.has_key?(label)
 
+          if info.has_key? :mandatory_categories
+            info[:mandatory_categories] = info[:mandatory_categories].map(&:downcase)
+            next unless (info[:mandatory_categories] & cat) == info[:mandatory_categories]
+          end
+
           unless subitems.to_hash.empty?
-            result, index = traverse_menu(subitems, cat, label, selected_index) 
-            selected, selected_index = result, index unless result.nil? 
+            result, index = traverse_menu(subitems, cat, label, selected_index)
+            selected, selected_index = result, index unless result.nil?
           end
 
+          raise NoCategoriesError, key unless info.has_key? :categories
+
+          categories = info[:categories].map { |s| s.downcase unless s.nil? }
+
           cat.each do |c|
-            if info[:categories].include?(c.strip)
-              i = info[:categories].index(c)
+            if categories.include?(c.strip)
+              i = categories.index(c)
               if i < selected_index
                 selected = info 
                 selected_index = i
               end
             end
-          end if info.has_key? :categories
+          end
+
         end
       end
 
@@ -82,22 +91,21 @@ module FluxboxAppsMenu
       menu = menu.select { |k, v| k.class == String }.sort_by { |k, v| v.class == String ? k.downcase : '' }
       menu.each do |name, items|
         if items.class.to_s == 'Hash'
-          text += prefix + item_submenu(name, @cfg.expand_icon(nil, items[:icon])) + "\n"
-
+          icon = items[:icon]
           items = items.select { |k, v| k.class == String }
+          subitems = render_menu(items, level + 1)
 
-          text += render_menu(items, level + 1)
+          unless subitems.empty?
+            text += "#{prefix}#{item_submenu(name, @cfg.expand_icon(nil, icon))}\n#{subitems}#{prefix}[end]\n"
+          end
 
-          text += "#{prefix}[end]\n"
         elsif items.class.to_s == 'String'
           text += prefix + items + "\n"
         end
       end
 
       text
-
     end
 
   end
-
 end

data/lib/fluxbox_apps_menu/utils.rb

@@ -19,3 +19,6 @@ class String
   def reverse_color;  "\033[7m#{self}\033[27m" end
 end
 
+class NoCategoriesError < StandardError
+  
+end

data/lib/fluxbox_apps_menu/version.rb

@@ -1,3 +1,3 @@
 module FluxboxAppsMenu
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: fluxbox_apps_menu
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Fabio Mucciante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This script reads the .desktop files installed and build the application's
@@ -102,26 +93,25 @@ files:
 homepage: https://github.com/fabiomux/fluxbox_apps_menu
 licenses:
 - GPL v.3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Build the Fluxbox apps menu.
 test_files: []