myterm 0.0.3 → 0.0.4

data/._repath.rb

@@ -2,49 +2,30 @@
 
 payload = lambda do
 
-  bin_folder="#{`pwd`.strip}/bin"
-  unless File.directory?(bin_folder)
-    return {
-      :message => "not a directory, won't add to PATH: #{bin_folder}"
-    }
-  end
+  dir = File.expand_path('../bin', __FILE__)
+  File.directory?(dir) or return {
+    :message => "not a directory, won't add to PATH: #{dir}"
+  }
 
   path = ENV['PATH']
-  path_parts = path.split(':')
-
-  if path.include?(bin_folder)
-    if true or ARGV.include?('-F')
-      unless path_parts.reject! { |p| p == bin_folder }
-        return {
-          :message => "bin folder \"#{bin_folder}\" not found in path \"#{path}\""
-        }
-      end
-      return {
-        :new_path => ( [bin_folder] + [path_parts] ).join(':'),
-        :message  => "rewriting path to have bin folder at the beginning",
-        :success => true
-      }
-    else
-      if 0 == path.index(bin_folder)
-        return {
-          :message => "bin folder is already at front of PATH",
-          :success => true
-        }
-      else
-        return {
-          :message => "bin folder is in path but not at front.  use -F to rewrite PATH",
-          :status => :not_front,
-          :success => true
-        }
-      end
-    end
-  else
-    path_parts.unshift(bin_folder)
-    return {
-      :new_path => path_parts.join(':'),
+  parts = path.split(':')
+  case parts.index(dir)
+  when nil
+    {
+      :new_path => ([dir] + parts).join(':'),
       :message  => "prepending bin folder to the beginning of the PATH.",
       :success  => true
     }
+  when 0
+    { :message  => "already at front of path: \"#{dir}\"",
+      :success  => true
+    }
+  else
+    {
+      :new_path => ([dir] + parts.reject{ |x| x == path }).join(':'),
+      :message  => "rewriting path to have bin folder at the beginning",
+      :success  => true
+    }
   end
 
 end.call

data/.gitignore

@@ -1,3 +1,4 @@
 /.DS_Store
 /.__tmp.sh
 /.rvmrc
+/*.gem

data/.repath.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
-ruby ./._repath.rb 1> .__tmp.sh
-source ./.__tmp.sh
+dir="$( cd "$( dirname "$0" )" && pwd )"
+tmp="$dir/.__tmp.sh"
+ruby "$dir/._repath.rb" 1> "$tmp"
+source "$tmp"
+rm "$tmp"

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+
+
+## for version 0.0.4 -
+
+### 2012-01-20
+
+  * fix issue with tmux sessions
+  * overhaul whitespace & naming conventions
+

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    myterm (0.0.1)
+    myterm (0.0.3)
       highline
       rb-appscript
+      rmagick
 
 GEM
   remote: http://rubygems.org/
@@ -13,7 +14,9 @@ GEM
     highline (1.6.2)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    rake (0.9.2.2)
     rb-appscript (0.6.1)
+    rmagick (2.13.1)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -30,4 +33,5 @@ PLATFORMS
 
 DEPENDENCIES
   myterm!
+  rake
   ruby-debug19

data/README.md

@@ -13,7 +13,13 @@
 
 `myterm` attempts to be as self-documenting as possible.  Try `myterm -h` for help.
 
-The most common use case for me personally is something like: 
+The most common use case for me personally is usually something like: 
+
+    myterm bg ohai
+
+where "ohai" is some label that I want to appear in the background of the iTerm window.
+
+More ambitiously, I might do:
 
     myterm bg --exec node server.js
 
@@ -26,9 +32,12 @@ which will display the string "node server.js" up in the background and then run
 
 `myterm` needs ImageMagick and its `convert` executable to be in your path.
 
+Installing ImageMagick on your mac is "easy" with macports, provided that you don't run into hiccups.  (But be prepared for it to take something like5 minutes.)
+
 `myterm` needs some font file to use.  It has an installer that will try to grab the [Simple Life](http://www.dafont.com/simple-life.font) font by Michael Strobel.
 
-Additionally it needs whatever its gem dependencie(s) are, which at the time of this writing are: rb-appscript, highline.
+Additionally it needs whatever its gem dependencie(s) are (which at the time of this writing are: rb-appscript, highline, rmagick).  Installing the myterm ruby gem should install these dependencies.  If you are developing myterm you could also install them with "bundle install".
+
 
 
 
@@ -40,8 +49,9 @@ Additionally it needs whatever its gem dependencie(s) are, which at the time of
 
     mkdir ~/src; cd ~/src
     git clone git@github.com:hipe/myterm.git; cd myterm
-    gem build *.gemspec
-    gem install *.gem
+    gem build myterm.gemspec
+    gem install myterm-VERSION.gem # where VERSION is whatever version was built.
+
 
 
 ## Support

data/VERSION

@@ -0,0 +1 @@
+0.0.4

data/lib/myterm/api.rb

@@ -1,189 +1,208 @@
 module Skylab; end
-module Skylab::Myterm; end
 
-class Skylab::Myterm::ValidationError < RuntimeError ; end
+module Skylab::Myterm
 
-module Skylab::Myterm::Color
-  Myterm = Skylab::Myterm
-  def self.[] obj
-    obj.extend self
-  end
-  def self.dup color
-    self[color.dup]
-  end
-  def alpha= mixed
-    if mixed.kind_of?(String)
-      md = /\A(\d+(?:\.\d+)?)%?\z/.match(mixed) or
-        raise Myterm::ValidationError.new("invalid format for percent #{val.inspect} -- expecting e.g. \"58%\"")
-      mixed = md[1].to_f
-    end
-    (0.0..100.0).include?(mixed) or
-      raise Myterm::ValidationError.new("Percent value (#{mixed}%) must be between 0 and 100 inclusive.")
-    self[3] = Myterm::ChannelScalarNormalized[mixed / 100.0]
+  class ValidationError < RuntimeError ; end
+
+  module Color
+    def alpha= mixed
+      if mixed.kind_of?(String)
+        md = /\A(\d+(?:\.\d+)?)%?\z/.match(mixed) or
+          raise ValidationError.new("invalid format for percent #{val.inspect} -- expecting e.g. \"58%\"")
+        mixed = md[1].to_f
+      end
+      (0.0..100.0).include?(mixed) or
+        raise ValidationError.new("Percent value (#{mixed}%) must be between 0 and 100 inclusive.")
+      self[3] = ChannelScalarNormalized[mixed / 100.0]
+    end
+
+    def to_hex
+      '#' + self.map{ |x| int_to_hex(x) }.join('')
+    end
+
+    TARGET_PLACES = 2  # each component of an #rrggbb hexadecimal color has 2 places
+
+    DIVISOR = 16 ** TARGET_PLACES
+
+    def int_to_hex int
+      int.respond_to?(:to_hex) and return int.to_hex
+      (int.to_f / DIVISOR).round.to_s(16).rjust(TARGET_PLACES, '0')
+    end
   end
-  def to_hex
-    '#' + self.map{ |x| int_to_hex(x) }.join('')
+
+  class << Color
+    def [] obj
+      obj.extend self
+    end
+
+    def dup color
+      self[color.dup]
+    end
   end
-  TargetPlaces = 2  # each component of an #rrggbb hexadecimal color has 2 places
-  Divisor = 16 ** TargetPlaces
-  def int_to_hex int
-    int.respond_to?(:to_hex) and return int.to_hex
-    (int.to_f / Divisor).round.to_s(16).rjust(TargetPlaces, '0')
+
+  module ChannelScalarNormalized
+    def to_hex
+      (('ff'.to_i(16).to_f * self).to_i).to_s(16).rjust(2, '0')
+    end
   end
-end
 
-module Skylab::Myterm::ChannelScalarNormalized
-  def self.[] obj
-    obj.extend self
+  class << ChannelScalarNormalized
+    def [] obj
+      obj.extend self
+    end
   end
-  def to_hex
-    (('ff'.to_i(16).to_f * self).to_i).to_s(16).rjust(2, '0')
+
+  class ImageBuilder
+    def build_text_drawing img
+      @lines.empty? and return fail("foo")
+      #@todo setters for everything etc
+      draw = Magick::Draw.new
+      draw.gravity         = @opts[:gravity] || Magick::NorthEastGravity
+      @opts[:fill] ||= '#662020'
+      @opts[:fill].kind_of?(Proc) and @opts[:fill] = @opts[:fill].call(self)
+      draw.fill            = @opts[:fill]
+      draw.font            = @opts[:font] || "#{ENV['HOME']}/.fonts/SimpleLife.ttf"
+      draw.font_style      = @opts[:font_style] || Magick::NormalStyle
+      draw.pointsize       = @opts[:point_size] || 60
+      draw.text_antialias  = @opts.key?(:text_antialias) ? @opts[:text_antialias] : true
+      draw.annotate(img, 0,0,20,10, @lines.first)
+      if @lines.length > 1
+        second_line = @lines[1..-1].join(' ')
+        draw.annotate(img, 0,0,20,80, second_line) do
+          self.pointsize = 30
+        end
+      end
+      nil # draw not needed at this point
+    end
+    private :build_text_drawing
+
+    def initialize iterm, lines, opts
+      @iterm, @lines, @opts = [iterm, lines, opts]
+    end
+
+    attr_reader :iterm
+
+    def run
+      require 'RMagick'
+      bg_color = Color.dup(@iterm.session.background_color)
+      @opts.key?(:alpha_percent) and bg_color.alpha = @opts[:alpha_percent]
+      img = Magick::Image.new(500, 300) do # copying over hard-coded dimensions from original Dmytro script
+        self.background_color = bg_color.to_hex
+      end
+      build_text_drawing img
+      img
+    end
   end
-end
 
-class Skylab::Myterm::ImageBuilder
-  Myterm = Skylab::Myterm
-  class << self
+  class << ImageBuilder
     def build_background_image iterm, lines, opts
       new(iterm, lines, opts).run
     end
   end
-  def initialize iterm, lines, opts
-    @iterm, @lines, @opts = [iterm, lines, opts]
-  end
-  attr_reader :iterm
-  def run
-    require 'RMagick'
-    bg_color = Myterm::Color.dup(@iterm.session.background_color)
-    @opts.key?(:alpha_percent) and bg_color.alpha = @opts[:alpha_percent]
-    img = Magick::Image.new(500, 300) do # copying over hard-coded dimensions from original Dmytro script
-      self.background_color = bg_color.to_hex
-    end
-    build_text_drawing img
-    img
-  end
-private
-  def build_text_drawing img
-    @lines.empty? and return fail("foo")
-    #@todo setters for everything etc
-    draw = Magick::Draw.new
-    draw.gravity         = @opts[:gravity] || Magick::NorthEastGravity
-    @opts[:fill] ||= '#662020'
-    @opts[:fill].kind_of?(Proc) and @opts[:fill] = @opts[:fill].call(self)
-    draw.fill            = @opts[:fill]
-    draw.font            = @opts[:font] || "#{ENV['HOME']}/.fonts/SimpleLife.ttf"
-    draw.font_style      = @opts[:font_style] || Magick::NormalStyle
-    draw.pointsize       = @opts[:point_size] || 60
-    draw.text_antialias  = @opts.key?(:text_antialias) ? @opts[:text_antialias] : true
-    draw.annotate(img, 0,0,20,10, @lines.first)
-    if @lines.length > 1
-      second_line = @lines[1..-1].join(' ')
-      draw.annotate(img, 0,0,20,80, second_line) do
-        self.pointsize = 30
-      end
-    end
-    nil # draw not needed at this point
-  end
-end
 
-class Skylab::Myterm::ItermProxy
-  # ItermProxy is a wrapper around everything Iterm to the extent that its AppleScript interface supports
+  class ItermProxy
+    # ItermProxy is a wrapper around everything Iterm to the extent that its AppleScript interface supports
+    #
+    MIN_LEN = 50
 
-  Myterm = ::Skylab::Myterm # keep top level name out of the bulk of the code
+    def app
+      @app ||= begin
+        require 'appscript'
+        Appscript.app('iTerm')
+      end
+    end
+    private :app
 
-  MinLen = 50
+    def invalid msg
+      raise ValidationError.new(msg)
+    end
+    private :invalid
 
-  def bounds= arr
-    x = arr.detect { |i| i.to_s !~ /^\d+$/ } and return invalid("expecting digit had #{x.inspect}")
-    x = arr[2,2].detect { |i| i.to_i < MinLen } and return invalid("too small: #{x} (min: #{MinLen})")
-    app.windows[0].bounds.set arr
-  end
+    def bounds= arr
+      x = arr.detect { |i| i.to_s !~ /^\d+$/ } and return invalid("expecting digit had #{x.inspect}")
+      x = arr[2,2].detect { |i| i.to_i < MIN_LEN } and return invalid("too small: #{x} (min: #{MIN_LEN})")
+      app.windows[0].bounds.set arr
+    end
 
-  def bounds
-    app.windows[0].bounds.get
-  end
+    def bounds
+      app.windows[0].bounds.get
+    end
 
-  def session
-    tty = `tty`.strip
-    @session ||= begin
-      session = catch(:catch_two) do
-        app.terminals.get.each do |term|
-          sessions = term.sessions.get
-          sessions.each do |session|
-            if session.tty.get == tty
-              throw :catch_two, session
+    def session
+      @session ||= begin
+        tty = `tty`.strip
+        t = s = 0
+        catch(:break) do
+          (1..app.terminals.count).each do |i|
+            (1..app.terminals[i].sessions.count).each do |j|
+              if tty == app.terminals[i].sessions[j].tty.get
+                throw(:break, SessionProxy.new(app, i, j))
+              end
             end
           end
-        end
+          nil
+        end or fail("couldn't ascertain current session!")
       end
-      session or fail("couldn't ascertain current session!")
-      SessionProxy.new(session)
     end
   end
 
-private
-
-  def app
-    @app ||= begin
-      require 'appscript'
-      Appscript.app('iTerm')
+  module AppscriptDelegator
+    def delegated_attr_readers *list
+      list.each do |property|
+        lambda do |_property|
+          define_method(_property) do
+            resource.send(_property).get
+          end
+        end.call(property)
+      end
     end
-  end
 
-  def invalid msg
-    raise Myterm::ValidationError.new(msg)
-  end
-end
+    def delegated_attr_writers *list
+      list.each do |property|
+        lambda do |_property|
+          define_method("#{_property}=") do |val|
+            resource.send(_property).set val
+          end
+        end.call(property)
+      end
+    end
 
-module Skylab::Myterm::AppscriptDelegator
-  def delegated_attr_readers *list
-    list.each do |property|
-      lambda do |_property|
-        define_method(_property) do
-          @resource.send(_property).get
-        end
-      end.call(property)
+    def delegated_attr_accessors *list
+      delegated_attr_readers(*list)
+      delegated_attr_writers(*list)
     end
   end
-  def delegated_attr_writers *list
-    list.each do |property|
-      lambda do |_property|
-        define_method("#{_property}=") do |val|
-          @resource.send(_property).set val
-        end
-      end.call(property)
+
+  class ItermProxy::SessionProxy
+    extend AppscriptDelegator
+
+    delegated_attr_accessors :background_image_path
+
+    def background_color
+      Color[resource.background_color.get]
     end
-  end
-  def delegated_attr_accessors *list
-    delegated_attr_readers(*list)
-    delegated_attr_writers(*list)
-  end
-end
 
-class Skylab::Myterm::ItermProxy::SessionProxy
-  Myterm = Skylab::Myterm
-  def initialize session
-    @resource = session
-  end
-  extend Myterm::AppscriptDelegator
+    def foreground_color
+      Color[resource.foreground_color.get]
+    end
 
-  delegated_attr_accessors :background_image_path
-  delegated_attr_readers :tty
+    def initialize app, term_idx, session_idx
+      @app, @term_idx, @sessions_idx = [app, term_idx, session_idx]
+    end
 
-  def background_color
-    Myterm::Color[@resource.background_color.get]
-  end
+    def resource
+      @app.terminals[@term_idx].sessions[@sessions_idx]
+    end
 
-  def foreground_color
-    Myterm::Color[@resource.foreground_color.get]
+    delegated_attr_readers :tty
   end
 end
 
-module Skylab::Myterm::ChannelScalarNormalized
-  def self.[] obj
-    obj.extend self
-  end
-  def to_hex
-    (('ff'.to_i(16).to_f * self).to_i).to_s(16).rjust(2, '0')
+module Skylab
+  class << Myterm
+    def version
+      File.read(File.expand_path('../../../VERSION', __FILE__))
+    end
   end
 end
+

data/lib/myterm/cli.rb

@@ -1,149 +1,144 @@
-require "#{File.expand_path('../vendor/face/cli', __FILE__)}"
-require "#{File.dirname(__FILE__)}/api"
-require 'ruby-debug'
+require File.expand_path('../vendor/skylab/face/cli', __FILE__)
+require File.expand_path('../api', __FILE__)
 require 'open3'
 
-module Skylab; end
-module Skylab::Myterm; end
 
-module Skylab::Myterm::PathPrettifier
-  HomeDirRe = /\A#{Regexp.escape(ENV['HOME'])}/
-protected
-  def pretty_path path
-    path.sub(HomeDirRe, '~')
+module Skylab::Myterm
+  module PathPrettifier
+    HOME_DIR_RE = /\A#{Regexp.escape(ENV['HOME'])}/
+    def pretty_path path
+      path.sub(HOME_DIR_RE, '~')
+    end
   end
-end
 
-class Tmx::Face::Command
-  include Skylab::Myterm::PathPrettifier
-end
+  class ::Skylab::Face::Command
+    include PathPrettifier # eew
+  end
 
-class Skylab::Myterm::Cli < Tmx::Face::Cli
-  Myterm = ::Skylab::Myterm # don't use fully qualified name internally
-  include Myterm::PathPrettifier
+  class Cli < ::Skylab::Face::Cli
+    include PathPrettifier
 
-  version do
-    require "#{File.dirname(__FILE__)}/version"
-    Myterm::VERSION
-  end
+    version { ::Skylab::Myterm.version }
 
-  o(:bounds) do |o|
-    syntax "#{path} [x y width height]"
-    o.banner = "gets/sets the bounds of the terminal window\n#{usage_string}"
-  end
+    o(:bounds) do |o|
+      syntax "#{invocation_string} [x y width height]"
+      o.banner = "gets/sets the bounds of the terminal window\n#{usage_string}"
+    end
 
-  def bounds o, *a
-    case a.length
-    when 4
-      begin ; iterm.bounds = a ; rescue Myterm::ValidationError => e ; return usage e ; end
-    when 0
-      @err.puts iterm.bounds.inspect
-    else
-      return usage("bad number of args #{a.length}: expecting 0 or 4")
+    def bounds o, *a
+      case a.length
+      when 4
+        begin ; iterm.bounds = a ; rescue ValidationError => e ; return usage e ; end
+      when 0
+        @err.puts iterm.bounds.inspect
+      else
+        return usage("bad number of args #{a.length}: expecting 0 or 4")
+      end
     end
-  end
 
-  o(:'bg') do |o, req|
-    syntax "#{path} [opts] [<text> [<text> [...]]]"
-    o.banner = "Generate a background image with certain text for the terminal\n#{usage_string}"
-    o.on('-e', '--exec <cmd ...>', 'Execute <cmd ...> in shell, also use it as text for background.') { }
-    o.on('-o', '--opacity PERCENT', "Percent by which to make image background opaque",
-      "(0%: tranparent. 100%: solid.  Default: solid)") { |amt| req[:alpha_percent] = amt }
-    req[:font_file] = DefaultFontFile
-    o.on('--font FONTFILE.ttf', "font to use (default: #{pretty_path(req[:font_file])})") do |path|
-      req[:font_file] = path
+    o(:'bg') do |o, req|
+      syntax "#{invocation_string} [opts] [<text> [<text> [...]]]"
+      o.banner = "Generate a background image with certain text for the terminal\n#{usage_string}"
+      o.on('-e', '--exec <cmd ...>', 'Execute <cmd ...> in shell, also use it as text for background.') { }
+      o.on('-o', '--opacity PERCENT', "Percent by which to make image background opaque",
+        "(0%: tranparent. 100%: solid.  Default: solid)") { |amt| req[:alpha_percent] = amt }
+      req[:font_file] = DEFAULT_FONT_FILE
+      o.on('--font FONTFILE.ttf', "font to use (default: #{pretty_path(req[:font_file])})") do |path|
+        req[:font_file] = path
+      end
+      req[:fill] = '#662020'
+      o.on('--fill[=COLOR]', "Write text in this color (default: #{req[:fill].inspect})",
+        "(when present but with no value, will use \"Text/Normal\" setting of current iTerm tab)" ) do |v|
+        req[:fill] = v || lambda { |img| img.iterm.session.foreground_color.to_hex }
+      end
+      o.on('-v', '--verbose', 'Be verbose.') { req[:verbose] = true }
     end
-    req[:fill] = '#662020'
-    o.on('--fill[=COLOR]', "Write text in this color (default: #{req[:fill].inspect})",
-      "(when present but with no value, will use \"Text/Normal\" setting of current iTerm tab)" ) do |v|
-      req[:fill] = v || lambda { |img| img.iterm.session.foreground_color.to_hex }
+
+    def before_parse_bg req, args
+      idx = args.index { |s| %w(-e --exec).include?(s) } or return true
+      req[:_exec_this] = args[(idx+1)..-1]
+      args.replace idx == 0 ? [] : args[0..(idx-1)]
+      true
+    end
+    protected :before_parse_bg
+
+    def bg req, *args
+      if args.empty?
+        if req[:_exec_this]
+          args.any? and fail("logic error -- see before_parse_bg.")
+          args = req[:_exec_this]
+        else
+          return get_background
+        end
+      end
+      check_font(req) or return
+      img = ImageBuilder.build_background_image(iterm, args, req) or return false
+      req[:verbose] and @err.puts "(bg_color: #{img.background_color.inspect})"
+      outpath = "#{IMG_DIRNAME}/#{IMG_BASENAME}.#{Process.pid}.png"
+      img.write(outpath)
+      req[:verbose] and @err.puts "(setting background image to: #{outpath})" # doesn't care if --verbose
+      iterm.session.background_image_path = outpath
+      if req[:_exec_this]
+        @err.puts "(#{program_name} executing: #{req[:_exec_this].join(' ')})"
+        exec(req[:_exec_this].join(' '))
+      end
+      true
     end
-    o.on('-v', '--verbose', 'Be verbose.') { req[:verbose] = true }
-  end
 
-  def before_parse_bg req, args
-    idx = args.index { |s| %w(-e --exec).include?(s) } or return true
-    req[:_exec_this] = args[(idx+1)..-1]
-    args.replace idx == 0 ? [] : args[0..(idx-1)]
-    true
-  end
-  protected :before_parse_bg
+    DEFAULT_FONT_FILE = "#{ENV['HOME']}/.fonts/MytermDefaultFont.ttf"
+    IMG_DIRNAME  = '/tmp'
+    IMG_BASENAME = 'iTermBG'
 
-  def bg req, *args
-    if args.empty?
-      if req[:_exec_this]
-        args.any? and fail("logic error -- see before_parse_bg.")
-        args = req[:_exec_this]
+  private
+
+    def check_font req
+      File.exist?(req[:font_file]) and return true
+      if req[:font_file] == DEFAULT_FONT_FILE
+        return maybe_download_font req
       else
-        return get_background
+        font_not_found req
       end
     end
-    check_font(req) or return
-    img = Myterm::ImageBuilder.build_background_image(iterm, args, req) or return false
-    req[:verbose] and @err.puts "(bg_color: #{img.background_color.inspect})"
-    outpath = "#{ImgDirname}/#{ImgBasename}.#{Process.pid}.png"
-    img.write(outpath)
-    req[:verbose] and @err.puts "(setting background image to: #{outpath})" # doesn't care if --verbose
-    iterm.session.background_image_path = outpath
-    if req[:_exec_this]
-      @err.puts "(#{program_name} executing: #{req[:_exec_this].join(' ')})"
-      exec(req[:_exec_this].join(' '))
-    end
-    true
-  end
 
-  DefaultFontFile = "#{ENV['HOME']}/.fonts/MytermDefaultFont.ttf"
-  ImgDirname  = '/tmp'
-  ImgBasename = 'iTermBG'
-
-private
-  def check_font req
-    File.exist?(req[:font_file]) and return true
-    if req[:font_file] == DefaultFontFile
-      return maybe_download_font req
-    else
-      font_not_found req
+    DEFAULT_FONT_URL                = 'http://img.dafont.com/dl/?f=simple_life'
+    DEFAULT_FONT_FILE_NOT_SIMLINKED = "#{ENV['HOME']}/.fonts/SimpleLife.ttf"
+
+    def maybe_download_font req
+      target = DEFAULT_FONT_FILE_NOT_SIMLINKED
+      File.exist?(target) and return true
+      $stdin.tty? && $stdout.tty? or return font_not_found(req)
+      @err.write "Font file #{pretty_path(req[:font_file])} not found.  "
+      require 'highline'
+      require 'fileutils'
+      HighLine.new.agree("Let #{program_name} download it? (Y/n) (recommended: yes)") or return false
+      outfile = DEFAULT_FONT_FILE_NOT_SIMLINKED.sub(/\.ttf$/, '.zip')
+      font_dir = File.dirname(outfile)
+      File.directory?(font_dir) or FileUtils.mkdir_p(font_dir, :verbose => true)
+      cmds = ["wget -O #{outfile} #{DEFAULT_FONT_URL}"]
+      cmds.push "cd #{font_dir}"
+      cmds.push "unzip #{outfile}"
+      cmds.push "ln -s #{DEFAULT_FONT_FILE_NOT_SIMLINKED} #{DEFAULT_FONT_FILE}"
+      cmds.push("echo 'finished installing for #{program_name}: #{pretty_path(DEFAULT_FONT_FILE_NOT_SIMLINKED)}. " <<
+        "Please try using it again.'")
+      @err.puts(cmd = cmds.join(' ; '))
+      exec(cmd)
     end
-  end
-
-  DefaultFontUrl              = 'http://img.dafont.com/dl/?f=simple_life'
-  DefaultFontFileNotSimlinked = "#{ENV['HOME']}/.fonts/SimpleLife.ttf"
-
-  def maybe_download_font req
-    target = DefaultFontFileNotSimlinked
-    File.exist?(target) and return true
-    $stdin.tty? && $stdout.tty? or return font_not_found(req)
-    @err.write "Font file #{pretty_path(req[:font_file])} not found.  "
-    require 'highline'
-    require 'fileutils'
-    HighLine.new.agree("Let #{program_name} download it? (Y/n) (recommended: yes)") or return false
-    outfile = DefaultFontFileNotSimlinked.sub(/\.ttf$/, '.zip')
-    font_dir = File.dirname(outfile)
-    File.directory?(font_dir) or FileUtils.mkdir_p(font_dir, :verbose => true)
-    cmds = ["wget -O #{outfile} #{DefaultFontUrl}"]
-    cmds.push "cd #{font_dir}"
-    cmds.push "unzip #{outfile}"
-    cmds.push "ln -s #{DefaultFontFileNotSimlinked} #{DefaultFontFile}"
-    cmds.push("echo 'finished installing for #{program_name}: #{pretty_path(DefaultFontFileNotSimlinked)}. " <<
-      "Please try using it again.'")
-    @err.puts(cmd = cmds.join(' ; '))
-    exec(cmd)
-  end
 
-  def font_not_found req
-    @err.puts "font file not found: #{pretty_path(req[:font_file])}"
-    req.command.usage
-    return false
-  end
+    def font_not_found req
+      @err.puts "font file not found: #{pretty_path(req[:font_file])}"
+      req.command.usage
+      return false
+    end
 
-  def iterm
-    @iterm ||= Myterm::ItermProxy.new
-  end
+    def iterm
+      @iterm ||= ItermProxy.new
+    end
 
-  def get_background
-    @err.puts "tty: #{iterm.session.tty}"
-    @err.puts "background_image: #{iterm.session.background_image_path.inspect}"
-    @err.puts "background_color: #{iterm.session.background_color}"
+    def get_background
+      @err.puts "tty: #{iterm.session.tty}"
+      @err.puts "background_image: #{iterm.session.background_image_path.inspect}"
+      @err.puts "background_color: #{iterm.session.background_color}"
+    end
   end
-
 end
+

data/lib/myterm/vendor/{face → skylab/face}/cli.rb

@@ -1,16 +1,17 @@
 require 'optparse'
 
-# an ultralight command-line parser (391 lines)
+# an ultralight command-line parser (407 lines)
 # that wraps around OptParse (can do anything it does)
 # with colors
 # with flexible command-like options ('officious' like -v, -h)
 # with commands with arguments based off of method signatures
 # with subcommands, (namespaces) arbitrarily deeply nested
 
-module Tmx; end
-module Tmx::Face; end
+module Skylab; end
+module Skylab::Face; end
 
-module Tmx::Face::Colors
+module Skylab::Face::Colors
+  extend self
   def bold str ; style str, :bright, :green end
   def hi   str ; style str, :green          end
   def ohno str ; style str, :red            end
@@ -26,7 +27,7 @@ module Tmx::Face::Colors
   end
 end
 
-module Tmx::Face
+module Skylab::Face
   class Command
 
     include Colors
@@ -80,12 +81,12 @@ module Tmx::Face
 
     def parse argv
       req = { }
-      req.send(:instance_variable_set, '@method_parameters', argv)
       class << req
-        attr_accessor :method_parameters, :command
+        attr_accessor :command
+        attr_accessor :method_parameters
       end
-      @parent_protected_instance_methods.include?("before_parse_#{@intern}".intern) and
-        ! @parent.send("before_parse_#{@intern}", req, argv) and return false
+      req.method_parameters = argv
+      req.command = self
       begin
         build_option_parser(req).parse! argv
         req
@@ -96,10 +97,11 @@ module Tmx::Face
       end
     end
 
+    NoUsageRe = /\A#{Regexp.escape(Skylab::Face::Colors.hi('usage:'))} /
+
     def summary
-      build_option_parser({}).to_s.
-        sub(/\A#{Regexp.escape(hi('usage:'))} /, '').
-        split("\n").select{ |s| ! s.strip.empty? }
+      build_option_parser({}).to_s =~ /\A[\n]*([^\n]*)(\n+[^\n])?/
+      [ "#{$1}#{ ' [..]' if $2 }".sub(NoUsageRe, '') ]
     end
 
     def syntax *args
@@ -125,10 +127,8 @@ module Tmx::Face
       def invocation_string
         "#{@parent.invocation_string} #{name}"
       end
-      alias_method :path, :invocation_string
       def parent= parent
         @parent and fail("won't overwrite existing parent")
-        @parent_protected_instance_methods = parent.class.protected_instance_methods(false).map(&:intern)
         @parent = parent
       end
       def usage msg=nil
@@ -159,7 +159,8 @@ module Tmx::Face
         #   option_definitions.reject! { |a,_| '-h' == a.first }
       end
       def namespace name, &block
-        command_definitions.push [Namespace, [name], block]
+        def_block = name.kind_of?(Array) ? name : [Namespace, [name], block]
+        command_definitions.push Namespace.add_definition(def_block)
       end
       def on *a, &b
         block_given? or raise ArgumentError.new("block required")
@@ -277,6 +278,19 @@ module Tmx::Face
     class Namespace
       extend TreeDefiner, Colors
       include Treeish, Nodeish, Colors
+      @definitions ||= []
+      class << self
+        def add_definition arr
+          @definitions.push arr
+          arr
+        end
+        def namespaces
+          @definitions.each_with_index do |defn, idx|
+            defn.kind_of?(Class) or @definitions[idx] = defn[0].build(*defn[1], &defn[2])
+          end
+          @definitions
+        end
+      end
       alias_method :interface, :class
       def init_for_run parent, name_as_used
         @name_as_used = name_as_used
@@ -290,6 +304,7 @@ module Tmx::Face
       end
       alias_method :inspect, :name
       def self.build name, &block
+        name.kind_of?(Symbol) or return name
         name = name.to_s
         Class.new(self).class_eval do
           self.namespace_name = name
@@ -330,11 +345,12 @@ module Tmx::Face
   end
 end
 
-class Tmx::Face::Cli
-  extend Tmx::Face::Command::TreeDefiner
-  include Tmx::Face::Colors
-  include Tmx::Face::Command::Nodeish
-  include Tmx::Face::Command::Treeish
+class Skylab::Face::Cli
+  Face = Skylab::Face
+  extend Face::Command::TreeDefiner
+  include Face::Colors
+  include Face::Command::Nodeish
+  include Face::Command::Treeish
 
   def initialize
     @out = $stdout
@@ -362,7 +378,6 @@ class Tmx::Face::Cli
     end while (cmd and cmd.respond_to?(:find_command) and runner = cmd)
     cmd and req = cmd.parse(argv) and
     begin
-      req.command = cmd
       runner.send(cmd.method_symbol, req, * req.method_parameters)
     rescue ArgumentError => e
       argument_error e, cmd

data/myterm.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "myterm/version"
+require 'myterm/api'
 
 Gem::Specification.new do |s|
   s.name        = "myterm"
-  s.version     = Skylab::Myterm::VERSION
+  s.version     = Skylab::Myterm.version
   s.authors     = ["Mark Meves"]
   s.email       = ["mark.meves@gmail.com"]
   s.homepage    = "http://botnoise.org"
@@ -14,8 +14,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "myterm"
 
-  s.add_dependency 'rb-appscript'
   s.add_dependency 'highline'
+  s.add_dependency 'rb-appscript'
+  s.add_dependency 'rmagick' # i had 2.13.1
+
+  s.add_development_dependency 'rake'
   s.add_development_dependency "ruby-debug19"
 
   s.files         = `git ls-files`.split("\n")
@@ -23,3 +26,4 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myterm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000 -04:00
+date: 2012-01-24 00:00:00.000000000 -08:00
 default_executable: 
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70123357981900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70123357981900
 - !ruby/object:Gem::Dependency
   name: rb-appscript
-  requirement: &70161455195900 !ruby/object:Gem::Requirement
+  requirement: &70123357981460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161455195900
+  version_requirements: *70123357981460
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &70161455195480 !ruby/object:Gem::Requirement
+  name: rmagick
+  requirement: &70123357981040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +44,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161455195480
+  version_requirements: *70123357981040
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70123357980620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70123357980620
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70161455195060 !ruby/object:Gem::Requirement
+  requirement: &70123357980200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161455195060
+  version_requirements: *70123357980200
 description: Command line interface for customizing iTerm using AppleScript. Creates
   meaningful, salient, eye-catching background images that help to discern between
   iTerm windows.
@@ -59,16 +81,17 @@ files:
 - .gitignore
 - .repath.sh
 - .rvmrc.example
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
+- VERSION
 - bin/myterm
 - doc/HISTORY.md
 - lib-iterm.sh
 - lib/myterm/api.rb
 - lib/myterm/cli.rb
-- lib/myterm/vendor/face/cli.rb
-- lib/myterm/version.rb
+- lib/myterm/vendor/skylab/face/cli.rb
 - myterm.gemspec
 has_rdoc: true
 homepage: http://botnoise.org

data/lib/myterm/version.rb

@@ -1,4 +0,0 @@
-module Skylab; end
-module Skylab::Myterm
-  VERSION = "0.0.3"
-end