dmenu 0.0.2 → 1.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) <YEAR>, Dominik Honnef <dominikho@gmx.net>
+Copyright (c) 2014, Dominik Honnef <dominikh@fork-bomb.org>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/dmenu.rb

@@ -1,4 +1,3 @@
-require "shellwords"
 require "dmenu/item"
 
 # @example A simple menu
@@ -7,7 +6,7 @@ require "dmenu/item"
 #
 #   menu.run # this will return a Dmenu::Item, according to what the user selected.
 class Dmenu
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 
   # @return [Array<#to_s, Item>] Items to display in the menu. Items
   #   that are not an instance of the {Item} class will transparently
@@ -50,8 +49,6 @@ class Dmenu
   # @return [Item, nil] Returns the selected item or nil, if the user
   #   didn't make any selection (i.e. pressed ESC)
   def run
-    command = "dmenu #{args}"
-    puts command
     pipe = IO.popen(command, "w+")
 
     items = @items.map {|item|
@@ -74,6 +71,7 @@ class Dmenu
       return nil
     end
 
+    value.chomp!
     selection = items.find {|item|
       item.key.to_s == value
     }
@@ -81,19 +79,40 @@ class Dmenu
     return selection
   end
 
-  def args
-    args = []
-    args << "-b" if @position == :bottom
-    args << "-i" if @case_insensitive
-    args << "-l #@lines" if @lines > 1
-    args << "-fn " + Shellwords.escape(@font)  if @font
-    args << "-nb " + Shellwords.escape(@background) if @background
-    args << "-nf " + Shellwords.escape(@foreground) if @foreground
-    args << "-sb " + Shellwords.escape(@selected_background) if @selected_background
-    args << "-sf " + Shellwords.escape(@selected_foreground) if @selected_foreground
-    args << "-p " + Shellwords.escape(@prompt) if @prompt
-
-    args.join(" ")
+  private
+
+  def command
+    args = ["dmenu"]
+
+    if @position == :bottom
+      args << "-b"
+    end
+
+    if @case_insensitive
+      args << "-i"
+    end
+
+    if @lines > 1
+      args << "-l"
+      args << lines.to_s
+    end
+
+    h = {
+      "fn" => @font,
+      "nb" => @background,
+      "nf" => @foreground,
+      "sb" => @selected_background,
+      "sf" => @selected_foreground,
+      "p"  => @prompt,
+    }
+
+    h.each do |flag, value|
+      if value
+        args << "-#{flag}"
+        args << value
+      end
+    end
+
+    return args
   end
-  private :args
 end

metadata

@@ -1,69 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dmenu
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Dominik Honnef
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-03 00:00:00 +02:00
-default_executable: 
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies: []
-
 description: A Ruby OOP wrapper around dmenu.
 email: dominikh@fork-bomb.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/dmenu/item.rb
+files:
 - lib/dmenu.rb
+- lib/dmenu/item.rb
 - README
 - LICENSE
-has_rdoc: yard
-homepage: http://fork-bomb.org
-licenses: []
-
+homepage: 
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby OOP wrapper around dmenu.
 test_files: []
-
+has_rdoc: yard