DYAutomate 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca40553f032c4e9d73485419d62ab39396340fa3c884ae22c9c323ea4222cc2a
-  data.tar.gz: 8c96d0b43dff6fe910d66967e233004907d8441b711a2a98a09a1f47575e7518
+  metadata.gz: 488a3c5f4815c40ae02294499acb20770b78d1a7789aab5b709082c68efe4f35
+  data.tar.gz: a761a7d0166d42d1dfcaba894cd456e6ea306d0f5edde717f56cb78a6a6de54b
 SHA512:
-  metadata.gz: 72d26755088d66ac96ba98e3f457e184bfa514db907b3ec49b48eecd5c03e60b5f1a54228b408b04fd3d09335ffa74f9ce4c23f2b9079b315d8ddd3db5a2cb5f
-  data.tar.gz: 07c5579de29bc7d0af3f67825f7cbfe94c68890b7fe4e4cdfc5e997480ae8a13d9b82b54444b40039139a715c6c082a0ae40c9d05c09dc6f18458bdb45c9083b
+  metadata.gz: aa07c1a77398558bc1fcf8c04fb8b02df83d747f720152e7a369a6c33aac6dc8d1df303366549fce9be75b580c8c40b3b4333c47106338a8aeb26de23fd118c7
+  data.tar.gz: f762ad8ed262d8b41e8eceb989dbddb0a7bf23845b37f6015016eff654813ce40a58b4cb83dc206c654a2039b34d2198d1acc4b762e97ca90ea5223d80cb4753

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,14 @@ 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 :config
+
 		self.abstract_command = true
 	    self.command = 'dj'
 	    self.version = VERSION
@@ -24,10 +25,8 @@ module DYAutomate
 
 	    def initialize(argv)
 	      super
-				@repoName = CoreConfig::Core_previte_repo_name
-				@env_str = CoreConfig::Core_env_str
 				@config = DYAutomateConfig.loadConfig
-				pp("当前环境变量 #{@env_str}",1)
+				pp("当前环境变量 #{env_str}",1)
 	    end
 
 	    def self.options
@@ -50,7 +49,15 @@ module DYAutomate
 				elsif level == 2
 					puts msg.red if msg
 	    	end
-	    end
+			end
+
+			def repoName
+				@config.detailObj.private_repo_name if @config
+			end
+
+			def env_str
+				@config.detailObj.env_str if @config
+			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/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.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: DYAutomate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - 陈冬冬
@@ -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
@@ -149,6 +148,7 @@ files:
 - 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/workspace.rb

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