rumai 3.3.1 → 4.0.0

data/lib/rumai/inochi.rb

@@ -18,12 +18,12 @@ module Rumai
   ##
   # Number of this release of this project.
   #
-  VERSION = '3.3.1'
+  VERSION = '4.0.0'
 
   ##
   # Date of this release of this project.
   #
-  RELDATE = '2010-08-11'
+  RELDATE = '2011-02-25'
 
   ##
   # Description of this release of this project.

data/lib/rumai/ixp/message.rb

@@ -234,7 +234,13 @@ module Rumai
         #
         module CounterField
           def to_9p field_values
-            value_to_9p field_values[@countee.name].length
+            value = field_values[@countee.name]
+            count =
+              case value
+              when String then value.bytesize
+              else value.length
+              end
+            value_to_9p count
           end
         end
 
@@ -401,7 +407,7 @@ module Rumai
       #
       def to_9p
         data = type.to_9p(1) << super
-        size = (data.length + 4).to_9p(4)
+        size = (data.bytesize + 4).to_9p(4)
         size << data
       end
 
@@ -683,7 +689,8 @@ class String
   # Transforms this object into a string of 9P2000 bytes.
   #
   def to_9p
-    length.to_9p(2) << self[0, Rumai::IXP::BYTE2_MASK]
+    count = [bytesize, Rumai::IXP::BYTE2_MASK].min
+    count.to_9p(2) << byteslice(0, count)
   end
 
   ##
@@ -693,6 +700,16 @@ class String
   def self.from_9p stream
     stream.read stream.read_9p(2)
   end
+
+  unless method_defined? :byteslice
+    ##
+    # Does the same thing as String#slice but
+    # operates on bytes instead of characters.
+    #
+    def byteslice(*args)
+      unpack('C*').slice(*args).pack('C*')
+    end
+  end
 end
 
 class Time

data/lib/rumai/ixp/transport.rb

@@ -327,15 +327,15 @@ module Rumai
           raise 'cannot write to a directory' if @stat.directory?
 
           data = content.to_s
-          limit = data.length + @pos
+          limit = data.bytesize + @pos
 
           while @pos < limit
-            chunk = data[@pos, @msize]
+            chunk = data.byteslice(@pos, @msize)
 
             req = Twrite.new(
               :fid    => @fid,
               :offset => @pos,
-              :count  => chunk.length,
+              :count  => chunk.bytesize,
               :data   => chunk
             )
             rsp = @agent.talk(req)

data/lib/rumai/wm.rb

@@ -172,17 +172,27 @@ module Rumai
     end
 
     ##
-    # Moves this client in the given direction on the given view.
+    # Moves this client by the given amount in
+    # the given direction on the given view.
     #
-    def nudge direction, view = View.curr
-      reshape :nudge, direction, view
+    def nudge direction, amount = 1, view = View.curr
+      reshape :nudge, view, direction, amount
     end
 
     ##
-    # Grows this client in the given direction on the given view.
+    # Grows this client by the given amount in
+    # the given direction on the given view.
     #
-    def grow direction, view = View.curr
-      reshape :grow, direction, view
+    def grow direction, amount = 1, view = View.curr
+      reshape :grow, view, direction, amount
+    end
+
+    ##
+    # Shrinks this client by the given amount
+    # in the given direction on the given view.
+    #
+    def shrink direction, amount = 1, view = View.curr
+      reshape :grow, view, direction, -amount.to_i
     end
 
     ##
@@ -448,10 +458,10 @@ module Rumai
 
     private
 
-    def reshape method, direction, view
+    def reshape command, view, direction, amount
       area = self.area(view)
       index = area.client_ids.index(@id) + 1 # numbered as 1..N
-      view.ctl.write "#{method} #{area.id} #{index} #{direction}"
+      view.ctl.write "#{command} #{area.id} #{index} #{direction} #{amount}"
     end
 
     ##
@@ -630,10 +640,9 @@ module Rumai
     # Inserts the given clients at the bottom of this area.
     #
     def push *clients
-      clients.flatten!
       return if clients.empty?
 
-      insert clients
+      insert *clients
 
       # move inserted clients to bottom
       clients.reverse.each_with_index do |c, i|
@@ -650,9 +659,6 @@ module Rumai
     # currently focused client in this area.
     #
     def insert *clients
-      clients.flatten!
-      return if clients.empty?
-
       clients.each do |c|
         import_client c
       end
@@ -662,10 +668,9 @@ module Rumai
     # Inserts the given clients at the top of this area.
     #
     def unshift *clients
-      clients.flatten!
       return if clients.empty?
 
-      insert clients
+      insert *clients
 
       # move inserted clients to top
       clients.each_with_index do |c, i|
@@ -679,7 +684,7 @@ module Rumai
     # Concatenates the given area to the bottom of this area.
     #
     def concat area
-      push area.clients
+      push *area.clients
     end
 
     ##
@@ -693,14 +698,14 @@ module Rumai
       len, out = length, fringe
 
       if len > max_clients
-        out.unshift clients[max_clients..-1]
+        out.unshift *clients[max_clients..-1]
 
       elsif len < max_clients
         until (diff = max_clients - length) == 0
           importable = out.clients[0, diff]
           break if importable.empty?
 
-          push importable
+          push *importable
         end
       end
     end
@@ -840,7 +845,7 @@ module Rumai
     # Returns the IDs of all areas in this view.
     #
     def area_ids
