barabara 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fc704ae054747cbedd0ddd81d1306b8fbb0f430839f80aaafda64cdf29225cd
-  data.tar.gz: 4357e8b018f5b770808f31b35747e30586289295e2b7834b39438608631a6103
+  metadata.gz: 7a5a8677921fc942822f26bce8282a47153496ab564969fb27609454ecba6fab
+  data.tar.gz: 36facf5e163322d9fb0b6325f3a2296b3bb104117e9e8bff2eebc8ebeabd81b7
 SHA512:
-  metadata.gz: 1ea2f0049b07c412363316266425db72818b56e5fbd3aa122a1006eae248ecbbaf51432964a2c8bc2920117900d610d3d92c1525137906ee1417ce7d591bad25
-  data.tar.gz: 5159919bf03b2314c5f8ae990a177dcd55b3ff84667de3db2a4446c6d2cbfb30a077fdd16088398bbb0c8818c043877086eb399b8fe7e3e5e429d87a1004032d
+  metadata.gz: e37e4b9dc3b5939398c475c7e97182d8b6be50561ecfd26bdaab1afc480ae2360753a2367caf98304307aaab940858f6a05e4079bec8557ff3252d1dfe243bf9
+  data.tar.gz: 242704e57c26b2e802905f7a4c4e5af036e185c7de7dfec38c7b618a4e691a127b355642a3f885c4a968727fbd129f9a7cfb2958b3c86f4853c5cc3279fa6040

data/lib/barabara/config.rb

@@ -64,8 +64,8 @@ module Barabara
             name: "barabara", height: 12,
             format: "%%{S%<monitor>s}%%{l}%<tags>s%<sep>s %%{c} %<window_title>s %%{r} %<volume>s %<battery>s %<sep>s %<time>s %<sep>s %<weather>s\n",
             fonts: {
-              text:   "-lucy-tewi-medium-*-normal-*-11-*-*-*-*-*-*-*",
-              glyphs: "-wuncon-siji-medium-r-normal-*-10-100-75-75-c-80-iso10646-1"
+              text:   { name: "-lucy-tewi-medium-*-normal-*-11-*-*-*-*-*-*-*", offset: 0 },
+              glyphs: { name: "-wuncon-siji-medium-r-normal-*-10-100-75-75-c-80-iso10646-1", offset: 0 }
             },
             snippets:   { sep: "%%{B-}%%{F%<ac_winbr>s}|%%{F-}" },
             extra_opts: ["| sh"]

data/lib/barabara/modules/lemonbar.rb

@@ -34,12 +34,11 @@ module Barabara
         cmd_opts = [
           "-B '#{@colors[:in_framebr]}'",
           "-F '#{@colors[:ac_text]}'",
-          "-g x#{options[:height]}+0+0",
-          "-n #{options[:name]}", '-a 30',
-          "-f #{options[:fonts][:text]}",
-          "-f #{options[:fonts][:glyphs]}"
+          "-g 'x#{options[:height]}+0+0'",
+          "-n '#{options[:name]}'", '-a 30'
         ]
-        cmd_opts << options[:extra_opts] if options.key?(:extra_opts)
+        cmd_opts.concat font_opts(options[:fonts])
+        cmd_opts.concat options[:extra_opts] if options.key?(:extra_opts)
         cmd_opts
       end
 
@@ -64,7 +63,7 @@ module Barabara
                              monitor: monitor
                            ))
         end
-        string
+        string.delete "\n"
       end
 
       def render
@@ -75,6 +74,20 @@ module Barabara
         @panel_data.merge!(data)
         render
       end
+
+      private
+
+      def font_opts(fonts = {})
+        fonts.flat_map do |type, font_def|
+          if font_def.is_a? String
+            ["-f '#{font_def}'"]
+          elsif font_def.key? :offset
+            ["-o '#{font_def[:offset]}'", "-f '#{font_def[:name]}'"]
+          else
+            ["-f '#{font_def[:name]}'"]
+          end
+        end
+      end
     end
   end
 end

data/lib/barabara/version.rb

@@ -1,3 +1,3 @@
 module Barabara
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barabara
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Serge Tkatchouk