tcms 0.0.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09dab269b19b6494560d0025e41c45219afb6a0c
-  data.tar.gz: 1ffec2a5835a5833a02a0b3a7204a3936aed8e2f
+  metadata.gz: 4fb365b173a996cbde60604babc913c56ada8eae
+  data.tar.gz: c108119027212708cec9913e7e2dc763daec11cc
 SHA512:
-  metadata.gz: dc9bfd3926d66b5b941e17b5fff00c54315d542c52311d1372d7bc04f734a82698872f98a54540a0963440f15a77a621d0e5e77ca6381e20b4877f8621b8f42f
-  data.tar.gz: dfc091386d9dd4177ca16e1617f7a5a05d517b6d54b6c0bd663a6dc7417792999c4d4c3fc67e97ba2fbe8c2c122556e13bec2a4f4029d99ae124d2c2e8fc855f
+  metadata.gz: b14ead2367a951fb0c0971e8dd83f762da0ed557c5a33666a8faa92960c9af40d30110392426dc7ccb50094e8088eb64bd749c1b474e8168de7539e2d33e8adc
+  data.tar.gz: 87e984fa0d42991d7f32c7ce7b3e2f78655532791c8ad7140a8b52471aaa6df791d04af3793dbecdfd3087ba8f16e3aad5de557b28c01308e6b0c1cbefaf69b0

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tcms.gemspec
-gemspec
+gem 'rest_client'

data/bin/tcms

@@ -2,11 +2,12 @@
 require 'pathname'
 require 'optparse'
 
-THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
-
-path = Pathname.new(File.dirname(THIS_FILE)).realpath.parent.to_s
-
-require path + '/lib/tcms'
+begin 
+  command_path = Pathname.new(File.dirname(__FILE__)).realpath.parent.to_s
+  require command_path + '/lib/tcms'
+rescue
+  require "tcms"
+end
 
 #减少
 #unless File.exist?('project.yml')
@@ -21,6 +22,10 @@ opt = OptionParser.new do |opts|
     options[:files] = arr
     options[:action] = :deploy
   end
+  opts.on('-b [type]','--build [type]','构建项目') do |type|
+    options[:type] = type 
+    options[:action] = :build
+  end
   opts.on('-h','--help','帮助文档') do |n|
     puts opts
     puts '更多参考，请访问-http://wiki.cms.tencent-cloud.com/mars.html'
@@ -30,5 +35,11 @@ end.parse!
 
 case options[:action]
 when :deploy
-  Tcms::upload_assets options[:files]
+  if options[:files]
+    Tcms::upload_assets options[:files]
+  else
+    Tcms::deploy_project
+  end
+when :build
+  Tcms::build_project(options[:type])
 end

data/lib/tcms.rb

@@ -3,6 +3,13 @@ require 'rest_client'
 require 'rake'
 require 'pathname'
 
+begin
+  tcms_lib_path = Pathname.new(File.dirname(__FILE__)).realpath.to_s
+  require tcms_lib_path+ '/tcms/publisher'
+rescue
+  require "tcms/publisher"
+end
+
 module Tcms
   PROJECT_FILE = "project.yml"
   UPLOAD_CGI = 'http://wizard2.webdev.com/tcms/tools/uploadfile.php'
@@ -20,9 +27,7 @@ module Tcms
         puts "#{file}/ 下无assets.yml配置,请配置素材远程频道和目录.."
         next 
       end
-
       file_config = self.read_config_file file_path
-
       if File.directory? file
         FileList.new(file+'/**/*').each do |f|
           unless File.directory? f
@@ -41,12 +46,21 @@ module Tcms
   def self.upload_file file,config 
     remote_path = config["remotepath"]+'/'+file.sub(/^\w+\//,'')
     #puts remote_path
-    puts "正在上传文件#{file}到http://#{config["site"]}.qq.com/#{config["channel"]}/"+remote_path+"..."
+    puts "正在上传#{file}"
     upload_path = "#{UPLOAD_CGI}?site=#{config["site"]}&channel=#{config["channel"]}&remotepath=#{remote_path}"
     begin
-      response = RestClient.post(upload_path,:NEW_FILE=>File.new(file)){|response|
+      response = RestClient.post(upload_path,:NEW_FILE=>File.new(file)){|response,request,result|
         if [200].include? response.code
-          puts '--上传成功！'
+          puts '--上传成功！'+response.description 
+          site =  config["site"]
+          domain = 'qq.com'
+
+          #业务修正
+          if site.match 'mat1' then domain = "gtimg.cn/#{config["channel"]}" end
+          if site.match 'pingjs' then site = 'rss' end
+
+          url = "http://#{site}.#{domain}/#{remote_path}"
+          puts '--远程地址：'+url
         end
       }
     rescue Exception => e
@@ -56,4 +70,50 @@ module Tcms
       puts ''
     end
   end
+
+  #发布整个项目
+  def self.deploy_project
+    unless File.exist? PROJECT_FILE
+      puts 'project.yml 不存在，请运行: tcms -create 创建配置文件'
+      return
+    end
+
+    project = self.read_config_file PROJECT_FILE
+    assets = project['assets']
+    #上传素材文件夹
+    FileList.new(assets["folder"]+'/**/*').each do |f|
+      unless File.directory? f
+        if f.include? project["version"].to_s
+          self.upload_file f,assets
+        end
+      end
+    end
+    #上传页面文件
+    #TODO fixed concat upload function
+    pages = project['pages']
+    FileList.new(pages['folder']+"/**/*").each do |f|
+      unless File.directory? f
+        if f.include? 'htm'
+          self.upload_file f,pages
+        end
+      end
+    end
+  end
+
+  def self.build_project type
+    unless type then type = 'dev' end
+    unless ['dev','test','rel','release'].include? type 
+      puts '未知命令选项，请选择[dev,test,release].'
+      return
+    end
+
+    project = self.read_config_file PROJECT_FILE
+    FileList.new(project['templates']['folder']+'/**/*').each do |f|
+      result =  f.match(/\/(\w+).html?\.erb/)
+      if result
+        publisher = Tcms::Publisher.new(result[1],{"title"=>"aa"},project)
+        publisher.render(type)
+      end
+    end
+  end
 end

data/lib/tcms/helper.rb

@@ -0,0 +1,65 @@
+module Tcms
+  module Helper 
+    def script_for name
+      if @_build_type  == "dev"
+        return _script_for_local name
+      else
+        return _script_for_publish name
+      end
+    end
+
+    def _script_for_local name
+      file_path = @_project["scripts"]["folder"]
+      file_content = File.read(file_path+"/#{name}.js",:encoding=>"utf-8")
+      script_output = ''
+      file_output = file_content.gsub(/\/\/=include\s([^\s]+)/){|include_str|
+        matches = /\/\/=include\s([^\s]+)/.match(include_str)
+        file_url = file_path+"/#{matches[1]}.js"
+        script_output+= '<script type="text/javascript" charset="utf-8" src="'+file_url+'"></script>';
+        script_output+="\n"
+      }
+
+      script_output += '<script type="text/javascript" charset="utf-8" src="'+file_path+"/"+name+'.js"></script>'
+      return script_output
+    end
+
+    def _script_for_publish name
+      file_path = @_project["scripts"]["folder"]
+      file_content = File.read(file_path+"/#{name}.js",:encoding=>"utf-8")
+      script_output = "";
+      file_output = file_content.gsub(/\/\/=include\s([^\s]+)/){|include_str|
+        matches = /\/\/=include\s([^\s]+)/.match(include_str)
+        file_url = file_path+"/#{matches[1]}.js"
+
+        unless File.exist?(file_url)
+          puts 'no file include exist！|'+ file_url
+          return
+        end
+
+        File.read(file_url,:encoding=>"utf-8")
+      }
+      publish_name = name+'.'+ @_project["version"].to_s
+      #写文件
+      write_file =file_path+'/'+publish_name+'.js';
+
+      if File.exist? write_file
+        File.delete write_file
+      end
+
+      concat_file = File.open(write_file,'w+')
+      concat_file.write(file_output)
+
+      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>'
+
+    end
+  end
+end

data/lib/tcms/publisher.rb

@@ -0,0 +1,58 @@
+require 'digest'
+require 'erb'
+require 'json'
+require 'pathname'
+
+begin
+  require Pathname.new(File.dirname(__FILE__)).realpath.to_s+'/helper'
+rescue
+  require "tcms/helper"
+end
+
+module Tcms
+  class Publisher
+    #初始化
+    def initialize(name,data,project)
+      @project = project
+      templates = project["templates"]
+      @encoding = project["encoding"]
+      @name = name
+      @data = self.extend_data(data)
+      @template = File.read("#{templates['folder']}/#{name}.html.erb",:encoding=>@encoding)
+    end
+
+    def extend_data data
+      class<<data
+        include Tcms::Helper
+        def method_missing name,*args
+          self[name.to_s]
+        end
+      end
+      data
+    end
+    #直接输出页面地址
+    def render type
+      page = ERB.new(@template)
+      project = @project
+
+      bd = @data.instance_eval{
+        @_build_type = type
+        @_project = project
+
+        binding();
+      }
+      content = page.result(bd)
+      
+      write_file_path = @project["pages"]["folder"]+"/"+@name+'.html'
+      if File.exist? write_file_path
+        File.delete write_file_path
+      end
+
+      write_file = File.new(write_file_path,'w+')
+      write_file.puts content
+      write_file.close
+
+      puts "已生成页面#{write_file_path}"
+    end
+  end
+end

data/lib/tcms/version.rb

@@ -1,3 +1,3 @@
 module Tcms
-  VERSION = "0.0.1"
+  VERSION = "0.9.1"
 end

data/server

@@ -0,0 +1,8 @@
+require 'sinatra'
+require 'json'
+set :bind,'0.0.0.0'
+set :port,'80'
+set :root, File.dirname(__FILE__)
+set :public_folder, File.dirname(__FILE__) 
+    
+    

metadata

@@ -1,60 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: tcms
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.9.1
 platform: ruby
 authors:
-- '''bertwang'''
+- "'bertwang'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: TCMS WebApp 互动相关工具，部分功能限于内网&VPN可用。相关文档@raylei.
 email:
-- '''1060151577@qq.com'''
+- "'1060151577@qq.com'"
 executables:
 - tcms
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/tcms
 - lib/tcms.rb
+- lib/tcms/helper.rb
+- lib/tcms/publisher.rb
 - lib/tcms/version.rb
-- tcms.gemspec
-- bin/tcms
+- server
 homepage: http://dxtool.cms.tencent-cloud.com/
 licenses:
 - MIT
@@ -65,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: TCMS WebApp Tools

data/.gitignore

@@ -1,14 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/tcms.gemspec

@@ -1,23 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tcms/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "tcms"
-  spec.version       = Tcms::VERSION
-  spec.authors       = ["'bertwang'"]
-  spec.email         = ["'1060151577@qq.com'"]
-  spec.summary       = %q{TCMS WebApp Tools}
-  spec.description   = %q{TCMS WebApp 互动相关工具，部分功能限于内网&VPN可用。相关文档@raylei.}
-  spec.homepage      = "http://dxtool.cms.tencent-cloud.com/"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = ['tcms']
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-end