emerge 0.2.1 → 0.3.0

data/lib/utils/github.rb

@@ -4,7 +4,7 @@ module EmergeCLI
     GITHUB_EVENT_PUSH = 'push'.freeze
 
     def self.event_name
-      ENV['GITHUB_EVENT_NAME']
+      ENV.fetch('GITHUB_EVENT_NAME', nil)
     end
 
     def self.supported_github_event?
@@ -22,7 +22,7 @@ module EmergeCLI
 
     def self.sha
       if push?
-        ENV['GITHUB_SHA']
+        ENV.fetch('GITHUB_SHA', nil)
       elsif pull_request?
         github_event_data.dig(:pull_request, :head, :sha)
       end
@@ -55,7 +55,7 @@ module EmergeCLI
 
     def self.github_event_data
       @github_event_data ||= begin
-        github_event_path = ENV['GITHUB_EVENT_PATH']
+        github_event_path = ENV.fetch('GITHUB_EVENT_PATH', nil)
         Logger.error 'GITHUB_EVENT_PATH is not set' if github_event_path.nil?
 
         Logger.error "File #{github_event_path} doesn't exist" unless File.exist?(github_event_path)

data/lib/utils/logger.rb

@@ -1,5 +1,5 @@
 require 'logger'
-require 'colorize'
+require 'colored2'
 
 module EmergeCLI
   class Logger
@@ -43,7 +43,7 @@ module EmergeCLI
                             when 'ERROR'
                               msg.to_s.red
                             when 'DEBUG'
-                              msg.to_s.light_blue
+                              msg.to_s.blue
                             else
                               msg.to_s
                             end

data/lib/utils/network.rb

@@ -9,9 +9,9 @@ module EmergeCLI
     public_constant :EMERGE_API_PROD_URL
 
     RETRY_DELAY = 5
-    MAX_RETRIES = 1
+    MAX_RETRIES = 3
 
-    def initialize(api_token:, base_url: EMERGE_API_PROD_URL)
+    def initialize(api_token: nil, base_url: EMERGE_API_PROD_URL)
       @base_url = base_url
       @api_token = api_token
       @internet = Async::HTTP::Internet.new
@@ -21,8 +21,8 @@ module EmergeCLI
       request(:get, path, nil, headers)
     end
 
-    def post(path:, body:, headers: {})
-      request(:post, path, body, headers)
+    def post(path:, body:, headers: {}, query: nil)
+      request(:post, path, body, headers, query)
     end
 
     def put(path:, body:, headers: {})
@@ -35,15 +35,23 @@ module EmergeCLI
 
     private
 
-    def request(method, path, body, custom_headers)
+    def request(method, path, body, custom_headers, query = nil)
       uri = if path.start_with?('http')
               URI.parse(path)
             else
-              URI::HTTPS.build(host: @base_url, path:)
+              query_string = query ? URI.encode_www_form(query) : nil
+              URI::HTTPS.build(
+                host: @base_url,
+                path: path,
+                query: query_string
+              )
             end
       absolute_uri = uri.to_s
 
-      headers = { 'X-API-Token' => @api_token }
+      headers = {
+        'User-Agent' => "emerge-cli/#{EmergeCLI::VERSION}"
+      }
+      headers['X-API-Token'] = @api_token if @api_token
       headers['Content-Type'] = 'application/json' if method == :post && body.is_a?(Hash)
       headers.merge!(custom_headers)
 
@@ -62,20 +70,32 @@ module EmergeCLI
 
         response
       rescue StandardError => e
-        # Workaround for an issue where the request is not fully written, haven't determined the root cause yet
-        if e.message.include?('Wrote 0 bytes') && retries < MAX_RETRIES
-          retries += 1
-          Logger.warn "Request failed due to incomplete write. Retrying in #{RETRY_DELAY} seconds..."
-          sleep RETRY_DELAY
+        retries += 1
+        if retries <= MAX_RETRIES
+          delay = RETRY_DELAY * retries
+          error_message = e.message
+          Logger.warn "Request failed (attempt #{retries}/#{MAX_RETRIES}): #{error_message}"
+          Logger.warn "Retrying in #{delay} seconds..."
+
+          begin
+            @internet.close
+          rescue StandardError
+            nil
+          end
+          @internet = Async::HTTP::Internet.new
+
+          sleep delay
           retry
         else
-          Logger.error "Request failed: #{absolute_uri} #{e.message}"
+          Logger.error "Request failed after #{MAX_RETRIES} attempts: #{absolute_uri} #{e.message}"
           raise e
         end
       end
     end
 
     def perform_request(method, absolute_uri, headers, body)
+      headers ||= {}
+
       case method
       when :get
         @internet.get(absolute_uri, headers:)

data/lib/utils/version_check.rb

@@ -0,0 +1,32 @@
+require 'json'
+
+module EmergeCLI
+  module Utils
+    class VersionCheck
+      def initialize(network: EmergeCLI::Network.new)
+        @network = network
+      end
+
+      def check_version
+        Sync do
+          response = @network.get(
+            path: 'https://rubygems.org/api/v1/gems/emerge.json',
+            headers: {}
+          )
+          latest_version = JSON.parse(response.read).fetch('version')
+          current_version = EmergeCLI::VERSION
+
+          if Gem::Version.new(latest_version) > Gem::Version.new(current_version)
+            Logger.warn "A new version of emerge-cli is available (#{latest_version})"
+            Logger.warn "You are currently using version #{current_version}"
+            Logger.warn "To update, run: gem update emerge\n"
+          end
+        end
+      rescue KeyError
+        Logger.error 'Failed to parse version from RubyGems API response'
+      rescue StandardError => e
+        Logger.error "Failed to check for updates: #{e.message}"
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
-module EmergeCli
-  VERSION = '0.2.1'.freeze
+module EmergeCLI
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: emerge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Emerge Tools
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: async
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.20.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.1
+        version: 0.86.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.83.1
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: dry-cli
+  name: open3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: open3
+  name: ruby_tree_sitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -136,104 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.27.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.25.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.25.1
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.1
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.2.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.13.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.68.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.68.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.22.0
 description: The official CLI for Emerge Tools
 email:
 - support@emergetools.com
@@ -249,12 +137,15 @@ files:
 - lib/commands/config/snapshots/snapshots_ios.rb
 - lib/commands/global_options.rb
 - lib/commands/integrate/fastlane.rb
+- lib/commands/reaper/reaper.rb
 - lib/commands/upload/snapshots/client_libraries/default.rb
 - lib/commands/upload/snapshots/client_libraries/paparazzi.rb
 - lib/commands/upload/snapshots/client_libraries/roborazzi.rb
 - lib/commands/upload/snapshots/client_libraries/swift_snapshot_testing.rb
 - lib/commands/upload/snapshots/snapshots.rb
 - lib/emerge_cli.rb
+- lib/reaper/ast_parser.rb
+- lib/reaper/code_deleter.rb
 - lib/utils/git.rb
 - lib/utils/git_info_provider.rb
 - lib/utils/git_result.rb
@@ -263,7 +154,14 @@ files:
 - lib/utils/network.rb
 - lib/utils/profiler.rb
 - lib/utils/project_detector.rb
+- lib/utils/version_check.rb
 - lib/version.rb
+- parsers/libtree-sitter-java-darwin-arm64.dylib
+- parsers/libtree-sitter-java-linux-x86_64.so
+- parsers/libtree-sitter-kotlin-darwin-arm64.dylib
+- parsers/libtree-sitter-kotlin-linux-x86_64.so
+- parsers/libtree-sitter-swift-darwin-arm64.dylib
+- parsers/libtree-sitter-swift-linux-x86_64.so
 homepage: https://github.com/EmergeTools/emerge-cli
 licenses:
 - MIT
@@ -271,6 +169,7 @@ metadata:
   homepage_uri: https://github.com/EmergeTools/emerge-cli
   source_code_uri: https://github.com/EmergeTools/emerge-cli
   changelog_uri: https://github.com/EmergeTools/emerge-cli/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -286,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Emerge CLI