fly.io-rails 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091df3ce45d486651daa4c683f833bf32a70125a00864d8d35cf83aeff979bf8'
-  data.tar.gz: bb2d0a59197a4a9731ed03367a81cccafe2f770a7949e49b2ae744db9cec5647
+  metadata.gz: c3e2cb915aae5b7e8d4d2cd96fc2461e814817793b67933ac50997f4f98fdfd0
+  data.tar.gz: b8671505b05fa89a22b0340054d7c691a0a836cc4206b416b69f77cbc76a241e
 SHA512:
-  metadata.gz: b30322c1952953f68d2edf9d5ad85d333c7d71e956ff8a0f41c7e06c8b301f19610f915470d9ef0a4b665e31703714d93478bf2884d65a818c11adbda1bda7b4
-  data.tar.gz: b4ac51e241cbbdf226013d2421a44b0fae3d532e04ccd6f0b4fd5b870780aff55671b44d2d7fd11abe09fd7ada1f00973409d18d646d4640ba3f862b1185b1b4
+  metadata.gz: debc5c5ec2c92168e7a0ab10ea3a2dd5a574ddce0687cf505dcd393dbed3a014462d001ed35e05c8664c3eab3f61d3b4f0110f75a89aa817d5830ce93bd5886e
+  data.tar.gz: c3ef5f38213186776cfe5aa67f3fe0d1c32f7254de36794277efddfe5bc03a4d52817bb5ed9c424e40095581ab0864548d002adcbb734ebfdd52e0450ff62565

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

@@ -16,13 +16,13 @@ module Fly
     include Fly::Scanner
     attr_accessor :options
 
-    def initialize(app, options={})
+    def initialize(app=nil, options={})
       # placate thor
       @options = {}
       @destination_stack = [Dir.pwd]
 
       # extract options
-      self.app = app
+      app ? self.app = app : app = self.app
       regions = options[:region]&.flatten || []
       @avahi = options[:avahi]
       @litefs = options[:litefs]

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

@@ -0,0 +1,41 @@
+$:.unshift File.expand_path('lib')
+require 'fly.io-rails/actions'
+
+require 'bundler'
+require 'pp'
+
+def check_git
+  return if Dir.exist? '/srv/fly.io-rails/lib'
+
+  spec = Bundler::Definition.build('Gemfile', nil, []).dependencies.
+  find {|spec| spec.name == 'fly.io-rails'}
+
+  if spec.git
+    if `which git`.empty? and File.exist? '/etc/debian_version'
+      system 'apt-get update'
+      system 'apt-get install -y git'
+    end
+
+    system `git clone --depth 1 #{spec.git} /srv/fly.io-rails`
+    exit 1 unless Dir.exist? '/srv/fly.io-rails/lib'
+    exec "ruby -r /srv/fly.io-rails/deploy -e #{caller_locations(1,1)[0].label}"
+  end
+end
+
+def dump_config
+  action = Fly::Actions.new
+
+  config = {}
+  action.instance_variables.sort.each do |name|
+    config[name] = action.instance_variable_get(name)
+  end
+
+  File.open('/srv/config', 'w') {|file| PP.pp(config, file)}
+end
+
+def build_gems
+  check_git
+  dump_config
+
+  system 'rake -f lib/tasks/fly.rake fly:build_gems'
+end

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

@@ -1,10 +1,26 @@
 module Fly
   module DSL
     class Base
+      @@blocks = {}
+
       def initialize
         @value = {}
       end
 
+      def self.block name, kind
+        @@blocks[name] = kind
+
+        define_method name do |&block| 
+          @config[name] ||= kind.new
+          @config[name].instance_eval(&block) if block
+          @config[name]
+        end
+      end
+      
+      def self.blocks
+        @@blocks
+      end
+
       def self.option name, default=nil
         @options ||= {}
         @options[name] = default
@@ -47,33 +63,23 @@ module Fly
       option :size, 3
     end
 
+    class Deploy < Base
+      option :swap_mb, 0
+    end
+
     #############################################################
 
-    class Config
-      @@blocks = {}
+    class Config < Base
 
       def initialize
         @config = {}
       end
 
-      def self.block name, kind
-        @@blocks[name] = kind
-
-        define_method name do |&block| 
-          @config[name] ||= kind.new
-          @config[name].instance_eval(&block) if block
-          @config[name]
-        end
-      end
-
-      def self.blocks
-        @@blocks
-      end
-
       block :machine, Machine
       block :postgres, Postgres
       block :redis, Redis
       block :sqlite3, Sqlite3
+      block :deploy, Deploy
     end
   end
 end

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/generators/fly/config_generator.rb

@@ -0,0 +1,19 @@
+require 'fly.io-rails/actions'
+
+module Fly::Generators
+class ConfigGenerator < Rails::Generators::Base
+  include FlyIoRails::Utils
+
+  # despite its name, this is a debug tool that will dump the config
+  def generate_config
+    action = Fly::Actions.new(@app, options)
+
+    config = {}
+    action.instance_variables.sort.each do |name|
+      config[name] = action.instance_variable_get(name)
+    end
+
+    pp config
+  end
+end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sam Ruby
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: rubys@intertwingly.net
 executables: []
 extensions: []
@@ -63,6 +63,7 @@ files:
 - Rakefile
 - lib/fly.io-rails.rb
 - lib/fly.io-rails/actions.rb
+- lib/fly.io-rails/deploy.rb
 - lib/fly.io-rails/dsl.rb
 - lib/fly.io-rails/generators.rb
 - lib/fly.io-rails/hcl.rb
@@ -72,6 +73,7 @@ files:
 - lib/fly.io-rails/utils.rb
 - lib/fly.io-rails/version.rb
 - lib/generators/fly/app_generator.rb
+- lib/generators/fly/config_generator.rb
 - lib/generators/fly/terraform_generator.rb
 - lib/generators/templates/Dockerfile.erb
 - lib/generators/templates/Procfile.fly.erb
@@ -91,7 +93,7 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/rubys/fly.io-rails
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: Rails support for Fly-io
 test_files: []