renuo-cli 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccd25184eef6694e483475a333723876704e19ccd95208cc0f2767fe65933e0f
-  data.tar.gz: c4a2447d6ad50d362e2c774b10891b7413df3466957940c8e7265e869ae63325
+  metadata.gz: 63ddefa045f6a882dc8c2cdb625d809dd4867e6d726069c49348299000574aa3
+  data.tar.gz: 91f7b57e66180c476c91cb39a143dfdb474a8177e6f8b194dbe0d321369d4601
 SHA512:
-  metadata.gz: 0bf03b6b6f03220c7dc3e0ee20697cd74d95ee51674d4070f0b3bde0146397fada1c1971ac12fd98839ce4468afb52d6de6fc9acea55b813b8f65878efaffdc1
-  data.tar.gz: 805ebae3c760ee7467e767c927845900f32016a2aa75ef72b933f53c39f4c36c9a81d28cfcebff272f65ec030c6bb7ead78ba5a56ef8d702f20501207819fa57
+  metadata.gz: dd150d6c2692edd4c90ea37385edb895beca3897ec88de3978145c0b7b2430133f35aba36681a2bca202ded28dc193964dd33fc70353d64145937eea52785a6f
+  data.tar.gz: 905e009a98226b7c0e5d48fb808cce676aaab29c077f23d4ca1ed2d4b42b31259e4b55a05b87b53f92fcda697012db31d77d40c0f65cef75aca5ab2fbbce6d7e

data/.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.5

data/.semaphore/main-deploy.yml

@@ -2,8 +2,8 @@ version: v1.0
 name: main-deploy
 agent:
   machine:
-    type: e1-standard-2
-    os_image: ubuntu2004
+    type: e2-standard-2
+    os_image: ubuntu2204
 
 blocks:
   - name: main-deploy

data/.semaphore/semaphore.yml

@@ -1,12 +1,15 @@
 version: "v1.0"
 name: renuo-cli
+
 agent:
   machine:
-    type: e1-standard-2
-    os_image: ubuntu2004
+    type: e2-standard-2
+    os_image: ubuntu2204
+
 auto_cancel:
   running:
     when: "true"
+
 fail_fast:
   cancel:
     when: "branch != 'main'"

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

@@ -105,11 +105,11 @@ class ReleaseProject
 
     return unless version_bumped
 
-    system(cmd_in_folder('git add . && git commit -m "bump version"'))
+    system(cmd_in_folder(%(git add #{find_files_with_version.join(' ')} && git commit -m "Bump version")))
   end
 
   def find_and_replace_version
-    find_files_with_version.split("\n").any? do |file_name|
+    find_files_with_version.any? do |file_name|
       puts "Replace the version in #{file_name}?"
       print_version_found(file_name)
       if agree('confirm?')
@@ -124,7 +124,7 @@ class ReleaseProject
   def find_files_with_version
     excluded_dirs = %w[.git node_modules tmp].map { |dir| "--exclude-dir=#{dir}" }.join(' ')
     grep_current_version = "grep -rl -F #{excluded_dirs} --include='*.rb' #{current_version} ."
-    `#{cmd_in_folder(grep_current_version)}`
+    `#{cmd_in_folder(grep_current_version)}`.split("\n")
   end
 
   def print_version_found(file_name)
@@ -132,7 +132,10 @@ class ReleaseProject
   end
 
   def bump_version_in_file(file_name)
-    system(cmd_in_folder("sed -i '' 's|#{current_version}|#{@version}|g' #{file_name}"))
+    # Use `-i ''` for OS X and `-i` for GNU
+    args = "''" unless system('sed --version > /dev/null 2>&1')
+
+    system(cmd_in_folder("sed -i #{args} 's|#{current_version}|#{@version}|g' #{file_name}"))
   end
 
   def finish_release_branch

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'fileutils'
+require 'json'
+
+CONFIG_FILE = 'config/1password-secrets.yml'
+
+class SecretsFetcher
+  def run
+    system('which op > /dev/null') || abort('op is not installed. Please install it (e.g. brew install 1password-cli).')
+
+    abort("Config file #{CONFIG_FILE} not found.") unless File.exist?(CONFIG_FILE)
+    config = YAML.load_file(CONFIG_FILE).deep_symbolize_keys
+
+    config[:items].each do |item|
+      elaborate_item(item)
+    end
+  end
+
+  private
+
+  def elaborate_item(item)
+    private_link = item[:private_link]
+    files = item[:files]
+    default_folder = item[:default_folder]
+    item_id = extract_item_id(private_link)
+    item = get_item(item_id)
+    return if item.nil?
+
+    files.each do |file|
+      process_files(file[:folder] || default_folder, file[:name], item, item_id)
+    end
+  end
+
+  def get_item(item_id)
+    output = execute_command(command: "op item get #{item_id} --format json",
+                             success_message: '',
+                             error_message: "Error fetching item #{item_id}." \
+                                            "Check `private_link` in  your #{CONFIG_FILE} file.")
+    JSON.parse(output) if output
+  end
+
+  def execute_command(command:, success_message:, error_message:)
+    output = `#{command}`
+    if $CHILD_STATUS.success?
+      puts success_message unless success_message.empty?
+      output
+    else
+      warn error_message
+    end
+  end
+
+  def extract_item_id(private_link)
+    /&i=([^&]+)/.match(private_link)[1]
+  end
+
+  def process_files(output_folder, filename, item, item_id)
+    FileUtils.mkdir_p(output_folder)
+    output_path = File.join(output_folder, filename)
+
+    vault_id = item.dig('vault', 'id')
+    download_file_from_item(item['files'], vault_id, item_id, filename, output_path)
+    puts "\n\n"
+  end
+
+  def download_file_from_item(files, vault_id, item_id, filename, output_path)
+    item_file = files&.find { |tmp_file_config| tmp_file_config['name'].eql?(filename) }
+    if item_file.nil?
+      warn "File `#{filename}` not found in item #{item_id}. Check the file name in your #{CONFIG_FILE} file."
+      return
+    end
+    execute_command(command: "op read \"op://#{vault_id}/#{item_id}/#{item_file['id']}\" --out-file #{output_path}",
+                    success_message: "Successfully fetched #{filename} and saved to #{output_path}",
+                    error_message: "Error fetching #{filename}.")
+  end
+end

data/lib/renuo/cli/version.rb

@@ -2,7 +2,7 @@
 
 module Renuo
   module Cli
-    VERSION = '4.2.1'
+    VERSION = '4.3.0'
     NAME = 'renuo-cli'
   end
 end

data/lib/renuo/cli.rb

@@ -28,6 +28,7 @@ require 'renuo/cli/app/renuo_version'
 require 'renuo/cli/app/create_slidev_presentation'
 require 'renuo/cli/app/commit_leaderboard'
 require 'renuo/cli/app/commit_leaderboard_sync'
+require 'renuo/cli/app/secrets_fetcher'
 require 'highline'
 
 def agree(question)
@@ -69,17 +70,6 @@ module Renuo
         end
       end
 
-      command :config do |c|
-        c.syntax = 'renuo config [options]'
-        c.summary = 'Setup the config (API keys)'
-        c.description = 'Setup the config (API keys)'
-        c.action do
-          key = ask('API Key?') { |q| q.echo = '*' }
-          LocalStorage.new.store(:api_key, key)
-          say('stored the api key')
-        end
-      end
-
       command 'list-large-git-files' do |c|
         c.syntax = 'renuo list-large-git-files'
         c.summary = 'Lists the 5 largest files in a git repository. Warning: must be a bare checkout of the repo!'
@@ -299,6 +289,18 @@ module Renuo
           CommitLeaderboardSync.new.run(args)
         end
       end
+
+      command 'fetch-secrets' do |c|
+        c.syntax = 'renuo fetch-secrets'
+        c.summary = 'Fetches the needed secrets in a project from the renuo secrets store'
+        c.description = <<~DESCRIPTION
+          Run the command within a project folder to fetch the secrets from the renuo secrets store.
+          The bin/setup of the project might run this command for you.
+        DESCRIPTION
+        c.action do
+          SecretsFetcher.new.run
+        end
+      end
     end
   end
 end

data/renuo-cli.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'dotenv', '~> 2.7.2'
   spec.add_development_dependency 'mdl', '~> 0.13'
   spec.add_development_dependency 'pry', '~> 0.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'renuocop'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rubocop', '~> 1.62'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renuo-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Renuo AG
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-04 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: renuocop
   requirement: !ruby/object:Gem::Requirement
@@ -333,6 +333,7 @@ files:
 - bin/renuo
 - bin/run
 - bin/setup
+- config/1password-secrets.yml
 - lib/renuo/cli.rb
 - lib/renuo/cli/app/command_helper.rb
 - lib/renuo/cli/app/commit_leaderboard.rb
@@ -357,6 +358,7 @@ files:
 - lib/renuo/cli/app/release_project.rb
 - lib/renuo/cli/app/release_xing.rb
 - lib/renuo/cli/app/renuo_version.rb
+- lib/renuo/cli/app/secrets_fetcher.rb
 - lib/renuo/cli/app/services/cloudfront_config_service.rb
 - lib/renuo/cli/app/services/markdown_parser_service.rb
 - lib/renuo/cli/app/services/renuo_cli_config.rb
@@ -385,7 +387,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -400,8 +402,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: The Renuo CLI automates some common workflows.
 test_files: []