travis-build-tools 1.0.30.0 → 2.0.38.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njg3ODgyOGQwNWJkNDQyY2FkNTM4OTJiMjYxOThiZmRhMDlkMDE5NQ==
+    MWQ4MTc0NWJlMjFmODI3MjgwMmFkMTE4YzhhODAzY2ZkNzcyNmU0YQ==
   data.tar.gz: !binary |-
-    NTk3ZDI3MTFlMTYzMmZmMTAxZDM4NzQ5NDYwYjMyYzRkZTI2YTEwZA==
+    ZjdmMmI2NWI0ZTc5MTAwY2Q4NGU1NzUxNzYzYWEyYWQ3YWZhNjBlZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTYzOWY4NjNmNzc4MGYzMTc4Yzk3MDIzY2U2M2M2OWMxOTczZDFhZTczY2I2
-    NmVkYmViNGIyNzdiMzVmNDU3N2I0MDIxMDEzN2ZkN2ZiNDFmOTRmODRmNjg2
-    ZWUwODllMmMxZTRhZWU3NmZmZTgwYzlmYmIxNmI2OTUzMzBhMjI=
+    NmI5MWY3MjQ4ZjgxMmFiZGMzMmVhMjJkY2NhMWEzODI4ZmVjNTE1ODdlNmI4
+    OWU2YmQ5MmNmOTg3Y2ZhZWVjYzdmMGZlMDBiMzRlMDhiYWM0ODljM2NjMDQ2
+    NmVmZjMyN2U5OTIzNjBmYzVmMzEyNmUyMTM3ZDM4NmJhNWQ1YzQ=
   data.tar.gz: !binary |-
-    YzM2YTUxYzFlYmFmOTJhMWYwYWZkMmRhOThjNzQ2NmUzZDY3Yjg5MzI1ZWVl
-    NjNlYjQ1ZjQ0ZWI0NjdkYTI4OGVlMTI0OTMwNTZmOGJlMWZhMTQ3NjM4ODRj
-    OTAyYTViYWNiOWNkYzhhNjVmYTAwMjU5ODcxYjAwM2IxYWM5NjU=
+    YzQ0MmMxNGY4OTkzMDU2MjI5ZTRjZmMxYjhlZGY3YzRkMDZkYTQ1YzFmNzkz
+    MTE4ZmJlZTc4YWJkMGQ4NzE3NTE3YTg4MzEyNmQ3ODZkYzg0ZmUzZGEwNTgz
+    NzVmYTYzYTI3MDNmZjNiN2YyODg2MGYzMTdmZWY5NTUwMTgzMzA=

data/lib/travis-build-tools/builder.rb

@@ -0,0 +1,50 @@
+module TravisBuildTools
+  class Builder
+    def initialize(service_user, git_repository = nil)
+      @service_user = service_user
+      origin_url = %x[git config --get remote.origin.url]
+      @git_repository = git_repository || origin_url.split('://')[1] || origin_url.split('@')[1]
+
+      raise 'git_repository is not specified' if !@git_repository
+      raise 'service_user is not specified' if !@service_user
+    end
+
+    def publish_git_tag(tag_name)
+      if ENV['TRAVIS'] && ENV['TRAVIS_PULL_REQUEST'].match(/false/i)
+        raise 'tag_name is not specified' if !tag_name
+
+        #Setup up deploy
+        puts %x[git config --global user.email "builds@travis-ci.com"]
+        puts %x[git config --global user.name "Travis CI"]
+        puts %x[git tag #{tag_name} -a -m "Generated tag from TravisCI."]
+        puts "Pushing Git tag #{tag_name}."
+
+        %x[git push --tags --quiet https://#{@service_user}@#{@git_repository} #{tag_name} > /dev/null 2>&1]
+      end
+    end
+    
+    def merge_downstream(release_branch_name, master_branch_name)
+      if ENV['TRAVIS'] && ENV['TRAVIS_PULL_REQUEST'].match(/false/i)
+        #get all branches
+        branches = %x[git ls-remote --heads origin].scan(/^.*refs\/heads\/(.*)$/).flatten
+        matching_branches = branches.select{|b| b.match(/#{Regexp.quote(release_branch_name)}/)}
+
+        #If this branch doesn't match the downstream then ignore creating the merge
+        return if !matching_branches.include?(ENV['TRAVIS_BRANCH'])
+
+        #Sort the branches by the match that comes after the release branch name
+        sorted_branches = matching_branches.map{|b| Gem::Version.new(b.match(/#{Regexp.quote(release_branch_name)}(.*)$/)[1].strip)}
+
+        #Find the next branch in the array that isn't the current branch
+        current_release_version = Gem::Version.new(ENV['TRAVIS_BRANCH'].match(/#{Regexp.quote(release_branch_name)}(.*)$/)[1].strip)
+        next_branch_to_merge = (sorted_branches.drop_while{|b| b <= current_release_version}.map{|v| release_branch_name + v.to_s} + ['master']).first
+
+        #create a merge commit for that branch
+        puts %x[git merge --no-ff origin/#{next_branch_to_merge}]
+        puts "Merging to downstream branch: #{next_branch_to_merge}"
+        #push origin for that branch using the service user
+        %x[git push --quiet https://#{@service_user}@#{@git_repository} HEAD:#{next_branch_to_merge} > /dev/null 2>&1]
+      end
+    end
+  end
+end

data/lib/travis-build-tools/dsl.rb

@@ -1,35 +1,4 @@
 module TravisBuildTools
   module DSL
-    def publish_git_tag(*args, &block)
-      PublishGitTagTask.define_task(*args, &block)
-    end
-  end
-
-  class PublishGitTagTask < Rake::Task
-    attr_accessor :service_user
-    attr_accessor :tag_name
-    attr_accessor :git_repository
-
-    def initialize(task_name, app)
-	  super(task_name, app)
-	end
-
-    def execute(args=nil)
-      super(args)
-
-      if ENV['TRAVIS'] && ENV['TRAVIS_PULL_REQUEST'].match(/false/i)
-        raise 'service_user is not specified' if !@service_user
-        raise 'tag_name is not specified' if !@tag_name
-        raise 'git_repository is not specified' if !@git_repository
-
-        #Setup up deploy
-        puts %x[git config --global user.email "builds@travis-ci.com"]
-        puts %x[git config --global user.name "Travis CI"]
-        puts %x[git tag #{tag_name} -a -m "Generated tag from TravisCI."]
-        puts "Pushing Git tag #{tag_name}."
-
-        %x[git push --tags --quiet https://#{service_user}@#{git_repository} #{tag_name} > /dev/null 2>&1]
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-build-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.30.0
+  version: 2.0.38.0
 platform: ruby
 authors:
 - Warren Parad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - lib/travis-build-tools.rb
 - lib/travis-build-tools/build.rb
+- lib/travis-build-tools/builder.rb
 - lib/travis-build-tools/dsl.rb
 - lib/travis-build-tools/zip_file_generator.rb
 homepage: https://github.com/wparad/Travis-Build-Tools