DYAutomate 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba69e8f13d39a2569e80ca6ee3507f63e3163327a17c04405a4217dcb6d97e6
-  data.tar.gz: b2dfb0b058ded8166663e9f98445879e001f8e50b4723124c4a226734aab7d86
+  metadata.gz: ca40553f032c4e9d73485419d62ab39396340fa3c884ae22c9c323ea4222cc2a
+  data.tar.gz: 8c96d0b43dff6fe910d66967e233004907d8441b711a2a98a09a1f47575e7518
 SHA512:
-  metadata.gz: f8aaaab77feac17d7b3d3ed6e9d10044447971621eb3906020ebc56d36859de68cb64c9e38f58d7de37a82fcccf9f2f1e6c604e2a468e945c079f0f17d468dd9
-  data.tar.gz: a19ac413271aa7e0cfee305930ab6f4143a14112e1012d8f52c50ff707d8fce47ac5c4f8895b30cd10fde745bc2c077eae2d87ec4f5e87a58987682c2949913e
+  metadata.gz: 72d26755088d66ac96ba98e3f457e184bfa514db907b3ec49b48eecd5c03e60b5f1a54228b408b04fd3d09335ffa74f9ce4c23f2b9079b315d8ddd3db5a2cb5f
+  data.tar.gz: 07c5579de29bc7d0af3f67825f7cbfe94c68890b7fe4e4cdfc5e997480ae8a13d9b82b54444b40039139a715c6c082a0ae40c9d05c09dc6f18458bdb45c9083b

data/lib/Core/DYBaseObj.rb

@@ -0,0 +1,36 @@
+require 'yaml'
+
+module DYAutomate
+  class DYBaseObj < Object
+
+    @public
+
+    def initialize
+      super
+      yield self if block_given?
+    end
+
+    def self.fromFile(path)
+      if File.exist?(path)
+        content = File.open(path, 'r:utf-8', &:read)
+        eval(content,nil,path.to_s)
+      end
+    end
+
+    #加载从yaml
+    def self.fromYAML(path)
+      if File.exist?(path)
+        content = File.open(path)
+        YAML.load(content)
+      end
+    end
+
+    #以yaml缓存
+    def doCacheByYAML(path)
+      if path
+        File.open(path, "w") { |file| YAML.dump(self, file) }
+      end
+    end
+
+  end
+end

data/lib/Core/user_interface.rb

@@ -0,0 +1,36 @@
+module DYAutomate
+  # Disable the wrapping so the output is deterministic in the tests.
+  #
+  # UI.disable_wrap = true
+
+  # Redirects the messages to an internal store.
+  #
+  module UI
+    @output = ''
+    @warnings = ''
+    @next_input = ''
+
+    class << self
+      attr_accessor :output
+      attr_accessor :warnings
+      attr_accessor :next_input
+
+      def puts(message = '')
+        @output << "#{message}\n"
+      end
+
+      def warn(message = '', _actions = [])
+        @warnings << "#{message}\n"
+      end
+
+      def print(message)
+        @output << message
+      end
+
+      alias_method :gets, :next_input
+
+      def print_warnings
+      end
+    end
+  end
+end

data/lib/DYAutomate/Command/codeGenerate.rb

@@ -0,0 +1,70 @@
+
+module DYAutomate
+  class Command
+    class CodeGenerate < Command
+
+      # require 'Command/pod/push.rb'
+      # require 'Command/pod/version.rb'
+
+      self.abstract_command = false
+      self.command = 'code'
+      self.summary = '按照模版，自动生成代码'
+      # self.default_subcommand = 'list'
+      self.arguments = [
+          # CLAide::Argument.new('NAME',   true),
+      ]
+
+      #当前路径
+      attr_accessor :path
+
+      def initialize(argv)
+        @path = Dir.pwd
+        super
+      end
+
+      def validate!
+        super
+        unless @config.templates_git_url
+            help! "
+            error -- >!!! Not found <templates_git_url> in the #{DYAutomateConfig::configFilePath}"
+        end
+
+      end
+
+      def run
+          clone_templates
+          exulateFile = File.join(@config.templates_cache_path,"ACMain.rb")
+          if File.exist?(exulateFile)
+            system("ruby #{exulateFile} #{Dir.pwd}")
+          else
+            UI.puts "cant find templates start file <ACMain.rb>."
+          end
+      end
+
+      def clone_templates
+        url = @config.templates_git_url
+        path = @config.templates_cache_path
+        system("rm -rf #{path}")
+        unless Dir.exist?(path)
+          Dir.mkdir(path,0777)
+        end
+        UI.puts("Cloning `#{url}` into `#{path}`.")
+        system("git clone #{url} --depth 1 #{path}")
+
+      end
+
+      # def check_git_version
+      #   versionFile = File.join(@config.templates_cache_path,"version")
+      #   isSame = false
+      #   if File.exist?(versionFile)
+      #     versionContent = File.open(versionFile, 'r:utf-8', &:read)
+      #     if versionContent
+      #       isSame = versionContent.chomp.eql?(@git_tag.chomp)
+      #     end
+      #   end
+      #   isSame
+      # end
+
+    end
+  end
+end

data/lib/DYAutomate/Command.rb

@@ -1,16 +1,19 @@
 require 'DYAutomate.rb'
 require 'version'
 require 'Core/CoreConfig'
