podspecpush 0.5.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3faa15aa12076b7850a59b1414ca8d0a516caa4
-  data.tar.gz: eac72308586de8ff936dfcd20b12c389396e8d68
+  metadata.gz: 460568fb63be21ba9618be857fe0a35272fe11d3
+  data.tar.gz: ad3614c557b408e525cfed115bdbf32281422477
 SHA512:
-  metadata.gz: 63d36c6148bd38b85ef99ff5b4bbbb462b1a0968390885073a4139e4751f8a1519afafe608702528833884a7ca594f252c120a249b7b2dd2642d59f94efff9e8
-  data.tar.gz: a98f338180959ca2b261e3d98989ce8ec601ac69f0f81a8c3d523e48fd6bf83a22055ece9f150a90b8c304980254359f53b1f5c895a39286a0200e20ba63bb56
+  metadata.gz: d6e283b1f7fc12a758d6229b1ede14164b83f28cbf345db9cee3ea3d06a18e863e615d8b09756c22ab8f4223d30da16e38d11b7df5d2b03cd45b09f5b9da7093
+  data.tar.gz: 7a8fc7db807d5819714d5608d10773bb4fc6ceec4519d78189dcce2908b009c92958c942e8460e10b120dd4241737deb27fefd26bcb4695f0d3e2d031c5c0495

data/lib/podspecpush/version.rb

@@ -1,3 +1,3 @@
 module Podspecpush
-  VERSION = "0.5.0"
+  VERSION = "0.9.0"
 end

data/lib/podspecpush.rb

@@ -1,106 +1,151 @@
 require "podspecpush/version"
+require 'colorize'
 require 'trollop'
 
 module Podspecpush
   class PodPush
-    def push
-      opts = Trollop::options do
-        opt :repo, "Repo name", :type => :string
-        opt :sources, "List of private repo sources to consider when linting private repo", :type => :string
-        opt :force, "Pod verify & push with warnings"
-        opt :privateRepo, "If set, assume repo is private and skip public checks"
-      end
-      Trollop::die :repo, "Repo must be provided" if opts[:repo] == nil
 
-      force = opts[:force]
-      repoName = opts[:repo]
-      privateRepo = opts[:privateRepo]
-      sources = opts[:sources]
+    def specfile
+      Dir["*.podspec"].first
+    end
+
+    def shouldUseBundleExec
+      File.exist?('Gemfile')
+    end
 
-      podspecName = `ls | grep .podspec`.strip
+    def ensureSpecfile
+      podspecFile = specfile
 
-      clean = `git status --porcelain`
+      puts "No spec file found".red unless podspecFile != nil
+      exit unless podspecFile != nil
+    end
 
-      if clean.length != 0 
-        puts "Repo is not clean; will not push new version"
+    def ensureGitClean
+      if `git status --porcelain`.length != 0
+        puts "Repo is not clean; will not push new version".red
         exit
       end
 
-      version = `git describe --abbrev=0`.strip
-
-      newFile = ""
-
-      File.readlines(podspecName).each do |line|
-        idx = /  s.version/ =~ line
-        if idx != nil && idx >= 0 
-          startIdx = line.index("\'")
-          endIdx = line.index("\'", startIdx + 1)
-          currentVersion = line[startIdx + 1...endIdx]
-          if currentVersion == version
-            puts "Can't push same version silly!"
-            exit
-          end
-          line[startIdx +1 ...endIdx] = version
-        end
-  
-        newFile += line  
-      end
+      cmd = []
+      cmd << ['bundle exec'] if shouldUseBundleExec
+      cmd << ['pod cache clean --all'] if shouldUseBundleExec
+      system cmd.join(' ')
+    end
 
-      File.open(podspecName, 'w') { |file| file.write(newFile) }
-      
-      isPrivateFlag = (privateRepo == true ? ' --private' : '')
-      sourcesFlag = (sources == nil ? '' : " --sources=#{sources},https://github.com/CocoaPods/Specs.git")
-      disallowWarningsLint = "pod spec lint #{podspecName}" + isPrivateFlag + sourcesFlag
-      allowWarningsLint = disallowWarningsLint + " --allow-warnings"
-
-      lintCmd = (force == true ? allowWarningsLint : disallowWarningsLint)
-      lint = system(lintCmd)
-
-      if lint == false
-        puts "Linting failed, try again by allowing warnings? [Y/n]"
-        decision = gets.chomp.downcase
-        if decision == "y"
-          tryAgainCmd = allowWarningsLint
-          tryAgain = system(tryAgainCmd)
-          
-          if tryAgain == false
-            puts "Even with warnings, something is wrong. Look for any errors"
-            exit
-          else
-            puts "Proceeding by allowing warnings"
-          end
-        else
-          exit
-        end
-      end
+    def makeLintCmd(opts)
+      lintCmd = []
+      lintCmd << ['bundle exec'] if shouldUseBundleExec
+      lintCmd = ["pod spec lint"]
 
