easyoperate 0.1.2 → 0.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.0 2008-12-22
+
+* 1 major enhancement:
+  * Scm Plugin (Add your SCM Plugin to ~/.eo/scm )
+
 == 0.1.0 2008-12-13
 
 * 1 major enhancement:

data/Manifest.txt

@@ -7,7 +7,9 @@ example/eorc
 lib/easyoperate.rb
 lib/eo.rb
 lib/eo/eo.rb
-lib/eo/scm.rb
+lib/eo/repository.rb
+lib/eo/scm/git.rb
+lib/eo/scm/svn.rb
 test/test_easyoperate.rb
 test/test_eo_cli.rb
 test/test_helper.rb

data/README.rdoc

@@ -17,7 +17,7 @@
             # then  copy autoload/rails.vim to ~/.vim/autoload/
             # then  copy plugin/rails.vim to ~/.vim/plugin/
 
-   scm:     # svn/git,default is git
+   scm:     # Default is git,your can define your scm-type in ~/.eo/scm
 
    cmd:     # Where you can define your methods
       cp_autoload: `cp autoload/rails.vim ~/.vim/autoload/`

data/bin/eo

@@ -3,8 +3,15 @@
 # Copyright (c) 2008. GPL3.
 # Author: Jinzhu Zhang
 
-require File.expand_path(File.dirname(__FILE__) + "/../lib/easyoperate")
-
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require "easyoperate"
 require "eo"
 
-Eo.execute(STDOUT, ARGV)
+# easy debug
+if ARGV.delete('-d')
+  ['rubygems','ruby-debug'].each {|x| require x}
+else
+  def debugger;end
+end
+
+Eo.execute(ARGV)

data/lib/easyoperate.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH << File.dirname(__FILE__)
-
 module Easyoperate
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/eo.rb

@@ -1,49 +1,29 @@
-%w(optparse yaml eo/eo).each {|f| require f}
+%w(yaml eo/eo).each {|f| require f}
 
 class Eo
 
-  def self.execute(stdout, arguments=[])
-
-    parser = OptionParser.new do |opts|
-      opts.banner = <<-BANNER.gsub(/^          /,'')
-          Usage: #{File.basename($0)} [options] [ARGS]
-
-          Options are:
-      BANNER
-
-      opts.on_tail("-h", "--help","Show this help message.") do |args|
-        stdout.puts opts; exit
-      end
-
-      opts.on_tail("-v", "--version","Show version information.") do
-        puts "\e[33mEo_oE : v" + Easyoperate::VERSION + "\e[0m"; exit
-      end
-
-      opts.on("-u [ARGS]", "--update","Update Repository. <Regexp>") do |args|
-        self.update(args)
-      end
-
-      opts.on("-s [ARGS]", "--show","Show All Repositories. <Regexp>") do |args|
-        self.show(args)
-      end
-
-      opts.on("-c [ARGS]", "--choose","Choose Repository.") do |args|
-        self.choose(args)
-      end
-
-      opts.on("-i [ARGS]", "--init","Initialize Repository. <Regexp>") do |args|
-        self.init(args)
-      end
-
-      if arguments.empty?
-        self.run
-      else
-        begin
-          opts.parse!(arguments)
-        rescue OptionParser::InvalidOption
-          puts "\e[31m;(\tError\e[0m \n\tHelp?\t\e[33m$ eo -h \e[31m;)\e[0m"
-        end
-      end
+  def self.execute(args)
+
+    case args.first
+    when "-s" then self.show(args[1,args.size])
+    when "-c" then self.choose(args[1,args.size])
+    when "-i" then self.init(args[1,args.size])
+    when "-u" then self.update(args[1,args.size])
+    when "-t" then self.type
+    when "-v" then puts "\e[33mEo_oE : v" + Easyoperate::VERSION + "\e[0m"
+    when "-h" then
+      puts <<-DOC.gsub(/^(\s*\|)/,'')
+        |Usage: #{File.basename($0)} [options] [ARGS]
+
+        |Options are:
+        |  -u        Update Repository. <Regexp>
+        |  -s        Show All Repositories. <Regexp>
+        |  -v        Show version information.
+        |  -c        Choose Repository.
+        |  -t        Show All Support Scm
+        |  -i        Initialize Repository. <Regexp>
+      DOC
+    else self.run
     end
   end
 end

data/lib/eo/eo.rb

@@ -1,17 +1,18 @@
-require 'eo/scm'
+require File.join(File.dirname(__FILE__),'repository')
+
 class Eo
-  Repo = Hash.new
+  Repos = Hash.new
 
   Config_file = File.join("#{ENV['HOME']}",".eorc")
 
   unless File.exist?(Config_file)
-    puts " \e[31m;( No config file\e[0m \n\nexample file:"
+    puts " \e[31m;(     No config file\e[0m \n\nExample Config file:\n\n"
     puts File.read(File.join(File.dirname(__FILE__),'../../example/eorc'))
     exit
   end
 
-  YAML.load_file(Config_file).each_pair do |keys,value|
-    Repo[keys] = Scm.new.merge(value)
+  YAML.load_file(Config_file).each_pair do |key,value|
+    Repos[key] = Repository.new(value.merge(:_name_ => key))
   end
 
   class << self
@@ -26,76 +27,92 @@ class Eo
         when /C/i then choose(input[1])
         when /U/i then update(input[1])
         when /I/i then init(input[1])
-        when /Q/i then exit(0)
+        when /T/i then type
+        when /Q/i then exit
         else help
         end
       end
     end
 
     def help
-      puts "Usage:"
-      puts "  S /args/ : Show matched repositories <Regexp>"
-      puts "  C /args/ : Choose One Repository <Regexp>"
-      puts "  U /args/ : Update matched Repository <Regexp>"
-      puts "  I /args/ : Initialize matched Repository <Regexp>"
-      puts "  Q        : Quit"
-      puts "  H        : Show this help message."
-      puts "e.g:\n  \e[32m s v.*m\e[0m"
+      puts <<-DOC.gsub(/^(\s*\|)/,'')
+      |Usage:
+      |  S /args/ : Show matched repositories <Regexp>
+      |  C /args/ : Choose One Repository <Regexp>
+      |  U /args/ : Update matched Repository <Regexp>
+      |  I /args/ : Initialize matched Repository <Regexp>
+      |  T        : Show All Support Scm
+      |  Q        : Quit
+      |  H        : Show this help message.
+      |e.g:\n  \e[32m s v.*m\e[0m
+      DOC
+    end
+
+    def type
+      ["#{ENV['HOME']}/.eo/scm/",File.join(File.dirname(__FILE__),'scm')].each do |x|
+        next if !File.exist?(x)
+        (@scm ||= []).concat(Dir.new(x).entries.reject {|i| i =~/^\.+$/})
+      end
+
+      puts "\e[33mAll Scm-type :\e[0m"
+      @scm.uniq.map do |x|
+        (@formated_scm ||= []) << File.basename(x,".rb")
+      end
+      format_display(@formated_scm)
     end
 
     def show(*args)
       repos = pick(args,false)
       puts "\e[33mAll Repo match < #{args} > :\e[0m"
-      repos.each_index do |x|
-        printf "\e[32m %-22s\e[0m" % [repos[x].rstrip]
-        printf("\n") if (x+1)%3==0
-      end
-      puts "\n" if repos.size%3 != 0
+      format_display(repos)
     end
 
     def choose(*args)
       repos = pick(args)
-      if repos && repos = repos.to_s
+
+      if repos && repos = repos.to_s    # Convert Array To String
         return false unless exist_path(repos)
         loop do
-          printf("\e[01;34m#{repos.first} (h:help)>> \e[0m")
+          printf("\e[01;34m#{repos} (h:help)>> \e[0m")
           input = STDIN.gets.strip
           break if input =~ /\A\s*q\s*\Z/
           exit if input =~ /\A\s*Q\s*\Z/
-          Repo[repos].send(input) unless input.empty?
+          Repos[repos].send(input) unless input.empty?
         end
       end
     end
 
     def init(*args)
       repos = pick(args,false)
+
       repos.each do |x|
-        if File.exist?(File.expand_path(Repo[x]['path']))
+        if File.exist?(File.expand_path(Repos[x].path))
           puts "\e[32m %-18s: already Initialized\e[0m" % [x]
           next
         end
         puts "\e[32m %-18s: Initializing\e[0m" % [x]
-        Repo[x].init
+        Repos[x].init
       end
     end
 
     def update(*args)
       repos = pick(args,false)
+
       repos.each do |x|
-        puts "\e[32m Updating #{Repo[x]['path']}:\e[0m"
+        puts "\e[32m Updating #{Repos[x].path}:\e[0m"
         next if !exist_path(x)
-        Repo[x].update
+        Repos[x].update
       end
     end
 
     protected
-    def pick(args,only_one=true)
-      repos = Repo.keys.grep(/#{args}/)
-        if only_one
+    def pick(args,single=true)
+      repos = Repos.keys.grep(/#{args}/)
+        if single
           if repos.size == 1
             return repos
           elsif repos.empty?
-            printf("\e[31mSorry,But No Result.\n\e[0m")
+            printf("\e[31mNo Result About < #{args} >.\n\e[0m")
             return false
           else
             return choose_one(repos)
@@ -108,18 +125,14 @@ class Eo
     def choose_one(args)
       puts "\e[33mPlease Choose One of them : \e[0m"
 
-      args.each_index do |x|
-        printf "\e[32m%-2d\e[0m %-22s" % [x+1,args[x].rstrip]
-        printf "\n" if (x+1)%3 == 0
-      end
-      printf "\n" if args.size%3 != 0
+      format_display(args)
 
       num = choose_range(args.size)
       return num ? [args[num-1]] : false
     end
 
     def choose_range(size)
-      printf "\e[33mPlease Input A Valid Number (1..#{size}) (q to quit): \e[0m"
+      printf "\e[33mPlease Input A Valid Number (1-#{size}) (q:quit): \e[0m"
       num = STDIN.gets
       return false if num =~ /q/i
       choosed_num = num.strip.empty? ? 1 : num.to_i
@@ -127,13 +140,20 @@ class Eo
     end
 
     def exist_path(repos)
-      if File.exist?(File.expand_path(Repo[repos]['path']))
-        Dir.chdir(File.expand_path(Repo[repos]['path']))
+      if File.exist?(File.expand_path(Repos[repos].path))
+        Dir.chdir(File.expand_path(Repos[repos].path))
       else
         puts "\n l.l,Have You init \e[33m#{repos}\e[0m Repository?\n\n"
         return false
       end
     end
 
+    def format_display(args)
+      args.each_index do |x|
+        printf "\e[32m%-2d\e[0m %-22s" % [x+1,args[x].rstrip]
+        printf "\n" if (x+1)%3 == 0
+      end
+      puts "\n" if args.size%3 != 0
+    end
   end
 end

data/lib/eo/repository.rb

@@ -0,0 +1,66 @@
+$LOAD_PATH.unshift("#{ENV['HOME']}/.eo/",File.join(File.dirname(__FILE__)))
+
+class Repository
+  attr_accessor :repo,:path,:_name_,:autorun
+
+  def initialize(opt={})
+
+    ['repo','path','_name_','autorun'].each do |x|
+      eval "self.#{x} = opt.delete('#{x}')"
+    end
+
+    begin
+      scm = opt['scm'] || 'git'
+      require "scm/#{scm.downcase}"
+      extend eval "Scm::#{scm.capitalize}"
+    rescue LoadError
+      puts <<-DOC.gsub(/^(\s*\|)/,'')
+        |\e[33m#{opt[:_name_]}\e[0m
+        |   \e[31mSorry,doesn't support < #{scm} > now.\e[0m
+        |   \e[31mYou can define your Scm-Type in ~/.eo/scm.\e[0m
+        DOC
+      exit 0
+    end
+
+    if opt['cmd']                   # Define Your Methods
+      opt['cmd'].each do |key,value|
+        self.class.send(:define_method, key, lambda { eval(value) } )
+        (@defined_methods ||= [] ) << [key,value]
+      end
+    end
+  end
+
+  def help
+    if @defined_methods
+      printf("Your Defined Methods :\n")
+      @defined_methods.each do |x|
+        puts "  %-18s: %s" % [x.first, x.last]
+      end
+    end
+
+    puts <<-DOC.gsub(/^\s*\|/,'')
+    |Usage:
+    |  update             Update
+    |  shell/sh           Goto shell
+    |  help/h             Show this help message
+    |  q                  Quit this shell
+    |  Q                  Exit this program
+    |  <Hash Method>      Run
+    |  <Your Method>      Run.if undefined by above
+    |  <Shell Command>    Run.if undefined by above
+    |e.g:\n  \e[32m pwd \e[0m => The repository's path
+    DOC
+  end
+  alias h help
+
+  def shell
+    system("sh")
+  end
+  alias sh shell
+
+  def method_missing(m,*args)
+    # method missing -> shell command
+    result = system(m.to_s + " " + args.join(' '))
+    puts "\e[31mlol, Some Wrong?\e[0m" unless result
+  end
+end

data/lib/eo/scm/git.rb

@@ -0,0 +1,22 @@
+module Scm
+  module Git
+    def init
+      system("git clone #{self.repo} #{self.path}")
+    end
+
+    def update
+      old_commit = now_commit
+      system("git pull")
+      new_commit = now_commit
+      if new_commit != old_commit && self.autorun
+        self.autorun.split(';').each do |x|
+          eval x
+        end
+      end
+    end
+
+    def now_commit
+      return `git log --pretty=format:%H -1`
+    end
+  end
+end

data/lib/eo/scm/svn.rb

@@ -0,0 +1,22 @@
+module Scm
+  module Svn
+    def init
+      system("svn co #{self.repo} #{self.path}")
+    end
+
+    def update
+      old_commit = now_commit
+      system("svn update")
+      new_commit = now_commit
+      if new_commit != old_commit && self.autorun
+        self.autorun.split(';').each do |x|
+          eval x
+        end
+      end
+    end
+
+    def now_commit
+      return `svn -l 1 log -q | sed '1d;3d' | awk '{print $1}'`
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: easyoperate
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jinzhu Zhang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 +08:00
+date: 2008-12-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -53,7 +53,9 @@ files:
 - lib/easyoperate.rb
 - lib/eo.rb
 - lib/eo/eo.rb
-- lib/eo/scm.rb
+- lib/eo/repository.rb
+- lib/eo/scm/git.rb
+- lib/eo/scm/svn.rb
 - test/test_easyoperate.rb
 - test/test_eo_cli.rb
 - test/test_helper.rb

data/lib/eo/scm.rb

@@ -1,89 +0,0 @@
-class Scm < Hash
-
-  def help
-    if self['cmd'] && cmd = self['cmd'].keys
-      printf("Your Defined Methods :\n")
-      cmd.each_index do |x|
-        puts "  %-18s: %s" % [cmd[x].rstrip,self['cmd'][cmd[x]]]
-      end
-      puts
-    end
-
-    puts "Usage: "
-    puts "  %-18s: %s." % ["update","Update"]
-    puts "  %-18s: %s." % ["shell/sh","Goto shell"]
-    puts "  %-18s: %s." % ["help/h","Show this help message"]
-    puts "  %-18s: %s." % ["q","Quit this shell"]
-    puts "  %-18s: %s." % ["Q","Exit this program"]
-    puts "  %-18s: %s." % ["<Hash Method>","Run"]
-    puts "  %-18s: %s." % ["<Your Method>","Run.if undefined by above"]
-    puts "  %-18s: %s." % ["<Shell Command>","Run.if undefined by above"]
-    puts "e.g:\n  \e[32m pwd \e[0m => The repository's path"
-
-  end
-  alias h help
-
-  def update
-    old_commit = now_commit
-    scm_update
-    new_commit = now_commit
-    if new_commit != old_commit && self['autorun']
-      self['autorun'].split(';').each do |x|
-        eval x
-      end
-    end
-  end
-
-  def shell
-    system("sh")
-  end
-  alias sh shell
-
-  def init
-    command = case self['scm']
-    when /svn/ then 'svn co'
-    when /git/ then 'git clone'
-    when nil   then 'git clone'
-    end
-    if command
-      system("#{command} #{self['repo']} #{self['path']}")
-    else
-      puts "\e[31mSorry,Maybe doesn't support #{self['scm']} rightnow.\e[0m"
-    end
-  end
-
-  def method_missing(m,*args)
-    m = m.to_s
-    methods = self['cmd'] ? self['cmd'].keys.grep(m) : []
-
-    if methods.size == 1
-      eval self['cmd'][m]
-    else
-      result = system(m + " " + args.join(' '))
-      puts "\e[31mlol, Some Wrong?\e[0m" unless result
-    end
-  end
-
-  protected
-  def scm
-    return 'git' if !Dir.entries('.').grep(".git").empty?
-    return 'svn' if !Dir.entries('.').grep(".svn").empty?
-  end
-
-  def scm_update
-    case scm
-    when /git/ then system("git pull")
-    when /svn/ then system("svn update")
-    end
-  end
-
-  def now_commit
-   case scm
-   when /git/ then return `git log --pretty=format:%H -1`
-   when /svn/ then return `svn -l 1 log -q | grep "\w" | awk '{print $1}'`
-   else
-     puts "\e[31mSorry,Only Support SVN/GIT\e[0m"
-     exit
-   end
-  end
-end