reposh 0.1.2 → 0.1.6

data/README

@@ -1,33 +1,49 @@
-
-= reposh
-
-Simple VCS Manager Shell
-
-== Description
-
-http://mono.kmc.gr.jp/~yhara/w/?Reposh
-http://rubyforge.org/projects/reposh/
-
-== Installation
-
-=== Archive Installation
-
-  rake install
-
-=== Gem Installation
-
-  gem install reposh
-
-
-== Features/Problems
-
-* vim-like keybind
-
-== Synopsis
-
-
-== Copyright
-
-Author::    yhara <yhara at kmc.gr.jp>
-Copyright:: Copyright (c) 2008 yhara
-License::   Ruby's Licence
+== Reposh - what's this?
+
+Without reposh, you type like this:
+  $ svk di
+  $ svk ci
+  $ svk st
+  $ ls
+but this is not DRY :)
+
+With reposh, you can omit typing all 'svk's:
+  $ reposh
+  Welcome to reposh x.y.z (mode: svk)
+  > di
+  > ci
+  >          # just push [Enter] for 'svk status'
+  > :ls      # start with ':' to run shell commands
+
+== How to use
+
+(1) write /home/(your name)/.reposh.yaml
+(2) cd to your working directory
+(3) reposh.rb [Enter]
+
+== Options
+
+see reposh.rb --help
+
+== Commands
+
+* exit, quit, ^D(^Z)
+  * Quit reposh
+* :ls ~/
+  * Run "ls ~/" by shell
+* [Enter]
+  * Equals to "status" (you can change this by .reposh.yaml) 
+* %reload
+  * Reload reposh.rb (for reposh developper)
+  * Some more commands starts with % are supported: see source
+
+All other commands are passed to vcs system.
+
+== Configuration
+
+see sample.reposh.yaml
+
+== Contact
+ 
+  http://mono.kmc.gr.jp/~yhara/w?Reposh
+

data/bin/reposh

@@ -1,173 +1,6 @@
-#!/usr/bin/env ruby#
+#!/usr/bin/env ruby
 # reposh.rb - Reposh - Simple VCS Manager Shell
-# usage:
-#   read bottom of this file
-#
-require 'readline'
-require 'yaml'
-require 'optparse'
-
-class Reposh
-  VERSION = "0.1.2"
-  CONF_DEFAULT = { "system" => {
-    "default" => {
-      "binpath" => nil,
-      "prompt" => "> ",
-      "default_cmd" => "status",
-    },
-    "darcs" => {
-      "default_cmd" => "whatsnew --summary",
-    }
-  }}
-
-  def initialize
-  end
-
-  def run
-    parse_option(ARGV)
-    @conf_path ||= File.join(ENV["HOME"], ".reposh.yaml")
-    @system_name ||= guess_system
-
-    @conf = load_config(@conf_path)
-    @binpath     = get_conf("binpath") || @system_name
-    @prompt      = get_conf("prompt")
-    @default_cmd = get_conf("default_cmd")
-    run_loop
-  end
-
-  def parse_option(args)
-    o = OptionParser.new{|opt|
-      opt.on("-c confpath",
-             "path to .reposh.yaml"){|path|
-        @confpath = path
-      }
-      opt.on("-s system",
-             "vcs command name (eg. svn, svk, hg)"){|sys|
-        @system_name = sys
-      }
-      opt.on("-h", "--help",
-             "show this message"){
-        puts opt
-        exit
-      }
-      opt.on("-v", "--version",
-             "show version information"){
-        puts VERSION
-        exit
-      }
-    }
-    o.parse(args)
-  end
-
-  def load_config(path)
-    if File.exist?(path)
-      YAML.load(File.read(path))
-    else
-      CONF_DEFAULT
-    end
-  end
-
-  def guess_system
-    case
-    when File.directory?(".hg")
-      "hg"
-    when File.directory?("_darcs")
-      "darcs"
-    when File.directory?(".svn")
-      "svn"
-    else
-      "svk"
-    end
-  end
-
-  def get_conf(prop)
-    value = (@conf["system"][@system_name] and @conf["system"][@system_name][prop])
-    value ||= (CONF_DEFAULT["system"][@system_name] && CONF_DEFAULT["system"][@system_name][prop])
-    value ||= CONF_DEFAULT["system"]["default"][prop]
-  end
-
-  def run_loop
-    puts "Welcome to reposh #{VERSION} (mode: #{@system_name})"
-    loop do
-      cmd = Readline.readline(@prompt, true)
-      cmd = @default_cmd if cmd == ""
-
-      case cmd
-      when "%reload"
-        load __FILE__
-      when "%env"
-        require 'pp'
-        pp ENV
-      when "%version"
-        puts VERSION
-      when nil, "exit", "quit"
-        puts ""
-        exit
-      when /^:(.*)/
-        puts $1
-        execute $1
-      else
-        execute "#{@binpath} #{cmd}"
-      end
-    end
-  end
-
-  def execute(cmd)
-    result = system(cmd)
-    if (not result) and ($?.nil? or $?.exitstatus == 127)
-      puts "error: failed to exec '#{cmd}'"
-    end
-  end
-end
 
+$LOAD_PATH << File.join(File.dirname(__FILE__), '../lib')
+require 'reposh'
 Reposh.new.run
-
-=begin
-== Reposh - what's this?
-Without reposh:
-  $ svk st
-  $ svk di
-  $ svk ci
-  $ ls
-
-With reposh:
-  $ reposh
-  > st
-  > di
-  > ci
-  > :ls
-
-== How to use
-(1) write /home/(your name)/.reposh.yaml
-(2) cd to your working directory
-(3) reposh.rb [Enter]
-
-== Options
-see reposh.rb --help
-
-== Commands
-* exit, quit, ^D(^Z)
-  * Quit reposh
-* :ls ~/
-  * Run "ls ~/" by shell
-* [Enter]
-  * Equals to "status" (you can change this by .reposh.yaml)
-* %reload
-  * Reload reposh.rb (for reposh developper)
-  * Some more commands starts with % are supported: see source
-
-All other commands are passed to vcs system.
-
-== Sample .reposh.yaml
-system:
-  default:
-    prompt: "> "
-  svn:
-    binpath: svn
-  svk:
-    binpath: c:/prog/svk/bin/svk.bat
-    prompt: "svk > "
-    default_cmd: "status"
-  hg:
-    binpath: hg
-=end

data/lib/reposh.rb

@@ -1,4 +1,230 @@
+require 'readline'
+require 'yaml'
+require 'optparse'
+
+class Hash
+  def recursive_merge(other)
+    self.merge(other) do |key, my_val, other_val|
+      # for values of a same key
+      if my_val.is_a? Hash and other_val.is_a? Hash
+        my_val.recursive_merge(other_val) # XXX: hang-ups for cyclic hash?
+      else
+        other_val
+      end
+    end
+  end
+end
 
 class Reposh
+  VERSION = "0.1.6"
+  CONF_DEFAULT = { 
+    "global" => {
+      "editing_mode" => nil,
+      "custom_commands" => [],
+      "pathext" => [],
+    },
+    "system" => {
+      "default" => {
+        "binpath" => nil,
+        "prompt" => "> ",
+        "default_cmd" => "status",
+      },
+      "darcs" => {
+        "default_cmd" => "whatsnew --summary",
+      }
+    }
+  }
+
+  def run
+    parse_option(ARGV)
+    @conf_path ||= File.join(ENV["HOME"], ".reposh.yaml")
+    @system_name ||= guess_system
+
+    @conf = load_config(@conf_path)
+    @editing_mode = @conf["global"]["editing_mode"]
+    pathext       = @conf["global"]["pathext"]
+    @prompt      = get_conf(@system_name, "prompt")
+    binpath      = get_conf(@system_name, "binpath") || @system_name
+    default_cmd  = get_conf(@system_name, "default_cmd")
+
+    @commands = Commands.new(binpath, default_cmd, pathext)
+    @commands.register_custom_commands(@conf["global"]["custom_commands"])
+
+    run_loop
+  end
+
+  def parse_option(args)
+    o = OptionParser.new{|opt|
+      opt.on("-c confpath",
+             "path to .reposh.yaml"){|path|
+        @confpath = path
+      }
+      opt.on("-s system",
+             "vcs command name (eg. svn, svk, hg)"){|sys|
+        @system_name = sys
+      }
+      opt.on("-h", "--help",
+             "show this message"){
+        puts opt
+        exit
+      }
+      opt.on("-v", "--version",
+             "show version information"){
+        puts VERSION
+        exit
+      }
+    }
+    o.parse(args)
+  end
+
+  def load_config(path)
+    if File.exist?(path)
+      config_hash = YAML.load(File.read(path))
+      CONF_DEFAULT.recursive_merge(config_hash)
+    else
+      CONF_DEFAULT
+    end
+  end
+
+  def guess_system
+    case 
+    when File.directory?(".hg")
+      "hg"
+    when File.directory?("_darcs")
+      "darcs"
+    when File.directory?(".svn")
+      "svn"
+    else
+      "svk"
+    end
+  end
+  
+  def get_conf(system, prop)
+    (@conf["system"][system] and @conf["system"][system][prop]) or @conf["system"]["default"][prop] 
+  end
+
+  def run_loop
+    if @editing_mode == "vi"
+      Readline.vi_editing_mode
+    end
+
+    puts "Welcome to reposh #{VERSION} (mode: #{@system_name})"
+    loop do
+      cmd = Readline.readline(@prompt, true)
+      @commands.dispatch(cmd, @system_name)
+    end
+  end
+
+  class Commands
+    def initialize(binpath, default_cmd, pathext)
+      @binpath, @default_cmd, @pathext = binpath, default_cmd, pathext
+      @commands = []
+      register_builtin_commands
+    end
+
+    def register_builtin_commands
+      # default command
+      register(/.*/){|match|
+        cmd = (match[0] == "") ? @default_cmd : match[0]
+        execute "#{@binpath} #{cmd}"
+      }
+
+      # system commands
+      register("%reload"){ 
+        load __FILE__ 
+      }
+      register("%env"){
+        require 'pp'
+        pp ENV
+      }
+      register("%version"){
+        puts VERSION 
+      }
+      register(/\A%ruby (.*)/){|match|
+        puts "reposh: result is " + eval(match[1]).inspect
+      }
+      @trace_mode = false
+      register("%trace"){
+        @trace_mode = (not @trace_mode)
+        puts "set trace_mode to #{@trace_mode}"
+      }
+
+      # exit commands
+      exit_task = lambda{
+        puts ""
+        exit
+      }
+      register(nil,    &exit_task)
+      register("exit", &exit_task)
+      register("quit", &exit_task)
+
+      # shell execution command
+      register(/^:(.*)/){|match|
+        execute match[1]
+      }
+    end
+
+    def register_custom_commands(commands)
+      commands.each do |hash|
+        if hash["for"] 
+          systems = hash["for"].split(/,/).map{|s| s.strip}
+        else
+          systems = nil
+        end
+        register(Regexp.new(hash["pattern"]), systems){|match|
+          cmd = hash["rule"].
+                  gsub(/\{system\}/, @binpath).
+                  gsub(/\{\$(\d+)\}/){ match[$1.to_i] }
+          puts cmd
+          execute cmd
+        }
+      end
+    end
+
+    def register(pattern, systems = nil, &task)
+      @commands.unshift [pattern, systems, task]
+    end
+
+    def dispatch(cmd, sys)
+      @commands.each do |pattern, systems, task|
+        next if systems && !systems.include?(sys)
+
+        if (match = match?(pattern, cmd))
+          return task.call(match)
+        end
+      end
+      raise "must not happen"
+    end
+
+    def match?(pat, value)
+      case pat
+      when Regexp
+        pat.match(value)
+      when nil
+        value == nil
+      else
+        pat.strip == value
+      end
+    end
+
+    def execute(cmd)
+      stat = false
+      ([""] + @pathext).each do |ext|
+        command = add_ext(cmd, ext)
+        puts command if @trace_mode
+        result = system(command)
+        return if result
+        stat = $?
+      end
+      puts "reposh: failed to exec '#{cmd}': status #{stat.exitstatus}"
+    end
+
+    def add_ext(cmd, ext)
+      exe, *args = cmd.split(' ')
+      "#{exe}#{ext} #{args.join ' '}"
+    end
+
+  end
 
 end
+

data/sample.reposh.yaml

@@ -0,0 +1,25 @@
+global:
+  editing_mode: vi             # default is: emacs
+  # pathext: [".bat", ".cmd"]  # for windows users
+  custom_commands:
+    # > ignore_of lib  =>  svn propedit svn:ignore lib
+    - pattern: \Aignore_of (.*)
+      rule: "{system} propedit svn:ignore {$1}"
+      for: svn, svk
+    # > ignore lib/*.o  =>  svn propset svn:ignore *.o lib
+    - pattern: \Aignore (.*)[\\/]([^\\/]+)
+      rule: "{system} propset svn:ignore {$2} {$1}"
+      for: svn, svk
+
+# settings for each vcs
+system:
+  default:  # for all vcs
+    prompt: "> "
+  svn:
+    binpath: svn
+  svk:
+    binpath: c:/prog/svk/bin/svk.bat    # path to svk
+    prompt: "svk > "                    # prompt
+    default_cmd: "status"               # used when you just type [Enter]
+  hg:
+    binpath: hg

metadata

@@ -1,52 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: reposh
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors: 
-- ujihisa
-autorequire: ""
+- yhara (Yutaka HARA)
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-02-04 00:00:00 +09:00
+date: 2008-06-23 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: Reposh - Simple VCS Manager Shell
-email: ujihisa@gmail.com
+description: 
+email: yhara,at,kmc,gr,jp
 executables: 
 - reposh
 extensions: []
 
-extra_rdoc_files: 
-- README
-- ChangeLog
+extra_rdoc_files: []
+
 files: 
 - README
-- ChangeLog
-- Rakefile
+- sample.reposh.yaml
 - bin/reposh
-- bin/reposh.bat
-- test/reposh_test.rb
-- test/test_helper.rb
 - lib/reposh.rb
-has_rdoc: true
-homepage: http://reposh.rubyforge.org
+has_rdoc: false
+homepage: http://mono.kmc.gr.jp/~yhara/
 post_install_message: 
-rdoc_options: 
-- --title
-- reposh documentation
-- --charset
-- utf-8
-- --opname
-- index.html
-- --line-numbers
-- --main
-- README
-- --inline-source
-- --exclude
-- ^(examples|extras)/
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -64,9 +48,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: reposh
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: Reposh - Simple VCS Manager Shell
-test_files: 
-- test/test_helper.rb
+summary: Simple VCS Shell
+test_files: []
+

data/ChangeLog

@@ -1,4 +0,0 @@
-== 0.1.2 / 2008-01-31
-
-* initial release
-

data/Rakefile

@@ -1,133 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/sshpublisher'
-require 'fileutils'
-
-require 'rubyforge'
-include FileUtils
-
-NAME              = "reposh"
-AUTHOR            = "ujihisa"
-EMAIL             = "ujihisa@gmail.com"
-DESCRIPTION       = "Reposh - Simple VCS Manager Shell"
-RUBYFORGE_PROJECT = "reposh"
-HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-BIN_FILES         = %w(reposh)
-VERS              = "0.1.2"
-
-REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-CLEAN.include ['**/.*.sw?', '*.gem', '.config']
-RDOC_OPTS = [
-  '--title', "#{NAME} documentation",
-  "--charset", "utf-8",
-  "--opname", "index.html",
-  "--line-numbers",
-  "--main", "README",
-  "--inline-source",
-]
-
-task :default => [:test]
-task :package => [:clean]
-
-Rake::TestTask.new("test") do |t|
-  t.libs   << "test"
-  t.pattern = "test/**/*_test.rb"
-  t.verbose = true
-end
-
-spec = Gem::Specification.new do |s|
-  s.name              = NAME
-  s.version           = VERS
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = ["README", "ChangeLog"]
-  s.rdoc_options     += RDOC_OPTS + ['--exclude', '^(examples|extras)/']
-  s.summary           = DESCRIPTION
-  s.description       = DESCRIPTION
-  s.author            = AUTHOR
-  s.email             = EMAIL
-  s.homepage          = HOMEPATH
-  s.executables       = BIN_FILES
-  s.rubyforge_project = RUBYFORGE_PROJECT
-  s.bindir            = "bin"
-  s.require_path      = "lib"
-  s.autorequire       = ""
-  s.test_files        = Dir["test/test_*.rb"]
-
-  #s.add_dependency('activesupport', '>=1.3.1')
-  #s.required_ruby_version = '>= 1.8.2'
-
-  s.files = %w(README ChangeLog Rakefile) +
-    Dir.glob("{bin,doc,test,lib,templates,generator,extras,website,script}/**/*") + 
-    Dir.glob("ext/**/*.{h,c,rb}") +
-    Dir.glob("examples/**/*.rb") +
-    Dir.glob("tools/*.rb")
-
-  s.extensions = FileList["ext/**/extconf.rb"].to_a
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
-task :install do
-  name = "#{NAME}-#{VERS}.gem"
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{name}}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.options += RDOC_OPTS
-  rdoc.template = "resh"
-  #rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  if ENV['DOC_FILES']
-    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
-  else
-    rdoc.rdoc_files.include('README', 'ChangeLog')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.include('ext/**/*.c')
-  end
-end
-
-desc "Publish to RubyForge"
-task :rubyforge => [:rdoc, :package] do
-  require 'rubyforge'
-  Rake::RubyForgePublisher.new(RUBYFORGE_PROJECT, 'ujihisa').upload
-end
-
-desc 'Package and upload the release to rubyforge.'
-task :release => [:clean, :package] do |t|
-  v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
-  abort "Versions don't match #{v} vs #{VERS}" unless v == VERS
-  pkg = "pkg/#{NAME}-#{VERS}"
-
-  rf = RubyForge.new
-  puts "Logging in"
-  rf.login
-
-  c = rf.userconfig
-#  c["release_notes"] = description if description
-#  c["release_changes"] = changes if changes
-  c["preformatted"] = true
-
-  files = [
-    "#{pkg}.tgz",
-    "#{pkg}.gem"
-  ].compact
-
-  puts "Releasing #{NAME} v. #{VERS}"
-  rf.add_release RUBYFORGE_PROJECT, NAME, VERS, *files
-end

data/bin/reposh.bat

@@ -1 +0,0 @@
-@ruby d:/proj/reposh/reposh %*

data/test/reposh_test.rb

@@ -1,8 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-require "test/unit"
-class ReposhTest < Test::Unit::TestCase
-  def test_todo
-    assert false, 'please write test'
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/reposh'
-