DYAutomate 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8cece690d31b9c48e92f8d2fbed11fde2acd5fd7
-  data.tar.gz: 187b6d0fde6816001bf9cfb720f705ba78c404cd
+SHA256:
+  metadata.gz: eee9ab638bb3f94d5f418cd1ed9f8576f3f627a175db34563940336d0052c131
+  data.tar.gz: ef5f2d200b78279663aeee72dca7cdc319e213e12d082321e93a65b888c882a6
 SHA512:
-  metadata.gz: 91ec377a56e5c67bb1af469d3016847001571d120ba6ba4f5b1f545db51b5690b0c85c93f50633a117d42fea1af6b7e02b7035140e91d4a59fc6bca452332334
-  data.tar.gz: d2eb99d791b057c03dd569daa97ea1fbd316b823901cc0f7a94c80f1d3769b8a329465d5d886edcccce9c34cb25b1755d19044d7e8bc4981280315d514054c66
+  metadata.gz: 99f860caef424bd3503649bdd98ea03a12d7664e447b75eb3e57e4288aee507c812b7c69c05baca78735f87347b365b133e1dce4b31ea8a61f19000e4a0c92dd
+  data.tar.gz: f951592fd69c67e4a9ca2ad67513a41bfccd5f6b9e53397b1a60a97b7dd119da37e41f01a4e16756ba525940726b03edc84f9c3a339691ade73a9f39c101ef01

data/lib/Core/CoreConfig.rb

@@ -0,0 +1,7 @@
+
+module CoreConfig
+  Core_previte_repo_name = 'dy_repo_private_pods'
+  Core_previte_repo_url = 'git@code.aliyun.com:iOSPodRepos/dy_repo_private_pods.git#####https://github.com/CocoaPods/Specs.git'
+  Core_pod_git_url = "git@code.aliyun.com:iOSPrivatePods"
+  Core_env_str = "Core_pod_git_url=#{Core_pod_git_url} Core_previte_repo_url=#{Core_previte_repo_url}"
+end

data/lib/DYAutomate/Command/Pod/push.rb

@@ -75,7 +75,11 @@ module DYAutomate
           if isTagOk
             #push 到repo仓库
             dy_update_repo
-            isok = system "pod repo push #{@repoName} \
+
+            pp('私有库repo ->' + @repoName,1)
+            pp("环境变量 -->"+@env_str,1)
+
+            isok = system "#{@env_str} pod repo push #{@repoName} \
               --sources='master',#{@repoName} \
               --use-libraries \
               --allow-warnings \

data/lib/DYAutomate/Command/Pod/version.rb

@@ -6,15 +6,13 @@ module DYAutomate
 
         # self.abstract_command = true
         self.command = 'ver'
-        self.summary = '''
-        修改podspec文件版本号
-        用法：
-          `dj pod ver 1`  只升级一个小版本0.1.0 --> 0.1.1
-          `dj pod ver 1 1`  升级一个小版本和一个大版本 0.1.0 --> 0.2.1
-          `dj pod ver 0 1`  只升级一个大版本 0.1.0 --> 0.2.0
-        '''
+        self.summary = "
+        修改podspec文件版本号 `dj pod ver 1` 0.1.0 --> 0.1.1
+          `dj pod ver 1 1`  0.1.0 --> 0.2.1
+          `dj pod ver 0 1` 0.1.0 --> 0.2.0
+        "
         self.arguments = [
-            CLAide::Argument.new('addVersion', false),
+            CLAide::Argument.new('addVersion', false,'升级一个小版本'),
             CLAide::Argument.new('addBigVersion', false)
         ]
 
@@ -42,7 +40,7 @@ module DYAutomate
           if @addBig.to_i > 0
             pp('增加一个大版本',1)
             new_v = get_version_big_new
-            new_v = '0.14.0'
+
             fix_pod_version(new_v)
           end
         end

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

@@ -42,9 +42,7 @@ module DYAutomate
         end
 
         def do_install
-          # system "rm -rf Podfile.lock"
-          # system "rm -rf Pods/*"
-          isOk = system "pod update --no-repo-update"
+          isOk = system "#{@env_str} pod update --no-repo-update"
           if isOk
             pp("pod install 成功",1)
           else

data/lib/DYAutomate/Command/pod.rb

@@ -25,9 +25,6 @@ module DYAutomate
 
       def initialize(argv)
         @path = Dir.pwd
-        # @path = '/Users/cdd/Documents/Dy/podsDemo/DYPodDemoA'
-        # @repoName = CoreConfig::Core_previte_repo_name
-        @repoName = 'dy_repo_private_pods'
         super
       end
 
@@ -150,7 +147,7 @@ module DYAutomate
         Dir.entries(path).each do |subDir|
           puts subDir
           unless excludeFiles.include?(subDir)
-            system "pod repo update #{subDir}"
+            system "#{@env_str} pod repo update #{subDir}"
           end
         end
       end

data/lib/DYAutomate/Command/workspace.rb

@@ -81,7 +81,7 @@ module DYAutomate
         Dir.entries(path).each do |subDir|
           puts subDir
           unless excludeFiles.include?(subDir)
-            system "pod repo update #{subDir}"
+            system "#{@evn_str} pod repo update #{subDir}"
           end
         end
       end

data/lib/DYAutomate/Command.rb

@@ -1,13 +1,12 @@
 require 'DYAutomate.rb'
 require 'version'
-# require 'CoreConfig'
+require 'Core/CoreConfig'
 
 module DYAutomate
-	# include CoreConfig
 	require 'CLAide'
 
 	class Command < CLAide::Command
-
+		include CoreConfig
 		require 'Command/pod.rb'
 		require 'Command/workspace.rb'
 		# require 'Command/dgit.rb'
@@ -22,6 +21,8 @@ module DYAutomate
 
 	    def initialize(argv)
 	      super
+				@repoName = CoreConfig::Core_previte_repo_name
+				@env_str = CoreConfig::Core_env_str
 	    end
 
 	    def self.options

data/lib/DYAutomate/version.rb

@@ -1,3 +1,3 @@
 module DYAutomate
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/DYAutomate.rb

@@ -4,5 +4,4 @@ require 'DYAutomate/Command'
 module DYAutomate
   autoload :Command ,'DYAutomate/Command'
   require 'colored2'
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DYAutomate
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - 陈冬冬
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 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
@@ -138,6 +138,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/dj
+- lib/Core/CoreConfig.rb
 - lib/DYAutomate.rb
 - lib/DYAutomate/Command.rb
 - lib/DYAutomate/Command/Git/tagAdd.rb
@@ -157,6 +158,7 @@ rdoc_options: []
 require_paths:
 - lib
 - lib/DYAutomate
+- lib/Core
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -169,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: 自动化工具