fly.io-rails 0.0.20-x86-linux → 0.0.21-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fd2964fbab010ec3244d90a6430bc404613ea7607f40f4de64edea4f88744fb
-  data.tar.gz: 7238b56eb85b12f7284a29b61fa3cfe34717cc8ad06ebc32f826c202d1b22e46
+  metadata.gz: 7fcef8814fc0d4f7cc5df0f6a1efbf60264939d1a7348061b762cbc12b5e70ff
+  data.tar.gz: 2f472a0b9bace6d29a45c825e65fd7fb7507c860fc876dfa0f25b5a15abb8c00
 SHA512:
-  metadata.gz: e403ed878b80fb6b5331713306273234178189b270add51920662e7dd86a990c9a18b9a89422f689dd1398d8968081a9d5719ad220c7a7d58eaa62fc2a629c30
-  data.tar.gz: 1c0b1dce5ec790488c12144f3fda0290376aa311b4d6247736a402c0f61957bdf770eccc0f5711d0e95149b83cf98f2c9614016b70ef91d23bd44e8ef30e7d85
+  metadata.gz: b21ea3f0fa7440776e6a891384fdff8347b89ae2c10e8ce77b272ad6f71ce570ee8b2847054d0ab850227c9de75e637921f1905345e4640b944771df97b5b043
+  data.tar.gz: e14291186d1ddd6a054dacf5846157bbf6dbe2ff5dde410c698ffde0b80e1c01bc8b88334f5829dab5a3b9e482acbdf820a0c3b9a15cac5b3f242bb4c80658ac

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

@@ -0,0 +1,66 @@
+require 'thor'
+require 'active_support'
+require 'active_support/core_ext/string/inflections'
+require 'fly.io-rails/machines'
+
+module Fly
+  class Actions < Thor::Group
+    include Thor::Actions
+    include Thor::Base
+    attr_accessor :options
+
+    def initialize(app = nil)
+      self.app = app if app
+
+      @ruby_version = RUBY_VERSION
+      @bundler_version = Bundler::VERSION
+      @node = File.exist? 'node_modules'
+      @yarn = File.exist? 'yarn.lock'
+      @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
+      @org = Fly::Machines.org
+      @regions = []
+
+      @options = {}
+      @destination_stack = [Dir.pwd]
+    end
+
+    def app
+      return @app if @app
+      self.app = TOML.load_file('fly.toml')['app']
+    end
+
+    def app=(app)
+      @app = app
+      @appName = @app.gsub('-', '_').camelcase(:lower)
+    end
+
+    source_paths.push File::expand_path('../generators/templates', __dir__)
+
+    def generate_dockerfile
+      app
+      template 'Dockerfile.erb', 'Dockerfile'
+    end
+
+    def generate_dockerignore
+      app
+      template 'dockerignore.erb', '.dockerignore'
+    end
+
+    def generate_terraform
+      app
+      template 'main.tf.erb', 'main.tf'
+    end
+
+    def generate_raketask
+      app
+      template 'fly.rake.erb', 'lib/tasks/fly.rake'
+    end
+
+    def generate_all
+      generate_dockerfile
+      generate_dockerignore
+      generate_terraform
+      generate_raketask
+    end
+  end
+end

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

@@ -1,3 +1,3 @@
 module Fly_io
-  VERSION = '0.0.20'
+  VERSION = '0.0.21'
 end

data/lib/generators/terraform_generator.rb

@@ -1,5 +1,5 @@
 require 'open3'
-require 'fly.io-rails/machines'
+require 'fly.io-rails/actions'
 
 class TerraformGenerator < Rails::Generators::Base
   include FlyIoRails::Utils
@@ -30,18 +30,8 @@ class TerraformGenerator < Rails::Generators::Base
       @regions = options[:regions].flatten
     end
 
-    @ruby_version = RUBY_VERSION
-    @bundler_version = Bundler::VERSION
-    @node = File.exist? 'node_modules'
-    @yarn = File.exist? 'yarn.lock'
-    @node_version = @node ? `node --version`.chomp.sub(/^v/, '') : '16.17.0'
-    @appName = @app.gsub('-', '_').camelcase(:lower)
-    @org = Fly::Machines.org
-
-    template 'Dockerfile.erb', 'Dockerfile'
-    template 'dockerignore.erb', '.dockerignore'
-    template 'main.tf.erb', 'main.tf'
-    template 'fly.rake.erb', 'lib/tasks/fly.rake'
+    action = Fly::Actions.new(@app)
+    action.generate_all
 
     credentials = nil
     if File.exist? 'config/credentials/production.key'
@@ -60,4 +50,3 @@ class TerraformGenerator < Rails::Generators::Base
     tee 'terraform init'
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fly.io-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: x86-linux
 authors:
 - Sam Ruby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fly-ruby
@@ -51,6 +51,7 @@ files:
 - exe/flyctl
 - exe/x86-linux/flyctl
 - lib/fly.io-rails.rb
+- lib/fly.io-rails/actions.rb
 - lib/fly.io-rails/generators.rb
 - lib/fly.io-rails/hcl.rb
 - lib/fly.io-rails/machines.rb