tcms 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 279413908020f60acaa2d58b5f7c57bfe06249d1
-  data.tar.gz: 40061af7efb609f13cf407f1bf4f6f91a0cc6295
+  metadata.gz: 430e5ea036cee1adbc410416499684431cc185f7
+  data.tar.gz: c55736027e835baa4da61c8550db594f5df3ef3a
 SHA512:
-  metadata.gz: e57eb7aed2c5a0927cbe4d03bedd149b832f768158bd662835af63020c59c92597ba6a35b8514558c7bdb94514aebbb7d4c20981cb877f3c21041b77ab29c05a
-  data.tar.gz: 4e9eb35d5c5977a93e549228c12f71c294ee4b0976553c874733bd56e53ef65d3c8caa7a8cbe4d848dd56e3a3a241e57e2b6aa42a51880918065dcc0676d4d26
+  metadata.gz: c8a0a265caa29e98ee0eb1e28bcf45ce26733678dc49577b892925557498feab806ef8e49ca46a7badf62ba55dbe433c4c5a711c9d8d4117a4193cd8bdbbda0d
+  data.tar.gz: 3a41fdc7dea50c3ce1efd8e56588fa5768c3be59ef55cca04d4319d555356e1c2f903deb354d025532ed917e54997e281b3e835997dc3e6af8090453fbc680ed

data/lib/tcms/version.rb

@@ -1,3 +1,3 @@
 module Tcms
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/tcms.rb

@@ -3,6 +3,7 @@ require 'rest_client'
 require 'rake'
 require 'pathname'
 require 'json'
+require 'fileutils'
 
 begin
   tcms_lib_path = Pathname.new(File.dirname(__FILE__)).realpath.to_s
@@ -45,17 +46,27 @@ module Tcms
 
   #上传单个文件
   def self.upload_file file,config 
-    remote_path = config["remotepath"]+'/'+file.sub(config["folder"]+'/','')
-    puts remote_path+"::"
+
+    file_name = file.sub(config["folder"]+'/','')
+
+    remote_path = config["remotepath"]+'/'+file_name
     puts "正在上传#{file}"
     upload_path = "#{UPLOAD_CGI}?site=#{config["site"]}&channel=#{config["channel"]}&remotepath=#{remote_path}"
+    upload_file_path = file
+
     begin
-      file_content = File.read(file)
-      if config["remote_encoding"]
-        file_content = file_content.encode(config["remote_encoding"],"UTF-8",:invalid=>:replace,:undef=>:replace)
+      if config["remote_encode"] != 'UTF-8'
+        file_content = File.read(file)
+        file_content = file_content.encode(config["remote_encode"],"UTF-8",:invalid=>:replace,:undef=>:replace)
+
+        upload_file_path = config["folder"]+'/__upload__'+file_name
+        tmp_file = File.new(upload_file_path,'w+') 
+        tmp_file.puts file_content
+        tmp_file.close
       end
 
-      response = RestClient.post(upload_path,{:NEW_FILE=>file_content,:multipart=>true}){|response,request,result|
+      puts upload_file_path+"::xxxx"
+      response = RestClient.post(upload_path,:NEW_FILE=>File.new(upload_file_path)){|response,request,result|
         if [200].include? response.code
           puts '--上传成功！'+response.description 
           site =  config["site"]
@@ -74,6 +85,10 @@ module Tcms
       puts "(>_<)..."
       puts "#{file}上传失败！"+ e.message
       puts ''
+    ensure
+      if upload_file_path.include? '__upload__'
+        File.delete upload_file_path
+      end
     end
   end
 
@@ -100,7 +115,9 @@ module Tcms
     FileList.new(pages['folder']+"/**/*").each do |f|
       unless File.directory? f
         if f.include? 'htm'
-          self.upload_file f,pages
+          unless f.include? '__upload__'
+            self.upload_file f,pages
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tcms
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - "'bertwang'"