renuo-cli 1.8.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eea3c5df45adf1359cb93a9b1b41f70f37193174bee321249d4749a1d5ebdcb
-  data.tar.gz: 5984e0ab5a47c433ba42326f4737feb0ad1d12f87847f3540d7784edd1cdaf34
+  metadata.gz: 708171502068c3d1748c92b702a7e0af0c550607bf2b950a8ef082b225996a2d
+  data.tar.gz: 550e4ec36dbfa189ea34bcb2e2e7295ad701ad587b05142d3839484175853194
 SHA512:
-  metadata.gz: 5297398c47861cf1974097075be3b973c347277fc56431ff3383037e6b7c172f5266627d4b42fc7b71d72013f8b7a7e98cd512246920e83a80c541f58e90b8d7
-  data.tar.gz: 95edee563ba860d322f13071180a99df516c54170d64f39daa83e6f8fe4e4176257428549806117683cba749e7438aa0a487ab38714cf5866470e073e8a06ecc
+  metadata.gz: a6a524f253a75c50eedea23a7ac02070897e0c4e5d80256536e390f8b6206dfe78b9400e5ec34f9514b1d62f94a8194b3521ca0f9c097ac64cf4f441bed3bbf9
+  data.tar.gz: '0991a1fe20fae345363b140e671b0ece06a44e3dc4c4d20b788db531d64eb2c24ee924407bd2a405fa6654cc888ea07d4fcc25f02da6a0a73eb956fa9e93917c'

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/.ruby-version

@@ -1 +1 @@
-2.7.2
+2.7.5

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/lib/renuo/cli/app/configure_semaphore.rb

@@ -15,7 +15,7 @@ class ConfigureSemaphore
     FileUtils.mkdir_p(%w[.semaphore .semaphore/bin])
 
     write_or_warn('.semaphore/semaphore.yml', render('templates/semaphore/semaphore.yml.erb'))
-    %w[master develop testing].each do |environment|
+    %w[main develop testing].each do |environment|
       @environment = environment
       write_or_warn(".semaphore/#{environment}-deploy.yml", render('templates/semaphore/semaphore-deploy.yml.erb'))
     end
@@ -38,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
@@ -46,7 +46,7 @@ class CreateAwsProject
     @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
@@ -78,7 +78,7 @@ 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

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/release_project.rb

@@ -5,11 +5,10 @@ class ReleaseProject
 
   def run(args)
     @project_name, @update_type, @version = args
-    validate_project_name
-    validate_update_type
-    validate_custom_version_format
-    compare_develop_master
-    checkout_project
+    validate_args
+    open_comparison_page
+    checkout_project # in the meantime
+    veto_comparison
     @version ||= calculate_version
     release
   ensure
@@ -18,6 +17,12 @@ class ReleaseProject
 
   private
 
+  def validate_args
+    validate_project_name
+    validate_update_type
+    validate_custom_version_format
+  end
+
   def validate_project_name
     abort('>> No project name given.') unless @project_name
   end
@@ -49,22 +54,28 @@ class ReleaseProject
     abort('>> Invalid Version Number. Use format X.Y.Z for your version.')
   end
 
-  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?')
+  def veto_comparison
+    abort unless agree('Are you fine with the changes you just reviewed in your browser?')
   end
 
   def open_comparison_page
-    system "open https://github.com/#{@project_name}/compare/master...develop"
+    puts 'Opening browser to double-check what is going to be deployed…'
+    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
@@ -78,7 +89,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
 
@@ -135,7 +146,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
@@ -167,4 +178,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/templates/semaphore/bin/cache_restore.erb

@@ -5,22 +5,22 @@ do
   case $cache_group in
 
   rails)
-    cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),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 yarn.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
+    cache restore nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc),nvm-$SEMAPHORE_GIT_BRANCH,nvm-develop
+    cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum .ruby-version)-$(checksum Gemfile.lock),gems-develop-$(checksum .ruby-version)-$(checksum Gemfile.lock),gems-develop-$(checksum .ruby-version)
+    cache restore yarn-cache-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),yarn-cache-$SEMAPHORE_GIT_BRANCH,yarn-cache-develop
+    cache restore node-modules-$SEMAPHORE_GIT_BRANCH-$(checksum yarn.lock),node-modules-$SEMAPHORE_GIT_BRANCH,node-modules-develop
     ;;
 
   python)
-    cache restore requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements.txt),requirements-$SEMAPHORE_GIT_BRANCH,requirements-develop,requirements-master
+    cache restore requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements.txt),requirements-$SEMAPHORE_GIT_BRANCH,requirements-develop
     ;;
 
   assets)
-    cache restore packs-$SEMAPHORE_GIT_BRANCH,packs-develop,packs-master
-    cache restore packstest-$SEMAPHORE_GIT_BRANCH,packstest-develop,packstest-master
-    cache restore assets-$SEMAPHORE_GIT_BRANCH,assets-develop,assets-master
-    cache restore sprocketscache-$SEMAPHORE_GIT_BRANCH,sprocketscache-develop,sprocketscache-master
-    cache restore webpackercache-$SEMAPHORE_GIT_BRANCH,webpackercache-develop,webpackercache-master
+    cache restore packs-$SEMAPHORE_GIT_BRANCH,packs-develop
+    cache restore packstest-$SEMAPHORE_GIT_BRANCH,packstest-develop
+    cache restore assets-$SEMAPHORE_GIT_BRANCH,assets-develop
+    cache restore sprocketscache-$SEMAPHORE_GIT_BRANCH,sprocketscache-develop
+    cache restore webpackercache-$SEMAPHORE_GIT_BRANCH,webpackercache-develop
     ;;
 
   *)

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

@@ -6,7 +6,7 @@ do
 
   rails)
     cache store nvm-$SEMAPHORE_GIT_BRANCH-$(checksum .nvmrc) $HOME/.nvm
-    cache store gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock) vendor/bundle
+    cache store gems-$SEMAPHORE_GIT_BRANCH-$(checksum .ruby-version)-$(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
     ;;

data/lib/renuo/cli/app/templates/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

@@ -9,7 +9,7 @@ auto_cancel:
     when: "true"
 fail_fast:
   cancel:
-    when: "branch != 'master'"
+    when: "branch != 'main'"
 
 blocks:
   - name: cache
@@ -23,8 +23,11 @@ blocks:
         - name: cache
           commands:
             - checkout --use-cache
+            - gem update --system --no-document
             - source .semaphore/bin/cache_restore rails
-            - bundle install --deployment -j 4 --path vendor/bundle
+            - 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
@@ -41,14 +44,26 @@ blocks:
       prologue:
         commands:
           - checkout --use-cache
+          - gem update --system --no-document
           - source .semaphore/bin/cache_restore rails
-          - bundle install --deployment --path vendor/bundle
+          - 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
@@ -64,8 +79,11 @@ blocks:
       prologue:
         commands:
           - checkout --use-cache
+          - gem update --system --no-document
           - source .semaphore/bin/cache_restore rails
-          - bundle install --deployment --path vendor/bundle
+          - 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
@@ -79,10 +97,10 @@ promotions:
     pipeline_file: develop-deploy.yml
     auto_promote:
       when: "result = 'passed' and branch = 'develop'"
-  - name: master
-    pipeline_file: master-deploy.yml
+  - name: main
+    pipeline_file: main-deploy.yml
     auto_promote:
-      when: "result = 'passed' and branch = 'master'"
+      when: "result = 'passed' and branch = 'main'"
   - name: testing
     pipeline_file: testing-deploy.yml
     auto_promote:

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -38,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|
@@ -121,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'
@@ -148,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

@@ -28,6 +28,7 @@ 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Renuo AG
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2022-03-10 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
@@ -349,7 +363,7 @@ homepage: https://github.com/renuo/renuo-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -364,8 +378,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []