dynmenu 0.1.1 → 0.1.2

data/bin/dynmenu

@@ -2,13 +2,17 @@
 
 require 'yaml'
 
+$debug = false
 $subtle = true
 $lines = 20
+$location = '-b '
+$launcher = false
 begin
     require 'subtle/subtlext'
 rescue LoadError
     $subtle = false
 end
+$subtle = false unless `pgrep subtle`.to_i > 0
 require 'root_menu'
 require 'command'
 require 'style'
@@ -34,13 +38,18 @@ Usage:  dynmenu [options] file
     Options:        -h --help   : Show this help
                     -r          : Open the menu as read only and static
                     -l <number> : Show max <number> lines in the menu (default=20)
+                    -t          : Show dynmenu on top and not at the bottom.
+                    -d          : Debug mode. Shows additional information for commands.
+                    --launcher  : Show only a launcher
+                                  (this would normally be under '>> Run' in the Menu)
+
     File:                       : The menu file to be loaded and saved to.
                                   It will be created if not existing.
 END_USAGE
 
 puts license
 
-if ARGV.length > 4 || ARGV.length < 1 || ARGV.include?("-h") || ARGV.include?("--help")
+if ARGV.length > 6 || ARGV.length < 1 || ARGV.include?("-h") || ARGV.include?("--help")
     puts usage
     exit
 elsif ARGV.include? "-l"
@@ -58,9 +67,11 @@ else
         end
     end
 end
+$debug = true if ARGV.include? '-d'
+$location = '' if ARGV.include? '-t'
+$launcher = true if ARGV.include? '--launcher'
 
 file = ARGV[ARGV.length - 1]
-
 if File.exist? file
     menu = YAML::load File.read(file)
 else

data/lib/command.rb

@@ -126,10 +126,14 @@ class Command
             if $subtle
                 subtle_execute
             else
-                system "#{@command} &>/dev/null"
+                command = "#{@command} &>/dev/null"
+                puts command if $debug
+                system command 
             end
         when URI
-            system "xdg-open '%s' &>/dev/null" % [ @command.to_s ]
+            command = "xdg-open '#{@command.to_s}' &>/dev/null"
+            puts command if $debug
+            system command
             if $subtle
                 browser = find_browser
                 browser.focus unless browser.nil?
@@ -139,6 +143,12 @@ class Command
     end
 
     def subtle_execute
+        if $debug
+            puts "App: #{@app}"
+            puts "Tags: #{@tags.to_s}"
+            puts "Views: #{@views.to_s}"
+            puts "Modes: #{@modes.to_s}"
+        end
         tags = @tags.map do |t|
             tag = Subtlext::Tag.first(t) || Subtlext::Tag.new(t)
             tag.save

data/lib/editor.rb

@@ -113,7 +113,7 @@ class Editor < Menu
             colors = [:bg, :fg, :bg_hi, :fg_hi]
             unless (entries.index selection).nil?
                 if (entries.index selection) < 4
-                    style.color = colors[entries.index selection], show_menu([style.color(colors[entries.index selection])], "Enter a color")
+                    style.set_color colors[entries.index selection], show_menu([style.color(colors[entries.index selection])], "Enter a color")
                 elsif (entries.index selection) < 5
                     if style.font.nil?
                         selection = show_menu(["default"], "Set font")

data/lib/menu.rb

@@ -74,7 +74,7 @@ class Menu
         unless $read_only || self.is_a?(Dynamic)
             entries << "> #{Editor.name}"
         end
-        command = "echo \"#{entries.join "\n"}\" | dmenu -i -b -l #{$lines} #{get_font_string} -nf \"#{@style.color :fg}\" -nb \"#{@style.color :bg}\" -sf \"#{@style.color :fg_hi}\" -sb \"#{@style.color :bg_hi}\" -p \"#{name}\""
+        command = "echo \"#{entries.join "\n"}\" | dmenu -i #{$location}-l #{$lines} #{get_font_string} -nf \"#{@style.color :fg}\" -nb \"#{@style.color :bg}\" -sf \"#{@style.color :fg_hi}\" -sb \"#{@style.color :bg_hi}\" -p \"#{name}\""
         (`#{command}`).strip
     end
 

data/lib/root_menu.rb

@@ -12,6 +12,13 @@ class Root_Menu < Menu
         set_item Run_Menu.new self, @history
     end
 
+    def execute
+        if $launcher
+            return Run_Menu.new(self, @history).execute unless @run_menu
+            @items.each_value {|item| return item.execute if item.is_a? Run_Menu}
+        end    
+        super
+    end
     def run_menu?
         @run_menu
     end
@@ -25,7 +32,6 @@ class Root_Menu < Menu
         end
     end
 
-
     def encode_with coder
         super
         coder['run_menu'] = @run_menu

data/lib/style.rb

@@ -1,5 +1,5 @@
 class Style
-    @@re_color = Regexp.new(/^#[0-9a-fA-F]{6}$/)
+    @@re_color = Regexp.new(/^#(([0-9a-fA-F]{6})|([0-9a-fA-F]{3}))$/)
     def initialize
         @colors = {
             :bg     => "#202020",
@@ -9,7 +9,7 @@ class Style
         }
     end
 
-    def color= color, value
+    def set_color color, value
         unless @colors.keys.include? color
             raise ArgumentError, "Invalid key!"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynmenu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: