tcms 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb365b173a996cbde60604babc913c56ada8eae
-  data.tar.gz: c108119027212708cec9913e7e2dc763daec11cc
+  metadata.gz: 4792b187d7993510df0ecdfda818d64c4b41c507
+  data.tar.gz: 63719cb502d163b9c9f8c374d9eed425b91255f8
 SHA512:
-  metadata.gz: b14ead2367a951fb0c0971e8dd83f762da0ed557c5a33666a8faa92960c9af40d30110392426dc7ccb50094e8088eb64bd749c1b474e8168de7539e2d33e8adc
-  data.tar.gz: 87e984fa0d42991d7f32c7ce7b3e2f78655532791c8ad7140a8b52471aaa6df791d04af3793dbecdfd3087ba8f16e3aad5de557b28c01308e6b0c1cbefaf69b0
+  metadata.gz: 4024cfa0b32436d6c1aa696e97ec1d32cb90b4264fd95cadd35e55d1940a708773b61efa858ccbd642d26683dd355e3e95dedcf32e757ea0f1237e7b9980621f
+  data.tar.gz: d851245f17d399c5d30f007b9a54eeac800ad75a1a7d8a7d64095792cd349bd53868f32f0d713a9f767ffaf5eadee072f9400c348b22f2116af0f8e2d546f9c0

data/Gemfile

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

data/bin/tcms

@@ -9,11 +9,6 @@ rescue
   require "tcms"
 end
 
-#减少
-#unless File.exist?('project.yml')
-#  puts '未创建配置文件，请输入 tcms -create 来创建配置'
-#  exit
-#end
 
 options = {}
 opt = OptionParser.new do |opts|
@@ -26,6 +21,13 @@ opt = OptionParser.new do |opts|
     options[:type] = type 
     options[:action] = :build
   end
+
+  opts.on('-c','--create','创建配置文件') do |type|
+    options[:action] = :create
+  end
+  opts.on('-s',"--server",'呼起本地服务') do
+    options[:action] = :server
+  end
   opts.on('-h','--help','帮助文档') do |n|
     puts opts
     puts '更多参考，请访问-http://wiki.cms.tencent-cloud.com/mars.html'
@@ -42,4 +44,14 @@ when :deploy
   end
 when :build
   Tcms::build_project(options[:type])
+when :create
+  Tcms::create_project
+when :server
+  puts '启动服务，如果失败，请用高级权限运行:ruby server.local'
+  begin
+  `ruby server.local`
+  rescue
+  end
+else
+  puts opt
 end

data/lib/tcms/version.rb

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

data/lib/tcms.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'rest_client'
 require 'rake'
 require 'pathname'
+require 'json'
 
 begin
   tcms_lib_path = Pathname.new(File.dirname(__FILE__)).realpath.to_s
@@ -107,13 +108,61 @@ module Tcms
       return
     end
 
+
     project = self.read_config_file PROJECT_FILE
+
+    config_file = project["templates"]["folder"]+"/config.js"
+
+    @template_config = Hash.new
+
+    if File.exist? config_file
+      puts "读取模版配置文件#{config_file}.."
+      config_content = File.read(config_file,:encoding=>"UTF-8")
+      @template_config = JSON.parse config_content.gsub(/'/,'"')
+    end
+
+    @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} 
+        @template_config[key] = JSON.parse(response)
+
+        if @template_config[key].is_a?(Hash)
+          if @template_config[key].has_key? 'code'
+            @template_config[key] = @template_config[key]["data"]
+          end
+        end
+      end
+    end
+
     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 = Tcms::Publisher.new(result[1],@template_config,project)
         publisher.render(type)
       end
     end
   end
+
+  def self.create_project 
+    template_folder = Pathname.new(File.dirname(__FILE__)).realpath.parent.to_s+"/template"
+    if File.exist? 'project.yml'
+      puts '已存在配置文件project.yml'
+    else
+      puts '创建配置文件成功！-project.yml'
+      content = File.read(template_folder+"/project.yml.edit",:encoding=>"UTF-8")
+      pro_file = File.new('project.yml',"w+")
+      pro_file.puts content
+      pro_file.close
+    end
+
+    unless File.exist? "server.local"
+      server_content = File.read(template_folder+'/server.local',:encoding=>"UTF-8")
+      server_file = File.new("server.local","w+")
+      server_file.puts server_content
+      server_file.close
+      File.chmod(0755,'server.local')
+    end
+
+  end
 end

data/template/project.yml.edit

@@ -0,0 +1,17 @@
+project_name: {YOUR_PROJECT_NAME}
+version : 1.0
+encoding : UTF-8 
+assets:
+  channel : {频道,类似news,pingjs等,非必须，配置了site=mat1后，需要配置频道}
+  site : {mat1 素材暂时都在mat1}
+  remotepath : {远程文件夹remote/path/}
+  folder : {本地文件夹publish/assets}
+pages:
+  site : {页面发布频道，如http://news.qq.com/xx} 
+  remotepath : {页面远程目录/xx/path}
+  folder: {页面本地目录:publish} 
+templates :
+  folder : {模版文件夹:templates} 
+scripts:
+  folder : {编辑脚本文件夹:assets/scripts} 
+

data/{server → template/server.local}

@@ -1,8 +1,6 @@
-require 'sinatra'
-require 'json'
-set :bind,'0.0.0.0'
-set :port,'80'
-set :root, File.dirname(__FILE__)
-set :public_folder, File.dirname(__FILE__) 
-    
-    
+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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tcms
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - "'bertwang'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,8 @@ files:
 - lib/tcms/helper.rb
 - lib/tcms/publisher.rb
 - lib/tcms/version.rb
-- server
+- template/project.yml.edit
+- template/server.local
 homepage: http://dxtool.cms.tencent-cloud.com/
 licenses:
 - MIT