orientepodspecpush 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e109bef4e89d1e92f40cc5240c7fc8dbc316546ca9697cdbcedb10ab89d33144
-  data.tar.gz: e3fb09c2068cc9585c3114f07f51828c2d00d809e3ca9da2651e1a881eba6b7f
+  metadata.gz: 4fa26e81068f8215cdaf67dae7fb391b57927638b19e7a9688aac99a020c3557
+  data.tar.gz: 2e677e8f5f521d305009605724c9c7a73d50d831b3ae7aa48c0bf2b9cf661f09
 SHA512:
-  metadata.gz: 19442d221268dc184a1dd3a81c0d22ed0f91acdea765b704fba812fb8311340de5221ff05fb0d41e4d01c1476d3eac16f0b0eae58ae880aae4c31cb70239d054
-  data.tar.gz: 8a8e868e240a5c3dca464b25259af421249b6015f49a5595b9de4edeee526745d4c1fab91e345fb0036925b33489013bd8e8c9086b31bdb52c25ab9a11100936
+  metadata.gz: b3b575e62e189f99f411d70f4b7b5f9121ff0f396d19e0184f23447086176825af0638d9fb117fb3af976ac39eacec301a861b55afabe1fa9d44446b55f35284
+  data.tar.gz: b587bfe4e54447ff0db10746eb0effbd20ecdfb720f3eb84bd26232e9141ec2ef15b2b61e9342e492c3d5ad91a934efb865946fd8d9acd65728fc48f92df003f

data/lib/orientepodspecpush/version.rb

@@ -1,3 +1,3 @@
 module Orientepodspecpush
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/lib/orientepodspecpush.rb

@@ -2,6 +2,49 @@ require "orientepodspecpush/version"
 require 'colorize'
 require 'trollop'
 
+# def test
+#   opts = Trollop::options do
+#     version "#{Orientepodspecpush::VERSION}"
+#     opt :specRepo, "Name of the repo to push to. See pod repo list for available repos", :type => :string
+#     opt :workspace, "Path to cocoapod workspace", :type => :string
+#     opt :sources, "Comma delimited list of private repo sources to consider when linting private repo. Master is included by default so private repos can source master", :type => :string
+#     opt :private, "If set, assume the cocoapod is private and skip public checks"
+#     opt :tag, "tag of the repo push to", :type => :string
+#     opt :tagCommitMsg, "commit message of this tag", :type => :string
+#     opt :lint, "pod spec lint 情况下所需要的参数，需要用引号括起来，例如'--allow-warnings --sources=some source address'",:type => :string
+#     opt :package, "pod package  情况下所需要的参数，需要用引号括起来，例如'--force --no-mangle'",:type => :string
+#     opt :push, "pod repo push 情况下所需要的参数，需要用引号括起来，例如'--verbose --use-libraries'",:type => :string
+#     opt :noPackage, "If set, no need to package"
+#   end
+
+#   puts "lint:#{opts[:lint]}"
+#   puts "package:#{opts[:package]}"
+#   puts "push:#{opts[:push]}"
+#   puts "noPackage:#{opts[:noPackage]}"
+#   puts "tag:#{opts[:tag]}"
+
+#   if opts[:specRepo] == nil
+#     puts '空'
+#     else
+# puts '非空'
+#   end
+#   # Need these two
+#   Trollop::die :specRepo, "Spec Repo must be provided" if opts[:specRepo] == nil
+#   Trollop::die :workspace, "Workspace path must be provided" if opts[:workspace] == nil
+#   Trollop::die :tag, "tag must be provided" if opts[:tag] == nil
+# end
+
+# test
+
+# def test
+#   cmd = []
+#   cmd << "wo"
+#   cmd << ["ai","si"]
+#   cmd << "ni"
+#   puts cmd.join "--"
+# end
+
+# test
 module Orientepodspecpush
   class PodPush
 
@@ -26,7 +69,13 @@ module Orientepodspecpush
       cmd << ['bundle exec'] if shouldUseBundleExec
       podPackage = "pod package #{specfile}"
       cmd << [podPackage]
-      cmd << opts[:package] unless opts[:package] == nil
+      packageCmd = "--force --spec-sources='ssh://git-codecommit.ap-southeast-1.amazonaws.com/v1/repos/ios-OrienteSpecs, https://github.com/CocoaPods/Specs.git'"
+      if opts[:package].included? "--spec-sources"
+        cmd << opts[:package] unless opts[:package] == nil
+      else
+        cmd << packageCmd
+      end
+      
       
       system cmd.join(' ')
 
@@ -69,11 +118,18 @@ module Orientepodspecpush
 
       # Build lintCmd
       lintCmd << specfile
+
+      lintCommand = "--allow-warnings --sources='ssh://git-codecommit.ap-southeast-1.amazonaws.com/v1/repos/ios-OrienteSpecs,https://github.com/CocoaPods/Specs.git'"
+      if opts[:lint].included? "--sources"
+        lintCmd <<  ["#{opts[:lint]}"]
+      else
+        lintCmd <<  [lintCommand]
+      end
       # lintCmd << sourcesArg
-      lintCmd << opts[:sources] unless opts[:sources] == nil
-      lintCmd <<  ["#{opts[:lint]}"]
+      # lintCmd << opts[:sources] unless opts[:sources] == nil
+      
       lintCmd << ["--private"] unless opts[:private] == false
-
+      
       # finalize
       lintCmd.join(' ')
     end
@@ -81,9 +137,21 @@ module Orientepodspecpush
     def makePushCmd(opts)
       cmd = []
       cmd << ['bundle exec'] if shouldUseBundleExec
-      podRepoPush = "pod repo push #{opts[:specRepo]} #{specfile}"
-      cmd << [podRepoPush]
-      cmd << opts[:push] unless opts[:push] == nil      
+      if opts[:specRepo] == nil
+        podRepoPush = "pod repo push OrienteSpecs #{specfile}"
+      else 
+        podRepoPush = "pod repo push #{opts[:specRepo]} #{specfile}"
+      end
+      
+      # cmd << [podRepoPush]
+      cmd << podRepoPush
+      pushCommand = "--allow-warnings --sources='ssh://git-codecommit.ap-southeast-1.amazonaws.com/v1/repos/ios-OrienteSpecs,https://github.com/CocoaPods/Specs.git'"
+      if opts[:push].included? "--sources"
+        cmd << opts[:push]
+      else
+        cmd << pushCommand
+      end
+      # cmd << opts[:push] unless opts[:push] == nil      
 
       cmd.join(' ')
     end
@@ -106,7 +174,12 @@ module Orientepodspecpush
         system "git tag -a #{@podVersion} -m '#{@podVersionMessage}'"
       end
       # system "git tag -a #{@podVersion} -m '#{@podVersionMessage}'"
-      system "git push --tags"
+      flag = system "git push --tags"
+      if flag == false
+        system "git tag -d #{@podVersion}"
+        exit
+        
+      end
 
       contents = File.read(specfile)
       oldVersion = Regexp.new('[0-9.]{2,8}').match(Regexp.new('(s.version)\s*=.*\n').match(contents).to_s).to_s
@@ -197,7 +270,7 @@ module Orientepodspecpush
       puts "noPackage:#{opts[:noPackage]}"
       puts "tag:#{opts[:tag]}"
       # Need these two
-      Trollop::die :specRepo, "Spec Repo must be provided" if opts[:specRepo] == nil
+      # Trollop::die :specRepo, "Spec Repo must be provided" if opts[:specRepo] == nil
       Trollop::die :workspace, "Workspace path must be provided" if opts[:workspace] == nil
       Trollop::die :tag, "tag must be provided" if opts[:tag] == nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientepodspecpush
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - John wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop