mireru 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1e35de74d8cb4f531e906e8a63160ad994296f
-  data.tar.gz: 65fd4237832ccb0b88f44a4a36e122d004192c38
+  metadata.gz: 4af6b308832832e50dca8694b82fa42b30620a10
+  data.tar.gz: ff89a104fb6b23923092d96215abfa0a0e96afe1
 SHA512:
-  metadata.gz: 7b340d980af27c6f4733c83cf47981b078d98d2933359a10d322f07ca8aa9d44ae66fa39109046faf072528e3087ce3e11748fbe97e1428e809d379fa735a7a5
-  data.tar.gz: 3f6e380aed270fa5243098c15c1ad14b28cbeee18fc6b0309719eedd5088e03800d265aed81321da53b19bfa3a8d2dd4049de74fce1fce353e75b462c5561545
+  metadata.gz: ebfdd64bdfd0b9fd2806cbf721952a3175c75982a45f4179649190e714d4525fa4f800713797a5b5f47097c3dfb772ec06c20dccf6922ab574f2264c14d77c7e
+  data.tar.gz: d8a4448a9adb13d360aa2f0dfc8ef326502911a3e831063d8f3ac6a90aa6c95ac7c574a0b7cb5182cd6727315eced4c3fcb88a9628c1710bf6465af7434d122d

data/NEWS.md

@@ -0,0 +1,12 @@
+# NEWS
+
+## mireru 0.1.2: 2013-05-09
+
+Improve Font handling.
+
+### Changes
+
+  * Improvements
+    * Use monospace font as default.
+    * Add change font keybind "f" (at random).
+    * Support font option.

data/README.md

@@ -18,7 +18,11 @@ If no argument, then search current directory.
 
 ### Options
 
--d, --deep: deep search
+-d, --deep
+    deep search as "**/*"
+
+-f, --font
+    set font such as "Monospace 16"
 
 ### Keybind
 

data/lib/mireru/command/mireru.rb

@@ -28,6 +28,8 @@ module Mireru
           exit(true)
         end
 
+        font = purge_option(arguments, /\A(-f|--font)\z/, true)
+
         files = files_from_arguments(arguments)
         file_container = ::Mireru::Container.new(files)
 
@@ -37,6 +39,7 @@ module Mireru
         end
 
         window = ::Mireru::Window.new
+        window.font = font if font
         window.add_container(file_container)
 
         Gtk.main
@@ -46,8 +49,7 @@ module Mireru
       def files_from_arguments(arguments)
         if arguments.empty?
           files = Dir.glob("*")
-        elsif /\A(-d|--deep)\z/ =~ arguments[0]
-          arguments.shift
+        elsif purge_option(arguments, /\A(-d|--deep)\z/)
           if arguments.empty?
             files = Dir.glob("**/*")
           else
@@ -73,12 +75,26 @@ module Mireru
         files
       end
 
+      def purge_option(arguments, regexp, has_value=false)
+        index = arguments.find_index {|arg| regexp =~ arg }
+        return false unless index
+        if has_value
+          arguments.delete_at(index) # flag
+          arguments.delete_at(index) # value
+        else
+          arguments.delete_at(index)
+        end
+      end
+
       def write_help_message
         message = <<-EOM
 #{USAGE}
   If no argument, then search current directory.
 Options:
-  -d, --deep: deep search
+  -d, --deep
+      deep search as "**/*"
+  -f, --font
+      set font such as "Monospace 16"
 Keybind:
   n: next
   p: prev
@@ -112,7 +128,10 @@ Warning: file not found.
 #{USAGE}
   If no argument, then search current directory.
 Options:
-  -d, --deep: deep search
+  -d, --deep
+      deep search as "**/*"
+  -f, --font
+      set font such as "Monospace 16"
         EOM
         @logger.error(message)
       end

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/mireru/widget.rb

@@ -26,6 +26,7 @@ module Mireru
           view.buffer.highlight_syntax = true
           view.buffer.highlight_matching_brackets = true
           view.editable = false
+          view.override_font(Pango::FontDescription.new("Monospace"))
           widget = view
         end
         widget

data/lib/mireru/window.rb

@@ -3,6 +3,7 @@ require "mireru/widget"
 
 module Mireru
   class Window < Gtk::Window
+    attr_accessor :font
     def initialize
       super
       @scroll = Gtk::ScrolledWindow.new
@@ -36,6 +37,10 @@ module Mireru
           if Mireru::Widget.image?(@file)
             pixbuf = Gdk::Pixbuf.new(@file, *self.size)
             @widget.pixbuf = pixbuf
+          elsif @widget.is_a?(Gtk::TextView)
+            font = @widget.pango_context.families.sample.name
+            @widget.override_font(Pango::FontDescription.new(font))
+            self.title = "#{File.basename(@file)} (#{font})"
           end
         when Gdk::Keyval::GDK_KEY_o
           if Mireru::Widget.image?(@file)
@@ -69,6 +74,7 @@ module Mireru
       @scroll.vadjustment.value = 0
       @scroll.each {|child| @scroll.remove(child) }
       @widget = Mireru::Widget.create(file, *self.size)
+      @widget.override_font(Pango::FontDescription.new(@font)) if @font
       if @widget.is_a?(Gtk::Scrollable)
         @scroll.add(@widget)
       else

data/test/test-mireru.rb

@@ -88,4 +88,14 @@ class MireruTest < Test::Unit::TestCase
     files = @mireru.__send__(:files_from_arguments, arguments)
     assert_equal(files, arguments)
   end
+
+  def test_purge_option
+    arguments = %w(--deep -f ubuntu dir1 file1 dir2)
+    flag = @mireru.__send__(:purge_option, arguments, /\A(-d|--deep)\z/)
+    assert_not_nil(flag)
+    assert_equal(%w(-f ubuntu dir1 file1 dir2), arguments)
+    value = @mireru.__send__(:purge_option, arguments, /\A-f\z/, true)
+    assert_equal("ubuntu", value)
+    assert_equal(%w(dir1 file1 dir2), arguments)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -121,6 +121,7 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE.txt
+- NEWS.md
 - README.md
 - Rakefile
 - bin/mireru