thktool 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3338d97b9a7b58d33ff0e3aabfa347312d53d48f29614a5c5fdee84299e3e97b
-  data.tar.gz: faa7b40816771d4ca09a0bdbfd2882e6ecac1970c72fa80f646f2864edf7e1a3
+  metadata.gz: fe27fc871efd61f401ad7e5276fdbb27f93648319f96f4f9d16f6ee163d81f63
+  data.tar.gz: 7d39318e334e965a85beb9c83859a0d671ca0515d96acb0e80c05d9342044ceb
 SHA512:
-  metadata.gz: 105c8a382be9fbeb228e72317f3fb8206e59edd03b6d0afe43f4379baa5ea9a6bfa3058cf6c20e40691acb80824b4cc9b8e80bfa8cb35ab41c2b4f2acbbb5000
-  data.tar.gz: 10d8a2ff0323ca4611bae81f0a6c330c6420e7d2f088736b8dd8d5de9fd17c067b14c80bfc3e513cd3d87efc3596530c703d2454b1e33e39612d5d5ba806a84d
+  metadata.gz: eb9f7187a18fed63cc7faa0a2a4b4b878939a8a7de10d573d1f7ab081b8083f55ae0b32a8c5b0507b65d85ff9dfbdc324ca1664a6deb01f309dde0fea530e4cc
+  data.tar.gz: '051793aa1e6fcca4fa510619b6d9089fa77a61c16a5b07cdc51f7e5fdc4bf8196d3bfdb04a4f94db0d358e04b0d4422888353484b94d0d4f87f73266439c73c0'

data/lib/config.rb

@@ -0,0 +1,68 @@
+class Config
+    def initialize
+        
+    end
+
+    def self.create_config_file_if_need
+        yaml = nil
+        if File.exist?(Config.config_file)
+            yaml = YAML.load_file(Config.config_file)
+            Config.load_yaml(yaml)
+        else
+            yaml = YAML.load_file('lib/thktool_config.yml')
+            File.open(Config.config_file,"w") { |f| YAML.dump(yaml,f) }
+        end
+        yaml
+    end
+
+    def self.config_file
+        self.Home + "/thktool_config.yml"
+    end
+
+    def self.load_yaml(yaml)
+        @@source_repo_path = yaml['SOURCE_REPO_PATH'].trans_home_path!
+        @@source_spec_path = yaml['SOURCE_SPEC_PATH'].trans_home_path!
+        @@bin_repo_path = yaml['BIN_REPO_PATH'].trans_home_path!
+        @@bin_spec_path = yaml['BIN_SPEC_PATH'].trans_home_path!
+        @@source_repo_url = yaml['SOURCE_REPO_URL']
+        @@bin_repo_url = yaml['BIN_REPO_URL']
+        @@package_enable = yaml['PACKAGE_ENABLE']
+        @@package_source_repo = yaml['PACKAGE_SOURCE_REPO']
+    end
+
+    def self.Home
+        ('/Users/'+`whoami`).chomp
+    end
+
+    def self.Source_Repo_Path
+        @@source_repo_path
+    end
+
+    def self.Source_Spec_Path
+        @@source_spec_path
+    end
+
+    def self.Bin_Repo_Path
+        @@bin_repo_path
+    end
+
+    def self.Bin_Spec_Path
+        @@bin_spec_path
+    end
+
+    def self.Source_Repo_Url
+        @@source_repo_url
+    end
+
+    def self.Bin_Repo_Url
+        @@bin_repo_url
+    end
+
+    def self.Package_Enable
+        @@package_enable == 1
+    end
+
+    def self.Package_Source_repo
+        @@package_source_repo
+    end
+end

data/lib/modify_until.rb

@@ -1,4 +1,4 @@
-require_relative 'const'
+require_relative 'config'
 require 'Pathname'
 
 class ModifyUntil
@@ -29,7 +29,7 @@ class ModifyUntil
         p 'start modify file ...' + file
 
         IO.write(file, File.open(file) do |f|
-            f.read.gsub(/:commit => (.*)/, ":commit => \"#{commit}\"")
+            f.read.gsub(/:commit => "(.*)"/, ":commit => \"#{commit}\"")
         end
         )
     end
@@ -37,7 +37,7 @@ class ModifyUntil
 
     # 开始修改源码仓库
     def self.modify_src_commit(src,commit)
-        path = Const.Source_Spec_Path
+        path = Config.Source_Spec_Path
         pn = find_max_ver(path,src)
         if pn.file?
             modify_src_file_line(pn.to_s,commit)
@@ -51,8 +51,8 @@ class ModifyUntil
     def self.modify_fwk_file_line(file,src_commit,fwk_commit)
         p 'start modify file ...' + file
 
-        src_url = Const.Source_Repo_Url
-        bin_url = Const.Bin_Repo_Url
+        src_url = Config.Source_Repo_Url
+        bin_url = Config.Bin_Repo_Url
 
         IO.write(file, File.open(file) do |f|
             f.read.gsub(/.*s.source.*#{src_url}.*/, "    s.source           = \{ :git => \'#{src_url}\', :commit => \"#{src_commit}\"\}")
@@ -66,7 +66,7 @@ class ModifyUntil
     end
 
     def self.modify_fwk_commit(fwk,src_commit,fwk_commit)
-        path = Const.Bin_Spec_Path
+        path = Config.Bin_Spec_Path
         pn = find_max_ver(path,fwk)
         if pn.file?
             modify_fwk_file_line(pn.to_s,src_commit,fwk_commit)
@@ -84,4 +84,11 @@ class String
       cmp = proc { |s| s.split(fieldsep).map(&:to_i) }
       cmp.call(self) <=> cmp.call(other)
     end
+
+    def trans_home_path!
+        real = Config.Home
+        if self.include? '~'
+            self.gsub(/~/,real)
+        end
+    end
 end

data/lib/package_framework.rb

@@ -1,10 +1,10 @@
-require_relative 'const'
+require_relative 'config'
 
 class PackageFramework
     
     def self.package(podspec)
-        Dir.chdir(Const.Bin_Repo_Path)
-        spec_source = ['https://github.com/CocoaPods/Specs.git','git@repo.we.com:iosfeaturelibraries/thkbusinesskitspecs.git','git@repo.we.com:ios/tspecsrepo.git']
+        Dir.chdir(Config.Bin_Repo_Path)
+        spec_source = Config.Package_Source_repo
         command = "pod packagethk #{podspec} --force --exclude-deps --no-mangle --configuration=Debug --spec-sources=#{spec_source.join(',')}"
         puts "start package ..."
         puts command

data/lib/thktool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thktool
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/thktool.rb

@@ -5,6 +5,8 @@ require_relative "trigger_event"
 require_relative "modify_until"
 require_relative "package_framework"
 require_relative "git_until"
+require 'yaml'
+require_relative "config"
 
 module Thktool
   class Error < StandardError; end
@@ -17,27 +19,38 @@ module Thktool
   p "web hook argv : "
   p ARGV
 
-  # Tool.run(ARGV)
+  # 初始化配置
+  yml = Config.create_config_file_if_need
+  # 加载配置文件
+  Config.load_yaml(yml)
+
 end
 
 class Tool  
   def self.run(argv)
+    # 初始化配置
+    yml = Config.create_config_file_if_need
+    # 加载配置文件
+    Config.load_yaml(yml)
+    # 触发器创建
     te = TriggerEvent.new(argv)
     if te.validate_object
       # 修改源码仓库对应的spec仓库
       src_podspec = ModifyUntil.modify_src_commit(te.fwk,te.commit)
       # 提交spec仓库代码
-      GitUntil.git_push(Const.Source_Spec_Path,"source podspec repo change : #{te.fwk} commit => #{te.commit}")
+      GitUntil.git_push(Config.Source_Spec_Path,"source podspec repo change : #{te.fwk} commit => #{te.commit}")
+      # 判断是否打包
+      return unless Config.Package_Enable
       # 开始制作二进制包
       PackageFramework.package(src_podspec)
       # 提交二进制包到framwork仓库
-      GitUntil.git_push(Const.Bin_Repo_Path,"binary repo change : #{te.fwk}")
+      GitUntil.git_push(Config.Bin_Repo_Path,"binary repo change : #{te.fwk}")
       # 获取二进制仓库最后一次提交commit
-      last_commit_id = GitUntil.last_commit_id(Const.Bin_Repo_Path)
+      last_commit_id = GitUntil.last_commit_id(Config.Bin_Repo_Path)
       # 修改二进制spec仓库
       fwk_podspec = ModifyUntil.modify_fwk_commit(te.fwk,te.commit,last_commit_id)
       # 提交二进制spec仓库
-      GitUntil.git_push(Const.Bin_Spec_Path,"binary podspec change : #{te.fwk} src commit => #{te.commit},  bin commit => #{last_commit_id}")
+      GitUntil.git_push(Config.Bin_Spec_Path,"binary podspec change : #{te.fwk} src commit => #{te.commit},  bin commit => #{last_commit_id}")
     end
   end
 end

data/lib/thktool_config.yml

@@ -0,0 +1,19 @@
+SOURCE_REPO_PATH: ~/
+
+SOURCE_SPEC_PATH: ~/thkbusinesskitspecs
+
+BIN_REPO_PATH: ~/frameworkrepo
+
+BIN_SPEC_PATH: ~/frameworkspec
+
+SOURCE_REPO_URL: 'http://repo.we.com/iosfeaturelibraries/THKBusinessComponent.git'
+
+BIN_REPO_URL: 'git@repo.we.com:iosfeaturelibraries/frameworkrepo.git'
+
+PACKAGE_ENABLE: 1
+
+PACKAGE_SOURCE_REPO:
+- https://github.com/CocoaPods/Specs.git
+- git@repo.we.com:iosfeaturelibraries/thkbusinesskitspecs.git
+- git@repo.we.com:ios/tspecsrepo.git
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thktool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Joe.cheng
@@ -23,12 +23,13 @@ files:
 - README.md
 - Rakefile
 - bin/thktool
-- lib/const.rb
+- lib/config.rb
 - lib/git_until.rb
 - lib/modify_until.rb
 - lib/package_framework.rb
 - lib/thktool.rb
 - lib/thktool/version.rb
+- lib/thktool_config.yml
 - lib/trigger_event.rb
 - sig/thktool.rbs
 - thktool.gemspec

data/lib/const.rb

@@ -1,33 +0,0 @@
-class Const
-    def initialize
-        
-    end
-
-    def self.Home
-        ('/Users/'+`whoami`).chomp
-    end
-
-    def self.Source_Repo_Path
-        './'
-    end
-
-    def self.Source_Spec_Path
-        self.Home + '/thkbusinesskitspecs'
-    end
-
-    def self.Bin_Repo_Path
-        self.Home + '/frameworkrepo'
-    end
-
-    def self.Bin_Spec_Path
-        self.Home + '/frameworkspec'
-    end
-
-    def self.Source_Repo_Url
-        'http://repo.we.com/iosfeaturelibraries/THKBusinessComponent.git'
-    end
-
-    def self.Bin_Repo_Url
-        'git@repo.we.com:iosfeaturelibraries/frameworkrepo.git'
-    end
-end