mireru 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5e44166849dd0f28a9ca3fed76087cafe5e3e9
-  data.tar.gz: 04edc5e6fed3407dbc9ccaf755b393a5ea6c652f
+  metadata.gz: 30b30b55a62ebb76c00bb13f7f8fd49c80ec6ade
+  data.tar.gz: 62cf52fd2780daa0e6d9e62a9d666536e64afb6e
 SHA512:
-  metadata.gz: ab3cc3ee7bdb3a33e4a179d629778366e442c2fe26e8a7798052270337a9d14b9f26cfae2998c42d2c3bc8798f7ecad5deb6ba0492b7433eaf08f6daab676ddb
-  data.tar.gz: ca3c1b7cfc990c67b649a555667eae975fa3a77441aefdf798d3e588ef841157171de166518d6be5dfaa5f5a64d3c8f6ca089d607d8b60ecc208c4765cef4f9a
+  metadata.gz: ff475315e946a1aa82a60a21556899127c111f5b0a025428ded94fbb0c3a9e32dfd87a5de70c46eeff6d8fc69d536b061574e520296866e1522021077e49a509
+  data.tar.gz: ade0850157b14f64964c4c7d48997a7ec71c30f0bc061772a93651ca178165762559151e28017babab5601d3a0222dda82a2b4d5ea330ef86ced466d96176f5d

data/README.md

@@ -12,10 +12,14 @@ A friend of a keyboard.
 
 ### Launch
 
-    $ mireru [FILE...]
+    $ mireru [OPTION]... [FILE]...
 
 If no argument, then search current directory.
 
+### Options
+
+-d, --deep: deep search
+
 ### Keybind
 
 #### Common
@@ -26,6 +30,8 @@ p: prev
 
 r: reload
 
+e: expand path
+
 q: quit
 
 #### Scroll

data/lib/mireru/command/mireru.rb

@@ -6,7 +6,7 @@ require "mireru/container"
 module Mireru
   module Command
     class Mireru
-      USAGE = "Usage: mireru [FILE...]"
+      USAGE = "Usage: mireru [OPTION]... [FILE]..."
 
       class << self
         def run(*arguments)
@@ -19,17 +19,14 @@ module Mireru
       end
 
       def run(arguments)
-        if arguments.empty?
-          files = Dir.glob("*")
-          file_container = ::Mireru::Container.new(files)
-        elsif /\A(-h|--help)\z/ =~ arguments[0]
+        if /\A(-h|--help)\z/ =~ arguments[0]
           write_help_message
           exit(true)
-        else
-          files = arguments
-          file_container = ::Mireru::Container.new(files)
         end
 
+        files = files_from_arguments(arguments)
+        file_container = ::Mireru::Container.new(files)
+
         if file_container.empty?
           write_empty_message
           exit(false)
@@ -42,14 +39,47 @@ module Mireru
       end
 
       private
+      def files_from_arguments(arguments)
+        if arguments.empty?
+          files = Dir.glob("*")
+        elsif /\A(-d|--deep)\z/ =~ arguments[0]
+          arguments.shift
+          if arguments.empty?
+            files = Dir.glob("**/*")
+          else
+            files = []
+            arguments.each do |f|
+              if File.directory?(f)
+                files << Dir.glob("#{f}/**/*")
+              else
+                files << f
+              end
+            end
+            files.flatten!
+          end
+        elsif arguments.all? {|v| File.directory?(v) }
+          files = []
+          arguments.each do |f|
+            files << Dir.glob("#{f}/*")
+          end
+          files.flatten!
+        else
+          files = arguments
+        end
+        files
+      end
+
       def write_help_message
         message = <<-EOM
 #{USAGE}
   If no argument, then search current directory.
+Options:
+  -d, --deep: deep search
 Keybind:
   n: next
   p: prev
   r: reload
+  e: expand path
   q: quit
 
   scroll:

data/lib/mireru/version.rb

@@ -1,3 +1,3 @@
 module Mireru
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/mireru/window.rb

@@ -30,6 +30,8 @@ module Mireru
           self.add_from_file(@file)
         when Gdk::Keyval::GDK_KEY_r
           self.add_from_file(@file)
+        when Gdk::Keyval::GDK_KEY_e
+          self.title = File.expand_path(@file)
         when Gdk::Keyval::GDK_KEY_f
           if Mireru::Widget.image?(@file)
             pixbuf = Gdk::Pixbuf.new(@file, *self.size)
@@ -48,6 +50,14 @@ module Mireru
           @scroll.vadjustment.value -= 17
         when Gdk::Keyval::GDK_KEY_l
           @scroll.hadjustment.value += 17
