fly.io-rails 0.1.19 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc23fa369a363a787843d3550716ee786faabbbc0f04d44d6d648fc8199242b
-  data.tar.gz: c0def1765381df4dd6940049913c0cff4b27fda258efab192848b9a5ad229f59
+  metadata.gz: 7d44b178e905d455c46dd7b537b594327b4d42c851c7c64fc84683de3f66f8e5
+  data.tar.gz: a8370f586bb8f7fff41794d51b270c2d4d62ba2ad4f849621ed1ff76339d67a2
 SHA512:
-  metadata.gz: c482ea6f86f0b9184a97def4f78f2ea694192261aae93f0105eda54a859578e1d696a47c4ad6fb9d6fbbaf956c58a3a8431492654639f4aab5f8f7db263629bc
-  data.tar.gz: 9c2b5c82abbc06cea0f12e505184d6389de4a40f675d2cd8dca65d5957c3c70b5239de7b9cca4459f885818d5becc973aa9621c4945434407181aaecf9261ba6
+  metadata.gz: 8dfbe824f8a4a8c2b04e9bfaab4257490dc110063240edbd9aba1cc3480978fdd1170c362fcda0ea2dae960c4237a53627f98255088a385d4ff7cb9db5d47b9e
+  data.tar.gz: ada5cac909a279a0aef6d00161690522c306fa1c2b3046fa408645ead53833cdc16364a692bf7055b92797b873b66bc7781f7a09af1d573fa0b2583f0884246f

data/Rakefile

@@ -1,163 +1,3 @@
-# coding: utf-8
-#
-#  Rake tasks to manage native gem packages with flyctl binary executables from github
-#
-#  TL;DR: run "rake package"
-#
-#  The native platform gems (defined by Fly_io::PLATFORMS)
-#  will each contain two files in addition to what the vanilla ruby gem contains:
-#
-#     exe/
-#     ├── flyctl                                 #  generic ruby script to find and run the binary
-#     └── <Gem::Platform architecture name>/
-#         └── flyctl                             #  the flyctl binary executable
-#
-#  The ruby script `exe/flyctl` is installed into the user's path, and it simply locates the
-#  binary and executes it. Note that this script is required because rubygems requires that
-#  executables declared in a gemspec must be Ruby scripts.
-#
-#  As a concrete example, an x86_64-linux system will see these files on disk after installing
-#  fly.io-rails-1.x.x-x86_64-linux.gem:
-#
-#     exe/
-#     ├── flyctl     
-#     └── x86_64-linux/
-#         └── flyctl     
-#
-#  So the full set of gem files created will be:
-#
-#  - pkg/fly.io-rails-1.0.0.gem
-#  - pkg/fly.io-rails-1.0.0-arm64-darwin.gem
-#  - pkg/fly.io-rails-1.0.0-x64-mingw32.gem
-#  - pkg/fly.io-rails-1.0.0-x86_64-darwin.gem
-#  - pkg/fly.io-rails-1.0.0-x86_64-linux.gem
-# 
-#  Note that in addition to the native gems, a vanilla "ruby" gem will also be created without
-#  either the `exe/flyctl` script or a binary executable present.
-#
-#
-#  New rake tasks created:
-#
-#  - rake gem:ruby           # Build the ruby gem
-#  - rake gem:arm64-darwin   # Build the arm64-darwin gem
-#  - rake gem:x64-mingw32    # Build the x64-mingw32 gem
-#  - rake gem:x86_64-darwin  # Build the x86_64-darwin gem
-#  - rake gem:x86_64-linux   # Build the x86_64-linux gem
-#  - rake download           # Download all flyctl binaries
-#
-#  Modified rake tasks:
-#
-#  - rake gem                # Build all the gem files
-#  - rake package            # Build all the gem files (same as `gem`)
-#  - rake repackage          # Force a rebuild of all the gem files
-#
-#  Note also that the binary executables will be lazily downloaded when needed, but you can
-#  explicitly download them with the `rake download` command.
-#
-require "bundler/setup"
 require "bundler/gem_tasks"
-require "rubygems/package_task"
-require 'net/http'
-require 'json'
-require 'stringio'
-require 'zip'
-require_relative 'lib/fly.io-rails/platforms'
 
-task default: :package
-
-FLY_IO_RAILS_GEMSPEC = Bundler.load_gemspec("fly.io-rails.gemspec")
-
-gem_path = Gem::PackageTask.new(FLY_IO_RAILS_GEMSPEC).define
-desc "Build the ruby gem"
-task "gem:ruby" => [gem_path]
-
-def fetch(uri, limit = 10)
-  raise ArgumentError, 'HTTP redirect too deep' unless limit > 0
-  response = Net::HTTP.get_response(URI(uri))
-
-  case response
-  when Net::HTTPSuccess
-    response.body
-  when Net::HTTPRedirection
-    fetch(response['location'], limit - 1)
-  else
-    STDERR.puts 'HTTP Error: ' + response.message.to_s
-    exit 1
-  end
-end
-
-exepaths = []
-uri = 'https://api.github.com/repos/superfly/flyctl/releases/latest'
-release = JSON.parse(fetch(uri))
-
-release['assets'].each do |asset|
-  platform = Fly_io::PLATFORMS[asset['name'][/^flyctl_.*?_(.*?)\./, 1]]
-  next unless platform
-
-  FLY_IO_RAILS_GEMSPEC.dup.tap do |gemspec|
-    exedir = File.join(gemspec.bindir, platform) # "exe/x86_64-linux"
-    exepath = File.join(exedir, "flyctl") # "exe/x86_64-linux/flyctl"
-
-    if asset['name'] =~ /Windows/i
-      exepath += '.exe' 
-      dll = File.join(exedir, 'wintun.dll')
-      gemspec.files << dll
-      file dll => exepath
-    end
-
-    exepaths << exepath
-    gemspec.files << exepath
-
-    # modify a copy of the gemspec to include the native executable
-    gemspec.platform = platform
-
-    # create a package task
-    gem_path = Gem::PackageTask.new(gemspec).define
-    desc "Build the #{platform} gem"
-    task "gem:#{platform}" => [gem_path]
-
-    directory exedir
-    file exepath => [exedir] do
-      release_url = asset['browser_download_url']
-      warn "Downloading #{release_url} ..."
-
-      case File.extname(asset['name'])
-      when '.gz'
-	Zlib::GzipReader.wrap(StringIO.new(fetch(release_url))) do |gz|
-	  Gem::Package::TarReader.new(gz) do |tar|
-	    tar.each do |entry|
-              exepath = File.join(exedir, entry.full_name)
-              File.open(exepath, "wb") do |local|
-                local.write(entry.read)
-              end
-              FileUtils.chmod(0755, exepath, verbose: true)
-	    end
-	  end
-	end
-      when '.zip'
-	Zip::File.open_buffer(fetch(release_url)) do |zip_file|
-	  zip_file.each do |entry|
-            exepath = File.join(exedir, entry.name)
-            STDERR.puts exepath
-            File.open(exepath, "wb") do |local|
-              local.write(zip_file.read(entry.name))
-            end
-	  end
-	end
-      end
-    end
-  end
-end
-
-desc "Download all flyctl binaries"
-task download: exepaths
-
-task package: :download
-
-CLOBBER.add(exepaths.map { |path| File.dirname(path) })
-
-namespace :gem do
-  task :push do
-    sh 'for i in pkg/*.gem; do gem push $i; done'
-  end
-end
+# Run `rake release` to release a new version of the gem.

data/lib/fly.io-rails/scanner.rb

@@ -19,6 +19,10 @@ module Fly
       @anycable = gemfile.include? 'anycable'
       @rmagick = gemfile.include? 'rmagick'
       @bootstrap = gemfile.include? 'bootstrap'
+      @puppeteer = gemfile.include? 'puppeteer'
+
+      package_json = IO.read('package.json') rescue ''
+      @puppeteer ||= package_json.include? 'puppeteer'
 
       @cable = ! Dir['app/channels/*.rb'].empty?
 

data/lib/fly.io-rails/version.rb

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.1.19'
+  VERSION = '0.2.1'
 end

data/lib/generators/templates/Dockerfile.erb

