markw-dmenu 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ef6ca078ebbfd95bfa5054155cd8edbde1967bb
-  data.tar.gz: 2e192a476b78fbab2fdafc98d5150aa6697e7b33
+  metadata.gz: c4970b9671c550168bff003f3d5abcc252d83768
+  data.tar.gz: 7611b44957a330b91861133914ff9d26e1756693
 SHA512:
-  metadata.gz: f38873e2aae318b9b34fbcc76f01208fdb025c32b10e733750fcdfdd1c798aaf8deb5c45c745b892ea44cd93cdad9638eae7000a2f8db78fa1aba22c1e921c7e
-  data.tar.gz: a226744e2cb98c5d8761e1fdae951a54853a8bba5e1f76b65ab900b8233ccdc41654b5ef5869544c114d67cc0e1402ff82f21ab9f763fbcdf88464bfcb1b7419
+  metadata.gz: 300bead8873d4137a9958bb88575e65809cbae196a2db1a8342666b6f8626c74b0a37deda27ec463ef3a362ceb530e1b9d7ba127f286e886d5f26bbc16d5a889
+  data.tar.gz: b27278737605cc1d50a98dcbf4511347a0586e74ea8cbf1edfe547e2e9297a47c37e7beba80afc86da1877d4f0204171312b769a24f711c1cc1b73720d08466d

data/dmenu.gemspec

@@ -2,12 +2,13 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "markw-dmenu"
-  spec.version       = "1.0.0"
+  spec.version       = "1.1.0"
   spec.authors       = ["Mark Watts"]
   spec.email         = ["wattsmark2015@gmail.com"]
   spec.summary       = %q{A set of utilites for working with the dmenu command line tool.}
   spec.homepage      = "http://github.com/mwatts15/dmenu"
   spec.license       = "MPL-2.0"
+  spec.description   = """Primarily for use by other things made by markw. Use at your own risk"""
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
@@ -15,5 +16,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "markw-wcwidth", "~> 0.0.3"
+  spec.add_runtime_dependency "markw-wcwidth", "0.0.3"
 end

data/lib/dmenu.rb

@@ -6,6 +6,7 @@ class String
         force_encoding("utf-8")
     end
 end
+
 module Dmenu
     require 'wcwidth'
     # Characters that, in the keyed fonts, are actually double width,
@@ -37,16 +38,28 @@ module Dmenu
         res = ""
         lr_separation = 4
         textwidth = 2 * width / font_width - lr_separation
-        expr = %r{[^#{repl_chars}]+}
+        if !repl_chars.nil?
+            expr = %r{[^#{repl_chars}]+}
+        end
         entries.collect! do |line|
-            line = line.each_char.reject{|char| char.ord < 32 or (char.ord >= 0x7f and char.ord < 0xa0)}.inject(:+)
-            l, r = line.split("|||")
-            loff = l.gsub(expr, "").length
-            roff =  r.nil? ? 0 : r.gsub(expr, "").length
-            scrunched = scrunch(r, [textwidth - l.width - lr_separation, textwidth / 2].max)
-            s = r ? alignr(l, scrunched, textwidth - loff - roff) : l
+            transformed_line = line.each_char.reject{|char| char.ord < 32 or (char.ord >= 0x7f and char.ord < 0xa0)}.inject(:+)
+            s = if !transformed_line.nil?
+                l, r = transformed_line.split("|||")
+                loff = 0
+                roff = 0
+                if !repl_chars.nil?
+                    loff = l.gsub(expr, "").length
+                    roff =  r.nil? ? 0 : r.gsub(expr, "").length
+                end
+                scrunched = scrunch(r, [textwidth - l.width - lr_separation, textwidth / 2].max)
+                r ? alignr(l, scrunched, textwidth - loff - roff) : l
+            else
+                $stderr.puts "Couldn't list #{line.inspect}"
+                nil
+            end
             s
-        end
+        end.reject! {|x| x.nil? or x.empty? or x.match(/\s+/) }
+
         cmdline = "dmenu -f -p \"#{prompt}\" -nf \"#{fg_color}\" \
         -nb \"#{bg_color}\" \
         -sb \"#{sel_bg_color}\" \

data/lib/test.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'dmenu'
+require 'test/unit'
+
+class DmenuTest < Test::Unit::TestCase
+    include Dmenu
+    def test_1
+        assert_equal(10, Dmenu::scrunch("012345678901234567890", 10).width)
+    end
+    def test_2
+        assert(Dmenu::scrunch("患部で止まってすぐ溶ける　～ 狂気の優曇華院 (03:04)", 10).width <= 10)
+    end
+    def test_3
+        assert_not_nil(Dmenu::dmenu(%w<a b c>))
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markw-dmenu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mark Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,17 +42,17 @@ dependencies:
   name: markw-wcwidth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
-description: 
+description: Primarily for use by other things made by markw. Use at your own risk
 email:
 - wattsmark2015@gmail.com
 executables: []
@@ -62,6 +62,7 @@ files:
 - Gemfile
 - dmenu.gemspec
 - lib/dmenu.rb
+- lib/test.rb
 homepage: http://github.com/mwatts15/dmenu
 licenses:
 - MPL-2.0