rtfs 0.0.4 → 0.1.0

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/*
+.DS_Store

data/CHANGES

@@ -1,3 +1,8 @@
+=== 0.1.0 / 2012-04-25
+
+* ����webservice��ʽ
+* Client.new��ʽ�ij�Client.tfs
+
 === 0.0.1 / 2011-08-02
 
 * Birthday!

data/README.markdown

@@ -20,6 +20,7 @@ config/tfs.yml
 
     defaults: &defaults
       host: '127.0.0.1:3100'
+      appkey: "......."
 
     development:
       <<: *defaults
@@ -34,7 +35,9 @@ 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'])
+    $tfs = RTFS::Client.tfs(tfs_config.merge({:ns_addr => tfs_config['host']}))
+
+:ns_addr include http:// tfs used webservice
 
 Configure without TFS install
 -----------------------------
@@ -93,7 +96,7 @@ config/initialize/tfs.rb
       $tfs = FakeTfs::Client.new(:ns_addr => tfs_config['host'])
     else
       require 'rtfs'
-      $tfs = RTFS::Client.new(:ns_addr => tfs_config['host'])
+      $tfs = RTFS::Client.tfs(tfs_config.merge({:ns_addr => tfs_config['host']}))
     end
 
 

data/Rakefile

@@ -0,0 +1,11 @@
+$:.unshift('lib')
+
+require 'rubygems'
+gem('rspec')
+
+ROOT_DIR = File.join(File.dirname(__FILE__))
+
+require 'rake'
+require 'rtfs'
+
+import('tasks/pkg.rake')

data/config/templates/github.gemspec.erb

@@ -0,0 +1,18 @@
+# Generated: <%= Time.now.utc.to_s %>
+Gem::Specification.new do |s|
+  s.name = "<%= spec['name'] %>"
+  s.version = "<%= spec['version'] %>"
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = [<% spec['extra_rdoc_files'].each do |f| %>"<%= f %>",<% end %>]
+  s.summary = "<%= spec['summary'] %>"
+  s.author = "<%= spec['author'] %>"
+  s.email = "<%= spec['email'] %>"
+  s.homepage = "<%= spec['homepage'] %>"
+  s.rubyforge_project = "<%= spec['rubyforge_project'] %>"
+  <% spec['add_dependency'].each do |gem, version| %>s.add_dependency("<%= gem %>", "<%= version %>")<% end %>
+#  s.require_path = "<%= spec['require_path'] %>"
+  s.files = [<% spec['files'].each {|f| %>"<%= f %>",<% } %>]
+  s.bindir = 'bin'
+  s.executables = ['top4rsh']
+end

data/lib/rtfs.rb

@@ -16,9 +16,11 @@ require 'nice-ffi'
 require 'yaml'
 
 # require_local 'rtfs/wrapper.rb'
-require_local 'rtfs/client.rb'
-require_local 'rtfs/meta.rb'
-require_local 'rtfs/version.rb'
+require 'rtfs/client.rb'
+require 'rtfs/web_service.rb'
+require 'rtfs/tfstool.rb'
+require 'rtfs/meta.rb'
+require 'rtfs/version.rb'
 
 # tfs = RTFS::Client.new({:ns_addr => '10.246.65.210:3100'})
 # puts "tfsname: '#{tfs.put_file_and_get_url("/home/xifeng/1.png")}'"

data/lib/rtfs/client.rb

@@ -1,86 +1,20 @@
 # Code for client
 # by nowa<nowazhu@gmail.com> 2011-07-23
 module RTFS
-  TFSTOOL_PATH = "/home/admin/tfs/bin/tfstool"
 
   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)
+    def self.tfs(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
+      if options[:ns_addr].include?("http://")
+        return RTFS::WebService.new(options)
+      else
+        return RTFS::Tfstool.new(options)
       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
+end

data/lib/rtfs/tfstool.rb

@@ -0,0 +1,89 @@
+module RTFS
+
+  TFSTOOL_PATH = "/home/admin/tfs/bin/tfstool"
+  class Tfstool
+
+    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
+            if not File.exist?(@tfstool_path)
+                puts "[RTFS] debuger: #{@tfstool_path}"
+        raise NoTFSToolError.new
+            end
+    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/web_service.rb

@@ -0,0 +1,82 @@
+# encoding utf-8
+require 'rest-client'
+require "json"
+
+module RTFS
+  class WebService
+
+    attr_accessor :appkey
+    attr_accessor :ns_addr
+
+    def initialize(options)
+      return nil unless options
+      @ns_addr = options[:ns_addr]
+      @appkey = options[:appkey]
+    end
+      
+    # 获取文件
+    def get(tfs_name, local_file=nil)
+      RestClient.get(get_url("/v1/#{appkey}/#{tfs_name}"))
+    end
+    
+    # 上传文件
+    # 参数:
+    #   file_path     需要上传的文件路径
+    #   :ext          扩展名，默认会取 file_path 的扩展名, 如: .jpg
+    # 返回值
+    #   T1lpVcXftHXXaCwpjX
+    def put(file_path, options = {})
+        ext = options[:ext] || File.extname(file_path)
+        response = RestClient.post(get_url("/v1/#{appkey}",{:suffix => ext, :simple_name => options[:simple_name] || 0}),File.open(file_path).read, :accept => :json )
+        json = JSON.parse(response)
+        json && json["TFS_FILE_NAME"] ? json["TFS_FILE_NAME"] : nil
+
+    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://img0#{rand(4)+1}.taobaocdn.com/tfscom/#{t}#{ext}"
+    end
+    
+    # 删除文件, 不能带扩展名
+    def rm(tfs_name,options = {})
+        response = RestClient.delete(get_url("/v1/#{appkey}/#{tfs_name}", options))
+        response && response.code == 200 ? true : nil
+    end
+    
+    # 改名, 不能带扩展名
+    def rename(tfs_name, new_name)
+      #`#{tfstool_cmd} -i "rename #{tfs_name} #{new_name}"`
+    end
+    
+    # 文件信息查看, 不能带扩展名
+    def stat(tfs_name,options = {})
+        response = RestClient.get(get_url("/v1/#{appkey}/metadata/#{tfs_name}", options))
+        response && response.code == 200 ? JSON.parse(response) : nil
+    end
+
+    def client_name
+      "WebService"
+    end
+
+    private
+
+
+      def appkey
+          @appkey
+      end
+
+      def get_url(url,opts = {})
+          return url unless opts
+          url = "#{@ns_addr}#{url}"
+          params = []
+          opts.each{|k,v|
+              params << "#{k}=#{v}"
+          }
+          url.include?("?") ? "#{url}&#{params.join("&")}" : "#{url}?#{params.join("&")}"
+      end
+
+  end
+end

data/pkg-info.yml

@@ -0,0 +1,27 @@
+<% require('pathname') %>
+spec:
+  name: rtfs
+  version: <%= RTFS::Version.to_version %>
+  summary: RTFS is a Ruby Client for TFS.
+  require_path: lib
+  has_rdoc: false
+  extra_rdoc_files:
+  - README.markdown
+  - CHANGES
+  - MIT-LICENSE
+  autorequire: rtfs
+  # bindir: bin
+  add_dependency:
+    nice-ffi: >=0.4
+  requirements:
+  - Ruby 1.8.7+
+  # - json gem, version 0.4.3 or higher
+  # - jcode (for unicode support)
+  required_ruby_version: >=1.8.7
+  author: Nowa Zhu
+  email: nowazhu@gmail.com
+  homepage: http://rtfs.labs.nowa.me
+  rubyforge_project: rtfs
+  files: <% (self.project_files + self.spec_files).each do |file| %>
+  - <%= Pathname.new(file).relative_path_from(Pathname.new(@root_dir)) %>
+<% end %>

data/rtfs.gemspec

@@ -0,0 +1,18 @@
+# Generated: Sun Oct 09 04:07:05 UTC 2011
+Gem::Specification.new do |s|
+  s.name = "rtfs"
+  s.version = "0.1.0"
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.markdown","CHANGES","MIT-LICENSE",]
+  s.summary = "RTFS is a Ruby Client for TFS."
+  s.author = "Nowa Zhu"
+  s.email = "nowazhu@gmail.com"
+  s.homepage = "https://github.com/nowa/rtfs"
+  s.add_dependency("nice-ffi", ">=0.4")
+  s.add_dependency("rest-client", ">=1.6.0")
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+  s.bindir = 'bin'
+end

data/spec/spec.opts

@@ -0,0 +1,6 @@
+--colour
+--format
+progress
+--loadby
+mtime
+--reverse

data/tasks/pkg.rake

@@ -0,0 +1,22 @@
+require 'rake/gempackagetask'
+
+meta = RTFS::Meta.new(ROOT_DIR)
+namespace :package do
+  desc "Create Gem Packages"
+  Rake::GemPackageTask.new(meta.gem_spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+  end
+end
+
+namespace :gemspec do
+  desc "Create GemSpec"
+  task :generate do
+    spec = meta.pkg_info['spec']
+    rgs = ERB.new(File.read(File.join(ROOT_DIR, 'config', 'templates', 'github.gemspec.erb')), 0)
+    s = rgs.result(spec.send(:binding))
+    gs_file = File.join(ROOT_DIR, 'rtfs.gemspec')
+    File.delete(gs_file) if File.exist?(gs_file)
+    File.open(gs_file, 'w') {|f| f.write(s); }
+  end
+end

metadata

@@ -1,92 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rtfs
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nowa Zhu
-autorequire: rtfs
+autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-09 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nice-ffi
+  requirement: &2168210780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2168210780
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2168210300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2168210300
 description: 
 email: nowazhu@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
 - CHANGES
 - MIT-LICENSE
-files: 
+files:
+- .gitignore
+- CHANGES
+- MIT-LICENSE
+- README.markdown
+- Rakefile
+- config/templates/github.gemspec.erb
+- lib/rtfs.rb
+- lib/rtfs/client.rb
 - lib/rtfs/meta.rb
+- lib/rtfs/tfstool.rb
 - lib/rtfs/version.rb
-- lib/rtfs/client.rb
+- lib/rtfs/web_service.rb
 - lib/rtfs/wrapper.rb
-- lib/rtfs.rb
-- README.markdown
-- CHANGES
-- MIT-LICENSE
-has_rdoc: true
-homepage: http://rtfs.labs.nowa.me
+- pkg-info.yml
+- rtfs.gemspec
+- spec/spec.opts
+- tasks/pkg.rake
+homepage: https://github.com/nowa/rtfs
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
-- Ruby 1.8.7+
-rubyforge_project: rtfs
-rubygems_version: 1.3.7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RTFS is a Ruby Client for TFS.
-test_files: []
-
+test_files:
+- spec/spec.opts