@@ -51,7 +51,13 @@ RUN mkdir -p tmp/pids
 RUN curl https://get.volta.sh | bash
 ENV VOLTA_HOME /root/.volta
 ENV PATH $VOLTA_HOME/bin:/usr/local/bin:$PATH
-RUN volta install node@${NODE_VERSION} yarn@${YARN_VERSION}
+RUN volta install node@${NODE_VERSION} yarn@${YARN_VERSION} && \
+    gem update --system --no-document && \
+    gem install -N bundler -v ${BUNDLER_VERSION}
+
+<% else -%>
+RUN gem update --system --no-document && \
+    gem install -N bundler -v ${BUNDLER_VERSION}
 
 <% end -%>
 #######################################################################
@@ -82,9 +88,6 @@ RUN --mount=type=cache,id=dev-apt-cache,sharing=locked,target=/var/cache/apt \
 
 FROM build_deps as gems
 
-RUN gem update --system --no-document && \
-    gem install -N bundler -v ${BUNDLER_VERSION}
-
 COPY Gemfile* ./
 RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
 
@@ -95,6 +98,10 @@ RUN bundle install &&  rm -rf vendor/bundle/ruby/*/cache
 
 FROM build_deps as node_modules
 
+<% if @puppeteer -%>
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+
+<% end -%>
 COPY package*json ./
 <% if @yarn -%>
 COPY yarn.* ./
@@ -132,6 +139,12 @@ RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl &&
     gpg --dearmor > /etc/apt/trusted.gpg.d/phusion.gpg && \
   sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger bullseye main > /etc/apt/sources.list.d/passenger.list'
 
+<% end -%>
+<% if @puppeteer -%>
+# add google chrome repository
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+ && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
+
 <% end -%>
 <%
   @deploy_packages = %w(file vim curl gzip)
@@ -139,6 +152,7 @@ RUN apt-get install -y dirmngr gnupg apt-transport-https ca-certificates curl &&
   @deploy_packages << 'postgresql-client' if @postgresql
   @deploy_packages << 'libsqlite3-0' if @sqlite3
   @deploy_packages << 'default-mysql-client' if @mysql
+  @deploy_packages << 'google-chrome-stable' if @puppeteer
   @deploy_packages << 'imagemagick' if @rmagick
   @deploy_packages << 'nodejs' if not @node and @bootstrap
   @deploy_packages << 'fuse' if @litefs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.2.1
 platform: ruby
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -54,15 +54,13 @@ dependencies:
         version: '0'
 description:
 email: rubys@intertwingly.net
-executables:
-- flyctl
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - Rakefile
-- exe/flyctl
 - lib/fly.io-rails.rb
 - lib/fly.io-rails/actions.rb
 - lib/fly.io-rails/dsl.rb

data/exe/flyctl

@@ -1,44 +0,0 @@
-#! /usr/bin/env ruby
-# because rubygems shims assume a gem's executables are Ruby
-
-require "fly.io-rails/platforms"
-
-supported_platforms = Fly_io::PLATFORMS.values
-platform = [:cpu, :os].map { |m| Gem::Platform.local.send(m) }.join("-")
-
-if supported_platforms.none? { |supported_platform| Gem::Platform.match(supported_platform) }
-  STDERR.puts(<<~ERRMSG)
-    ERROR: flyctl does not support the #{platform} platform
-  ERRMSG
-  exit 1
-end
-
-exe_path = Dir.glob(File.join(__dir__, "*", "flyctl*")).find do |f|
-  Gem::Platform.match(File.basename(File.dirname(f)))
-end
-if exe_path.nil?
-  STDERR.puts(<<~ERRMSG)
-    ERROR: Cannot find the flyctl executable for #{platform} in #{__dir__}
-    If you're using bundler, please make sure you're on the latest bundler version:
-
-      gem install bundler
-      bundle update --bundler
-
-    Then make sure your lock file includes this platform by running:
-
-      bundle lock --add-platform #{platform}
-      bundle install
-
-    See `bundle lock --help` output for details.
-  ERRMSG
-  exit 1
-end
-
-if Gem.win_platform?
-  # use system rather than exec as exec inexplicably fails to find the executable
-  # on Windows
-  system exe_path, *ARGV
-else
-  # use exec rather than system to avoid creating a new process
-  exec exe_path, *ARGV
-end