+require 'CustomConfig/DYAutomateConfig'
+require 'Core/user_interface'
 
 module DYAutomate
 	require 'CLAide'
-
+  include UI
 	class Command < CLAide::Command
 		include CoreConfig
 		require 'Command/pod.rb'
 		require 'Command/workspace.rb'
-		# require 'Command/dgit.rb'
+		require 'Command/codeGenerate'
 
+    attr_accessor :config
 		self.abstract_command = true
 	    self.command = 'dj'
 	    self.version = VERSION
@@ -23,6 +26,7 @@ module DYAutomate
 	      super
 				@repoName = CoreConfig::Core_previte_repo_name
 				@env_str = CoreConfig::Core_env_str
+				@config = DYAutomateConfig.loadConfig
 				pp("当前环境变量 #{@env_str}",1)
 	    end
 

data/lib/DYAutomate/CustomConfig/DYAutomateConfig.rb

@@ -0,0 +1,120 @@
+require 'Core/DYBaseObj'
+
+
+module DYAutomate
+  class DYAutomateConfig < DYBaseObj
+    @public
+    #cache相关的路径
+    @@cachePath = File.join(Dir.home(),'Documents','.DYAutomate')
+    @@configFilePath = File.join(@@cachePath, 'DYConfigFile.rb')
+    @@configGitClonePath = File.join(@@cachePath, 'Git')
+    @@logsDirPath = File.join(@@cachePath, 'log')
+
+    attr_accessor :git
+    attr_accessor :git_tag
+    attr_accessor :templates_git_url
+    # attr_accessor :templates_git_url
+    attr_accessor :templates_cache_path
+
+
+    def initialize
+      super
+    end
+
+    def self.logsDirPath
+      @@logsDirPath
+    end
+
+    #从配置中心读取
+    def self.loadConfig
+      checkConfigFile?
+      cc = DYAutomateConfig::fromFile(@@configFilePath)
+      puts cc
+      cc.loadDetailFromGit if cc
+      cc
+    end
+
+    @private
+
+    #检测config.rb是否存在
+    def self.checkConfigFile?
+      path = File.join(@@configFilePath)
+      unless File.exist?(path)
+        creatConfigFile
+        puts "*** At first ,you should edit the config file at path<#{@@configFilePath}>!!"
+
+        `open #{@@configFilePath}`
+      end
+    end
+
+    #创建一个ConfigFile例子
+    def self.creatConfigFile
+
+      unless Dir.exist?(@@cachePath)
+        Dir.mkdir(@@cachePath,0777)
+      end
+
+      File.new(@@configFilePath,'w+')
+
+      f = File.open(@@configFilePath, "w+")
+      demo = <<-EOF
+  #DYAutomate 配置
+
+  DYAutomateConfig.new do |c|
+    c.git = ""
+    c.git_tag = ""
+  end
+  EOF
+
+      f.write(demo)
+    end
+
+    def check_git_dir
+      unless Dir.exist?(@@configGitClonePath)
+        Dir.mkdir(@@configGitClonePath,0777)
+      end
+    end
+
+    def check_git_version
+      versionFile = File.join(@@configGitClonePath,"version")
+      isSame = false
+      if File.exist?(versionFile)
+        versionContent = File.open(versionFile, 'r:utf-8', &:read)
+        if versionContent
+          isSame = versionContent.chomp.eql?(@git_tag.chomp)
+        end
+      end
+      isSame
+    end
+
+    def clone_git
+      check_git_dir
+      if @git_tag && @git
+        url = "#{@git} --branch #{@git_tag}"
+        # url = "#{@git} "
+        cloneOk = system "git clone #{url} #{@@configGitClonePath}"
+        if cloneOk
+          puts "加载配置成功。。。"
+        else
+          puts "clone #{url}失败！！"
+        end
+      else
+        puts
+      end
+    end
+
+    def loadDetailFromGit
+      puts "加载配置。。。"
+      check_git_dir
+      unless check_git_version
+        system("rm -rf #{@@configGitClonePath}")
+        clone_git
+      end
+    end
+
+    def templates_cache_path
+      File.join(@@cachePath,'templates')
+    end
+
+  end
+end

data/lib/DYAutomate/version.rb

@@ -1,3 +1,3 @@
 module DYAutomate
-  VERSION = "1.0.10"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DYAutomate
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - 陈冬冬
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,14 +104,14 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
@@ -139,6 +139,8 @@ files:
 - README.md
 - bin/dj
 - lib/Core/CoreConfig.rb
+- lib/Core/DYBaseObj.rb
+- lib/Core/user_interface.rb
 - lib/DYAutomate.rb
 - lib/DYAutomate/Command.rb
 - lib/DYAutomate/Command/Git/tagAdd.rb
@@ -146,9 +148,11 @@ files:
 - lib/DYAutomate/Command/Pod/version.rb
 - lib/DYAutomate/Command/Workspace/install.rb
 - lib/DYAutomate/Command/Workspace/update.rb
+- lib/DYAutomate/Command/codeGenerate.rb
 - lib/DYAutomate/Command/dgit.rb
 - lib/DYAutomate/Command/pod.rb
 - lib/DYAutomate/Command/workspace.rb
+- lib/DYAutomate/CustomConfig/DYAutomateConfig.rb
 - lib/DYAutomate/version.rb
 homepage: https://code.aliyun.com/iOSTools/DYAutomate.git
 licenses: