rtfs 0.0.2 → 0.0.3

data/README.markdown

@@ -0,0 +1,123 @@
+RTFS
+====
+
+RTFS is a Ruby Client for TFS.  
+
+[About TFS](http://code.taobao.org/project/view/366/)
+
+Requirements
+------------
+
+* Linux System (TFS only success build in Linux system.)
+* TFS 
+
+Configure
+---------
+
+create this files before using.
+
+config/tfs.yml
+
+    defaults: &defaults
+      host: '127.0.0.1:3100'
+
+    development:
+      <<: *defaults
+
+    test:
+      <<: *defaults
+
+    production:
+      <<: *defaults
+      
+config/initialize/tfs.rb
+
+    require 'rtfs'
+    tfs_config = YAML.load_file("#{Rails.root}/config/tfs.yml")[Rails.env]
+    $tfs = RTFS::Client.new(:ns_addr => tfs_config['host'])
+
+Configure without TFS install
+-----------------------------
+
+If you development environment is Mac, or your developemnt environment not install TFS, you need use this file to hack upload file as FileSystem. 
+
+lib/fake_tfs.rb
+
+    module FakeTfs
+      class Client
+        def initialize(options = {})
+          @ns_addr = options[:ns_addr] || "uploads/tfs/"
+          if @ns_addr[0] != "/"
+            @ns_addr = [Rails.root,"public",@ns_addr].join("/")
+          end
+        end
+    
+        def put_file(file_path, options = {})
+          ext = options[:ext] || File.extname(file_path)
+          ext = ".jpg" if ext.blank?
+          file_name = [Digest::SHA1.hexdigest(file_path),ext].join("")
+
+          new_path = [@ns_addr,file_name].join("/")
+
+          FileUtils.cp(file_path, new_path)
+          File.basename(new_path)
+        end
+    
+        def rm_file(file_id)
+          puts "FakeTFS: removing #{file_id}\n"
+          Dir.glob(File.join(@ns_addr, "#{file_id}.*"))[0]
+        end
+      end
+    end
+
+
+config/tfs.yml
+
+    defaults: &defaults
+      host: 'uploads/tfs/'
+
+    development:
+      <<: *defaults
+
+    test:
+      <<: *defaults
+
+    production:
+      <<: *defaults
+      host: '127.0.0.1:3100'
+
+config/initialize/tfs.rb
+
+    tfs_config = YAML.load_file("#{Rails.root}/config/tfs.yml")[Rails.env]
+    if Rails.env == "development"
+      $tfs = FakeTfs::Client.new(:ns_addr => tfs_config['host'])
+    else
+      require 'rtfs'
+      $tfs = RTFS::Client.new(:ns_addr => tfs_config['host'])
+    end
+
+
+Usage
+-----
+
+    class UsersController < ApplicationController
+      def save
+        @user = User.new
+        ext = File.extname(params[:Filedata].original_filename)
+        file_name = $tfs.put(params[:Filedata].tempfile.path, :ext => ext)
+        @user.avatar_path = [file_name,ext].join("")
+      end
+    end
+    
+    
+    class User < ActiveRecord::Base
+      def avatar_url
+        server_id = self.id % 4 + 1
+        "http://img#{server_id}.tbcdn.com/#{self.avatar_path}"
+      end
+    end
+    
+Put local file to TFS
+
+    $ $tfs.put("~/Downloads/a.jpg")
+    T1Ub1XXeFBXXb1upjX

data/lib/rtfs.rb

@@ -20,7 +20,7 @@ require_local 'rtfs/client.rb'
 require_local 'rtfs/meta.rb'
 require_local 'rtfs/version.rb'
 
-# tfs = RTFS::Client.new({:ns_addr => '10.246.65.210:3100'})
+tfs = RTFS::Client.new({:ns_addr => '10.246.65.210:3100'})
 # puts "tfsname: '#{tfs.put_file_and_get_url("/home/xifeng/1.png")}'"
 # puts "#{tfs.get_file('T1H9t5XeRwXXaCwpjX')}"
 # puts "#{tfs.file_stat('T1H9t5XeRwXXaCwpjX').inspect}"

data/lib/rtfs/client.rb

@@ -1,80 +1,86 @@
 # Code for client
 # by nowa<nowazhu@gmail.com> 2011-07-23
-
 module RTFS
-	TFSTOOL_PATH = "/home/admin/tfs/bin/tfstool"
+  TFSTOOL_PATH = "/home/admin/tfs/bin/tfstool"
 
-	class Client
-		attr_accessor :ns_addr
-		attr_accessor :tfstool_path
-	
-		def initialize(options)
-			return nil unless options
-			@ns_addr = options[:ns_addr]
-			@tfstool_path = options[:tfstool_path] ? options[:tfstool_path] : TFSTOOL_PATH
-			raise NoTFSToolError.new unless File.exist?(@tfstool_path)
-		end
-		
-		# ��tfs��ȡ�ļ�
-		def get_file(tfs_name, local_file=nil)
-			local_file ||= tfs_name
-			`#{tfstool_cmd} -i "get #{tfs_name} #{local_file}"`
-		end
-		
-		# �����ļ���tfs�������ļ���tfsname
-		# tfsname example: T1lpVcXftHXXaCwpjX
-		def put_file(local_file, tfs_name="NULL", suffix=nil)
-			suffix ||= ".#{local_file.split(".").last}"
-			result = `#{tfstool_cmd} -i "put #{local_file} #{tfs_name} #{suffix}"`
-			# puts "result: #{result}"
-			t = nil
-			if result.include?("=> ")
-				result = result.split("=> ").last
-				if result.include?(",")
-					t = result.split(",").first
-				end
-			end
-			t.nil? ? nil : t
-		end
-		
-		# �����ļ���tfs�������ļ��Ŀɷ���cdn url
-		def put_file_and_get_url(local_file, tfs_name="NULL", suffix=nil)
-			suffix ||= ".#{local_file.split(".").last}"
-			t = put_file(local_file, tfs_name, suffix)
-			t.nil? ? nil : "http://img03.taobaocdn.com/tfscom/#{t}#{suffix}"
-		end
-		
-		# ɾ��tfs file
-		def rm_file(tfs_name)
-			`#{tfstool_cmd} -i "rm #{tfs_name}"`
-		end
-		
-		# ������tfs file�����Ƽ�ʹ��
-		# new name ����Ҳ�� tfsname ��ʽ
-		def rename_file(tfs_name, new_name)
-			`#{tfstool_cmd} -i "rename #{tfs_name} #{new_name}"`
-		end
-		
-		# ��ȡtfs file��stat
-		def file_stat(tfs_name)
-			result = `#{tfstool_cmd} -i "stat #{tfs_name}"`
-			stat = {}
-			result.split("\n").each do |line|
-				line = line.split(':').map {|i| i.gsub!(" ", "")}
-				stat["#{line.first}"] = line.last
-			end
-			stat
-		end
-		
-		protected
-			def tfstool_cmd
-				"#{@tfstool_path} -n -s #{@ns_addr}"
-			end
-	end
-	
-	class NoTFSToolError < RuntimeError
-	    def to_s
-	      "You must install tfs from yum or source first!"
-	    end
-	end # NoTFSToolError
+  class Client
+    attr_accessor :ns_addr
+    attr_accessor :tfstool_path
+  
+    # 参数:
+    #   :ns_addr          TFS 服务器地址，如 127.0.0.1:3100
+    #   :tfstool_path     tfstool 安装路径，默认 /home/admin/tfs/bin/tfstool
+    def initialize(options)
+      return nil unless options
+      @ns_addr = options[:ns_addr]
+      @tfstool_path = options[:tfstool_path] ? options[:tfstool_path] : TFSTOOL_PATH
+      raise NoTFSToolError.new unless File.exist?(@tfstool_path)
+    end
+    
+    # 获取文件
+    def get(tfs_name, local_file=nil)
+      local_file ||= tfs_name
+      `#{tfstool_cmd} -i "get #{tfs_name} #{local_file}"`
+    end
+    
+    # 上传文件
+    # 参数:
+    #   file_path     需要上传的文件路径
+    #   :ext          扩展名，默认会取 file_path 的扩展名, 如: .jpg
+    # 返回值
+    #   T1lpVcXftHXXaCwpjX
+    def put(file_path, options = {})
+      ext = options[:ext] || File.extname(file_path)
+      tfs_name = "NULL"
+      result = `#{tfstool_cmd} -i "put #{file_path} #{tfs_name} #{ext}"`
+      # puts "result: #{result}"
+      t = nil 
+      if result.include?("=> ")
+        result = result.split("=> ").last
+        if result.include?(",")
+          t = result.split(",").first
+        end
+      end
+      t.nil? ? nil : t
+    end
+    
+    # 上传文件 并返回完整 url (only for Taobao)
+    def put_and_get_url(file_path, options = {})
+      ext = options[:ext] || File.extname(file_path)
+      t = put(file_path, :ext => ext)
+      t.nil? ? nil : "http://img03.taobaocdn.com/tfscom/#{t}#{ext}"
+    end
+    
+    # 删除文件, 不能带扩展名
+    def rm(tfs_name)
+      `#{tfstool_cmd} -i "rm #{tfs_name}"`
+    end
+    
+    # 改名, 不能带扩展名
+    def rename(tfs_name, new_name)
+      `#{tfstool_cmd} -i "rename #{tfs_name} #{new_name}"`
+    end
+    
+    # 文件信息查看, 不能带扩展名
+    def stat(tfs_name)
+      result = `#{tfstool_cmd} -i "stat #{tfs_name}"`
+      stat = {}
+      result.split("\n").each do |line|
+        line = line.split(':').map {|i| i.gsub!(" ", "")}
+        stat["#{line.first}"] = line.last
+      end
+      stat
+    end
+    
+    protected
+      def tfstool_cmd
+        "#{@tfstool_path} -n -s #{@ns_addr}"
+      end
+  end
+  
+  class NoTFSToolError < RuntimeError
+    def to_s
+      "You must install tfs from yum or source first!"
+    end
+  end # NoTFSToolError
 end

data/lib/rtfs/version.rb

@@ -4,7 +4,7 @@
 module RTFS::Version
   MAJOR = 0
   MINOR = 0
-  REVISION = 2
+  REVISION = 3
   
   class << self
     # Returns X.Y.Z formatted version string

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rtfs
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nowa Zhu
@@ -15,7 +15,7 @@ autorequire: rtfs
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 +08:00
+date: 2011-08-24 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.markdown
 - CHANGES
 - MIT-LICENSE
 files: 
@@ -49,7 +49,7 @@ files:
 - lib/rtfs/client.rb
 - lib/rtfs/wrapper.rb
 - lib/rtfs.rb
-- README
+- README.markdown
 - CHANGES
 - MIT-LICENSE
 has_rdoc: true

data/README

@@ -1,3 +0,0 @@
-RTFS is a Ruby Client for TFS.  
-
-What's TFS: http://code.taobao.org/project/view/366/