+        when Gdk::Keyval::GDK_KEY_H
+          @scroll.hadjustment.value -= 1000000
+        when Gdk::Keyval::GDK_KEY_J, Gdk::Keyval::GDK_KEY_G
+          @scroll.vadjustment.value += 1000000
+        when Gdk::Keyval::GDK_KEY_K
+          @scroll.vadjustment.value -= 1000000
+        when Gdk::Keyval::GDK_KEY_L
+          @scroll.hadjustment.value += 1000000
         when Gdk::Keyval::GDK_KEY_q
           Gtk.main_quit
         end

data/test/test-container.rb

@@ -1,6 +1,6 @@
 require "mireru/container"
 
-class TestContainer< Test::Unit::TestCase
+class ContainerTest < Test::Unit::TestCase
   def setup
     @container = Mireru::Container.new
   end

data/test/test-logger.rb

@@ -1,7 +1,7 @@
 require "mireru/logger"
 require "stringio"
 
-class TestLogger < Test::Unit::TestCase
+class LoggerTest < Test::Unit::TestCase
   def setup
     @logger = Mireru::Logger.new
   end

data/test/test-mireru.rb

@@ -1,4 +1,72 @@
 require "mireru/command/mireru"
 
-class TestMireru < Test::Unit::TestCase
+class MireruTest < Test::Unit::TestCase
+  def setup
+    @mireru = Mireru::Command::Mireru.new
+  end
+
+  def test_run_help_option
+    arguments = %w(--help)
+    mock(@mireru).write_help_message
+    assert_raise SystemExit do
+      @mireru.run(arguments)
+    end
+  end
+
+  def test_run_help_option_sugar
+    arguments = %w(-h)
+    mock(@mireru).write_help_message
+    assert_raise SystemExit do
+      @mireru.run(arguments)
+    end
+  end
+
+  def test_files_from_arguments_no_argument
+    arguments = %w()
+    expected = %w(dir1 file1 dir2)
+    mock(Dir).glob("*") { expected }
+    files = @mireru.__send__(:files_from_arguments, arguments)
+    assert_equal(files, expected)
+  end
+
+  def test_files_from_arguments_deep_option_only
+    arguments = %w(--deep)
+    expected = %w(dir1 file1 dir2 dir1/file1 dir1/file2 dir2/file1)
+    mock(Dir).glob("**/*") { expected }
+    files = @mireru.__send__(:files_from_arguments, arguments)
+    assert_equal(files, expected)
+  end
+
+  def test_files_from_arguments_deep_option_and_dir
+    arguments = %w(--deep dir1 file1 dir2)
+    expected_dir1 = %w(dir1/file1 dir1/file2)
+    expected_dir2 = %w(dir2/file1)
+    expected = [expected_dir1, "file1", expected_dir2].flatten
+    mock(File).directory?("dir1") { true }
+    mock(File).directory?("file1") { false }
+    mock(File).directory?("dir2") { true }
+    mock(Dir).glob("dir1/**/*") { expected_dir1 }
+    mock(Dir).glob("dir2/**/*") { expected_dir2 }
+    files = @mireru.__send__(:files_from_arguments, arguments)
+    assert_equal(files, expected)
+  end
+
+  def test_files_from_arguments_all_dir
+    arguments = %w(dir1 dir2)
+    expected_dir1 = %w(dir1/file1 dir1/file2)
+    expected_dir2 = %w(dir2/file1)
+    expected = [expected_dir1, expected_dir2].flatten
+    mock(File).directory?("dir1") { true }
+    mock(File).directory?("dir2") { true }
+    mock(Dir).glob("dir1/*") { expected_dir1 }
+    mock(Dir).glob("dir2/*") { expected_dir2 }
+    files = @mireru.__send__(:files_from_arguments, arguments)
+    assert_equal(files, expected)
+  end
+
+  def test_files_from_arguments_else
+    arguments = %w(dir1 file1 dir2)
+    files = @mireru.__send__(:files_from_arguments, arguments)
+    assert_equal(files, arguments)
+  end
 end

data/test/test-widget.rb

@@ -1,6 +1,6 @@
 require "mireru/widget"
 
-class TestWidget < Test::Unit::TestCase
+class WidgetTest < Test::Unit::TestCase
   def test_image?
     assert_nil(Mireru::Widget.image?(__FILE__))
     assert_not_nil(Mireru::Widget.image?("test/fixtures/nijip.png"))

data/test/test-window.rb

@@ -1,6 +1,6 @@
 require "mireru/window"
 
-class TestWindow < Test::Unit::TestCase
+class WindowTest < Test::Unit::TestCase
   def setup
     @window = Mireru::Window.new
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mireru
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Masafumi Yokoyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3