fluent-tools 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807b6f8dbd3ccbbb76cbb8420d6093b250e88608a8a90c8fb0eda55f87bbf22c
-  data.tar.gz: 0533e6d8cfd25c021486c0b56931843347adb96fdb6b8ae3ba28021db8596547
+  metadata.gz: 7e2523a45a7bf0056d60edc34bea0f532ea2e0ccffd01bfd4b040dff9f84d2f5
+  data.tar.gz: 7d4fa4525e8354ebee03b7f45159453ddfd083440fd3b4c1610ec49e9e827539
 SHA512:
-  metadata.gz: 4a538a4801bfab70efc3635c2f6bc492ff866cac46222291b59fa8893fbfeaef225dc60e64e5503c556d41d12ef1c2e890117704e480b0b69cb971b6df28011a
-  data.tar.gz: bafabd8faabf050e41ce921ea69e9c6a5d3e950c0006ef3c50a1cb1c78112cac68d1ae4f3829c3bf380309ffbf114bdf3e6da10f542780dd1be9bfbbe829db0f
+  metadata.gz: 9c58f2118b25682e51d87ad35e1c2fdacf340437ccbcf7c17775b58ce6f32556d90bf9b4897c600b9a2aa9439a6135abd876eefa1dd4317a316af6f859a0a041
+  data.tar.gz: 1ada088241995965c30c6a2219e36e6ee9972f52a1daf721685e44ec5f8768a30bf6e5a8f232e4818f1d39c49795bedbb892aa82cef614c398d62613e2b4dffa

data/ext/fluent_tools/extconf.rb

@@ -30,11 +30,8 @@ MAKEFILE
 
 File.write('Makefile', makefile_content)
 
-unless success
-  puts '❌ Installation failed - binary could not be installed'
-  puts 'This may still work if the binary becomes available at runtime'
-  puts 'or if you build it manually using: rake build_rust'
-  exit 1
+if success
+  puts '✅ Installation complete'
+else
+  puts 'ℹ️ Installation complete - binary couldn\'t be downloaded but will be resolved at runtime'
 end
-
-puts '✅ Extension configuration complete'

data/installer.rb

@@ -13,7 +13,7 @@ require 'pathname'
 require_relative 'lib/fluent_tools/utils'
 
 # Installer for fluent-rust-tools gem
-# Downloads pre-built binaries or builds from source
+# Downloads pre-built binaries
 class FluentToolsInstaller
   include FluentTools::Utils::Logger
 
@@ -22,6 +22,7 @@ class FluentToolsInstaller
   end
 
   # Main installation method
+  # rubocop:disable Naming/PredicateMethod
   def install!
     log_info "🚀 Installing #{FluentTools::Utils::BINARY_NAME}#{" `#{@version}`" if @version}..."
 
@@ -33,14 +34,17 @@ class FluentToolsInstaller
         log_success 'Installation complete using pre-built binary!'
         true
       else
-        log_warning 'Pre-built binary not available, falling back to compilation...'
-        build_binary_from_source
+        log_error 'Pre-built binary not available for this platform/version'
+        log_error "Please check available releases at: https://github.com/#{FluentTools::Utils::REPO_OWNER}/#{FluentTools::Utils::REPO_NAME}/releases"
+        false
       end
     else
-      log_warning "Platform #{RUBY_PLATFORM} not supported for pre-built binaries"
-      build_binary_from_source
+      log_error "Platform #{RUBY_PLATFORM} not supported"
+      log_error "Please check available releases at: https://github.com/#{FluentTools::Utils::REPO_OWNER}/#{FluentTools::Utils::REPO_NAME}/releases"
+      false
     end
   end
+  # rubocop:enable Naming/PredicateMethod
 
   private
 
@@ -127,7 +131,7 @@ class FluentToolsInstaller
   end
 
   def install_binary(binary_data, platform)
-    install_dir = determine_install_dir
+    install_dir = FluentTools::Utils.determine_install_dir
     FileUtils.mkdir_p(install_dir)
 
     binary_extension = FluentTools::Utils.binary_extension(platform)
@@ -146,67 +150,4 @@ class FluentToolsInstaller
     log_info "✅ Binary installed successfully (#{File.size(binary_path)} bytes)"
     @binary_path = binary_path
   end
