renuo-cli 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ee2a4b983e26cfcc80c8fa8aa835f0d17fe33847cddbc687d4025bd70288c2
-  data.tar.gz: 3b54fc5b8eebb7a89987841e15f8656a60d21aff8468e2a4863c137120acaa53
+  metadata.gz: d06bce9aa4b4a3585383e216d0ec8a40934c744c0ef744ef6c5b93662bc48b7c
+  data.tar.gz: 38a4a1b6d6bdcf1e752b6e06ef35bde896f4369a51e7d6e1094b581d7e876445
 SHA512:
-  metadata.gz: 0bfd21df7ce5bc73b8bc2e0d10b08af3806b8fba660f45ce8e3d72ee91b0b47549256ff791bd17bd6f6255c7ef1fae6676a13f441337866a662b920d585c68bf
-  data.tar.gz: 2ec35a8e4fae858c3d4b237bd85af709fdca99640924ca5e84b587eb47c466c4ebf29d6622016dddcc156a1e86c732fb6da844929b8cd75569a1045e622e5708
+  metadata.gz: 2287372eff3dd81ddb3c615b03aa8bc5509008b8e349450ac5c4bceb2ee5710456b5035f35e2f9fd5210cf81bf9c175240268610de422971d3c5f2a8a14eb6b9
+  data.tar.gz: ccb4f801d47581ce421ef865410e55456774ac98e1f3252430ee3ad1750dbceabb71253590add5e48d4f589f6b6babf993d6c6dfec9f1659bdfe1b891327024f

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.5.1

data/lib/renuo/cli.rb

@@ -127,8 +127,9 @@ module Renuo
 
       command 'release' do |c|
         c.syntax = 'renuo release'
-        c.summary = 'Deploy a project to master in one command.'
-        c.description = 'Deploys a project to master as either a Major, Minor, Patch or Custom release.'
+        c.summary = 'Release a projects state of develop (on github) to master in one command.'
+        c.description = 'Creates a new release version of a project on master as either a Major, Minor, '\
+                        'Patch or Custom release based on the current state of develop on Github'
         c.example 'renuo release my-project minor', 'release a minor release of my-project'
         c.example 'renuo release my-project custom 2.5.0', 'release my-project as release 2.5.0'
         c.action do|args|

data/lib/renuo/cli/app/release_project.rb

@@ -1,136 +1,148 @@
 class ReleaseProject
   UPDATE_TYPES = %w[major minor patch custom].freeze
-  TEMP_FOLDER_NAME = ('_RENUO_RELEASE_TEMP_' + rand(100_000_000).to_s).freeze
-  MOVE_TO_TEMP = "mkdir -p #{TEMP_FOLDER_NAME} && cd #{TEMP_FOLDER_NAME}".freeze
+  TMP_FOLDER_NAME = ('_RENUO_RELEASE_TEMP_' + rand(100_000_000).to_s).freeze
+  MOVE_TO_TMP_FOLDER = "mkdir -p #{TMP_FOLDER_NAME} && cd #{TMP_FOLDER_NAME}".freeze
 
   def run(args)
-    project_name, @update_type, @version = args
-    validate_update_type(@update_type, @version)
-    @version = validate_version(@version)
-    validate_project_name(project_name)
-    compare_develop_master(project_name)
-    release(project_name, @update_type, @version)
+    @project_name, @update_type, @version = args
+    validate_project_name
+    validate_update_type
+    validate_custom_version_format
+    compare_develop_master
+    checkout_project
+    @version ||= calculate_version
+    release
   ensure
     cleanup
   end
 
-  def validate_update_type(update_type, version)
-    if version && update_type != UPDATE_TYPES[3]
-      say('>> Do not specify a version for a non-custom release. Given version will be ignored.')
+  private
+
+  def validate_project_name
+    abort('>> No project name given.') unless @project_name
+  end
+
+  def validate_update_type
+    unless valid_update_type?
+      abort('>> Please provide the desired update type: major, minor, patch or custom. '\
+            'If you are unsure about the type please read https://semver.org')
     end
 
-    if !version && update_type == UPDATE_TYPES[3]
-      @version = ask('>> Please enter your desired version for your custom release (X.Y.Z):')
-      validate_update_type(@update_type, @version)
+    if !custom_version? && @version
+      abort('>> Do not specify a version for a non-custom release. Given version will be ignored.')
     end
 
-    return if UPDATE_TYPES.include? update_type
+    abort('>> Please enter your desired version for the custom release.') if custom_version? && @version.nil?
+  end
 
-    @update_type = ask('>> Please enter your desired update type (major minor patch custom):')
-    validate_update_type(@update_type, version)
+  def valid_update_type?
+    UPDATE_TYPES.include? @update_type
   end
 
-  def validate_version(version)
-    return nil if version.nil?
-    version = version.match(/\d+\.\d+\.\d+/)
-    return version if version
-    abort('>> Invalid Version Number. Use format X.Y.Z for your version.')
+  def custom_version?
+    @update_type == UPDATE_TYPES[3]
   end
 
-  def validate_project_name(project_name)
-    abort('>> No project name given.') unless project_name
-    unless system("#{MOVE_TO_TEMP} && hub clone #{project_name} && " \
-                  "cd #{folder_name(project_name)} && git checkout master && git flow init -d")
-      cleanup
-      abort('>> Project not found on Github.')
-    end
+  def validate_custom_version_format
+    return if @version.nil?
+    abort('>> Invalid Version Number. Use format X.Y.Z for your version.') unless @version =~ /\d+\.\d+\.\d+/
   end
 
-  def compare_develop_master(project_name)
-    say('Please double-check what is going to be deployed.')
-    system "open https://github.com/#{project_name}/compare/master...develop"
+  def compare_develop_master
+    puts 'Please double-check what is going to be deployed.'
+    open_comparison_page
     abort unless agree('Are you fine with those changes?')
   end
 
-  def release(project_name, update_type, version)
-    version ||= update_version_number(current_version(project_name), update_type)
-
-    release_start project_name, update_type, version
-
-    say ">> Project successfully released with version #{version}."
+  def open_comparison_page
+    system "open https://github.com/#{@project_name}/compare/master...develop"
   end
 
-  def release_start(project_name, update_type, version)
-    abort('>> Unable to pull from Github. Cancelling release.') unless checkout? project_name
-
-    if update_type != UPDATE_TYPES[3] && !version_bump?(project_name, current_version(project_name))
-      abort('>> Please bump the version in files manually. Cancelling release.')
+  def checkout_project
+    unless system("#{MOVE_TO_TMP_FOLDER} && hub clone #{@project_name} && " \
+                  "cd #{folder_name} && git checkout master && git pull origin master &&" \
+                  'git checkout develop && git pull origin develop && git flow init -d')
+      abort('>> Project not found on Github.')
     end
-
-    ask_for_final_confirmation(project_name, update_type, version)
-
-    return if release_flow(project_name, version)
-    abort('>> Unable to finish release and push to master. Cancelling release.')
   end
 
-  def checkout?(project_name)
-    system("#{move_and_cd(project_name)} && " \
-           'git checkout master && git pull origin master && ' \
-           'git checkout develop && git pull origin develop')
+  def calculate_version
+    current_version_parts = current_version.split('.').map(&:to_i)
+    type_index = UPDATE_TYPES.index(@update_type)
+    current_version_parts[type_index + 1..-1] = [0] * (2 - type_index)
+    current_version_parts[type_index] += 1
+    current_version_parts.join('.')
   end
 
-  def version_bump?(project_name, current_version)
-    grep = "grep -R -F --color --exclude-dir=.git --exclude=Gemfile* '#{current_version}' ."
-    if system("#{move_and_cd(project_name)} && #{grep}")
-      agree(">> Current version number (#{current_version}) found in above files. " \
-          ' Do you wish to continue without changing it?')
+  def release
+    ask_for_final_confirmation
+    start_release_branch
+    bump_version
+    if finish_release_branch
+      puts ">> Project successfully released with version #{@version}."
     else
-      true
+      abort('>> Unable to finish release and push to master. Cancelling release.')
     end
   end
 
-  def release_flow(project_name, version)
-    system("#{move_and_cd(project_name)} &&" \
-           "git flow release start #{version} && " \
-           "GIT_MERGE_AUTOEDIT=no git flow release finish -m #{version} #{version} && " \
-           'git checkout master && git push origin master && ' \
-           'git checkout develop && git push origin develop && ' \
-           'git push --tags')
-  end
-
-  def current_version(project_name)
-    describe = "#{move_and_cd(project_name)} && git describe --tags"
+  def current_version
+    return @current_version if @current_version
+    describe = cmd_in_folder('git describe --tags')
     tag = '`git rev-list --tags --max-count=1`'
-    if `#{move_and_cd(project_name)} && git tag` == ''
-      '0.0.0'
-    else
-      `#{describe} #{tag}`.strip
+    @current_version = if `#{cmd_in_folder('git tag')}` == ''
+                         '0.0.0'
+                       else
+                         `#{describe} #{tag}`.strip
+                       end
+  end
+
+  def bump_version
+    version_bumped = find_and_replace_version
+
+    return unless version_bumped
+    system(cmd_in_folder("git add . && git commit -m \"bump version\" && git push -u origin release/#{@version}"))
+  end
+
+  def find_and_replace_version
+    find_files_with_version.split("\n").any? do |file_name|
+      puts "Replace the version in #{file_name}?"
+      print_version_found(file_name)
+      if agree('confirm?')
+        bump_version_in_file(file_name)
+        true
+      else
+        false
+      end
     end
   end
 
-  def update_version_number(version, update_type)
-    version = version.split('.').map(&:to_i)
-    type_index = UPDATE_TYPES.index(update_type)
-    version[type_index + 1..-1] = [0] * (2 - type_index)
-    version[type_index] += 1
-    version.join('.')
+  def find_files_with_version
+    excluded_dirs = %w[.git node_modules tmp].map { |dir| "--exclude-dir=#{dir}" }.join(' ')
+    grep_current_version = "grep -rl -F #{excluded_dirs} --include='*.rb' #{current_version} ."
+    `#{cmd_in_folder(grep_current_version)}`
   end
 
-  def move_and_cd(project_name)
-    "#{MOVE_TO_TEMP} && cd #{folder_name(project_name)}"
+  def print_version_found(file_name)
+    system(cmd_in_folder("grep -A 1 -B 1 --color #{current_version} #{file_name}"))
   end
 
-  def folder_name(project_name)
-    project_name.split('/').last
+  def bump_version_in_file(file_name)
+    system(cmd_in_folder("sed -i '' 's|#{current_version}|#{@version}|g' #{file_name}"))
   end
 
-  def cleanup
-    system("rm -rf #{TEMP_FOLDER_NAME}")
+  def start_release_branch
+    system(cmd_in_folder("git flow release start #{@version}"))
+  end
+
+  def finish_release_branch
+    system(cmd_in_folder("GIT_MERGE_AUTOEDIT=no git flow release finish -m #{@version} #{@version} && " \
+                         'git checkout develop && git push origin develop && ' \
+                         'git checkout master && git push origin master --tags'))
   end
 
-  def ask_for_final_confirmation(project_name, update_type, version)
-    unless agree(">> Are you sure you wish to deploy '#{project_name}' " \
-            "as a #{update_type} release (#{current_version(project_name)} => #{version})?")
+  def ask_for_final_confirmation
+    unless agree(">> Are you sure you wish to deploy '#{@project_name}' " \
+            "as a #{@update_type} release (#{current_version} => #{@version})?")
       abort('>> Cancelling Release.')
     end
 
@@ -140,4 +152,20 @@ class ReleaseProject
       abort('>> Very good. Go home now.')
     end
   end
+
+  def cmd_in_folder(command)
+    "#{move_and_cd} && #{command}"
+  end
+
+  def move_and_cd
+    "#{MOVE_TO_TMP_FOLDER} && cd #{folder_name}"
+  end
+
+  def folder_name
+    @project_name.split('/').last
+  end
+
+  def cleanup
+    system("rm -rf #{TMP_FOLDER_NAME}")
+  end
 end

data/lib/renuo/cli/version.rb

@@ -1,6 +1,6 @@
 module Renuo
   module Cli
-    VERSION = '1.3.1'.freeze
+    VERSION = '1.4.0'.freeze
     NAME = 'renuo-cli'.freeze
   end
 end

data/renuo-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redcarpet', '~> 3.0'
 
   spec.add_development_dependency 'aruba', '~> 0.14.5'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'coveralls', '~> 0.8.9'
   spec.add_development_dependency 'cucumber', '~> 3.1'
   spec.add_development_dependency 'mdl', '~> 0.4.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.