DYAutomate 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca40553f032c4e9d73485419d62ab39396340fa3c884ae22c9c323ea4222cc2a
-  data.tar.gz: 8c96d0b43dff6fe910d66967e233004907d8441b711a2a98a09a1f47575e7518
+  metadata.gz: 7464e070b8d6ea964eb5c255de678fd531d23955c8e851696f29119fc4078ab8
+  data.tar.gz: c6ea05feca63a3c0d4372d506edaf980a75c538a7404d444238577cb35ccbb87
 SHA512:
-  metadata.gz: 72d26755088d66ac96ba98e3f457e184bfa514db907b3ec49b48eecd5c03e60b5f1a54228b408b04fd3d09335ffa74f9ce4c23f2b9079b315d8ddd3db5a2cb5f
-  data.tar.gz: 07c5579de29bc7d0af3f67825f7cbfe94c68890b7fe4e4cdfc5e997480ae8a13d9b82b54444b40039139a715c6c082a0ae40c9d05c09dc6f18458bdb45c9083b
+  metadata.gz: 3322a16cbdd540a2244077c7e725a41098cf66d5d6b64f07149a32af331cc32e8c16583946fc19ad4d729229c5e410713224053d2c9fadd301d48ecce7ee17be
+  data.tar.gz: 564ff4d2745d164d36863b5da47c922e30375242b9f2d96cf978c6fc2b0d0eb81edf317f5df2b9752555653005dd8898ab744d3aa10bb0a57bb125f0b4c51db2

data/README.md

@@ -22,17 +22,69 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### 代码模版
+- 自动生成代码
+```
+dj code
+```
+- 拷贝代码片段到xcode中
+```
+dj snippet
+```
+
+### 私有库
+- 查看使用方法
+```
+dj pod -h
+```
+- 版本更改 1.1.1 -> 1.1.2
+```
+dj pod ver 1
+```
+或者
+```
+dj pod ver 0 1
+```
+- 版本更改 1.1.1 -> 1.2.0
+```
+dj pod ver 1 0
+```
+- 提交私有库
+```
+dj pod push
+```
+
+### workspce
+- 项目pod update
+```
+dj ws up
+```
+- 项目pod install
+```
+dj ws in
+```
 
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
+For build
+```
+bundle rake build
+```
+
+For push
+```
+gem push DYAutomate.gemspec
+```
+or ↓↓↓↓↓↓
+
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/DYAutomate. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+有问题，可以
+> Email：784767574@qq.com
 
 ## License
 

data/lib/DYAutomate/Command.rb

@@ -1,6 +1,5 @@
 require 'DYAutomate.rb'
 require 'version'
-require 'Core/CoreConfig'
 require 'CustomConfig/DYAutomateConfig'
 require 'Core/user_interface'
 
@@ -8,12 +7,15 @@ module DYAutomate
 	require 'CLAide'
   include UI
 	class Command < CLAide::Command
-		include CoreConfig
 		require 'Command/pod.rb'
 		require 'Command/workspace.rb'
 		require 'Command/codeGenerate'
+    require 'Command/codeSnippet'
 
     attr_accessor :config
+		attr_accessor :env_str
+		attr_accessor :repo_name
+
 		self.abstract_command = true
 	    self.command = 'dj'
 	    self.version = VERSION
@@ -23,24 +25,23 @@ module DYAutomate
 	    # self.plugin_prefixes = %w(claide DYAutomate)
 
 	    def initialize(argv)
-	      super
-				@repoName = CoreConfig::Core_previte_repo_name
-				@env_str = CoreConfig::Core_env_str
-				@config = DYAutomateConfig.loadConfig
-				pp("当前环境变量 #{@env_str}",1)
+			super
+			@config = DYAutomateConfig.loadConfig
+			@env_str = @config.detailObj.env_str if @config
+			@repoName = @config.detailObj.private_repo_name if @config
 	    end
 
-	    def self.options
-	      [
-	        ['--silent', 'Show nothing'],
-	      ].concat(super)
-	    end
+	    # def self.options
+	    #   [
+	    #     ['--silent', 'Show nothing'],
+	    #   ].concat(super)
+	    # end
 
 	    def run
 	      pp('automate works!!',1)
 	    end
 
-	    def pp(msg,level)
+	    def pp(msg,level = 2)
 	    	unless msg
 	    		return
 	    	end
@@ -50,7 +51,17 @@ module DYAutomate
 				elsif level == 2
 					puts msg.red if msg
 	    	end
-	    end
+			end
+      #
+			# def repoName
+			# 	@repoName = @config.detailObj.private_repo_name if @config
+			# 	@repoName
+			# end
+      #
+			# def env_str
+			# 	@env_str = @config.detailObj.env_str if @config
+			# 	@env_str
+			# end
 
 	end
 end

data/lib/DYAutomate/Command/TaksFlow/test.rb

@@ -0,0 +1,44 @@
+
+require 'Core/DYBaseObj'
+
+class TestInfo < DYBaseObj
+  attr_accessor :user_name
+  attr_accessor :user_name
+  attr_accessor :git_branch
+  attr_accessor :version
+  attr_accessor :has_merge_master
+  attr_accessor :ipa_qrcode_url
+end
+
+module DYAutomate
+  class Command
+    class TaskFlow <Command
+      class Test < TaskFlow
+
+        # self.abstract_command = true
+        self.command = 'test'
+        self.summary = "
+          提交测试
+        "
+        self.arguments = [
+            # CLAide::Argument.new('addVersion', false,'升级一个小版本'),
+            # CLAide::Argument.new('addBigVersion', false)
+        ]
+
+
+        def initialize(argv)
+          super
+        end
+
+        def run
+          loop do
+            UI.puts("请输入你的名字")
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/DYAutomate/Command/Workspace/install.rb

@@ -18,6 +18,7 @@ module DYAutomate
         # #查询结果lib信息
         # attr_accessor :info
 
+
         def initialize(argv)
           # @name = argv.shift_argument
           super
@@ -48,8 +49,12 @@ module DYAutomate
           else
             pp("pod install 失败",1)
           end
-          system "sleep 3"
-          system "open *.xcworkspace"
+          
+          unless isSilent
+            system "sleep 3"
+            system "open *.xcworkspace"
+          end
+
         end
 
       end

data/lib/DYAutomate/Command/Workspace/update.rb

@@ -9,12 +9,12 @@ module DYAutomate
         # self.abstract_command = true
         self.command = 'up'
         self.summary = '更新repo，并update'
-        self.arguments = [
-            # CLAide::Argument.new('NAME',   true),
-        ]
+        # self.arguments = [
+        #     CLAide::Argument.new('quiet', false),
+        # ]
 
         # #要查询的lib名字
-        # attr_accessor :name
+        attr_accessor :quiet
         # #查询结果lib信息
         # attr_accessor :info
 
@@ -48,8 +48,12 @@ module DYAutomate
           else
             pp("pod update 失败",1)
           end
-          system "sleep 3"
-          system "open *.xcworkspace"
+          
+          unless @isSilent
+            system "sleep 3"
+            system "open *.xcworkspace"
+          end
+
         end
 
       end

data/lib/DYAutomate/Command/codeGenerate.rb

@@ -26,9 +26,8 @@ module DYAutomate
         super
         unless @config.templates_git_url
             help! "
-            error -- >!!! Not found <templates_git_url> in the #{DYAutomateConfig::configFilePath}"
+            error -- >!!! Not found <templates_git_url> in the #{DYAutomateConfig.configFilePath}"
         end
-
       end
 
       def run

data/lib/DYAutomate/Command/codeSnippet.rb

@@ -0,0 +1,57 @@
+
+module DYAutomate
+  class Command
+    class CodeSnippet < Command
+
+      require "fileutils"
+
+      self.abstract_command = false
+      self.command = 'snippet'
+      self.summary = '拷贝代码片段到Xcode中'
+      # self.default_subcommand = 'list'
+      self.arguments = [
+          # CLAide::Argument.new('NAME',   true),
+      ]
+
+      #当前路径
+      attr_accessor :xcode_snippsets_path
+
+      def initialize(argv)
+        super
+        @xcode_snippsets_path = File.join(Dir.home,"/Library/Developer/Xcode/UserData/CodeSnippets")
+      end
+
+      def validate!
+        super
+        unless Dir.exist?(@xcode_snippsets_path)
+          help! "
+            error -- >!!! Not found Xcode CodeSnippets at the #{@xcode_snippsets_path}"
+        end
+
+        unless @config.detailObj.codeSnippsets_git_url
+          help! "
+            error -- >!!! Not found the value of codeSnippsets_git_url"
+        end
+      end
+
+      def run
+        clone_templates
+      end
+
+      def clone_templates
+        tempPath = File.join(Dir.home,'Documents','.iOSCodeSnippet')
+        unless Dir.exist?(tempPath)
+          system("mkdir #{tempPath}")
+        end
+        system ("git clone #{@config.codeSnippsets_git_url} --depth 1 #{tempPath}")
+        Dir.chdir("#{tempPath}/CodeSnippets")
+        Dir.glob("*") do |path|
+          FileUtils.cp(path, @xcode_snippsets_path)
+        end
+        `rm -rf #{tempPath}`
+        puts "安装完成..."
+      end
+
+    end
+  end
+end

data/lib/DYAutomate/Command/pod.rb

@@ -24,8 +24,9 @@ module DYAutomate
       attr_accessor :spec_name
 
       def initialize(argv)
-        @path = Dir.pwd
         super
+        @path = Dir.pwd
+        pp("当前环境变量 #{@env_str}",1)
       end
 
       def validate!
@@ -69,6 +70,7 @@ module DYAutomate
         v
       end
 
+      # 1.1.1 => 1.1.2
       def get_version_new
         new_v = ''
         cur_v = get_spec_version
@@ -86,6 +88,7 @@ module DYAutomate
         new_v
       end
 
+      # 1.1.1 => 1.2.0
       def get_version_big_new
         new_v = ''
         cur_v = get_spec_version
@@ -143,7 +146,7 @@ module DYAutomate
       #更新repo
       def dy_update_repo
         path = File.join(Dir.home,'.cocoapods/repos')
-        excludeFiles = [".","..",".DS_Store",'master']
+        excludeFiles = [".","..",".DS_Store",'master','trunk']
         Dir.entries(path).each do |subDir|
           puts subDir
           unless excludeFiles.include?(subDir)

data/lib/DYAutomate/Command/taskFlow.rb

@@ -0,0 +1,39 @@
+module DYAutomate
+  class Command
+    class TaskFlow < Command
+
+      self.abstract_command = true
+      self.command = 'task'
+      self.summary = 'task相关'
+      # self.default_subcommand = 'list'
+      self.arguments = [
+          CLAide::Argument.new('NAME',   true),
+      ]
+
+      #路径
+      attr_accessor :path
+      # #查询结果lib信息
+      attr_accessor :git_obj
+
+      def initialize(argv)
+        super
+      end
+
+      def validate!
+        super
+        # unless @name
+        #   help! 'need the lib `NAME`.'
+        # end
+
+        # unless existGit?
+        #   help! "at #{Dir.pwd},is not git"
+        # end
+      end
+
+      def run
+        pp('git run ...',1)
+      end
+
+    end
+  end
+end

data/lib/DYAutomate/Command/workspace.rb

@@ -12,6 +12,12 @@ module DYAutomate
           # CLAide::Argument.new('NAME',   true),
       ]
 
+      def self.options
+        [
+          ['--silent', 'Show nothing'],
+        ].concat(super)
+      end
+
       #lib名字
       attr_accessor :name
       #当前路径
@@ -22,10 +28,15 @@ module DYAutomate
       # #查询结果lib信息
       attr_accessor :workSpace_path
 
+      # 是否静默
+      attr_accessor :isSilent
+
       def initialize(argv)
-        @path = Dir.pwd
         # @path = '/Users/cw/Documents/Dy/Apps/doing/doing'
         super
+        @path = Dir.pwd
+        @isSilent = argv.flag?("silent")
+        puts "env == #{@env_str}"
       end
 
       def validate!
@@ -46,6 +57,7 @@ module DYAutomate
 
       def run
         pp('WorkSpace run ...',1)
+        pp("当前环境变量 #{@env_str}",1)
       end
 
       #project文件是否存在
@@ -79,11 +91,11 @@ module DYAutomate
       #更新repo
       def dy_update_repo
         path = File.join(Dir.home,'.cocoapods/repos')
-        excludeFiles = [".","..",".DS_Store",'master']
+        excludeFiles = [".","..",".DS_Store",'master','trunk']
         Dir.entries(path).each do |subDir|
           puts subDir
           unless excludeFiles.include?(subDir)
-            system "#{@evn_str} pod repo update #{subDir}"
+            system "#{@env_str} pod repo update #{subDir}"
           end
         end
       end

data/lib/DYAutomate/CustomConfig/DYAutomateConfig.rb

@@ -2,6 +2,14 @@ require 'Core/DYBaseObj'
 
 
 module DYAutomate
+
+  class DYAutomateConfigDetail < DYBaseObj
+    attr_accessor :templates_git_url
+    attr_accessor :codeSnippsets_git_url
+    attr_accessor :private_repo_name
+    attr_accessor :env_str
+  end
+
   class DYAutomateConfig < DYBaseObj
     @public
     #cache相关的路径
@@ -10,17 +18,31 @@ module DYAutomate
     @@configGitClonePath = File.join(@@cachePath, 'Git')
     @@logsDirPath = File.join(@@cachePath, 'log')
 
-    attr_accessor :git
-    attr_accessor :git_tag
+    attr_accessor :detail_git
+    attr_accessor :detail_git_tag
+
+    attr_accessor :detailObj
     attr_accessor :templates_git_url
-    # attr_accessor :templates_git_url
-    attr_accessor :templates_cache_path
+    attr_accessor :codeSnippsets_git_url
 
+    attr_accessor :templates_cache_path
 
     def initialize
       super
     end
 
+    def self.cachePath
+      @@cachePath
+    end
+
+    def self.configFilePath
+      @@configFilePath
+    end
+
+    def self.configGitClonePath
+      @@configGitClonePath
+    end
+
     def self.logsDirPath
       @@logsDirPath
     end
@@ -28,8 +50,7 @@ module DYAutomate
     #从配置中心读取
     def self.loadConfig
       checkConfigFile?
-      cc = DYAutomateConfig::fromFile(@@configFilePath)
-      puts cc
+      cc = DYAutomateConfig.fromFile(@@configFilePath)
       cc.loadDetailFromGit if cc
       cc
     end
@@ -61,14 +82,32 @@ module DYAutomate
   #DYAutomate 配置
 
   DYAutomateConfig.new do |c|
-    c.git = ""
-    c.git_tag = ""
+    # 配置的git地址
+    c.detail_git = ""
+
+    # 配置的git tag
+    c.detail_git_tag = ""
   end
   EOF
-
       f.write(demo)
     end
 
+    def templates_git_url
+      url = ''
+      url = @detailObj.templates_git_url if @detailObj
+      url
+    end
+
+    def codeSnippsets_git_url
+      url = ''
+      url = @detailObj.codeSnippsets_git_url if @detailObj
+      url
+    end
+
+    def templates_cache_path
+      File.join(@@cachePath,'templates')
+    end
+
     def check_git_dir
       unless Dir.exist?(@@configGitClonePath)
         Dir.mkdir(@@configGitClonePath,0777)
@@ -81,7 +120,7 @@ module DYAutomate
       if File.exist?(versionFile)
         versionContent = File.open(versionFile, 'r:utf-8', &:read)
         if versionContent
-          isSame = versionContent.chomp.eql?(@git_tag.chomp)
+          isSame = versionContent.chomp.eql?(@detail_git_tag.chomp)
         end
       end
       isSame
@@ -89,12 +128,12 @@ module DYAutomate
 
     def clone_git
       check_git_dir
-      if @git_tag && @git
-        url = "#{@git} --branch #{@git_tag}"
+      if @detail_git_tag && @detail_git
+        url = "#{@detail_git} --branch #{@detail_git_tag}"
         # url = "#{@git} "
         cloneOk = system "git clone #{url} #{@@configGitClonePath}"
         if cloneOk
-          puts "加载配置成功。。。"
+          puts "clone #{url}成功。。。"
         else
           puts "clone #{url}失败！！"
         end
@@ -110,10 +149,9 @@ module DYAutomate
         system("rm -rf #{@@configGitClonePath}")
         clone_git
       end
-    end
-
-    def templates_cache_path
-      File.join(@@cachePath,'templates')
+      path = File.join(@@configGitClonePath,'detailConfig.rb')
+      @detailObj = DYAutomateConfigDetail.fromFile(path) if File.exist?(path)
+      puts "加载配置成功。。。" if @detailObj
     end
 
   end

data/lib/DYAutomate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DYAutomate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - 陈冬冬
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,16 +104,16 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/dj
-- lib/Core/CoreConfig.rb
 - lib/Core/DYBaseObj.rb
 - lib/Core/user_interface.rb
 - lib/DYAutomate.rb
@@ -146,11 +145,14 @@ files:
 - lib/DYAutomate/Command/Git/tagAdd.rb
 - lib/DYAutomate/Command/Pod/push.rb
 - lib/DYAutomate/Command/Pod/version.rb
+- lib/DYAutomate/Command/TaksFlow/test.rb
 - lib/DYAutomate/Command/Workspace/install.rb
 - lib/DYAutomate/Command/Workspace/update.rb
 - lib/DYAutomate/Command/codeGenerate.rb
+- lib/DYAutomate/Command/codeSnippet.rb
 - lib/DYAutomate/Command/dgit.rb
 - lib/DYAutomate/Command/pod.rb
+- lib/DYAutomate/Command/taskFlow.rb
 - lib/DYAutomate/Command/workspace.rb
 - lib/DYAutomate/CustomConfig/DYAutomateConfig.rb
 - lib/DYAutomate/version.rb
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.11
 signing_key: 
 specification_version: 4
 summary: 自动化工具

data/lib/Core/CoreConfig.rb

@@ -1,10 +0,0 @@
-
-module CoreConfig
-  Core_previte_repo_name = 'dy_repo_private_pods'
-  Core_previte_repo_url = 'git@gitlab.dongyin.net:iospodrepos/dy_repo_private_pods.git'
-  Core_public_repo_url = 'git@gitlab.dongyin.net:iospodrepos/dy_repo_public_pods.git'
-  Core_cocoapods_repo_url = 'https://github.com/CocoaPods/Specs.git'
-
-  Core_pod_git_url = "git@gitlab.dongyin.net:iosprivatepods"
-  Core_env_str = "Core_pod_git_url=#{Core_pod_git_url} Core_previte_repo_url=#{Core_previte_repo_url}#####{Core_public_repo_url}#####{Core_cocoapods_repo_url}"
-end