-      pushCmd = "pod repo push #{repoName} #{podspecName} --allow-warnings"
-      repoPush = system(pushCmd)
+      # Build sources
+      sources = ["https://github.com/CocoaPods/Specs.git"]
+      sources << opts[:sources] unless opts[:sources] == nil
+      sourcesArg = "--sources=" + sources.join(",")
 
-      if repoPush == false
-        puts "Push failed, see errors."
-        exit
+      # Build lintCmd
+      lintCmd << specfile
+      lintCmd << sourcesArg
+      lintCmd << ["--private"] unless opts[:private] == false
+
+      # finalize
+      lintCmd.join(' ')
+    end
+
+    def makePushCmd(opts)
+      cmd = []
+      cmd << ['bundle exec'] if shouldUseBundleExec
+      cmd << ["pod repo push #{opts[:specRepo]} #{specfile} --allow-warnings"]
+
+      cmd.join(' ')
+    end
+
+    def updateVersion
+      puts "Please enter new version of the pod so we can tag, lint and push it! (e.g. 1.2.0)".blue
+      @podVersion = gets.chomp.downcase
+
+      puts "Please enter new a brief message to put in the git tag describing what's changed".blue
+      @podVersionMessage = gets.chomp.downcase
+
+      system "git tag -a #{@podVersion} -m #{@podVersionMessage}"
+      system "git push --tags"
+
+      contents = File.read(specfile)
+      oldVersion = Regexp.new('[0-9.]{2,6}').match(Regexp.new('(s.version)\s*=.*\n').match(contents).to_s).to_s
+      File.write(specfile, contents.gsub!(oldVersion, @podVersion))
+    end
+
+    def rollbackTag
+      puts "Rolling back git tags".green
+      system "git tag -d #{@podVersion}"
+      system "git push -d origin #{@podVersion}"
+      exit
+    end
+
+    def executeLint(withWarnings)
+      cmd = [@lintCmd]
+      cmd << "--allow-warnings" unless withWarnings == false
+
+      command = cmd.join(' ')
+
+      puts "Executing: #{command}".green
+      success = system command
+
+      if success == false && withWarnings == false
+        # Try again?
+        puts "Linting failed, try again by allowing warnings? [Y/n]".blue
+        gets.chomp.downcase == "y" ? executeLint(true) : rollbackTag
+      elsif success == false && withWarnings == true
+        puts "Even with warnings, something is wrong. Look for any errors".red
+        rollbackTag
       end
+    end
 
-      addExecute = system('git add .')
+    def executePush
+      puts "Executing: #{@pushCmd}".green
+      success = system @pushCmd
 
-      if addExecute == false 
-        puts "Could not add files to git, consider finishing by hand by performing a git add, commit, and push. Your spec repo should be up to date"
-        exit
+      if success == false
+        puts "Push failed, see errors.".red
+        rollbackTag
       end
+    end
 
-      commitExecute = system('git commit -m "[Versioning] Updating podspec"')
+    def commitThisRepo
+      puts "Congrats! The pod has been linted and successfully push to the spec repo! All that is left is to commit the podspec here!".green
 
-      if commitExecute == false 
-        puts "Could not commit files, consider finishing by hand by performing a git commit and push. Your spec repo should be up to date"
-        exit
+      puts "Could not commit files, consider finishing by hand by performing a git commit and push. Your spec repo should be up to date".red unless system('git commit -am "[Versioning] Updating podspec"') == true
+      puts "Could not push to server, consider finishing by hand by performing a git push. Your spec repo should be up to date".red unless system('git push origin master')
+    end
+
+    def push
+      opts = Trollop::options do
+        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"
       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
 
-      pushToServer = system('git push origin master')
+      Dir.chdir(opts[:workspace]) do
+        # Check
+        ensureGitClean
+        ensureSpecfile
 
-      if pushToServer == false 
-        puts "Could not push to server, consider finishing by hand by performing a git push. Your spec repo should be up to date"
-        exit
+        # User input
+        updateVersion
+
+        # Cmds
+        @lintCmd = makeLintCmd(opts)
+        @pushCmd = makePushCmd(opts)
+
+        # execute
+        executeLint(false)
+        executePush
+
+        # Tidy up this repo!!
+        commitThisRepo
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podspecpush
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Joe Carroll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop