renuo-cli 3.1.0 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708171502068c3d1748c92b702a7e0af0c550607bf2b950a8ef082b225996a2d
-  data.tar.gz: 550e4ec36dbfa189ea34bcb2e2e7295ad701ad587b05142d3839484175853194
+  metadata.gz: ae956670e74e092cce3f2161073efebe67b18f87e6de498c967a10f8f6109327
+  data.tar.gz: 7cd7137d5ffcb4975dbbf39adc523b25f7271b01ac4551af353a2ca022489143
 SHA512:
-  metadata.gz: a6a524f253a75c50eedea23a7ac02070897e0c4e5d80256536e390f8b6206dfe78b9400e5ec34f9514b1d62f94a8194b3521ca0f9c097ac64cf4f441bed3bbf9
-  data.tar.gz: '0991a1fe20fae345363b140e671b0ece06a44e3dc4c4d20b788db531d64eb2c24ee924407bd2a405fa6654cc888ea07d4fcc25f02da6a0a73eb956fa9e93917c'
+  metadata.gz: 32ac196c93c183a57423b65873b15351e60c03eee3f4f67cbb65d37604c181cf1ea5905af409fbd9710037f9977d3abb1c6f3874138ad494836ef50f884a95d5
+  data.tar.gz: 7acedf79bb2198ae72e3b9d637e09070e0fdf652948ddb5f80caf7856f7bfc05ba143374350cd3807b311f3c3940605fb8fb2d4c7aa17ea4acbd86e81d417ff6

data/.semaphore/{master-deploy.yml → main-deploy.yml}

@@ -1,17 +1,17 @@
 version: v1.0
-name: master-deploy
+name: main-deploy
 agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu1804
 
 blocks:
-  - name: master-deploy
+  - name: main-deploy
     task:
       secrets:
         - name: rubygems-deploy
       jobs:
-        - name: master-deploy
+        - name: main-deploy
           commands:
             - checkout --use-cache
             - gem build renuo-cli

data/.semaphore/semaphore.yml

@@ -9,7 +9,7 @@ auto_cancel:
     when: "true"
 fail_fast:
   cancel:
-    when: "branch != 'master'"
+    when: "branch != 'main'"
 
 blocks:
   - name: tests
@@ -30,5 +30,5 @@ blocks:
           commands:
             - bin/check
 promotions:
-  - name: master
-    pipeline_file: master-deploy.yml
+  - name: main
+    pipeline_file: main-deploy.yml

data/README.md

@@ -32,11 +32,11 @@ To release a new version, update the version number in `version.rb`, and then ru
 
 ## Release
 
-* Bump the version number in `lib/renuo/cli/version.rb` and commit to `master`
+* Bump the version number in `lib/renuo/cli/version.rb` and commit to `main`
 
 ### Automatic
 
-* Deploy through Semaphore console by starting a promotion to master
+* Deploy through Semaphore console by starting a promotion to main
 
 ### Manual
 

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

@@ -0,0 +1,18 @@
+module CommandHelper
+  def run_command(command)
+    say "\n#{command.yellow}"
+    system command
+  end
+
+  def open_path(path)
+    system_command = case RbConfig::CONFIG['host_os']
+                     when /mswin|mingw|cygwin/
+                       'start'
+                     when /darwin/
+                       'open'
+                     when /linux|bsd/
+                       'xdg-open'
+                     end
+    run_command "#{system_command} #{path}"
+  end
+end

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

@@ -1,9 +1,9 @@
 class CreateHerokuApp
-  ADMIN_EMAIL = 'admin@renuo.ch'.freeze
+  ADMIN_EMAIL = 'operations@renuo.ch'.freeze
 
   def initialize; end
 
-  def run(*args)
+  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

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

@@ -1,5 +1,5 @@
 class CreateNewLogins
-  include RunCommand
+  include CommandHelper
 
   @logins = [{ name: 'Sentry', sign_up_url: 'https://sentry.io/organizations/renuo/members/new/',
                steps: ['Click on add new Member'] },
@@ -20,8 +20,7 @@ class CreateNewLogins
   private
 
   def open_site(website)
-    say website.blue
-    system "open '#{website}'"
+    open_path(website)
     wait_to_continue
   end
 

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

@@ -1,17 +1,33 @@
+require_relative 'command_helper'
+
 class NameDisplay
+  include CommandHelper
+
   def run(args, options)
-    return display_name('') if options.delete
+    return open_path(SLIDES) if options.monitor
+    return display_name(nil) if options.delete
+    return say('empty argument') if args.empty?
 
-    return say('invalid customer name') if args.empty?
+    return run_heroku_command(args.join(' ')) if options.override
 
     display_name(args.join(' '))
   end
 
+  private
+
+  HEROKU_APP_NAME = '-a renuo-dashboard-master'.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
+  WELCOME_MESSAGE = 'Welcome to Renuo'.freeze
+
   def display_name(name)
-    puts "TODO: display #{name}"
+    text_message = [WELCOME_MESSAGE, name, '🥳🔥'].compact.join(' ')
+    run_heroku_command(text_message)
   end
 
-  def delete_current
-    display_name('')
+  def run_heroku_command(text_message)
+    rails_command = "\"#{RENUO_CLI}['#{text_message}']\""
+    run_command([HEROKU_CLI, rails_command, HEROKU_APP_NAME].join(' '))
   end
 end

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

@@ -1,4 +1,8 @@
+require_relative 'command_helper'
+
 class ReleaseProject
+  include CommandHelper
+
   UPDATE_TYPES = %w[major minor patch custom].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
@@ -60,22 +64,14 @@ class ReleaseProject
 
   def open_comparison_page
     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"
+    open_path "https://github.com/#{@project_name}/compare/#{main_branch}...develop"
   end
 
   def checkout_project
     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'))
+                         "git checkout #{develop_branch} && git pull origin #{develop_branch}"))
   end
 
   def calculate_version
@@ -84,7 +80,6 @@ class ReleaseProject
 
   def release
     ask_for_final_confirmation
-    start_release_branch
     bump_version
     if finish_release_branch
       puts ">> Project successfully released with version #{@version}."
@@ -94,14 +89,12 @@ class ReleaseProject
   end
 
   def current_version
-    return @current_version if @current_version
-
-    @current_version = if `#{cmd_in_folder('git tag')}` == ''
-                         '0.0.0'
-                       else
-                         sorted_tags = `#{cmd_in_folder('git tag --sort=taggerdate')}`.split("\n").reverse
-                         sorted_tags.find { |tag| tag =~ RenuoVersion::SEMVER_SCHEMA }.strip
-                       end
+    @current_version ||= if `#{cmd_in_folder('git tag')}` == ''
+                           '0.0.0'
+                         else
+                           sorted_tags = `#{cmd_in_folder('git tag --sort=taggerdate')}`.split("\n").reverse
+                           sorted_tags.find { |tag| tag =~ RenuoVersion::SEMVER_SCHEMA }.strip
+                         end
   end
 
   def bump_version
@@ -109,7 +102,7 @@ class ReleaseProject
 
     return unless version_bumped
 
-    system(cmd_in_folder("git add . && git commit -m \"bump version\" && git push -u origin release/#{@version}"))
+    system(cmd_in_folder('git add . && git commit -m "bump version"'))
   end
 
   def find_and_replace_version
@@ -139,26 +132,43 @@ class ReleaseProject
     system(cmd_in_folder("sed -i '' 's|#{current_version}|#{@version}|g' #{file_name}"))
   end
 
-  def start_release_branch
-    system(cmd_in_folder("git flow release start #{@version}"))
+  def finish_release_branch
+    merge_branches
+    push_branches_and_tags
   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 #{main_branch} && git push origin #{main_branch} --tags"))
+  def merge_branches
+    system(
+      cmd_in_folder(
+        [
+          "GIT_MERGE_AUTOEDIT=no git checkout #{main_branch}",
+          "git merge #{develop_branch} --no-edit",
+          "git tag -a #{@version} -m \"Release with versioin: #{@version}\""
+        ].join(' && ')
+      )
+    )
+  end
+
+  def push_branches_and_tags
+    push_branch(develop_branch)
+    push_branch(main_branch)
+    system(cmd_in_folder("git checkout #{main_branch} && git push origin #{main_branch} --tags"))
+  end
+
+  def push_branch(branch)
+    system(cmd_in_folder("git checkout #{branch} && git push origin #{branch}"))
   end
 
   def ask_for_final_confirmation
     unless agree(">> Are you sure you wish to deploy '#{@project_name}' " \
-            "as a #{@update_type} release (#{current_version} => #{@version})?")
+        "as a #{@update_type} release (#{current_version} => #{@version})?")
       abort('>> Cancelling Release.')
     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?')
+        'Did you think about your family...waiting for you at home?')
       abort('>> Very good. Go home now.')
     end
   end
@@ -180,6 +190,11 @@ class ReleaseProject
   end
 
   def main_branch
-    @main_branch ||= system(cmd_in_folder('git checkout main && git show-ref refs/heads/main')) ? 'main' : 'master'
+    remote_repo = "git@github.com:#{@project_name}.git"
+    @main_branch ||= `git ls-remote --heads #{remote_repo} main`.empty? ? 'master' : 'main'
+  end
+
+  def develop_branch
+    'develop'
   end
 end

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

@@ -23,5 +23,4 @@ blocks:
             - 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:main
-            - heroku run -x rails db:migrate
-            - heroku dyno:restart
+            - if heroku run -x rails db:migrate; then heroku dyno:restart; else heroku rollback; exit -1; fi

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

@@ -92,6 +92,15 @@ blocks:
         - name: tests
           commands:
             - bin/check
+      epilogue:
+        on_fail:
+          commands:
+            - mkdir -p log
+            - mkdir -p tmp/screenshots
+            - 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
 promotions:
   - name: develop
     pipeline_file: develop-deploy.yml

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

@@ -1,5 +1,5 @@
 class UpgradeLaptopExecution
-  include RunCommand
+  include CommandHelper
 
   def initialize(upgrade_mac_os)
     @upgrade_mac_os = upgrade_mac_os

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

@@ -1,5 +1,5 @@
 class UpgradeMacOS
-  include RunCommand
+  include CommandHelper
 
   def run
     find_software_upgrades

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

@@ -1,4 +1,4 @@
-require_relative 'upgrade_laptop/run_command'
+require_relative 'command_helper'
 require_relative 'upgrade_laptop/upgrade_laptop_execution'
 require_relative 'upgrade_laptop/upgrade_mac_os'
 

data/lib/renuo/cli/version.rb

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

data/lib/renuo/cli.rb

@@ -46,7 +46,10 @@ module Renuo
         c.description = 'Sets the name of a customer on the Renuo dashboard'
         c.example 'Display "Peter Muster" on the dashboard', 'renuo display-name "Peter Muster"'
         c.example 'Remove the current name from the dashboard', 'renuo display-name --delete'
+        c.example 'Override the current message on the dashboard', 'renuo display-name Happy friday 🍻 --override'
         c.option '--delete', 'Deletes the current name'
+        c.option '--override', 'Overrides the entire message'
+        c.option '--monitor', 'Open the Google slides'
         c.action do |args, options|
           NameDisplay.new.run(args, options)
         end
@@ -108,7 +111,7 @@ module Renuo
       command 'create-aws-project' do |c|
         c.syntax = 'renuo create-aws-project'
         c.summary = 'Generates necessary commands for our project setup on AWS incl. necessary installations.'
-        c.description = <<-DESCRIPTION
+        c.description = <<~DESCRIPTION
           This creates commands for creating AWS users, buckets an versioning policies and CloudFront.
           It also guides you to set up the necessary environment.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.3
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -307,7 +307,7 @@ files:
 - ".ruby-version"
 - ".semaphore/bin/cache_restore"
 - ".semaphore/bin/cache_store"
-- ".semaphore/master-deploy.yml"
+- ".semaphore/main-deploy.yml"
 - ".semaphore/semaphore.yml"
 - Gemfile
 - LICENSE.txt
@@ -319,6 +319,7 @@ files:
 - bin/run
 - bin/setup
 - lib/renuo/cli.rb
+- lib/renuo/cli/app/command_helper.rb
 - lib/renuo/cli/app/configure_semaphore.rb
 - lib/renuo/cli/app/configure_sentry.rb
 - lib/renuo/cli/app/create_aws_project.rb
@@ -351,7 +352,6 @@ files:
 - lib/renuo/cli/app/toggl/workspace.rb
 - lib/renuo/cli/app/toggl_redmine_comparator.rb
 - lib/renuo/cli/app/upgrade_laptop.rb
-- lib/renuo/cli/app/upgrade_laptop/run_command.rb
 - lib/renuo/cli/app/upgrade_laptop/upgrade_laptop_execution.rb
 - lib/renuo/cli/app/upgrade_laptop/upgrade_mac_os.rb
 - lib/renuo/cli/app/work.rb

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

@@ -1,6 +0,0 @@
-module RunCommand
-  def run_command(command)
-    say "\n#{command.yellow}"
-    system command
-  end
-end