dynmenu 0.1 → 0.1.1

data/bin/dynmenu

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
+
 require 'yaml'
+
 $subtle = true
 $lines = 20
 begin
@@ -58,6 +60,7 @@ else
 end
 
 file = ARGV[ARGV.length - 1]
+
 if File.exist? file
     menu = YAML::load File.read(file)
 else

data/lib/command.rb

@@ -1,57 +1,52 @@
 require 'item'
+require 'uri'
+
 
 class Command
-    if $subtle
-        @@RE_COMMAND = Regexp.new(/^[+\^\*]*.+(\s[+\^\*])*(\s[@#][A-Za-z0-9_-]+)*$/)
-        @@RE_MODES   = Regexp.new(/^[+\^\*]+$/)
-        @@RE_SEARCH  = Regexp.new(/^[gs]\s+(.*)/)
-        @@RE_METHOD  = Regexp.new(/^:\s*(.*)/)
-        @@RE_BROWSER = Regexp.new(/(chrom[e|ium]|iron|navigator|firefox|opera)/i) 
-    end
+    @@RE_COMMAND = Regexp.new(/^[+\^\*]*.+(\s[+\^\*])*(\s[@#][A-Za-z0-9_-]+)*$/)
+    @@RE_MODES   = Regexp.new(/^[+\^\*=]+$/)
+    @@RE_METHOD  = Regexp.new(/^:\s*(.*)/)
+    @@RE_BROWSER = Regexp.new(/(chrom[e|ium]|iron|navigator|firefox|opera)/i) 
+    @@RE_SEARCH  = Regexp.new(/^[gs]\s+(.*)/)
     @@RE_URI = Regexp.new(/^((w\s+((https?|ftp):\/\/)?)|(https?|ftp):\/\/)(?:[A-Z0-9-]+.)+[A-Z]{2,6}([\/?].+)?$/i)
     @@RE_PROTO = Regexp.new(/^(http|https):\/\/.*/)
 
     include Item
 
+    attr_reader :tags, :views, :app, :modes, :command
+
     def initialize name, command = nil
         @name = name
-        if $subtle
-            @tags = []
-            @views = []
-            @app = ""
-            @modes = ""
-        end
+        clear_subtle_vars
+        self.command = command
+    end
 
-        set_command command
+    def clear_subtle_vars
+        @tags = []
+        @views = []
+        @app = ""
+        @modes = []
     end
 
     def encode_with coder
         coder['name'] = @name
         coder['command'] = @command
-        if $subtle
-            coder['tags'] = @tags
-            coder['views'] = @views
-            coder['app'] = @app
-            coder['modes'] = @modes
-        end
+        coder['tags'] = @tags
+        coder['views'] = @views
+        coder['app'] = @app
+        coder['modes'] = @modes
     end
 
     def init_with coder
         @name = coder['name']
         @command = coder['command']
-        if $subtle
-            @tags = coder['tags'] || []
-            @views = coder['views'] || []
-            @app = coder['app'] || ""
-            @modes = coder['modes'] || ""
-        end
-    end
-
-    def command
-        @command
+        @tags = coder['tags']
+        @views = coder['views']
+        @app = coder['app']
+        @modes = coder['modes']
     end
 
-    def set_command command
+    def command= command
         unless command.nil? || command.empty?
             if @@RE_URI.match command
                 split = Regexp.last_match(0).split(/\s+/)
@@ -64,17 +59,22 @@ class Command
                 if @@RE_METHOD.match(command)
                     command = Regexp.last_match(0).to_sym      
                 elsif @@RE_COMMAND.match command
-                    @tags = []
-                    @views = []
-                    @app = ""
-                    @modes = ""
+                    clear_subtle_vars
 
                     command.split.each do |arg|
                         case arg[0]
                         when '#' then @tags << arg[1..-1]
                         when '@' then @views << arg[1..-1]
-                        when '+', '^', '*'
-                            @modes += @@RE_MODES.match(arg).to_s
+                        when '+', '^', '*','='
+                            mode_s = @@RE_MODES.match(arg).to_s
+                            @modes += mode_s.split(//).map! do |c|
+                                case c
+                                when '+' then :full
+                                when '^' then :float
+                                when '*' then :stick
+                                when '=' then :zaphod
+                                end
+                            end
                         else
                             if @app.nil? || @app.empty?
                                 @app = arg
@@ -129,11 +129,10 @@ class Command
                 system "#{@command} &>/dev/null"
             end
         when URI
-            puts @command.to_s
-            system "xdg-open '%s' &>/dev/null &" % [ @command.to_s ]
+            system "xdg-open '%s' &>/dev/null" % [ @command.to_s ]
             if $subtle
-                find_browser
-                @browser.focus unless @browser.nil?
+                browser = find_browser
+                browser.focus unless browser.nil?
             end 
         end
         true
@@ -152,23 +151,8 @@ class Command
         end
         unless (client = Subtlext::Client.spawn(@app)).nil?
             client.tags = tags unless tags.empty?
-            unless @modes.empty?
-                flags = []
-
-                @modes.each_char do |c|
-                    case c
-                    when '+' then flags << :full
-                    when '^' then flags << :float
-                    when '*' then flags << :stick
-                    when '=' then flags << :zaphod
-                    end
-                end
-                client.flags = flags
-            end
+            client.flags = @modes unless @modes.empty?
         end
-    end
-
-    def to_s
-        "#{@name} => #{command}"
+        true
     end
 end

data/lib/editor.rb

@@ -1,6 +1,7 @@
 require 'menu'
 require 'dynamic'
 
+
 class Editor < Menu
     
     include Dynamic
@@ -12,12 +13,12 @@ class Editor < Menu
     end
 
     def name
-        "> #{@@name}"
+        "> #{Editor.name}"
     end
 
     def initialize parent
         @parent = parent
-        set_style parent.style
+        self.style = parent.style
     end
 
     def to_s
@@ -35,13 +36,13 @@ class Editor < Menu
             entries << "Done"
             selection = show_menu entries, @@name
             case entries.index selection
-            when 0 then @parent.set_name show_menu([@parent.name], "Edit Name")
-            when 1 then @parent.set_style show_style_menu
+            when 0 then @parent.name = show_menu([@parent.name], "Edit Name")
+            when 1 then @parent.style = show_style_menu
             when 2 then show_entries_menu
             when 3 then show_run_menu_menu
             end
         end
-        @parent.execute
+        false
     end
 
     def show_run_menu_menu
@@ -57,7 +58,7 @@ class Editor < Menu
             entries << "Done"
             selection = show_menu entries, "Run menu"
             case entries.index selection
-            when 0 then @parent.set_run_menu !@parent.run_menu?
+            when 0 then @parent.run_menu = !@parent.run_menu?
             when 1 then show_history_menu
             end
         end
@@ -78,15 +79,15 @@ class Editor < Menu
             entries << "Done"
 
             selection = show_menu entries, "History"
-            case entries.index.selection
+            case entries.index selection
             when 0
                 selection = (show_menu [], "Enter a number")
                 number = selection.to_i
-                @parent.history.set_length number unless number < 1 || number.to_s != selection
+                @parent.history.length = number unless number < 1 || number.to_s != selection
             when 1
                 selection = (show_menu [], "Enter a number")
                 number = (show_menu [], "Enter a number").to_i
-                @parent.history.set_show_num_items number unless number.to_s != selection
+                @parent.history.show_num_items = number unless number.to_s != selection
             when 2 then clear = !clear
             when (entries.length - 1) then @parent.history.clear if clear
             end
@@ -112,7 +113,7 @@ class Editor < Menu
             colors = [:bg, :fg, :bg_hi, :fg_hi]
             unless (entries.index selection).nil?
                 if (entries.index selection) < 4
-                    style.set_color colors[entries.index selection], show_menu([style.color(colors[entries.index selection])], "Enter a color")
+                    style.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")
@@ -120,7 +121,7 @@ class Editor < Menu
                         selection = show_menu([style.font], "Set font")
                     end
                     unless selection.nil? || selection == "default"
-                        style.set_font selection
+                        style.font = selection
                     end
                 end
             end
@@ -202,12 +203,12 @@ class Editor < Menu
             case entries.index selection
             when 0 
                 new_name = show_menu([command.name], "Enter a name")
-                command.set_name new_name unless new_name.empty?
+                command.name = new_name unless new_name.empty?
             when 1 
                 history = History.new 1, 1
                 history.update command.command unless command.command.nil? or command.command.empty?
                 new_command = Run_Menu.new(self, history, "Enter a command").show_menu
-                command.set_command new_command unless new_command.empty?
+                command.command = new_command unless new_command.empty?
             when 2 then delete = !delete unless new
             end
         end
@@ -219,7 +220,7 @@ class Editor < Menu
         new = menu.nil?
         if new
             menu = Menu.new "New menu"
-            menu.set_style @parent.style
+            menu.style = @parent.style
         end
         @parent.remove_item menu
         entries = []
@@ -241,7 +242,7 @@ class Editor < Menu
             selection = show_menu entries, string
             if (entries.index selection) == 0
                 new_name = show_menu [], "Enter a name"
-                menu.set_name new_name unless new_name.empty?
+                menu.name = new_name unless new_name.empty?
             end
             delete = !delete if (entries.index selection) == 1 && !new
         end

data/lib/history.rb

@@ -1,24 +1,11 @@
 class History
-    def initialize length, show_num_items = 5
-        @items = {}
-        set_length length
-        set_show_num_items show_num_items
-    end
-    
-    def length
-        @length
-    end
 
-    def show_num_items
-        @show_num_items
-    end
+    attr_accessor :length, :show_num_items
 
-    def set_length length
-        @length = length
-    end
-
-    def set_show_num_items num
-        @show_num_items = num
+    def initialize length, show_num_items = 5
+        @items = {}
+        self.length = length
+        self.show_num_items = show_num_items
     end
 
     def update item
@@ -30,11 +17,8 @@ class History
     end
 
     def items 
-        ret = {
-            :first => ((@items.sort_by {|item,age| age}).map {|pair| pair.first}).first(@show_num_items)
-        }
-        ret.store :rest, (@items.reject {|item, age| ret[:first].include? item}).keys
-        ret
+        sorted_items = (@items.sort_by {|item,age| age}).map {|pair| pair.first}
+        sorted_items.partition {|item| sorted_items.index(item) < (@show_num_items)}
     end
 
     def clear

data/lib/item.rb

@@ -3,7 +3,7 @@ module Item
         @name
     end
 
-    def set_name name
+    def name= name
         @name = name
     end
 end

data/lib/menu.rb

@@ -1,27 +1,31 @@
 require 'item'
 
+
 class Menu
 
     include Item
 
+    attr_accessor :style
+    attr_writer :name
+
     def initialize name
-        @name = name
+        self.name = name
         @items = Hash.new
-        @style = Style.new
-        set_item Editor.new self
+        self.style = Style.new
+        set_item(Editor.new self) unless self.is_a? Dynamic
     end
 
     def encode_with coder
         coder['name'] = @name
         coder['items'] = items
-        coder['style'] = @style
+        coder['style'] = style
     end
 
     def init_with coder
-        @name = coder['name']
+        self.name = coder['name']
         @items = coder['items']
-        @style = coder['style']
-        set_item Editor.new self
+        self.style = coder['style']
+        set_item(Editor.new self)
     end
 
     def set_item item
@@ -40,14 +44,6 @@ class Menu
         "> #{super}"
     end
 
-    def style
-        @style
-    end
-
-    def set_style style
-        @style = style
-    end
-
     def to_s
         string = "#{name}\n"
         string += (@items.keys.sort.map {|name| name.prepend("  ")}).join("\n")
@@ -84,8 +80,8 @@ class Menu
 
     def get_font_string
         font = ""
-        unless @style.font.nil?
-            font = "-fn \"#{@style.font}\""
+        unless self.style.font.nil?
+            font = "-fn \"#{self.style.font}\""
         end
         font
     end

data/lib/root_menu.rb

@@ -1,9 +1,13 @@
 require 'menu'
+
 class Root_Menu < Menu
 
+    attr_writer :run_menu
+    attr_reader :history
+
     def initialize history_length = 1000, history_items = 5
         super "Dynmenu"
-        @run_menu = true
+        self.run_menu = true
         @history = History.new history_length, history_items
         set_item Run_Menu.new self, @history
     end
@@ -21,9 +25,6 @@ class Root_Menu < Menu
         end
     end
 
-    def set_run_menu value
-        @run_menu = value
-    end
 
     def encode_with coder
         super

data/lib/run_menu.rb

@@ -4,12 +4,12 @@ class Run_Menu < Menu
 
     include Dynamic
 
-    @@RE_HIDDEN = Regexp.new /\/{,1}\.[^\/]*$/ 
+    @@RE_HIDDEN = Regexp.new(/(^|\/)\.[^\/]*$/i)
         def initialize parent, history = History.new(1, 5), name = "Run"
-            @name = name 
+            self.name = name 
             @parent = parent
             @history = history
-            set_style parent.style
+            self.style = parent.style
         end
 
     def name
@@ -26,8 +26,10 @@ class Run_Menu < Menu
     def show_menu
         get_files
         history_items = @history.items
-        items = history_items[:first] + @files + history_items[:rest] 
-        super items, @name
+        items = history_items.first
+        items << '---' unless items.empty?
+        items += @files + history_items[1]
+        super items, self.name
     end
 
     def get_files dirs = (`echo $PATH`).split(':')

data/lib/style.rb

@@ -9,7 +9,7 @@ class Style
         }
     end
 
-    def set_color color, value
+    def color= color, value
         unless @colors.keys.include? color
             raise ArgumentError, "Invalid key!"
         end
@@ -26,7 +26,7 @@ class Style
         @colors[color]
     end
 
-    def set_font font
+    def font= font
         @font = font
     end
     def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynmenu
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies: []
 description: A dmenu wrapper for subtle wm
 email: mail@jreinert.com
@@ -46,10 +46,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- dmenu
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dynmenu
 test_files: []
+has_rdoc: