renuo-cli 3.0.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4e597c6888d4eb5472df3d1fdc496afe3ff1ab16ce2ce9f20602da6c2ccc40
-  data.tar.gz: 3fef697d445ab64c2d62c4adf62d5c4718e56c2243b64237bc3f9cf8e1255b06
+  metadata.gz: b15431d56265376a769e662fd9b467c0c1b0753a5b27e4429821ec37e87f9e01
+  data.tar.gz: 29a10806d01da5cbb8b2a2946fdeb5226fd3cdafc36c4bec15cf0cc20a6f88ec
 SHA512:
-  metadata.gz: 8f57de9f499fd37447d94675a063e3e2f6eb76d94b7d47c182048036faa92d91b89877beb579683717990f872caba2c4adfddcfc0adc23b79e5e5ff9351584c9
-  data.tar.gz: 28f034598160faef73f8ae55c26f7c3dae0a772e0500498881e56a3ce4d83e32cefecbdb63a18c3205e27f860c42ad79ae248650f071e38b1db98c41d14d9c03
+  metadata.gz: 69a90927c91e4b854c7cf2d9ed57ac4d3a27573c446c9232d951815e36e66cdc46cbdeecf299579837cedaa1536ab9190610645e747626628d713cb61af0fc23
+  data.tar.gz: ce3f379d8e365792f82024d3aa12a1d13ed697ffd85b50ff41bc10f112ee230a3c2c78991fb9b484faaf716906624f2786114b035c63d0f3cb9ca9598c887382

data/.ruby-version

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

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/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_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,15 +1,18 @@
+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
 
   def run(args)
     @project_name, @update_type, @version = args
-    validate_project_name
-    validate_update_type
-    validate_custom_version_format
-    checkout_project
-    compare_develop_main
+    validate_args
+    open_comparison_page
+    checkout_project # in the meantime
+    veto_comparison
     @version ||= calculate_version
     release
   ensure
@@ -18,6 +21,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,29 +58,20 @@ class ReleaseProject
     abort('>> Invalid Version Number. Use format X.Y.Z for your version.')
   end
 
-  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?')
+  def veto_comparison
+    abort unless agree('Are you fine with the changes you just reviewed in your browser?')
   end
 
   def open_comparison_page
-    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"
+    puts 'Opening browser to double-check what is going to be deployed…'
+    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
@@ -80,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}."
@@ -90,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
@@ -105,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
@@ -135,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}",
+          "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
@@ -176,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/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-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
+    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-main
+    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-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
+    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

@@ -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.0.0'.freeze
+    VERSION = '3.1.2'.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-04-12 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
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.

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