tcms 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d95c0863ec6d93a84c6a91cd48300de7ee3062
-  data.tar.gz: 38b02c56417d66cc750df59103fb50c79900d403
+  metadata.gz: 0b32b4cfc7b937636fccac3b1e124d9ede5b676f
+  data.tar.gz: 8196f65e3643457d7dfc7b925663914dfc1b2e6d
 SHA512:
-  metadata.gz: 195000128ea1dcabed970cf7a47177721ecdcb4e66f5a5786e99f75342ab1771cd0da530a8fd35b54f466b2682f292d9930df7940cb115d20d30253ac1e55851
-  data.tar.gz: 5110cd1acee97033755d88da965d962a6b2e92a93b36a025dfaa3ebae81f44c84e5149cce05d5ee19620aef3d6da4ce4ee8abc23358ad5a009142c994648f0df
+  metadata.gz: 9e0961f5a84d92e9d9c82aaace18160b9f8196dc8cdc5337dd6b6fe83ed9b64f309e6738cfd07727a440df458bf458d36c90b4007605b84cc775eb5e34028ad6
+  data.tar.gz: 60b085cbc245f5f3809a968ea6052de4579286101ec864813297c42e06bb81a8830e2a177da5814787710bec33c17855ee919c56f9000cbbb18448100501d0d1

data/lib/tcms/helper.rb

@@ -2,9 +2,9 @@ module Tcms
   module Helper 
     def script_for name
       if @_build_type  == "dev"
-        return _script_for_local name
+        return self._script_for_local name
       else
-        return _script_for_publish name
+        return self._script_for_publish name
       end
     end
 
@@ -39,8 +39,10 @@ module Tcms
         File.read(file_url,:encoding=>"utf-8")
       }
       publish_name = name+'.'+ @_project["version"].to_s
+
+      assets_path = @_project['assets']["folder"]
       #写文件
-      write_file =file_path+'/'+publish_name+'.js';
+      write_file =assets_path+'/'+publish_name+'.js';
 
       if File.exist? write_file
         File.delete write_file
@@ -50,17 +52,24 @@ module Tcms
       concat_file.puts file_output
       concat_file.close
 
+      puts write_file
       puts '-生成素材'+publish_name+'.js'
 
       assets = @_project["assets"]
-      site = assets["site"]
-      domain = 'qq.com'
-      remote_path = assets["remotepath"]
-      if site.match 'mat1' then domain = "gtimg.cn/#{assets["channel"]}" end
-      if site.match 'pingjs' then site = 'rss' end
-      url = "http://#{site}.#{domain}/#{remote_path}"
-      return '<script type="text/javascript" charset="utf-8" src="'+url+"/"+publish_name+'.js?v='+Digest::MD5.hexdigest(file_output)+'"></script>'
 
+      if @_build_type == "test"
+        url = "/"+@_project["assets"]["folder"]
+        return '<script type="text/javascript" charset="utf-8" src="'+url+"/"+publish_name+'.js?v='+Digest::MD5.hexdigest(file_output)+'"></script>'
+      else
+        site = assets["site"]
+        domain = 'qq.com'
+        remote_path = assets["remotepath"]
+        if site.match 'mat1' then domain = "gtimg.cn/#{assets["channel"]}" end
+        if site.match 'pingjs' then site = 'rss' end
+        url = "http://#{site}.#{domain}/#{remote_path}"
+
+        return '<script type="text/javascript" charset="utf-8" src="'+url+"/"+publish_name+'.js?v='+Digest::MD5.hexdigest(file_output)+'"></script>'
+      end
     end
   end
 end

data/lib/tcms/version.rb

@@ -1,3 +1,3 @@
 module Tcms
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

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