-
-  # rubocop:disable Naming/PredicateMethod
-  def build_binary_from_source
-    log_info '🔨 Building from source...'
-
-    # Find project root (where Cargo.toml and Makefile are)
-    project_root = find_project_root
-    unless project_root
-      log_error 'Could not find project root (Cargo.toml)'
-      return false
-    end
-
-    # Use Makefile to build the binary
-    Dir.chdir(project_root) do
-      unless system('make build_native')
-        log_error 'Failed to build Rust binary using Makefile'
-        return false
-      end
-    end
-
-    # Copy binary to install location
-    copy_built_binary(project_root)
-    log_success 'Binary built and installed successfully!'
-
-    true
-  end
-  # rubocop:enable Naming/PredicateMethod
-
-  def find_project_root
-    Pathname.pwd.ascend do |dir|
-      return dir.to_s if File.exist?(File.join(dir, 'Cargo.toml'))
-    end
-    nil
-  end
-
-  def copy_built_binary(project_root)
-    install_dir = determine_install_dir
-    FileUtils.mkdir_p(install_dir)
-
-    binary_extension = FluentTools::Utils.binary_extension
-    source_binary = File.join(project_root, 'target', 'release', "#{FluentTools::Utils::BINARY_NAME}#{binary_extension}")
-    dest_binary = File.join(install_dir, "#{FluentTools::Utils::BINARY_NAME}#{binary_extension}")
-
-    raise "Built binary not found at #{source_binary}" unless File.exist?(source_binary)
-
-    FileUtils.cp(source_binary, dest_binary)
-    @binary_path = dest_binary
-  end
-
-  def determine_install_dir
-    # First check if we're in the development context (has Cargo.toml in parent dirs)
-    project_root = find_project_root
-    if project_root
-      # Development context - put in ruby/bin relative to project root
-      File.join(project_root, 'ruby', 'bin')
-    else
-      # We're in a gem installation context - create bin directory in current gem location
-      current_dir = File.expand_path('..', __dir__)
-      bin_dir = File.join(current_dir, 'bin')
-      FileUtils.mkdir_p(bin_dir)
-      bin_dir
-    end
-  end
 end

data/lib/fluent_tools/command_executor.rb

@@ -59,16 +59,7 @@ module FluentTools
       gem_binary = File.join(__dir__, '..', '..', 'bin', binary_name)
       return gem_binary if File.executable?(gem_binary)
 
-      # 2. Development context
-      if development_context?
-        dev_binary = File.join(project_root, 'target', 'release', binary_name)
-        return dev_binary if File.executable?(dev_binary)
-
-        ruby_binary = File.join(project_root, 'ruby', 'bin', binary_name)
-        return ruby_binary if File.executable?(ruby_binary)
-      end
-
-      # 3. System PATH
+      # 2. System PATH
       system_binary = `which #{binary_name} 2>/dev/null`.strip
       return system_binary unless system_binary.empty?
 
@@ -76,21 +67,6 @@ module FluentTools
       gem_binary
     end
 
-    def development_context?
-      !project_root.nil?
-    end
-
-    def project_root
-      @project_root ||= find_project_root
-    end
-
-    def find_project_root
-      Pathname.new(__dir__).ascend do |dir|
-        return dir.to_s if File.exist?(File.join(dir, 'Cargo.toml'))
-      end
-      nil
-    end
-
     def validate_input_file!(path)
       return if File.exist?(path)
 

data/lib/fluent_tools/utils.rb

@@ -81,6 +81,13 @@ module FluentTools
       PLATFORM_RUST_TARGETS[platform]
     end
 
+    def self.determine_install_dir
+      root_gem_dir = File.join(__dir__, '..', '..')
+      bin_dir = File.join(root_gem_dir, 'bin')
+      FileUtils.mkdir_p(bin_dir)
+      bin_dir
+    end
+
     # Logger mixin to provide consistent logging across tools
     module Logger
       def log_info(message, verbose: true)

data/lib/fluent_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FluentTools
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Automattic
@@ -28,30 +28,30 @@ dependencies:
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description: A Ruby gem that wraps a Rust CLI tool for converting between Mozilla's
   Fluent localization format and other formats like Android XML string resources and
   GNU gettext PO files
@@ -80,10 +80,13 @@ metadata:
   source_code_uri: https://github.com/Automattic/fluent-rust-tools
   changelog_uri: https://github.com/Automattic/fluent-rust-tools/blob/main/CHANGELOG.md
 post_install_message: |
-  This fluent-tools gem will try to use a pre-built binary for your platform.
-  If unavailable, it will compile the Rust binary during installation.
+  ✅ fluent-tools installed successfully!
+
+  This gem will automatically try to download pre-built binaries for your platform.
+  If a pre-built binary is not available, you can checkout the project and build one manually using:
+    cd ruby && bundle exec rake build_rust
 
-  If compilation is needed, make sure you have Rust installed: https://rustup.rs/
+  For more information: https://github.com/Automattic/fluent-rust-tools
 rdoc_options: []
 require_paths:
 - lib