tcms 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9024662a4b3870e14e724a1873e8067322da240
-  data.tar.gz: 0e7e2545339d311f6737d740e6746f876e6d840d
+  metadata.gz: 3c1684dd1cae1511dfb287f353c9a90e10a75266
+  data.tar.gz: 20770f6ed599a9a35dacc0fd790cbb9a0146089d
 SHA512:
-  metadata.gz: a39dfd700b47cb02bfbd0ff93877f54f933cd69ad6556857d9cec85bdd9a08ceb8b777966255123d392bcfc4f3f4963663958dc3da69902d0aebcf5c44563c07
-  data.tar.gz: 895806482edcf6587d99d4543fe94fd8b34b0a9b77320a7833900e817c26ea1d6a51480ac517781443eeeaeff8fb57afe0e9fe61ce04dc8492f34aae583dac7a
+  metadata.gz: a60630f5782d697b1b78658a21c7ebabe30eb6348ea383947dd1a6e33a7b61e6ee39e680b6e3de3f3a33e6757d18f2385c4183bdfab1b893b6fd8415ee72e862
+  data.tar.gz: 4291327663cab55a846de1e130d97959cc8e9fcc5e74108405b6bd154f86587ab9af65860329baa6e4781577a282154e3dc0ccb220a6d5e594f145a505441714

data/lib/tcms.rb

@@ -1,10 +1,14 @@
 require 'yaml'
-require 'rest_client'
+require 'httpclient'
 require 'rake'
 require 'pathname'
 require 'json'
 require 'fileutils'
 require_relative "tcms/version.rb"
+require_relative "tcms/publisher.rb"
+require_relative "tcms/helper.rb"
+
+
 
 module Tcms
   PROJECT_FILE = "project.yml"
@@ -19,19 +23,19 @@ module Tcms
     files.each do |file|
       file_path = "#{file}/assets.yml"
 
-      unless File.exist? file_path 
+      unless File.exist? file_path
         puts "#{file}/ 下无assets.yml配置,请配置素材远程频道和目录.."
-        next 
+        next
       end
       file_config = self.read_config_file file_path
       if File.directory? file
         FileList.new(file+'/**/*').each do |f|
           unless File.directory? f
-            self.upload_file f,file_config 
+            self.upload_file f,file_config
           end
         end
       elsif File.exist? file
-          self.upload_file file,file_config 
+          self.upload_file file,file_config
       else
         puts "#{file} :无此文件"
       end
@@ -39,7 +43,7 @@ module Tcms
   end
 
   #上传单个文件
-  def self.upload_file file,config 
+  def self.upload_file file,config
 
     file_name = file.sub(config["folder"]+'/','')
 
@@ -54,26 +58,51 @@ module Tcms
         file_content = file_content.encode(config["remote_encoding"],"UTF-8",:invalid=>:replace,:undef=>:replace)
 
         upload_file_path = config["folder"]+'/__upload__'+file_name
-        tmp_file = File.new(upload_file_path,'w+') 
+        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.new(upload_file_path))
-      if [200].include? response.code
-        puts '--上传成功！'
-        site =  config["site"]
-        domain = 'qq.com'
-
-        #业务修正
-        if site.match 'mat1' then domain = "gtimg.com/#{config["channel"]}" end
-        if site.match 'pingjs' then site = 'rss' end
-
-        url = "http://#{site}.#{domain}/#{remote_path}"
-        puts '--远程地址：'+url
-      else
-        raise response
+      #puts upload_path
+      #puts File.read(upload_file_path)
+      File.open(upload_file_path) do |file|
+        body = {"NEW_FILE"=>file}
+        clnt = HTTPClient.new
+        res = clnt.post(upload_path, body)
+        #puts res.body.downcase
+        if res.status == 200
+          puts '--上传成功！'
+          site =  config["site"]
+          domain = 'qq.com'
+
+          #业务修正
+          if site.match 'mat1' then domain = "gtimg.com/#{config["channel"]}" end
+          if site.match 'pingjs' then site = 'rss' end
+
+          url = "http://#{site}.#{domain}/#{remote_path}"
+          puts '--远程地址：'+url
+        else
+          raise res
+        end
       end
+
+      #response = RestClient.post upload_path,{:NEW_FILE=>File.new(upload_file_path,'rb')}
+      #
+      # if [200].include? response.code
+      #   puts response
+      #   #puts '--上传成功！'
+      #   site =  config["site"]
+      #   domain = 'qq.com'
+      #
+      #   #业务修正
+      #   if site.match 'mat1' then domain = "gtimg.com/#{config["channel"]}" end
+      #   if site.match 'pingjs' then site = 'rss' end
+      #
+      #   url = "http://#{site}.#{domain}/#{remote_path}"
+      #   puts '--远程地址：'+url
+      # else
+      #   raise response
+      # end
+      #
     rescue Exception => e
       puts ''
       puts "(>_<)..."
@@ -119,7 +148,7 @@ module Tcms
 
   def self.build_project type
     unless type then type = 'dev' end
-    unless ['dev','test','rel','release'].include? type 
+    unless ['dev','test','rel','release'].include? type
       puts '未知命令选项，请选择[dev,test,release].'
       return
     end
@@ -140,7 +169,7 @@ module Tcms
     @template_config.each do |key,value|
       if value.respond_to? :has_key? and value.has_key? "_data_from_url"
         puts "获取献上接口数据#{value}.."
-        response = RestClient.get value["_data_from_url"],{:accept=>:json} 
+        response = RestClient.get value["_data_from_url"],{:accept=>:json}
         @template_config[key] = JSON.parse(response)
 
         if @template_config[key].is_a?(Hash)
@@ -160,7 +189,7 @@ module Tcms
     end
   end
 
-  def self.create_project 
+  def self.create_project
     template_folder = Pathname.new(File.dirname(__FILE__)).realpath.parent.to_s+"/template"
     if File.exist? 'project.yml'
       puts '已存在配置文件project.yml'

data/lib/tcms/publisher.rb

@@ -3,7 +3,7 @@ require 'erb'
 require 'json'
 require 'pathname'
 
-require "helper"
+require_relative "helper.rb"
 
 module Tcms
   class Publisher

data/lib/tcms/version.rb

@@ -1,3 +1,3 @@
 module Tcms
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tcms
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - "'bertwang'"
@@ -17,9 +17,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,29 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.6
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement