renuo-cli 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f1d92e8c0fa0ec9f455becc6d582050953ff06995b1449f989c3b0e2e5e229
-  data.tar.gz: '0597a50d4d57f28c638227d424012a424149721582ac36bb862a733e7e9c584f'
+  metadata.gz: 5d0c7cb1b6bb3792c2b43d510487bb7e876070c6cdf83e7e4d41d96a556ab782
+  data.tar.gz: 851fe36fa4258b8a15a4bfe47186776e20638c453913df29549bb1d90c38398a
 SHA512:
-  metadata.gz: f77187004b463350afd60609871843362a2218152c20fa57c146af4d1a6795472e226376b4d933bc25c81a4e87c563459763e83bf825d40f15d6e9f182c1795c
-  data.tar.gz: 02736c206c176355e8e7ae1775cf75208445a1583011f8764acee31b05b26fffda5fc53a689839bf3369fa9aa894ca85ad8a21b2624bd94676b8d29cb7ea5cfc
+  metadata.gz: cd6b422735e525fe3f408ca5f30b65af4cb0f8a88b8b6c2d70b4cbc3db3bb077fc1e27b0af776b48b47d2e7590accf68e681d1c676aeb954bc7aae032a9b7a3a
+  data.tar.gz: f0989fe4f8c88dbbaf52f944c1aeb8053ae2d3199456e742941cd3cbdf2ce15d2f1cb5ba4edad6cabf51de438cc87d5b4580f8ce34f27d816a53600a646d99cd

data/README.md

@@ -20,7 +20,7 @@ After checking out the repo, run `bin/setup` to install dependencies.
 
 Run `rake spec` to run the tests.
 
-Run `ruby -Ilib ./bin/renuo` to run the executable.
+Run `ruby -Ilib ./bin/renuo` to run the executable. (e.g. `ruby -Ilib ./bin/renuo -v`)
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

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[main develop testing].each do |environment|
+    %w[main develop].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 "main,develop,testing" '\
+           '--branches "main,develop" '\
            "--slack-channels \"#project-#{project_name}\" "\
            '--slack-endpoint "https://hooks.slack.com/services/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"')
   end

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

@@ -22,5 +22,6 @@ class ConfigureSentry
     heroku_name = "#{project_name}-#{env}"
     say "heroku config:set SENTRY_DSN=#{sentry_dsn} --app #{heroku_name}"
     say "heroku config:set SENTRY_ENVIRONMENT=#{env} --app #{heroku_name}"
+    say "heroku labs:enable runtime-dyno-metadata --app #{heroku_name}"
   end
 end

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

@@ -8,7 +8,7 @@ class CreateAwsProject
   end
 
   def run
-    %w[main develop testing].each do |branch|
+    %w[main develop].each do |branch|
       print_setup_commands branch
     end
   end
@@ -41,18 +41,6 @@ class CreateAwsProject
   def collect_cloudfront_information
     @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[main develop testing].each do |branch|
-      cloudfront_alias_for branch
-    end
-  end
-
-  def cloudfront_alias_for(branch)
-    @cloudfront_alias[branch] = ask("What CF-Alias do you want to use for #{branch}?") { |q| q.validate = /.+/ }
   end
 
   def ensure_aws_setup?
@@ -72,40 +60,31 @@ class CreateAwsProject
     (system(installation_command) if agree(agree_text)) until system(installation_check_command)
   end
 
-  def print_setup_commands(branch)
+  def print_setup_commands(branch) # rubocop:todo Metrics/AbcSize
     say "\n# AWS #{branch} \n".colorize :green
     # wrap_at inserts newlines, after that, the command is no longer copyable
     $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)
+    say '# Hint: Don\'t forget to copy SecretAccessKey and AccessKeyId'.colorize :yellow
     puts aws_s3_versioning_setup(@aws_profile, aws_user(branch)) if branch == 'main'
-    cloudfront_setup(aws_user(branch), branch)
+    cloudfront_setup(aws_user(branch))
     $terminal.wrap_at = :auto if $terminal
   end
 
-  def cloudfront_setup(bucket, branch)
+  def cloudfront_setup(bucket)
     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 "\
-          'if not yet done'.colorize :yellow
-    else
-      say "\n# Hint: The domain name for your S3 files, can be found after running the" \
-          ' commands on https://console.aws.amazon.com/cloudfront/home'.colorize :yellow
-    end
+    puts aws_cloudfront_setup(@aws_profile, bucket, @redmine_project)
+    say '# Hint: Find the distribution domain name under Distribution.DomainName'.colorize :yellow
   end
 
   def aws_user(branch)
     [@project_name, branch, @project_purpose].compact.join('-')
   end
 
-  def cloudfront_alias(branch)
-    @cloudfront_alias[branch.to_sym]
-  end
-
   def aws_iam_setup(profile, user, app_group)
-    <<-IAM_COMMANDS
+    <<~IAM_COMMANDS
       aws --profile #{profile} iam create-user --user-name #{user}
       aws --profile #{profile} iam add-user-to-group --user-name #{user} --group-name #{app_group}
       aws --profile #{profile} iam create-access-key --user-name #{user}
@@ -113,23 +92,23 @@ class CreateAwsProject
   end
 
   def aws_s3_setup(profile, bucket, region, redmine_project)
-    <<-S3_COMMANDS
+    <<~S3_COMMANDS
       aws --profile #{profile} s3 mb s3://#{bucket} --region #{region}
       aws --profile #{profile} s3api put-bucket-tagging --bucket #{bucket} --tagging "TagSet=[{Key=redmine_project,Value=#{redmine_project}}]"
     S3_COMMANDS
   end
 
   def aws_s3_versioning_setup(profile, bucket)
-    <<-S3_VERSIONING_COMMANDS
+    <<~S3_VERSIONING_COMMANDS
       aws --profile #{profile} s3api put-bucket-versioning --bucket #{bucket} --versioning-configuration Status=Enabled
     S3_VERSIONING_COMMANDS
   end
 
-  def aws_cloudfront_setup(profile, bucket, branch, redmine_project)
+  def aws_cloudfront_setup(profile, bucket, redmine_project)
     tags = [{ "Key": 'redmine_project', "Value": redmine_project }]
-    cloudfront_config_string = CloudfrontConfigService.new(bucket, cloudfront_alias(branch), tags).to_s
+    cloudfront_config_string = CloudfrontConfigService.new(bucket, tags).to_s
 
-    <<-CLOUDFRONT_COMMANDS
+    <<~CLOUDFRONT_COMMANDS
       aws --profile #{profile} cloudfront create-distribution-with-tags --distribution-config-with-tags '#{cloudfront_config_string}'
     CLOUDFRONT_COMMANDS
   end

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

@@ -6,43 +6,30 @@ class CreateHerokuApp
   def run(args)
     project_name = args[0]
     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
     ENVIRONMENTS.each do |env|
-      print_environment_commands(emails, env, project_name)
+      print_environment_commands(env, project_name)
     end
     print_pipelines_commands(project_name)
   end
 
   private
 
-  def print_environment_commands(emails, env, project_name)
+  def print_environment_commands(env, project_name)
     heroku_name = "#{project_name}-#{env}"
-    say "heroku apps:create --region eu #{heroku_name}"
+    say "heroku apps:create --region eu #{heroku_name} -t staff"
     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}"
     say "heroku pg:backups:schedule DATABASE_URL --at '02:00 Europe/Zurich' --app #{heroku_name}"
-    print_ownership_commands(emails, heroku_name)
   end
 
   def print_pipelines_commands(project_name)
     say "heroku pipelines:create #{project_name} --app #{project_name}-#{MAIN} -s production -t staff"
     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"
-  end
-
-  def print_ownership_commands(emails, heroku_name)
-    say "\n"
-    emails.each do |email|
-      say "heroku access:add #{email} --app #{heroku_name}"
-    end
-    say "heroku access:add #{ADMIN_EMAIL} --app #{heroku_name}"
-    say "heroku apps:transfer -a #{heroku_name} #{ADMIN_EMAIL}"
     say "\n"
   end
 end

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

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

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

@@ -15,7 +15,7 @@ class NameDisplay
 
   private
 
-  HEROKU_APP_NAME = '-a renuo-dashboard-master'.freeze
+  HEROKU_APP_NAME = '-a renuo-dashboard-main'.freeze
   HEROKU_CLI = 'heroku run'.freeze
   RENUO_CLI = 'rails renuo:welcome'.freeze
   SLIDES = 'https://docs.google.com/presentation/d/1mPhQjArZnlUWUa2ik5R9IlGmdCKCwc2_H8Qq-AWgV-A/edit'.freeze

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

@@ -1,7 +1,6 @@
 class CloudfrontConfigService
-  def initialize(bucket, bucket_alias, tags = [])
+  def initialize(bucket, tags = [])
     @bucket = bucket
-    @bucket_alias = bucket_alias
     @tags = tags
   end
 
@@ -16,7 +15,6 @@ class CloudfrontConfigService
     {
       "DistributionConfig": {
         "CallerReference": unique_caller_reference,
-        "Aliases": bucket_aliases,
         "Origins": {
           "Quantity": 1,
           "Items": [
@@ -116,11 +114,4 @@ class CloudfrontConfigService
   def unique_caller_reference
     "#{Time.now.getutc.to_i}-#{@bucket}"
   end
-
-  def bucket_aliases
-    {
-      "Quantity": @bucket_alias ? 1 : 0,
-      "Items": @bucket_alias ? [@bucket_alias] : []
-    }
-  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
-    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
+    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
+    cache restore "requirements-$SEMAPHORE_GIT_BRANCH-$(checksum requirements.txt),requirements-$SEMAPHORE_GIT_BRANCH,requirements-develop"
     ;;
 
   assets)
-    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
+    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/semaphore.yml.erb

@@ -63,7 +63,8 @@ blocks:
             - 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
+            - zip -r coverage-$SEMAPHORE_GIT_SHA coverage/
+            - artifact push job --expire-in 2w coverage-$SEMAPHORE_GIT_SHA.zip
   - name: tests
     execution_time_limit:
       minutes: 10
@@ -98,10 +99,13 @@ blocks:
           commands:
             - mkdir -p log
             - mkdir -p tmp/screenshots
+            - mkdir -p tmp/capybara
             - mkdir -p coverage
             - artifact push job log --expire-in 2w
             - artifact push job tmp/screenshots --expire-in 2w
-            - artifact push job coverage --expire-in 2w
+            - artifact push job tmp/capybara --expire-in 2w
+            - zip -r coverage-$SEMAPHORE_GIT_SHA coverage/
+            - artifact push job --expire-in 2w coverage-$SEMAPHORE_GIT_SHA.zip
 promotions:
   - name: develop
     pipeline_file: develop-deploy.yml
@@ -111,7 +115,3 @@ promotions:
     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/version.rb

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

data/lib/renuo/cli.rb

@@ -123,7 +123,7 @@ 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 (main, develop, testing) and add it to the renuo apps group.
+          - create an IAM user for each environment (main, develop) and add it to the renuo apps group.
           - create S3 buckets for each user who owns it
           - tag the buckets
           - enable versioning for main buckets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.