relsr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573c8fedcc92906cd34469ffa7023636abf3e6b4
-  data.tar.gz: ee9b2213e2fcd3373efa59f810615f60cbbf35f8
+  metadata.gz: 2e42a687376bdf3e930c6ec27635cfe87aa755e1
+  data.tar.gz: 0916625438359e56c7f8b228027f9503dde072d2
 SHA512:
-  metadata.gz: be4e56435ddc5002ee418ea55416eee091227ec1ce8f194bce21557d0ce42dcec188ecab54e626e09647c5bac3c2afe7118ec0a41902171c8773a560e2740c78
-  data.tar.gz: 13ed7e2e54734ddf2cccf46fd19d21863ba6631a048bd8f61a3c2279861e5d2c5aebd292e4b9a89bf4fc0efc2d2a3880b4d054030c03bde6ccdd8b99f4e3c86d
+  metadata.gz: b748307bb79ee8843db68b6ffcebb4bb2b5eb8656919b5a4f478dde1274e7f462491800a4d384a08acd1d91798f1f3266eef68e64ed9766bf39b0022338d268f
+  data.tar.gz: 8c74b26cac6ee86f629cb8807c6c32c03ffd97640303b7ee679477c72752287f034d53ed07b3bede4f44bc731d363944d23f76524991af9d3835440c64339bd2

data/lib/relsr/initializer.rb

@@ -15,27 +15,39 @@ module Relsr
     private
 
     def self.parse_options 
-      @options = {}
+      @options = {
+        dry_run: false,
+        extra_branches: []
+      }
       OptionParser.new do |opts|
         opts.banner = "Usage: relsr [options]"
 
-        opts.on("-r", "--release", "Create a release branch and open a pull request") do |v|
-          @options[:branch] = true 
+        opts.on("-r", "--release", "Create a release branch and open a pull request") do 
+          @options[:release_branch] = true 
           @options[:pull_request] = true 
         end
 
-        opts.on("-b", "--branch", "Create a release branch only") do |v|
-          @options[:branch] = true 
+        opts.on("-b", "--branch", "Create a release branch only") do 
+          @options[:release_branch] = true 
+        end
+
+        opts.on("-a", "--add BRANCH", "Add a branch to the release") do |v|
+          @options[:extra_branches] << v 
         end
 
-        opts.on("-d", "--dry-run", "Dry run") do |v|
+        opts.on("-d", "--dry-run", "Dry run") do 
           @options[:dry_run] = true 
         end
 
-        opts.on("-i", "--init", "Create #{YAML_FILE} for project") do |v|
+        opts.on("-i", "--init", "Create #{YAML_FILE} for project in the current folder") do 
           create_default_yaml
           exit 0
         end
+
+        opts.on("-v", "--version", "Get version information") do 
+          version_info
+          exit 0
+        end
       end.parse!
     end
 
@@ -58,8 +70,13 @@ module Relsr
     end
 
     def self.process
-      manager = Relsr::ReleaseManager.new(@repo, @label, @options[:dry_run])
-      manager.create_release if @options[:branch]
+      manager = Relsr::ReleaseManager.new(
+        repo_name: @repo, 
+        label: @label, 
+        dry_run: @options[:dry_run], 
+        extra_branches: @options[:extra_branches]
+      )
+      manager.create_release_branch if @options[:release_branch]
       manager.create_pull_request if @options[:pull_request]
     end
 
@@ -70,6 +87,10 @@ module Relsr
       }
       File.open(YAML_FILE, 'w') {|f| f.write content.to_yaml }
     end
+
+    def self.version_info
+      puts "Relsr version #{Relsr::VERSION}"
+    end
   end
 
 end

data/lib/relsr/release_manager.rb

@@ -4,16 +4,17 @@ require 'colorize'
 module Relsr
   class ReleaseManager
 
-    def initialize(repo_name, label, dry_run = false)
+    def initialize(repo_name:, label:, extra_branches: [], dry_run: false)
       @repo_name = repo_name
       @label = label
       @release_branch_name = Time.now.strftime('release/%Y%m%d-%H%M%S')
       @dry_run = dry_run
+      @extra_branches = extra_branches
       Octokit.auto_paginate = true
     end
 
-    def create_release
-      create_release_branch
+    def create_release_branch
+      initialize_release_branch
       merge_work_branches
     end
 
@@ -27,14 +28,13 @@ module Relsr
           @release_branch_name,
           pr_body
         )
-
       end
       puts 'done'.green
     end
 
     private
 
-    def create_release_branch
+    def initialize_release_branch
       print_and_flush "Creating release branch '#{@release_branch_name}' on '#{@repo_name}'..."  
       unless @dry_run
         client.create_ref(@repo_name, "heads/#{@release_branch_name}", master.object.sha)
@@ -79,7 +79,7 @@ module Relsr
           end
         end
       end
-      branches_to_merge
+      branches_to_merge + @extra_branches
     end
 
     def master
@@ -91,9 +91,14 @@ module Relsr
     end
 
     def pr_body
-      issues.collect do |issue|
+      messages = issues.collect do |issue|
         "Connects ##{issue.number} - #{issue.title}"
-      end.join("\n")
+      end 
+      messages += @extra_branches.collect do |branch|
+        "Merging in additional branch '#{branch}'"
+      end
+
+      messages.join("\n")
     end
 
     def print_and_flush(msg)

data/lib/relsr/version.rb

@@ -1,3 +1,3 @@
 module Relsr
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relsr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit