renuo-cli 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea41f1e1409107f56612a86c5ffac9270043c1a26de29daacd897389d9aeb021
-  data.tar.gz: 0402adae259c529bb4121c20bb58918ab94df544c5686980d7e789d50f606669
+  metadata.gz: ea4e597c6888d4eb5472df3d1fdc496afe3ff1ab16ce2ce9f20602da6c2ccc40
+  data.tar.gz: 3fef697d445ab64c2d62c4adf62d5c4718e56c2243b64237bc3f9cf8e1255b06
 SHA512:
-  metadata.gz: c279530144b65ab0d43c65bbd14e3f983bb6479fa0c4b55b04b9b28938668086db8a5767a7eff1e4b7d7190e6b29093b8903ceb32ab3e879cda7290298171707
-  data.tar.gz: 80a86bc7b74a850eac17a8ea94626eecd831c4a7e1010e4c2a167e12425c5a190a52978d0c7c95e7404de717040aa05ce8dbcad83cbb1dea2c45cfc6749acfaa
+  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/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

@@ -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
@@ -49,22 +49,29 @@ class ReleaseProject
     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} && gh repo 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 +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
 
@@ -135,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
@@ -167,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/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,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-master
+    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-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,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
     ;;
 
   *)

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

@@ -22,5 +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,6 +23,7 @@ blocks:
         - 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'
@@ -43,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
@@ -66,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
@@ -81,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 = '2.0.0'.freeze
+    VERSION = '3.0.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: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 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