-      manifest.scan(/^# (\d+)/).flatten.unshift(FLOATING_AREA_ID)
+      manifest.scan(/^# (\d+) /).flatten.unshift(FLOATING_AREA_ID)
     end
 
     ##

data/man/man1/rumai.1

@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: rumai
 .\"    Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/11/2010
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 2011-02-25
 .\"    Manual: \ \&
-.\"    Source: \ \& 3.3.1
+.\"    Source: \ \& 4.0.0
 .\"  Language: English
 .\"
-.TH "RUMAI" "1" "08/11/2010" "\ \& 3\&.3\&.1" "\ \&"
+.TH "RUMAI" "1" "2011\-02\-25" "\ \& 4\&.0\&.0" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -156,7 +165,7 @@ Issue tracker (report bugs, request features, get help)
 .\}
 
 [Ruby]
-1\&.8\&.6 or newer\&.
+1\&.8\&.7 or newer\&.
 .RE
 .sp
 .RS 4
@@ -443,7 +452,7 @@ Set the last column\(cqs layout to stacking mode:
 .RS 4
 .\}
 .nf
-b\&.layout = \'stack\'
+b\&.layout = \*(Aqstack\*(Aq
 .fi
 .if n \{\
 .RE
@@ -554,7 +563,7 @@ Do complex operations on the red client\(cqs tags:
 .RS 4
 .\}
 .nf
-red\&.with_tags { concat %w[a b c]; push \'z\'; delete \'c\' }
+red\&.with_tags { concat %w[a b c]; push \*(Aqz\*(Aq; delete \*(Aqc\*(Aq }
 .fi
 .if n \{\
 .RE
@@ -682,7 +691,7 @@ Navigate into to the /lbar/ directory:
 .\}
 .nf
 n1 = fs\&.lbar
-n2 = fs[\'lbar\']
+n2 = fs[\*(Aqlbar\*(Aq]
 n1 == n2 #=> true
 left_bar = n1
 .fi
@@ -847,6 +856,90 @@ Its exit status will indicate whether all tests have passed\&. It may also print
 .sp
 \m[blue]\fBFork this project on GitHub\fR\m[] and send a pull request\&.
 .SH "HISTORY"
+.SS "Version 4\&.0\&.0 (2011\-02\-25)"
+.sp
+This release fixes a bug regarding the $WMII_ADDRESS environment variable\&.
+.PP
+\fBIncompatible changes\fR
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::Area#push(),
+#insert(), and
+#unshift()
+methods no longer accept an Array object as an argument\&. If you still wish to pass an Array, then use the splat operator to pass the contents of your Array to these methods\&.
+.sp
+Thanks to Mattia Gheda for reporting
+\m[blue]\fBthis issue\fR\m[]\&\s-2\u[4]\d\s+2\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Add
+\fIamount\fR
+parameter to
+Rumai::Client#nudge()
+and
+#grow()\&.
+.RE
+.PP
+\fBNew features\fR
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Add
+Rumai::Client#shrink()
+method for opposite of
+#grow()\&.
+.RE
+.PP
+\fBBug fixes\fR
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Fix ability to read and write Unicode strings to files in wmii IXP\&.
+.sp
+Thanks to OneLastTry for reporting
+\m[blue]\fBthis issue\fR\m[]\&\s-2\u[5]\d\s+2\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Fix parsing of area IDs from view manifest when
+\fBwitray\fR
+is present\&.
+.RE
 .SS "Version 3\&.3\&.1 (2010\-08\-11)"
 .sp
 This release fixes a bug regarding the $WMII_ADDRESS environment variable\&.
@@ -927,7 +1020,7 @@ Rumai::Client#grow
 and
 Rumai::Client#nudge
 methods
-\m[blue]\fBrequested by Nathan Neff\fR\m[]\&\s-2\u[4]\d\s+2\&. See "The /tag/ Hierarchy" in the wmii manpage for usage information\&.
+\m[blue]\fBrequested by Nathan Neff\fR\m[]\&\s-2\u[6]\d\s+2\&. See "The /tag/ Hierarchy" in the wmii manpage for usage information\&.
 .RE
 .PP
 \fBBug fixes\fR
@@ -941,7 +1034,7 @@ methods
 .IP \(bu 2.3
 .\}
 Add workaround for the
-\m[blue]\fBwmii\-hg2734 color tuple bug\fR\m[]\&\s-2\u[5]\d\s+2
+\m[blue]\fBwmii\-hg2734 color tuple bug\fR\m[]\&\s-2\u[7]\d\s+2
 in the test suite\&.
 .RE
 .PP
@@ -984,8 +1077,10 @@ This release fixes an IXP transport layer bug under Ruby 1\&.8\&.7\&.
 .\}
 
 IO#ungetc
-does not accept a one\-character string in Ruby 1\&.8\&.7\&. Thanks to Sebastian Chmielewski for reporting
-\m[blue]\fBthis issue\fR\m[]\&\s-2\u[6]\d\s+2\&.
+does not accept a one\-character string in Ruby 1\&.8\&.7\&.
+.sp
+Thanks to Sebastian Chmielewski for reporting
+\m[blue]\fBthis issue\fR\m[]\&\s-2\u[8]\d\s+2\&.
 .RE
 .SS "Version 3\&.2\&.3 (2010\-04\-28)"
 .sp
@@ -1003,8 +1098,10 @@ This release adds a UNIX manual page and requires wmii 3\&.9 or newer\&.
 .\}
 
 Rumai::Area#unshift
-needs wmii 3\&.9 or newer\&. The help manual has been corrected accordingly\&. Thanks to Mattia Gheda for reporting
-\m[blue]\fBthis issue\fR\m[]\&\s-2\u[7]\d\s+2\&.
+needs wmii 3\&.9 or newer\&. The help manual has been corrected accordingly\&.
+.sp
+Thanks to Mattia Gheda for reporting
+\m[blue]\fBthis issue\fR\m[]\&\s-2\u[9]\d\s+2\&.
 .RE
 .PP
 \fBHousekeeping\fR
@@ -1054,7 +1151,7 @@ Warnings of the following form appeared during gem installation:
 .RS 4
 .\}
 .nf
-Unrecognized directive \'\&.\&.\&.\' in lib/rumai/inochi\&.yaml
+Unrecognized directive \*(Aq\&.\&.\&.\*(Aq in lib/rumai/inochi\&.yaml
 .fi
 .if n \{\
 .RE
@@ -1208,7 +1305,9 @@ This release fixes bugs in automated view arrangements and updates the user manu
 .sp -1
 .IP \(bu 2.3
 .\}
-The relative order of clients was not being preserved during view arrangements\&. Thanks to Nathan Neff for reporting this\&.
+The relative order of clients was not being preserved during view arrangements\&.
+.sp
+Thanks to Nathan Neff for reporting this bug\&.
 .RE
 .sp
 .RS 4
@@ -1828,7 +1927,7 @@ which would cause Rumai to hang when multiple threads used it\&.
 .RE
 .SS "Version 1\&.0\&.0 (2008\-01\-26)"
 .sp
-This is the first release of Rumai, the evolution of \m[blue]\fBwmii\-irb\fR\m[]\&\s-2\u[8]\d\s+2, which lets you manipulate the [wmii] window manager through [Ruby]\&. Enjoy!
+This is the first release of Rumai, the evolution of \m[blue]\fBwmii\-irb\fR\m[]\&\s-2\u[10]\d\s+2, which lets you manipulate the [wmii] window manager through [Ruby]\&. Enjoy!
 .SH "AUTHORS"
 .sp
 Suraj N\&. Kurapati
@@ -1839,7 +1938,7 @@ Christoph Blank, Kenneth De Winter, Mattia Gheda, Michael Andrus, Nathan Neff, S
 .sp
 (the ISC license)
 .sp
-Copyright 2006 Suraj N\&. Kurapati <\m[blue]\fBsunaku@gmail\&.com\fR\m[]\&\s-2\u[9]\d\s+2>
+Copyright 2006 Suraj N\&. Kurapati <\m[blue]\fBsunaku@gmail\&.com\fR\m[]\&\s-2\u[11]\d\s+2>
 .sp
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies\&.
 .sp
@@ -1925,31 +2024,41 @@ ruby-wrapper
 \%http://github.com/chneukirchen/rup/blob/master/ruby-wrapper
 .RE
 .IP " 4." 4
+this issue
+.RS 4
+\%http://github.com/sunaku/rumai/issues/10
+.RE
+.IP " 5." 4
+this issue
+.RS 4
+\%http://github.com/sunaku/rumai/issues/9
+.RE
+.IP " 6." 4
 requested by Nathan Neff
 .RS 4
 \%http://github.com/sunaku/rumai/issues/6
 .RE
-.IP " 5." 4
+.IP " 7." 4
 wmii-hg2734 color tuple bug
 .RS 4
 \%http://code.google.com/p/wmii/issues/detail?id=206
 .RE
-.IP " 6." 4
+.IP " 8." 4
 this issue
 .RS 4
 \%http://github.com/sunaku/rumai/issues/3
 .RE
-.IP " 7." 4
+.IP " 9." 4
 this issue
 .RS 4
 \%http://github.com/sunaku/wmiirc/issues/8
 .RE
-.IP " 8." 4
+.IP "10." 4
 wmii-irb
 .RS 4
 \%http://article.gmane.org/gmane.comp.window-managers.wmii/1704
 .RE
-.IP " 9." 4
+.IP "11." 4
 sunaku@gmail.com
 .RS 4
 \%mailto:sunaku@gmail.com

metadata

@@ -3,10 +3,10 @@ name: rumai
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 3
-  - 3
-  - 1
-  version: 3.3.1
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - Suraj N. Kurapati
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,13 +68,13 @@ extra_rdoc_files: []
 files: 
 - bin/rumai
 - lib/rumai.rb
-- lib/rumai/fs.rb
-- lib/rumai/wm.rb
 - lib/rumai/ixp.rb
 - lib/rumai/inochi.rb
-- lib/rumai/ixp/transport.rb
 - lib/rumai/ixp/message.rb
+- lib/rumai/ixp/transport.rb
 - lib/rumai/irb.rb
+- lib/rumai/fs.rb
+- lib/rumai/wm.rb
 - LICENSE
 - CREDITS
 - man/man1/rumai.1