dynmenu 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fbef625ba9c1b1d7b7cafc3e9a6a0ff91145e22
-  data.tar.gz: 9d03d775d72a47cba114aea4862c12fdd172c801
+  metadata.gz: 0b0807e826ed4e2b62a3f02414b871c7bd85692c
+  data.tar.gz: 8223c9004a9e0da386be65ab1e981383f23e7153
 SHA512:
-  metadata.gz: ec1166c12fd6c14e2f35021961b93d3ec654911a27b77eb5afab0ce710c999a923e78724170eb301fe64ae2e605018ff88e3ff306853ebddac97ac7818c9f213
-  data.tar.gz: 2643c5214aa05c60ea5688ab4e51e428a8ab8fff7e096d04d746792f0033be723c3dbf30e966970acb25249e7364d1add2334a866bc4556f181bfe9a7e47a2bc
+  metadata.gz: 0f76c72085fba64d0a6c70abdaac03da321ceba564effe171551df5aac7ac78cfed42104eeab2cedc413fef0fccd8e5e037769b9811bd815ce45e66a40f65607
+  data.tar.gz: aba4d0d4449ca58b6c1d36368aaaa9cffa3ebdb0ddcce0d3a22cf122cdde342e1348196f5abe8228739db664664f3a987abe22d4e87059e23ab0377b729ad5b4

data/bin/dynmenu

@@ -10,7 +10,6 @@ $launcher = false
 begin
     require 'subtle/subtlext'
     $subtle = false unless Subtlext::Subtle.running? 
-    $current_client = Subtlext::Client.current
 rescue LoadError
     $subtle = false
 end

data/lib/command.rb

@@ -3,167 +3,185 @@ require 'uri'
 
 
 class Command
-    @@RE_COMMAND = Regexp.new(/^[+\^\*]*.+(\s[+\^\*])*(\s[@#][A-Za-z0-9_-]+)*$/)
-    @@RE_MODES   = Regexp.new(/^[+\^\*=]+$/)
-    @@RE_CURRENT = Regexp.new(/^&(*[+-](([A-Za-z0-9_]+-*)+))/)
-    @@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
-        clear_subtle_vars
-        self.command = command
+  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):\/\/.*/)
+  MODES = { '+' => :full, '^' => :float, '*' => :stick, '=' => :zaphod }
+
+  include Item
+
+  attr_reader :tags, :views, :app, :modes, :command
+
+  def initialize name, command = nil
+    @name = name
+    clear_subtle_vars
+    self.command = command
+  end
+
+  def clear_subtle_vars
+    @tags = []
+    @views = []
+    @app = ""
+    @modes = []
+  end
+
+  def encode_with coder
+    coder['name'] = @name
+    coder['command'] = @command
+    coder['tags'] = @tags
+    coder['views'] = @views
+    coder['app'] = @app
+    coder['modes'] = @modes
+  end
+
+  def init_with coder
+    @name = coder['name']
+    @command = coder['command']
+    @tags = coder['tags']
+    @views = coder['views']
+    @app = coder['app']
+    @modes = coder['modes']
+  end
+
+  def command= command
+    unless command.nil? || command.empty?
+      if RE_URI.match command
+        command = uri_command(Regexp.last_match(0))
+      elsif RE_SEARCH.match command
+        command = web_search Regexp.last_match(1) 
+      elsif $subtle
+        command = subtle_command(command)
+      end
     end
+    @command = command
+  end
+
+  def uri_command uri
+    command = uri.split(/\s+/)[-1]
+    command.prepend("http://") unless RE_PROTO.match command
+    command = URI.parse command
+  end
 
-    def clear_subtle_vars
-        @tags = []
-        @views = []
-        @app = ""
-        @modes = []
+  def web_search search_string, engine = :google
+    escaped_string = URI.escape search_string
+    case engine
+    when :duckduckgo then escaped_string.prepend "https://duckduckgo.com/?q="
+    else escaped_string.prepend "https://www.google.com/#q="
     end
+    URI.parse escaped_string
+  end
 
-    def encode_with coder
-        coder['name'] = @name
-        coder['command'] = @command
-        coder['tags'] = @tags
-        coder['views'] = @views
-        coder['app'] = @app
-        coder['modes'] = @modes
+  def subtle_command command
+    if RE_METHOD.match(command)
+      command = Regexp.last_match(0).to_sym      
+    elsif RE_COMMAND.match command
+      clear_subtle_vars
+      parse_subtle_args command.split
+    else
+      @app = command
     end
+  end
 
-    def init_with coder
-        @name = coder['name']
-        @command = coder['command']
-        @tags = coder['tags']
-        @views = coder['views']
-        @app = coder['app']
-        @modes = coder['modes']
+  def parse_subtle_args args
+    args.each do |arg|
+      case arg[0]
+      when '#' then add_tag arg
+      when '@' then add_view arg
+      when '+', '^', '*', '=' then add_mode arg
+      else
+        set_app arg
+      end
+    end
+    if @views.any? and not @app.empty? and @tags.empty?
+      @tags << "tag_#{rand(1337)}"
     end
+  end
 
-    def command= command
-        unless command.nil? || command.empty?
-            if @@RE_URI.match command
-                split = Regexp.last_match(0).split(/\s+/)
-                command = split[split.length - 1]
-                command.prepend("http://") unless @@RE_PROTO.match command
-                command = URI.parse command
-            elsif @@RE_SEARCH.match command
-                command = web_search Regexp.last_match(1) 
-            elsif $subtle
-                if @@RE_METHOD.match(command)
-                    command = Regexp.last_match(0).to_sym      
-                elsif @@RE_COMMAND.match command
-                    clear_subtle_vars
-
-                    command.split.each do |arg|
-                        case arg[0]
-                        when '#' then @tags << arg[1..-1]
-                        when '@' then @views << arg[1..-1]
-                        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
-                            else
-                                @app += ' ' + arg
-                            end
-                        end
-                    end
-                    if @views.any? and not @app.empty? and @tags.empty?
-                        @tags << "tag_#{rand(1337)}"
-                    end
-                else
-                    @app = command
-                end
-            end
-        end
-        @command = command
+  def add_tag arg
+    @tags << arg[1..-1]      
+  end
+
+  alias :add_view :add_tag
+
+  def add_mode arg
+    modes = RE_MODES.match(arg).to_s.split('')
+    @modes += modes.split.map do |mode|
+      MODES[mode]
     end
+  end
 
-    def web_search search_string, engine = :google
-        escaped_string = URI.escape search_string
-        case engine
-        when :duckduckgo then escaped_string.prepend "https://duckduckgo.com/?q="
-        else escaped_string.prepend "https://www.google.com/#q="
-        end
-        URI.parse escaped_string
+  def set_app arg
+    if @app.nil? || @app.empty?
+      @app = arg
+    else
+      @app += ' ' + arg
     end
+  end
 
-    def find_browser
-        begin
-            if @browser.nil?
-                Subtlext::Client.all.each do |c|
-                    if c.klass.match(@@RE_BROWSER)
-                        @browser = c
-                        @view = c.views.first
-                        return
-                    end
-                end
-            end
-        rescue
-            @browser = nil
-            @view = nil
+  def find_browser
+    begin
+      if @browser.nil?
+        Subtlext::Client.all.each do |c|
+          if c.klass.match(RE_BROWSER)
+            @browser = c
+            @view = c.views.first
+            return
+          end
         end
+      end
+    rescue
+      @browser = nil
+      @view = nil
     end
+  end
 
-    def execute
-        case @command
-        when String
-            if $subtle
-                subtle_execute
-            else
-                command = "#{@command} &>/dev/null"
-                puts command if $debug
-                system command 
-            end
-        when URI
-            command = "xdg-open '#{@command.to_s}' &>/dev/null"
-            puts command if $debug
-            system command
-            if $subtle
-                browser = find_browser
-                browser.focus unless browser.nil?
-            end 
-        end
-        true
+  def execute
+    case @command
+    when String
+      if $subtle
+        subtle_execute
+      else
+        command = "#{@command} &>/dev/null"
+        puts command if $debug
+        system command 
+      end
+    when URI
+      command = "xdg-open '#{@command.to_s}' &>/dev/null"
+      puts command if $debug
+      system command
+      if $subtle
+        browser = find_browser
+        browser.focus unless browser.nil?
+      end 
     end
+    true
+  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
-            tag
-        end
-        @views.each do |v|
-            view = Subtlext::View.first(v) || Subtlext::View.new(v)
-            view.save
-            view.tag(tags) unless view.nil? or tags.empty?
-        end
-        unless (client = Subtlext::Client.spawn(@app)).nil?
-            client.tags = tags unless tags.empty?
-            client.flags = @modes unless @modes.empty?
-        end
-        true
+  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
+      tag
+    end
+    @views.each do |v|
+      view = Subtlext::View.first(v) || Subtlext::View.new(v)
+      view.save
+      view.tag(tags) unless view.nil? or tags.empty?
+    end
+    unless (client = Subtlext::Client.spawn(@app)).nil?
+      client.tags = tags unless tags.empty?
+      client.flags = @modes unless @modes.empty?
     end
+    true
+  end
 end

data/lib/menu.rb

@@ -7,6 +7,7 @@ class Menu
 
     attr_accessor :style
     attr_writer :name
+    attr_writer :path
 
     def initialize name
         self.name = name
@@ -15,10 +16,15 @@ class Menu
         set_item(Editor.new self) unless self.is_a? Dynamic
     end
 
+    def path
+      @path ||= '$PATH'
+    end
+
     def encode_with coder
         coder['name'] = @name
         coder['items'] = items
         coder['style'] = style
+        coder['path'] = path
     end
 
     def init_with coder
@@ -26,6 +32,7 @@ class Menu
         @items = coder['items']
         self.style = coder['style']
         set_item(Editor.new self)
+        self.path = coder['path']
     end
 
     def set_item item

data/lib/run_menu.rb

@@ -32,7 +32,7 @@ class Run_Menu < Menu
         super items, self.name
     end
 
-    def get_files dirs = (`echo $PATH`).split(':')
+    def get_files dirs = `echo #{path}`.split(':')
         @files = []
         dirs.each do |dir|
             get_files_rec dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynmenu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Joakim Reinert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies: []
 description: A dmenu wrapper for subtle wm
 email: mail@jreinert.com
@@ -17,15 +17,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/history.rb
 - lib/item.rb
 - lib/editor.rb
 - lib/style.rb
+- lib/dynamic.rb
 - lib/menu.rb
-- lib/root_menu.rb
 - lib/run_menu.rb
-- lib/history.rb
-- lib/dynamic.rb
 - lib/command.rb
+- lib/root_menu.rb
 - bin/dynmenu
 homepage: https://github.com/supasnashbuhl/dynmenu
 licenses: []
@@ -47,9 +47,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - dmenu
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Dynmenu
 test_files: []
-has_rdoc: