renuo-cli 3.1.1 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63f2b385a0924947d1b2a9379a836576b8d28c22a56aab71a8b8c5b7e912a59
-  data.tar.gz: 9f518b1bf101f4a65b93db3a595f5afbc2e1d94389a454511e5c6a4db1bc69d0
+  metadata.gz: a3ebfe107422fcb325aaeaeb8ee0bb8a7d7180c2ff9bce010c623bc680c8606c
+  data.tar.gz: b015920000dd363cc2957677694fff8efe041a6068f38594fb545281a2e1ae14
 SHA512:
-  metadata.gz: 920b11fcc5d8135ac1e443916a7453f3317bf9b834438eb7d2c4c0031917250ad525b657cb6cb45b01ca92e4bb287186e34ad44fc7275d47947de590db2b3aeb
-  data.tar.gz: b555c4b20295c9094a43635868ff090f0ca63f50804985a0e2744892d0e51d7e9a2973e6a8e7a5ea735569c6b93f7585537c9c9bfda10d215a58d98a115ae3e0
+  metadata.gz: b697804eceb13dfe6a27e3135c3f8a9c18405f7af3b98cd02e5f7ec029a37134e1f7b0a781697e8970a00cf9d93599c4c6d29080ff09c4e9b9fb8bbf876b1121
+  data.tar.gz: 5fd0187df881a7dbfb3dfbd2b6d4e56473905f9ad3f7c56c775b1b765ac1b749446b991e0de97e1a4f6367e04187767d4e2a82990b989b5f9222d7f5d191b98d

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

@@ -71,7 +71,7 @@ class ReleaseProject
     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} --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
@@ -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 = "https://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/version.rb

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

data/lib/renuo/cli.rb

@@ -111,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.1
+  version: 3.1.4
 platform: ruby
 authors:
 - Renuo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-05-16 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