s3arch 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51661d90b5b65c15611e53f316b542cb6032dc34007adae6f8ee735baf6f0a3
-  data.tar.gz: cacd1cc9bcab08dcb1bae6dc9e0f757bc7a014a1dc92d907a1e90e7d1e99eab3
+  metadata.gz: 86ab9ff26fb027515006bee668f41d7d5f264fc301110d57f6ac4d365b426588
+  data.tar.gz: bb2a513c4f7252620668c7292357d0e314a60d9efae70738c5ffd127f386d4b2
 SHA512:
-  metadata.gz: c4bafc88643be123cfaf047d245679feae7881a3e2b75b0c8c90c445dc8be01a51be7aabb96d19a0760b47dee9f92f851c5c35f1547e806c9bb0b21a749a4009
-  data.tar.gz: 7b137e16651e582d3b1a4582949133c91b992ea96b98659b11d415410b9bbf20edc5653b0614455c51b6b2f5a019292232fabb0732924e292130d6bfc59aeb8a
+  metadata.gz: 6def4b186fc609041e90c7246d1a9fb0453aeb01ae7c880040d9c8154a94eb514505adeab291191094c8e5e755e9fb753ccf699dd04cabccc672b0c7f74ad4cc
+  data.tar.gz: d1e054232f1d30443340ddd06f2a264458166b030a69b823327f82a61025f4065c000fadba2bbfc82d45949ee69b00e25d5be350d12a09309e4efab133d49503

data/README.md

@@ -145,16 +145,16 @@ S3arch requires the `sqlite3` native extension at runtime. A Rake task is includ
 
 ```bash
 # Build the layer zip (outputs to pkg/sqlite-layer.zip)
-rake lambda:build_layer
+rake s3arch:layer:build
 
 # Build and publish in one step
-rake lambda:publish_layer PROFILE=devzilla
+rake s3arch:layer:publish PROFILE=devzilla
 
 # Customize the build
-rake lambda:build_layer RUBY_VERSION=3.4 ARCHITECTURE=x86_64
+rake s3arch:layer:build RUBY_VERSION=3.4 ARCHITECTURE=x86_64
 
 # Publish to a specific region/account
-rake lambda:publish_layer PROFILE=production REGION=us-west-2 LAYER_NAME=stowzilla-sqlite3-ruby
+rake s3arch:layer:publish PROFILE=production REGION=us-west-2 LAYER_NAME=stowzilla-sqlite3-ruby
 ```
 
 | Environment Variable | Default | Description |
@@ -169,6 +169,21 @@ rake lambda:publish_layer PROFILE=production REGION=us-west-2 LAYER_NAME=stowzil
 
 Requires Docker to be running (uses the official AWS SAM build images).
 
+## Rake Tasks
+
+```bash
+rake s3arch:layer:build    # Build the Lambda layer zip
+rake s3arch:layer:publish  # Build and publish to AWS
+rake s3arch:rebuild        # Rebuild index for an owner (OWNER_ID=xxx)
+rake s3arch:info           # Show config and version info
+```
+
+To make these tasks available in your app, add to your Rakefile:
+
+```ruby
+require 's3arch/tasks'
+```
+
 ## Requirements
 
 - Ruby >= 3.2

data/lib/s3arch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module S3arch
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/tasks/s3arch.rake

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+require_relative '../s3arch/version'
+
+namespace :s3arch do
+  namespace :layer do
+    desc 'Build the Lambda layer zip (defaults: RUBY_VERSION=3.4, ARCHITECTURE=x86_64)'
+    task :build do
+      require 'tmpdir'
+      require 'fileutils'
+
+      ruby_version   = ENV.fetch('RUBY_VERSION', '3.4')
+      architecture   = ENV.fetch('ARCHITECTURE', 'x86_64')
+      output_file    = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
+      s3arch_version = ENV.fetch('S3ARCH_VERSION', "~> #{S3arch::VERSION.sub(/\.\d+$/, '.0')}")
+
+      FileUtils.mkdir_p(File.dirname(output_file))
+
+      puts "🔨 Building Lambda layer (Ruby #{ruby_version} / #{architecture}, s3arch #{s3arch_version})..."
+
+      tmpdir = Dir.mktmpdir('s3arch-layer')
+      begin
+        File.write("#{tmpdir}/Gemfile", <<~GEMFILE)
+          source 'https://rubygems.org'
+          gem 'sqlite3', '~> 2.0'
+          gem 's3arch', '#{s3arch_version}'
+        GEMFILE
+
+        docker_image = "public.ecr.aws/sam/build-ruby#{ruby_version}:latest-#{architecture}"
+        platform = architecture == 'x86_64' ? 'linux/amd64' : 'linux/arm64'
+
+        build_script = <<~BASH
+          yum install -y sqlite-devel 2>/dev/null || dnf install -y sqlite-devel 2>/dev/null
+          bundle config set --local path /build/layer/ruby/gems/#{ruby_version}.0
+          bundle config set --local without "development test"
+          bundle config set --local deployment false
+          bundle install
+          NESTED="/build/layer/ruby/gems/#{ruby_version}.0/ruby/#{ruby_version}.0"
+          if [ -d "$NESTED" ]; then
+            mkdir -p /build/layer-final/ruby/gems/#{ruby_version}.0
+            cp -a "$NESTED"/* /build/layer-final/ruby/gems/#{ruby_version}.0/
+            rm -rf /build/layer
+            mv /build/layer-final /build/layer
+          fi
+        BASH
+
+        docker_cmd = [
+          'docker', 'run', '--rm',
+          '--platform', platform,
+          '-v', "#{tmpdir}:/build",
+          '-w', '/build',
+          docker_image,
+          '/bin/bash', '-c', build_script
+        ]
+
+        puts "🐳 Building in Docker (#{docker_image})..."
+        abort '❌ Docker build failed' unless system(*docker_cmd)
+
+        layer_dir = "#{tmpdir}/layer"
+
+        puts '🧹 Stripping layer...'
+        Dir.glob("#{layer_dir}/ruby/gems/*/gems/*/").each do |gem_dir|
+          %w[spec test tests doc docs examples benchmarks].each do |fat_dir|
+            FileUtils.rm_rf("#{gem_dir}#{fat_dir}")
+          end
+        end
+
+        junk_patterns = %w[
+          *.md *.rdoc *.txt *.c *.h *.o Makefile *.log
+          CHANGELOG* HISTORY* LICENSE* README* .gitignore Rakefile
+        ]
+        junk_patterns.each do |pattern|
+          Dir.glob("#{layer_dir}/**/#{pattern}").each { |f| FileUtils.rm_f(f) }
+        end
+
+        Dir.glob("#{layer_dir}/**/*.so").each do |so|
+          system('strip', '--strip-debug', so, err: File::NULL)
+        end
+
+        sqlite_so = Dir.glob("#{layer_dir}/**/sqlite3_native.so") +
+                    Dir.glob("#{layer_dir}/**/sqlite3.so")
+        abort '❌ sqlite3 native extension NOT found in layer' if sqlite_so.empty?
+        puts '✅ sqlite3 native extension included'
+
+        s3arch_lib = Dir.glob("#{layer_dir}/**/gems/s3arch-*/lib/s3arch.rb")
+        abort '❌ s3arch gem NOT found in layer' if s3arch_lib.empty?
+        puts '✅ s3arch gem included'
+
+        FileUtils.rm_f(output_file)
+        abort '❌ Failed to create zip' unless system('zip', '-qr', output_file, 'ruby/', chdir: layer_dir)
+
+        size = `du -h #{output_file}`.split("\t").first
+        puts "✅ Layer built: #{output_file} (#{size})"
+      ensure
+        system('sudo', 'rm', '-rf', tmpdir) || FileUtils.rm_rf(tmpdir)
+      end
+    end
+
+    desc 'Build and publish the Lambda layer (set AWS_PROFILE, LAYER_NAME=stowzilla-sqlite3-ruby)'
+    task publish: :build do
+      layer_name   = ENV.fetch('LAYER_NAME', 'stowzilla-sqlite3-ruby')
+      ruby_version = ENV.fetch('RUBY_VERSION', '3.4')
+      architecture = ENV.fetch('ARCHITECTURE', 'x86_64')
+      output_file  = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
+
+      abort "❌ Layer zip not found at #{output_file}" unless File.exist?(output_file)
+
+      cmd = %w[aws lambda publish-layer-version]
+      cmd += ['--layer-name', layer_name]
+      cmd += ['--zip-file', "fileb://#{output_file}"]
+      cmd += ['--compatible-runtimes', "ruby#{ruby_version}"]
+      cmd += ['--compatible-architectures', architecture]
+
+      puts "📤 Publishing layer '#{layer_name}'..."
+      puts "   #{cmd.join(' ')}"
+
+      abort '❌ Failed to publish layer' unless system(*cmd)
+
+      puts '✅ Layer published successfully'
+    end
+  end
+
+  desc 'Rebuild the search index for a given owner: rake s3arch:rebuild[owner-123]'
+  task :rebuild, [:owner_id] do |_t, args|
+    require 's3arch'
+
+    owner_id = args.owner_id || ENV.fetch('OWNER_ID', nil)
+    abort '❌ Usage: rake s3arch:rebuild[OWNER_ID]' unless owner_id
+
+    S3arch.configure { |c| c.from_env! }
+
+    puts "🔄 Rebuilding index for #{owner_id}..."
+    S3arch::Indexer.new.rebuild(owner_id)
+    puts '✅ Done'
+  end
+
+  desc 'Show current s3arch configuration and version info'
+  task :info do
+    require 's3arch'
+
+    puts "s3arch #{S3arch::VERSION}"
+    puts ''
+    puts 'Environment:'
+    %w[S3ARCH_SOURCE_TABLE S3ARCH_SOURCE_INDEX S3ARCH_INDEX_BUCKET S3ARCH_VERSION_TABLE].each do |var|
+      puts "  #{var}=#{ENV.fetch(var, '(not set)')}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3arch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adam Dalton
@@ -134,7 +134,7 @@ files:
 - lib/s3arch/tokenizer.rb
 - lib/s3arch/version.rb
 - lib/s3arch/web.rb
-- lib/tasks/lambda_layer.rake
+- lib/tasks/s3arch.rake
 homepage: https://github.com/stowzilla/s3arch
 licenses:
 - MIT

data/lib/tasks/lambda_layer.rake

@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../s3arch/version'
-
-namespace :lambda do
-  desc 'Build the Lambda layer zip (sqlite3 + s3arch) for deployment'
-  task :build_layer do
-    require 'tmpdir'
-    require 'fileutils'
-
-    ruby_version  = ENV.fetch('RUBY_VERSION', '3.4')
-    architecture  = ENV.fetch('ARCHITECTURE', 'x86_64')
-    output_file   = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
-    s3arch_version = ENV.fetch('S3ARCH_VERSION', "~> #{S3arch::VERSION.sub(/\.\d+$/, '.0')}")
-
-    FileUtils.mkdir_p(File.dirname(output_file))
-
-    puts "🔨 Building Lambda layer (Ruby #{ruby_version} / #{architecture}, s3arch #{s3arch_version})..."
-
-    tmpdir = Dir.mktmpdir('s3arch-layer')
-    begin
-      # Write a minimal Gemfile for the layer
-      File.write("#{tmpdir}/Gemfile", <<~GEMFILE)
-        source 'https://rubygems.org'
-        gem 'sqlite3', '~> 2.0'
-        gem 's3arch', '#{s3arch_version}'
-      GEMFILE
-
-      docker_image = "public.ecr.aws/sam/build-ruby#{ruby_version}:latest-#{architecture}"
-      platform = architecture == 'x86_64' ? 'linux/amd64' : 'linux/arm64'
-
-      build_script = <<~BASH
-        yum install -y sqlite-devel 2>/dev/null || dnf install -y sqlite-devel 2>/dev/null
-        bundle config set --local path /build/layer/ruby/gems/#{ruby_version}.0
-        bundle config set --local without "development test"
-        bundle config set --local deployment false
-        bundle install
-        # Flatten bundler's nested ruby/X.Y.0 structure into the layer root
-        NESTED="/build/layer/ruby/gems/#{ruby_version}.0/ruby/#{ruby_version}.0"
-        if [ -d "$NESTED" ]; then
-          mkdir -p /build/layer-final/ruby/gems/#{ruby_version}.0
-          cp -a "$NESTED"/* /build/layer-final/ruby/gems/#{ruby_version}.0/
-          rm -rf /build/layer
-          mv /build/layer-final /build/layer
-        fi
-      BASH
-
-      docker_cmd = [
-        'docker', 'run', '--rm',
-        '--platform', platform,
-        '-v', "#{tmpdir}:/build",
-        '-w', '/build',
-        docker_image,
-        '/bin/bash', '-c', build_script
-      ]
-
-      puts "🐳 Building in Docker (#{docker_image})..."
-      abort '❌ Docker build failed' unless system(*docker_cmd)
-
-      layer_dir = "#{tmpdir}/layer"
-
-      # Strip unnecessary files to reduce layer size
-      puts '🧹 Stripping layer...'
-      Dir.glob("#{layer_dir}/ruby/gems/*/gems/*/").each do |gem_dir|
-        %w[spec test tests doc docs examples benchmarks].each do |fat_dir|
-          FileUtils.rm_rf("#{gem_dir}#{fat_dir}")
-        end
-      end
-
-      junk_patterns = %w[
-        *.md *.rdoc *.txt *.c *.h *.o Makefile *.log
-        CHANGELOG* HISTORY* LICENSE* README* .gitignore Rakefile
-      ]
-      junk_patterns.each do |pattern|
-        Dir.glob("#{layer_dir}/**/#{pattern}").each { |f| FileUtils.rm_f(f) }
-      end
-
-      # Strip debug symbols from shared objects
-      Dir.glob("#{layer_dir}/**/*.so").each do |so|
-        system('strip', '--strip-debug', so, err: File::NULL)
-      end
-
-      # Verify native extension is present
-      sqlite_so = Dir.glob("#{layer_dir}/**/sqlite3_native.so") +
-                  Dir.glob("#{layer_dir}/**/sqlite3.so")
-      abort '❌ sqlite3 native extension NOT found in layer' if sqlite_so.empty?
-      puts '✅ sqlite3 native extension included'
-
-      # Verify s3arch gem is present
-      s3arch_lib = Dir.glob("#{layer_dir}/**/gems/s3arch-*/lib/s3arch.rb")
-      abort '❌ s3arch gem NOT found in layer' if s3arch_lib.empty?
-      puts '✅ s3arch gem included'
-
-      # Package the zip
-      FileUtils.rm_f(output_file)
-      abort '❌ Failed to create zip' unless system('zip', '-qr', output_file, 'ruby/', chdir: layer_dir)
-
-      size = `du -h #{output_file}`.split("\t").first
-      puts "✅ Layer built: #{output_file} (#{size})"
-    ensure
-      # Docker creates files as root; use sudo rm to clean up
-      system('sudo', 'rm', '-rf', tmpdir) || FileUtils.rm_rf(tmpdir)
-    end
-  end
-
-  desc 'Publish the Lambda layer to AWS (set PROFILE and REGION env vars)'
-  task publish_layer: :build_layer do
-    profile       = ENV.fetch('PROFILE', nil)
-    region        = ENV.fetch('REGION', 'us-east-1')
-    layer_name    = ENV.fetch('LAYER_NAME', 'stowzilla-sqlite3-ruby')
-    ruby_version  = ENV.fetch('RUBY_VERSION', '3.4')
-    architecture  = ENV.fetch('ARCHITECTURE', 'x86_64')
-    output_file   = File.expand_path(ENV.fetch('OUTPUT', 'pkg/sqlite-layer.zip'))
-
-    unless File.exist?(output_file)
-      abort "❌ Layer zip not found at #{output_file}. Run `rake lambda:build_layer` first."
-    end
-
-    cmd = %w[aws lambda publish-layer-version]
-    cmd += ['--layer-name', layer_name]
-    cmd += ['--zip-file', "fileb://#{output_file}"]
-    cmd += ['--compatible-runtimes', "ruby#{ruby_version}"]
-    cmd += ['--compatible-architectures', architecture]
-    cmd += ['--region', region]
-    cmd += ['--profile', profile] if profile
-
-    puts "📤 Publishing layer '#{layer_name}' to #{region}..."
-    puts "   #{cmd.join(' ')}"
-
-    abort '❌ Failed to publish layer' unless system(*cmd)
-
-    puts '✅ Layer published successfully'
-  end
-end