renuo-cli 1.7.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e4c4aa2edb020c6ac6c4c454d5e6f7818547d747
-  data.tar.gz: 5b7d8a34f2e3319a7e51e467eabaafb9cf39fbd8
+SHA256:
+  metadata.gz: ea4e597c6888d4eb5472df3d1fdc496afe3ff1ab16ce2ce9f20602da6c2ccc40
+  data.tar.gz: 3fef697d445ab64c2d62c4adf62d5c4718e56c2243b64237bc3f9cf8e1255b06
 SHA512:
-  metadata.gz: 8ead9a79d1de88514dba17d43e95e1adcc2e28f59959cd04314966e47770d8a105b6b8b32db6e0dfcd0c79c763ea17a12f0a9a29c874c4a4ccde355f8859c4b3
-  data.tar.gz: b1634389fe6c29a4c7e21e8ffa928cc29980fc5fb5eb53bf5b9190b70cf741b2ba95871d3fef75c4c5e839a606131b11fd6b2fdec9c5efaaf4876c917c60ad4c
+  metadata.gz: 8f57de9f499fd37447d94675a063e3e2f6eb76d94b7d47c182048036faa92d91b89877beb579683717990f872caba2c4adfddcfc0adc23b79e5e5ff9351584c9
+  data.tar.gz: 28f034598160faef73f8ae55c26f7c3dae0a772e0500498881e56a3ce4d83e32cefecbdb63a18c3205e27f860c42ad79ae248650f071e38b1db98c41d14d9c03

data/.gitignore

@@ -101,4 +101,3 @@ build/
 /pkg/
 /spec/reports/
 /tmp/
-.rubocop-https---raw-githubusercontent-com-renuo-applications-setup-guide-master-templates--rubocop-yml

data/.rubocop.yml

@@ -11,6 +11,9 @@ AllCops:
     - 'lib/renuo/cli/app/create_heroku_app'
     - 'vendor/**/*'
 
+Layout/LineLength:
+  Max: 120
+
 Naming/FileName:
   Exclude:
   - 'Gemfile'
@@ -25,9 +28,6 @@ Metrics/BlockLength:
 Metrics/ClassLength:
   Max: 160
 
-Metrics/LineLength:
-  Max: 120
-
 Style/Documentation:
   Enabled: false
 

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.2

data/.semaphore/bin/cache_restore

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+for cache_group in "$@"
+do
+  case $cache_group in
+
+  ruby)
+    cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master
+    ;;
+
+  *)
+    echo "Invalid argument: Cache group $cache_group not found."
+    exit 1
+    ;;
+  esac
+done

data/.semaphore/bin/cache_store

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+for cache_group in "$@"
+do
+  case $cache_group in
+
+  ruby)
+    cache store gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock) vendor/bundle
+    ;;
+
+  *)
+    echo "Invalid argument: Cache group $cache_group not found."
+    exit 1
+    ;;
+  esac
+done

data/.semaphore/master-deploy.yml

@@ -15,5 +15,4 @@ blocks:
           commands:
             - checkout --use-cache
             - gem build renuo-cli
-            - chmod 0600 ~/.gem/credentials
             - gem push renuo-cli-*.gem

data/.semaphore/semaphore.yml

@@ -7,24 +7,24 @@ agent:
 auto_cancel:
   running:
     when: "true"
+fail_fast:
+  cancel:
+    when: "branch != 'master'"
 
 blocks:
   - name: tests
     execution_time_limit:
-      minutes: 10
+      minutes: 5
+    dependencies: []
     task:
       secrets:
         - name: renuo-cli
-      env_vars:
-        - name: RAILS_ENV
-          value: test
       prologue:
         commands:
           - checkout --use-cache
-          - cache restore
-          - gem update bundler
+          - source .semaphore/bin/cache_restore ruby
           - bundle install -j 4 --path vendor/bundle
-          - cache store
+          - source .semaphore/bin/cache_store ruby
       jobs:
         - name: tests
           commands:

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

@@ -8,17 +8,24 @@ class ConfigureSemaphore
     @project_name = File.basename(Dir.getwd)
   end
 
+  # rubocop:disable Metrics/MethodLength
   def call
     return unless semaphore_cli_installed?
-    FileUtils.mkdir_p('.semaphore')
-    write_or_warn('.semaphore/semaphore.yml', render('templates/semaphore.yml.erb'))
-    %w[master develop testing].each do |environment|
+
+    FileUtils.mkdir_p(%w[.semaphore .semaphore/bin])
+
+    write_or_warn('.semaphore/semaphore.yml', render('templates/semaphore/semaphore.yml.erb'))
+    %w[main develop testing].each do |environment|
       @environment = environment
-      write_or_warn(".semaphore/#{environment}-deploy.yml", render('templates/semaphore-deploy.yml.erb'))
+      write_or_warn(".semaphore/#{environment}-deploy.yml", render('templates/semaphore/semaphore-deploy.yml.erb'))
     end
+    write_or_warn('.semaphore/bin/cache_restore', render('templates/semaphore/bin/cache_restore.erb'))
+    write_or_warn('.semaphore/bin/cache_store', render('templates/semaphore/bin/cache_store.erb'))
+
     create_semaphore_notification
     create_semaphore_secrets
   end
+  # rubocop:enable Metrics/MethodLength
 
   private
 
@@ -31,7 +38,7 @@ class ConfigureSemaphore
   def create_semaphore_notification
     system("sem create notifications #{project_name} "\
            "--projects #{project_name} "\
-           '--branches "master,develop,testing" '\
+           '--branches "main,develop,testing" '\
            "--slack-channels \"#project-#{project_name}\" "\
            '--slack-endpoint "https://hooks.slack.com/services/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"')
   end

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

@@ -8,7 +8,7 @@ class CreateAwsProject
   end
 
   def run
-    %w[master develop testing].each do |branch|
+    %w[main develop testing].each do |branch|
       print_setup_commands branch
     end
   end
@@ -27,7 +27,7 @@ class CreateAwsProject
   end
 
   def collect_s3_information
-    @project_purpose = ask('Suffix describing purpose (eg: assets): ') { |q| q.default = 'none' }
+    @project_purpose = ask('Suffix describing a non-default purpose (eg: "archives"): ') { |q| q.default = 'none' }
     @project_purpose = nil if @project_purpose.empty? || @project_purpose == 'none'
     @redmine_project = ask('Redmine project name for billing (eg: internal): ') do |q|
       q.default = @project_name
@@ -42,10 +42,11 @@ class CreateAwsProject
     @setup_cloudfront = agree('Would you like to setup also AWS CloudFront? '\
                               '(Default: yes, if you want to deliver assets/images from S3)')
     return unless @setup_cloudfront
+
     @cloudfront_alias = {}
     return unless agree('Would you like to use an alias to call your assets/images on S3? (Default: no)')
 
-    %i[master develop testing].each do |branch|
+    %i[main develop testing].each do |branch|
       cloudfront_alias_for branch
     end
   end
@@ -77,13 +78,14 @@ class CreateAwsProject
     $terminal.wrap_at = nil if $terminal
     puts aws_iam_setup(@aws_profile, aws_user(branch), @aws_app_group)
     puts aws_s3_setup(@aws_profile, aws_user(branch), @aws_region, @redmine_project)
-    puts aws_s3_versioning_setup(@aws_profile, aws_user(branch)) if branch == 'master'
+    puts aws_s3_versioning_setup(@aws_profile, aws_user(branch)) if branch == 'main'
     cloudfront_setup(aws_user(branch), branch)
     $terminal.wrap_at = :auto if $terminal
   end
 
   def cloudfront_setup(bucket, branch)
     return unless @setup_cloudfront
+
     puts aws_cloudfront_setup(@aws_profile, bucket, branch, @redmine_project)
     if @cloudfront_alias[branch.to_sym]
       say "\n# Warning: Don't forget to set up `#{cloudfront_alias(branch)}` on the DNS "\

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

@@ -1,15 +1,11 @@
-require 'commander'
-require_relative './environments'
-require_relative './fetch_emails'
-
 class CreateHerokuApp
   ADMIN_EMAIL = 'admin@renuo.ch'.freeze
 
   def initialize; end
 
-  def run(args)
+  def run(*args)
     project_name = args[0]
-    abort('>> No project name given.') unless project_name
+    abort('>> Project name must be between 2 and 22 characters.') unless project_name&.length&.between?(2, 22)
     emails = FetchEmails.new.fetch_emails
 
     say "# Commands to setup your Heroku application\n".colorize :green
@@ -25,6 +21,7 @@ class CreateHerokuApp
     heroku_name = "#{project_name}-#{env}"
     say "heroku apps:create --region eu #{heroku_name}"
     say "heroku domains:add #{heroku_name}.renuoapp.ch --app #{heroku_name}"
+    say "heroku domains:add #{project_name}-#{MASTER}.renuoapp.ch --app #{heroku_name}" if env == MAIN
     say "heroku addons:create heroku-postgresql  --app #{heroku_name}"
     say "heroku addons:create papertrail --app #{heroku_name}"
     say "heroku labs:enable runtime-dyno-metadata --app #{heroku_name}"
@@ -33,7 +30,7 @@ class CreateHerokuApp
   end
 
   def print_pipelines_commands(project_name)
-    say "heroku pipelines:create #{project_name} --app #{project_name}-#{MASTER} -s production"
+    say "heroku pipelines:create #{project_name} --app #{project_name}-#{MAIN} -s production"
     say "heroku pipelines:add #{project_name} --app #{project_name}-#{DEVELOP} -s staging"
     say "heroku pipelines:add #{project_name} --app #{project_name}-#{TESTING} -s staging"
     say "\n"

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

@@ -1,4 +1,5 @@
+MAIN = 'main'.freeze
 MASTER = 'master'.freeze
 DEVELOP = 'develop'.freeze
 TESTING = 'testing'.freeze
-ENVIRONMENTS = [MASTER, DEVELOP, TESTING].freeze
+ENVIRONMENTS = [MAIN, DEVELOP, TESTING].freeze

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

@@ -2,16 +2,34 @@ require 'net/http'
 require 'uri'
 
 class FetchEmails
-  def initialize; end
+  def initialize
+    @email_list_url = 'https://docs.google.com/spreadsheets/d/e/2PACX-1vSqPiedBeGk0N75cxZApEohj5LrIWlHWUxTjfhkmK9aOsUltcqCn24sD1haIasUjVfd8UT8VdUKUc4h/pub?gid=703649940&single=true&output=csv'
+  end
 
   def fetch_emails
-    uri = URI.parse('https://docs.google.com/spreadsheets/d/1rJFJQCgpz6GajMlGf0anKwVl5AY6TrYjMnJ4W-_0MK4/pub?gid=703649940&single=true&output=csv')
-    response = Net::HTTP.get_response(uri)
-    response.body.gsub(/\r\n/, "\n").split("\n").reject { |add| add == 'n/a' }
+    response = get_emails(@email_list_url)
+    response = handle_redirection(response) if response.is_a?(Net::HTTPRedirection)
+    format_response(response)
   end
 
   def run(_args)
-    say '# Here is a complete lit of Renuo email addresses'.colorize :green
+    say '# Here is a complete list of Renuo email addresses'.colorize :green
     say fetch_emails.join("\n")
   end
+
+  private
+
+  def get_emails(url)
+    uri = URI.parse(url)
+    Net::HTTP.get_response(uri)
+  end
+
+  def handle_redirection(response)
+    location = response['location']
+    get_emails(location)
+  end
+
+  def format_response(response)
+    response.body.gsub(/\r\n/, "\n").split("\n").reject { |add| add == 'n/a' }
+  end
 end

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

@@ -2,6 +2,6 @@ require 'securerandom'
 
 class GeneratePassword
   def run
-    say SecureRandom.base64(200).gsub(%r{[\+\/=]}, '')[0...100]
+    say SecureRandom.base64(200).gsub(%r{[+/=]}, '')[0...100]
   end
 end

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

@@ -1,4 +1,4 @@
-require_relative './heroku_apps.rb'
+require_relative './heroku_apps'
 
 class HerokuUsers
   def initialize; end

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

@@ -1,6 +1,6 @@
 class ReleaseProject
   UPDATE_TYPES = %w[major minor patch custom].freeze
-  TMP_FOLDER_NAME = ('_RENUO_RELEASE_TEMP_' + rand(100_000_000).to_s).freeze
+  TMP_FOLDER_NAME = "_RENUO_RELEASE_TEMP_#{rand(100_000_000)}".freeze
   MOVE_TO_TMP_FOLDER = "mkdir -p #{TMP_FOLDER_NAME} && cd #{TMP_FOLDER_NAME}".freeze
 
   def run(args)
@@ -8,8 +8,8 @@ class ReleaseProject
     validate_project_name
     validate_update_type
     validate_custom_version_format
-    compare_develop_master
     checkout_project
+    compare_develop_main
     @version ||= calculate_version
     release
   ensure
@@ -44,34 +44,38 @@ class ReleaseProject
   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+/
+    return if @version.nil? || @version =~ RenuoVersion::SEMVER_SCHEMA
+
+    abort('>> Invalid Version Number. Use format X.Y.Z for your version.')
   end
 
-  def compare_develop_master
+  def compare_develop_main
     puts 'Please double-check what is going to be deployed.'
     open_comparison_page
     abort unless agree('Are you fine with those changes?')
   end
 
   def open_comparison_page
-    system "open https://github.com/#{@project_name}/compare/master...develop"
+    system_command = case RbConfig::CONFIG['host_os']
+                     when /mswin|mingw|cygwin/
+                       'start'
+                     when /darwin/
+                       'open'
+                     when /linux|bsd/
+                       'xdg-open'
+                     end
+    system "#{system_command} https://github.com/#{@project_name}/compare/#{main_branch}...develop"
   end
 
   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
+    abort('>> Project not found on Github.') unless system("#{MOVE_TO_TMP_FOLDER} && gh repo clone #{@project_name}")
+
+    system(cmd_in_folder("git checkout #{main_branch} && git pull origin #{main_branch} &&" \
+                         'git checkout develop && git pull origin develop && git flow init -d'))
   end
 
   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('.')
+    RenuoVersion.create(current_version).bump(@update_type).to_s
   end
 
   def release
@@ -81,7 +85,7 @@ class ReleaseProject
     if finish_release_branch
       puts ">> Project successfully released with version #{@version}."
     else
-      abort('>> Unable to finish release and push to master. Cancelling release.')
+      abort(">> Unable to finish release and push to #{main_branch}. Cancelling release.")
     end
   end
 
@@ -92,7 +96,7 @@ class ReleaseProject
                          '0.0.0'
                        else
                          sorted_tags = `#{cmd_in_folder('git tag --sort=taggerdate')}`.split("\n").reverse
-                         sorted_tags.find { |tag| tag =~ /\d+\.\d+\.\d+/ }.strip
+                         sorted_tags.find { |tag| tag =~ RenuoVersion::SEMVER_SCHEMA }.strip
                        end
   end
 
@@ -100,6 +104,7 @@ class ReleaseProject
     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
 
@@ -137,7 +142,7 @@ class ReleaseProject
   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'))
+                         "git checkout #{main_branch} && git push origin #{main_branch} --tags"))
   end
 
   def ask_for_final_confirmation
@@ -147,6 +152,7 @@ class ReleaseProject
     end
 
     return unless Time.now.friday? && Time.now.hour >= 16
+
     unless agree('>> Are you sure you want to deploy on late Friday afternoon? ' \
           'Did you think about your family...waiting for you at home?')
       abort('>> Very good. Go home now.')
@@ -168,4 +174,8 @@ class ReleaseProject
   def cleanup
     system("rm -rf #{TMP_FOLDER_NAME}")
   end
+
+  def main_branch
+    @main_branch ||= system(cmd_in_folder('git checkout main && git show-ref refs/heads/main')) ? 'main' : 'master'
+  end
 end

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

@@ -1,5 +1,5 @@
 class ReleaseXing
-  TMP_FOLDER_NAME = ('_RENUO_RELEASE_TEMP_' + rand(100_000_000).to_s).freeze
+  TMP_FOLDER_NAME = "_RENUO_RELEASE_TEMP_#{rand(100_000_000)}".freeze
   MOVE_TO_TMP_FOLDER = "mkdir -p #{TMP_FOLDER_NAME} && cd #{TMP_FOLDER_NAME}".freeze
 
   def run

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

@@ -0,0 +1,52 @@
+class RenuoVersion
+  SEMVER_SCHEMA = /^\d+\.\d+\.\d+(\.[a-z]+\d+)?$/.freeze
+  SEGMENTS = %w[major minor patch].freeze
+
+  def self.create(str)
+    raise "Invalid segments (#{str} =~ #{SEMVER_SCHEMA})" unless str =~ SEMVER_SCHEMA
+
+    new(*str.split('.'))
+  end
+
+  attr_reader :segments
+
+  def initialize(major, minor, patch, prerelease = nil)
+    @segments = [major, minor, patch].map(&:to_i)
+    @segments.push(prerelease.to_s) if prerelease
+  end
+
+  def bump(segment)
+    raise "Invalid segment #{segment} (must be one of #{SEGMENTS})" unless SEGMENTS.include?(segment)
+
+    send("bump_#{segment}")
+    self
+  end
+
+  # Returns true if it's a release candidate (e.g. 3.0.0.rc4)
+  def prerelease?
+    @segments.length > 3
+  end
+
+  def to_s
+    @segments.join('.')
+  end
+
+  private
+
+  def bump_major
+    @segments = [@segments[0] + 1, 0, 0]
+  end
+
+  def bump_minor
+    @segments = [@segments[0], @segments[1] + 1, 0]
+  end
+
+  def bump_patch
+    if prerelease?
+      old_number = @segments[3][/\d+/]
+      @segments[3].gsub!(old_number, (old_number.to_i + 1).to_s)
+    else # default patch
+      @segments = [*@segments[0..1], @segments[2] + 1]
+    end
+  end
+end

data/lib/renuo/cli/app/services/renuo_cli_config.rb

@@ -19,6 +19,7 @@ class RenuoCliConfig
       config = YAML.load_file(CONFIG_FILE_PATH, fallback: {})
       value = config[name]
       return value if value
+
       system("open #{open_url}")
       value = ask("You haven't set your #{name}, yet. Please provide one:")
       config[name] = value

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

@@ -61,6 +61,7 @@ class SetupUptimerobot
 
   def validate_new_project(robot_obj)
     return if robot_obj['stat'] == 'ok'
+
     abort("An error occoured. Uptimerobot returned '#{robot_obj['error']['message']}'")
   end
 

data/lib/renuo/cli/app/templates/semaphore/bin/cache_restore.erb

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+for cache_group in "$@"
+do
+  case $cache_group in
+
+  rails)
+    cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-main
+    cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-main
+    cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-main
+    cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-main
+    ;;
+
+  python)
+    cache restore requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements.txt),requirements-$SEMAPHORE_GIT_BRANCH,requirements-develop,requirements-main
+    ;;
+
+  assets)
+    cache restore packs-$SEMAPHORE_GIT_BRANCH,packs-develop,packs-main
+    cache restore packstest-$SEMAPHORE_GIT_BRANCH,packstest-develop,packstest-main
+    cache restore assets-$SEMAPHORE_GIT_BRANCH,assets-develop,assets-main
+    cache restore sprocketscache-$SEMAPHORE_GIT_BRANCH,sprocketscache-develop,sprocketscache-main
+    cache restore webpackercache-$SEMAPHORE_GIT_BRANCH,webpackercache-develop,webpackercache-main
+    ;;
+
+  *)
+    echo "Invalid argument: Cache group $cache_group not found."
+    exit 1
+    ;;
+  esac
+done

data/lib/renuo/cli/app/templates/semaphore/bin/cache_store.erb

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+for cache_group in "$@"
+do
+  case $cache_group in
+
+  rails)
+    cache store nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc) $HOME/.nvm
+    cache store gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock) vendor/bundle
+    cache store yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock) $HOME/.cache/yarn
+    cache store node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock) node_modules
+    ;;
+
+  python)
+    cache store requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements.txt) .pip_cache
+    ;;
+
+  assets)
+    cache store packs-$SEMAPHORE_GIT_BRANCH public/packs
+    cache store packstest-$SEMAPHORE_GIT_BRANCH public/packs-test
+    cache store assets-$SEMAPHORE_GIT_BRANCH public/assets
+    cache store sprocketscache-$SEMAPHORE_GIT_BRANCH tmp/cache/assets/sprockets
+    cache store webpackercache-$SEMAPHORE_GIT_BRANCH tmp/cache/webpacker
+    ;;
+
+  *)
+    echo "Invalid argument: Cache group $cache_group not found."
+    exit 1
+    ;;
+  esac
+done

data/lib/renuo/cli/app/templates/{semaphore-deploy.yml.erb → semaphore/semaphore-deploy.yml.erb}

@@ -22,4 +22,6 @@ blocks:
             - ssh-add ~/.ssh/id_rsa_semaphore_heroku
             - git config --global url.ssh://git@heroku.com/.insteadOf https://git.heroku.com/
             - git remote add heroku $HEROKU_REMOTE
-            - git push heroku -f $SEMAPHORE_GIT_BRANCH:master
+            - git push heroku -f $SEMAPHORE_GIT_BRANCH:main
+            - heroku run -x rails db:migrate
+            - heroku dyno:restart

data/lib/renuo/cli/app/templates/semaphore/semaphore.yml.erb

@@ -0,0 +1,107 @@
+version: "v1.0"
+name: <%= project_name %>
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+auto_cancel:
+  running:
+    when: "true"
+fail_fast:
+  cancel:
+    when: "branch != 'main'"
+
+blocks:
+  - name: cache
+    execution_time_limit:
+      minutes: 10
+    dependencies: []
+    task:
+      secrets:
+        - name: <%= project_name %>
+      jobs:
+        - name: cache
+          commands:
+            - checkout --use-cache
+            - gem update --system --no-document
+            - source .semaphore/bin/cache_restore rails
+            - bundle config set deployment 'true'
+            - bundle config set path 'vendor/bundle'
+            - bundle install -j 4
+            - nvm install
+            - bin/yarn install --cache-folder ~/.cache/yarn
+            - source .semaphore/bin/cache_store rails
+  - name: linting
+    execution_time_limit:
+      minutes: 5
+    dependencies: ['cache']
+    task:
+      secrets:
+        - name: <%= project_name %>
+      env_vars:
+        - name: RAILS_ENV
+          value: test
+      prologue:
+        commands:
+          - checkout --use-cache
+          - gem update --system --no-document
+          - source .semaphore/bin/cache_restore rails
+          - bundle config set deployment 'true'
+          - bundle config set path 'vendor/bundle'
+          - bundle install -j 4
+          - nvm install
+          - bin/yarn install --cache-folder ~/.cache/yarn
+      jobs:
+        - name: linting
+          commands:
+            - bin/fastcheck
+      epilogue:
+        on_fail:
+          commands:
+            - mkdir -p log
+            - mkdir -p tmp/screenshots
+            - mkdir -p coverage
+            - artifact push job --expire-in 2w log
+            - artifact push job --expire-in 2w tmp/screenshots
+            - artifact push job --expire-in 2w coverage
+  - name: tests
+    execution_time_limit:
+      minutes: 10
+    dependencies: ['cache']
+    task:
+      secrets:
+        - name: <%= project_name %>
+      env_vars:
+        - name: DATABASE_URL
+          value: postgresql://postgres@localhost/test?encoding=utf8
+        - name: RAILS_ENV
+          value: test
+      prologue:
+        commands:
+          - checkout --use-cache
+          - gem update --system --no-document
+          - source .semaphore/bin/cache_restore rails
+          - bundle config set deployment 'true'
+          - bundle config set path 'vendor/bundle'
+          - bundle install -j 4
+          - nvm install
+          - bin/yarn install --cache-folder ~/.cache/yarn
+          - sem-service start postgres
+          - bundle exec rails db:create db:schema:load
+      jobs:
+        - name: tests
+          commands:
+            - bin/check
+promotions:
+  - name: develop
+    pipeline_file: develop-deploy.yml
+    auto_promote:
+      when: "result = 'passed' and branch = 'develop'"
+  - name: main
+    pipeline_file: main-deploy.yml
+    auto_promote:
+      when: "result = 'passed' and branch = 'main'"
+  - name: testing
+    pipeline_file: testing-deploy.yml
+    auto_promote:
+      when: "result = 'passed' and branch = 'testing'"

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

@@ -7,6 +7,7 @@ require 'renuo/cli/app/toggl/detail'
 require 'renuo/cli/app/toggl/user'
 require 'terminal-table'
 require 'colorize'
+require 'active_support/core_ext/numeric/time'
 
 class TogglRedmineComparator
   class << self
@@ -129,7 +130,7 @@ class TogglRedmineComparator
     end
 
     def non_working_day?(value)
-      [value[:redmine], value[:toggl]].all? { |v| v == 0.0 }
+      [value[:redmine], value[:toggl]].all?(&:zero?)
     end
 
     BUFFER = 20_000

data/lib/renuo/cli/app/upgrade_laptop/upgrade_mac_os.rb

@@ -11,7 +11,7 @@ class UpgradeMacOS
   end
 
   def reboot_required?
-    @output.include? '[restart]'
+    @output.downcase.include? 'restart'
   end
 
   private
@@ -32,7 +32,7 @@ class UpgradeMacOS
   end
 
   def agree_for_reboot?
-    agree "\nYour Mac needs to be rebooted, Still continue?".red + ' (Yes / No)'
+    agree "#{"\nYour Mac needs to be rebooted, Still continue?".red} (Yes / No)"
   end
 
   def execute_upgrade

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

@@ -6,7 +6,7 @@ class Work
   ACTIONS = %w[start].freeze
 
   def run(args)
-    ActiveResource::Base.logger = Logger.new(STDOUT)
+    ActiveResource::Base.logger = Logger.new($stdout)
     @action, @project_name, @ticket_number = args
     validate_action
     validate_project_name

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -20,6 +20,7 @@ require 'renuo/cli/app/setup_uptimerobot'
 require 'renuo/cli/app/release_xing'
 require 'renuo/cli/app/configure_semaphore'
 require 'renuo/cli/app/toggl_redmine_comparator'
+require 'renuo/cli/app/renuo_version'
 
 module Renuo
   class CLI
@@ -37,7 +38,6 @@ module Renuo
           abort 'Nice! I updated myself. 🤩 Now you can run the command again.'
         end
         abort('Good. Just do it yourself then...😒')
-        exit
       end
 
       command 'display-name'.to_sym do |c|
@@ -109,7 +109,7 @@ module Renuo
         c.syntax = 'renuo create-aws-project'
         c.summary = 'Generates necessary commands for our project setup on AWS incl. necessary installations.'
         c.description = <<-DESCRIPTION
-          This creates commands for creating AWS users, buckets an versioning policies and CloudFront. 
+          This creates commands for creating AWS users, buckets an versioning policies and CloudFront.
           It also guides you to set up the necessary environment.
 
           You will be asked for:
@@ -120,10 +120,10 @@ module Renuo
           - whether you want to setup CloudFront to deliver assets via S3
 
           The generated commands do the following:
-          - create an IAM user for each environment (master, develop, testing) and add it to the renuo apps group.
+          - create an IAM user for each environment (main, develop, testing) and add it to the renuo apps group.
           - create S3 buckets for each user who owns it
           - tag the buckets
-          - enable versioning for master buckets
+          - enable versioning for main buckets
           (- set up a CloudFront distribution for each environment with the default config or plus alias if configured)
         DESCRIPTION
         c.example 'Setup a project (you will be asked for details)', 'renuo create-aws-project'
@@ -147,8 +147,8 @@ module Renuo
 
       command 'release' do |c|
         c.syntax = 'renuo 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, '\
+        c.summary = 'Release a projects state of develop (on github) to main in one command.'
+        c.description = 'Creates a new release version of a project on main 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'

data/renuo-cli.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables << 'renuo'
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.7.0'
+
   spec.add_dependency 'activeresource', '~> 5.1.0'
   spec.add_dependency 'colorize', '~> 0'
   spec.add_dependency 'commander', '~> 4.0'
@@ -26,13 +28,14 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'aruba', '~> 0.14.5'
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'cucumber', '~> 3.1'
   spec.add_development_dependency 'dotenv', '~> 2.7.2'
   spec.add_development_dependency 'mdl', '~> 0.4.0'
   spec.add_development_dependency 'pry', '~> 0.11.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'rubocop', '0.55.0'
+  spec.add_development_dependency 'rubocop', '~> 1.2'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-console'
   spec.add_development_dependency 'vcr', '~> 4.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +224,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -291,9 +305,10 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".semaphore/bin/cache_restore"
+- ".semaphore/bin/cache_store"
 - ".semaphore/master-deploy.yml"
 - ".semaphore/semaphore.yml"
-- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -321,12 +336,15 @@ files:
 - lib/renuo/cli/app/redmine/issue.rb
 - lib/renuo/cli/app/release_project.rb
 - lib/renuo/cli/app/release_xing.rb
+- lib/renuo/cli/app/renuo_version.rb
 - lib/renuo/cli/app/services/cloudfront_config_service.rb
 - lib/renuo/cli/app/services/markdown_parser_service.rb
 - lib/renuo/cli/app/services/renuo_cli_config.rb
 - lib/renuo/cli/app/setup_uptimerobot.rb
-- lib/renuo/cli/app/templates/semaphore-deploy.yml.erb
-- lib/renuo/cli/app/templates/semaphore.yml.erb
+- lib/renuo/cli/app/templates/semaphore/bin/cache_restore.erb
+- lib/renuo/cli/app/templates/semaphore/bin/cache_store.erb
+- lib/renuo/cli/app/templates/semaphore/semaphore-deploy.yml.erb
+- lib/renuo/cli/app/templates/semaphore/semaphore.yml.erb
 - lib/renuo/cli/app/toggl/detail.rb
 - lib/renuo/cli/app/toggl/time_entry.rb
 - lib/renuo/cli/app/toggl/user.rb
@@ -353,15 +371,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.

data/CODE_OF_CONDUCT.md

@@ -1,13 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/lib/renuo/cli/app/templates/semaphore.yml.erb

@@ -1,70 +0,0 @@
-version: "v1.0"
-name: <%= project_name %>
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804
-auto_cancel:
-  running:
-    when: "true"
-
-blocks:
-  - name: cache
-    execution_time_limit:
-      minutes: 10
-    dependencies: []
-    task:
-      secrets:
-        - name: <%= project_name %>
-      jobs:
-        - name: cache
-          commands:
-            - checkout --use-cache
-            - cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master
-            - cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master
-            - cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master
-            - cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master
-            - bundle install --deployment -j 4 --path vendor/bundle
-            - nvm install
-            - bin/yarn install --cache-folder ~/.cache/yarn
-            - cache store
-  - name: tests
-    execution_time_limit:
-      minutes: 10
-    dependencies: ['cache']
-    task:
-      secrets:
-        - name: <%= project_name %>
-      env_vars:
-        - name: DATABASE_URL
-          value: postgresql://postgres@localhost/test?encoding=utf8
-        - name: RAILS_ENV
-          value: test
-      prologue:
-        commands:
-          - checkout --use-cache
-          - cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop,nvm-master
-          - cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH,gems-develop,gems-master
-          - cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop,yarn-cache-master
-          - cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop,node-modules-master
-          - bundle install --deployment --path vendor/bundle
-          - bin/yarn install --cache-folder ~/.cache/yarn
-          - sem-service start postgres
-          - bundle exec rails db:create db:schema:load
-      jobs:
-        - name: tests
-          commands:
-            - bin/check
-promotions:
-  - name: develop
-    pipeline_file: develop-deploy.yml
-    auto_promote:
-      when: "result = 'passed' and branch = 'develop'"
-  - name: master
-    pipeline_file: master-deploy.yml
-    auto_promote:
-      when: "result = 'passed' and branch = 'master'"
-  - name: testing
-    pipeline_file: testing-deploy.yml
-    auto_promote:
-      when: "result = 'passed' and branch = 'testing'"