relsr 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132462a91273419bb80a8fdca225340f7353725e
-  data.tar.gz: c935c023cd2f96f42dd8b8b8848f89c03a73b2e6
+  metadata.gz: 5fc15a9dcc78084e7b4e749784f098d5d6d96242
+  data.tar.gz: 63fa55f3009e71ddf4c1ead1e8941eae29fe5413
 SHA512:
-  metadata.gz: c3292732f062bae8201805cbf13e2dcb3ddcb33a5253ba9f27dc5e377649d615d2c256c790574a3f0410711ae23472107c5ef143437f91aca1bed6f6c0a948b6
-  data.tar.gz: 83afbad677ee8b0ff062491caae6335ef7b1feef71f7313ddffeed8f93ff89fb1c64e4cd06145d956338ae7fbd4b62351f91edde924d3544376691778437d232
+  metadata.gz: 4af2d0fe967d399e89071f2c59b1ed062717c8bfb6d8e8e992f08ffd4934d2372a55abd59b2bd101d9b2b51ad257402b63c988313133e6af2c1765cc7dadf50f
+  data.tar.gz: f41019d0116e94e3b806f02745d6214a80f97c64b44a6459d17f0ed68dbcf6bd275362aa3da0393bb28a1de9c0b2e2212a5d3f823f9097c5f30ac34d236af3d5

data/bin/relsr

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'relsr' 
+require_relative '../lib/relsr' 
 
-Relsr::Initializer.init
+puts "Relsr version #{Relsr::VERSION}" if ARGV.empty? || ARGV[0] == 'help'
+
+Relsr::Initializer.start(ARGV)

data/lib/relsr/initializer.rb

@@ -1,55 +1,30 @@
 require 'yaml'
-require 'optparse'
+require 'thor'
 
 module Relsr
-  class Initializer
+  class Initializer < Thor
 
     YAML_FILE = '.relsr.yml'
 
-    def self.init
-      parse_options
-      parse_yaml
-      process
+    desc 'release', 'Create a release branch and open a pull request'
+    option :'dry-run', type: :boolean, aliases: '-d'
+    option :'no-pr', type: :boolean, desc: "Don't create the pull request", default: false
+    option :add, desc: 'additional branches to add to the release', type: :array
+    def release
+      puts options
+      manager = release_manager
+      manager.create_release_branch
+      manager.create_pull_request unless options['no-pr']
     end
 
-    def self.parse_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 
-          @options[:release_branch] = true 
-          @options[:pull_request] = true 
-        end
-
-        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 
-          @options[:dry_run] = true 
-        end
-
-        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!
+    desc 'init', "Create default #{YAML_FILE} in the current folder"
+    def init
+      create_default_yaml
     end
 
-    def self.parse_yaml
+    private
+
+    def parse_yaml
       unless File.exist?(YAML_FILE)
         puts "Could not file #{YAML_FILE} file."
         exit 1
@@ -60,7 +35,7 @@ module Relsr
         raise 'label: has not been set' if config['label'].nil?
         @repo = config['repo']
         @label = config['label']
-        @options[:extra_branches] += config['add_branches'] if config.key? 'add_branches'
+        @extra_branches += config['add_branches'] if config.key? 'add_branches'
 
       rescue StandardError => error
         puts "invalid #{YAML_FILE} file"
@@ -69,28 +44,25 @@ module Relsr
       end
     end
 
-    def self.process
-      manager = Relsr::ReleaseManager.new(
+    def release_manager
+      @extra_branches = options['add'].to_a
+      parse_yaml
+
+      Relsr::ReleaseManager.new(
         repo_name: @repo, 
         label: @label, 
-        dry_run: @options[:dry_run], 
-        extra_branches: @options[:extra_branches]
+        dry_run: options['dry-run'], 
+        extra_branches: @extra_branches.uniq
       )
-      manager.create_release_branch if @options[:release_branch]
-      manager.create_pull_request if @options[:pull_request]
     end
 
-    def self.create_default_yaml
+    def create_default_yaml
       content = {
        'repo' => 'username/repo_name',
        'label' => 'acceptance-done'
       }
       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/version.rb

@@ -1,3 +1,3 @@
 module Relsr
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relsr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - John Cleary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement