mcrt 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b2691c7cbf7c9ef7551e5aebe739d19a6b19ec
-  data.tar.gz: 7b3aefa1ccebe96458ba54353d474afe87ef1f8b
+  metadata.gz: 55fd17a5464b4a35d721afcbf9ccb7eaa15d39cd
+  data.tar.gz: 1125e43f1cbc28992487d570a5585e2c9acc92b8
 SHA512:
-  metadata.gz: e2ed261e30e6dec106caf120817fd9f529f58468091905bcd428f255bc8910a29647587fd71b92fd1706e37e69e4d9f5c97bbb597e114aabc3b309fb4dbad83b
-  data.tar.gz: 3da5614e14fb896d3cb001109ad3c46128aa46e8564e68e5296b99af969ddcf7e0ecac990102874ee1ffa3f559787554345a8fe6fc2cf85005719b6fda00a58a
+  metadata.gz: 3287900e87f879cfb4c77d2af967f769f632398699a4db4f546bafce97967cd5bff5e707eb8fe746e8f5f1901e5f9b393e9c6a2214f632322e677f763fddc4c2
+  data.tar.gz: bd0bf62b519d45fd0db706a6c9a6b91234d3ad3c7e507ca9149b3d48d28cc14b12288aceef4d923a88ea356dbad2a4f6b159e0638b527cd983e5ec9d8594d606

data/lib/mcrt.rb

@@ -3,28 +3,85 @@ require 'net/https'
 require 'uri'
 require 'json'
 
-class MavenCentralPublishTool
-  def self.buildr_release(project, profile_name, username, password)
-    release_to_url = Buildr.repositories.release_to[:url]
-    release_to_username = Buildr.repositories.release_to[:username]
-    release_to_password = Buildr.repositories.release_to[:password]
+class MavenCentralReleaseTool
+  class << self
+    def define_publish_tasks(options = {})
+      desc 'Publish release on maven central'
+      task 'mcrt:publish' do
+        project = options[:project] || Buildr.projects[0].root_project
+        profile_name = options[:profile_name] || (raise ':profile_name not specified when defining tasks')
+        username = options[:username] || (raise ':username name not specified when defining tasks')
+        password = options[:password] || ENV['MAVEN_CENTRAL_PASSWORD'] || (raise "Unable to locate environment variable with name 'MAVEN_CENTRAL_PASSWORD'")
+        MavenCentralPublishTool.buildr_release(project, profile_name, username, password)
+      end
 
-    begin
-      Buildr.repositories.release_to[:url] = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
-      Buildr.repositories.release_to[:username] = username
-      Buildr.repositories.release_to[:password] = password
-
-      project.task(':upload').invoke
-
-      r = MavenCentralPublishTool.new
-      r.username = username
-      r.password = password
-      r.user_agent = "Buildr-#{Buildr::VERSION}"
-      r.release_sole_auto_staging(profile_name)
-    ensure
-      Buildr.repositories.release_to[:url] = release_to_url
-      Buildr.repositories.release_to[:username] = release_to_username
-      Buildr.repositories.release_to[:password] = release_to_password
+      desc 'Publish release to maven central iff current HEAD is a tag'
+      task 'mcrt:publish_if_tagged' do
+        tag = MavenCentralPublishTool.get_head_tag_if_any
+        if tag.nil?
+          puts 'Current HEAD is not a tag. Skipping publish step.'
+        else
+          puts "Current HEAD is a tag: #{tag}"
+          if MavenCentralPublishTool.is_tag_on_candidate_branches?(tag, candidate_branches)
+            task('mcrt:publish').invoke
+          end
+        end
+      end
+    end
+
+    def get_head_tag_if_any
+      version = `git describe --exact-match --tags 2>&1`
+      if 0 == $?.exitstatus && version =~ /^v[0-9]/ && (ENV['TRAVIS_BUILD_ID'].nil? || ENV['TRAVIS_TAG'].to_s != '')
+        version.strip
+      else
+        nil
+      end
+    end
+
+    def is_tag_on_branch?(tag, branch)
+      output = `git tag --merged #{branch} 2>&1`
+      tags = output.split
+      tags.include?(tag)
+    end
+
+    def is_tag_on_candidate_branches?(tag, branches)
+      sh 'git fetch origin'
+      branches.each do |branch|
+        if is_tag_on_branch?(tag, branch)
+          puts "Tag #{tag} is on branch: #{branch}"
+          return true
+        elsif is_tag_on_branch?(tag, "origin/#{branch}")
+          puts "Tag #{tag} is on branch: origin/#{branch}"
+          return true
+        else
+          puts "Tag #{tag} is not on branches: #{branch} or origin/#{branch}"
+        end
+      end
+      false
+    end
+
+    def buildr_release(project, profile_name, username, password)
+      release_to_url = Buildr.repositories.release_to[:url]
+      release_to_username = Buildr.repositories.release_to[:username]
+      release_to_password = Buildr.repositories.release_to[:password]
+
+      begin
+        Buildr.repositories.release_to[:url] = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+        Buildr.repositories.release_to[:username] = username
+        Buildr.repositories.release_to[:password] = password
+
+        project.task(':upload').invoke
+
+        r = MavenCentralPublishTool.new
+        r.username = username
+        r.password = password
+        r.user_agent = "Buildr-#{Buildr::VERSION}"
+        r.release_sole_auto_staging(profile_name)
+      ensure
+        Buildr.repositories.release_to[:url] = release_to_url
+        Buildr.repositories.release_to[:username] = release_to_username
+        Buildr.repositories.release_to[:password] = release_to_password
+      end
     end
   end
 

data/mcrt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{mcrt}
-  s.version            = '1.5.0'
+  s.version            = '1.6.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcrt
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies: []
 description: Maven Central Release Tool.
 email: peter@realityforge.org