fly.io-rails 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e2a638b08c3d778fbdac62956b4730c9436bd133c3cbaedc758f9fd79f7c08
-  data.tar.gz: d1b6bf847c64e993f4b23d1e35fdfc47c94e91d40d3a50aab723c912efda9475
+  metadata.gz: f61848b29215cf3f5b5517b0d60638b3b45994a1cc7372c3bb749e232848bfbc
+  data.tar.gz: d44a9762a24e43be85fa83bb979efcaa5dd1c5f218cd24351d121ee65062e207
 SHA512:
-  metadata.gz: 564d0bc23fa62c2d382ef078395e94bb4c2fb3771913265478d3e3492dfbca9f25cb0fce5b38dd5dcb9d973691fcea2cfc7341fcfc25e036e9abec930e54618f
-  data.tar.gz: 5ddd57513b37cdaaa80ce946b67c4af3614541b71c4b3f9b71554b390fb52d7c8de412a69151d7a514d67bb89a33cf86e613c44f946d10cf2249d83e661ffdcf
+  metadata.gz: 28e0865362aecfd714ffa45fa0a975fe20241b1da9eed606c519ebacc30168e02e3fa8e11a571271b6538a43580829f931e8387e89212d8aeeb8fc506d8f5c43
+  data.tar.gz: bebf94184a390f514e652679cc8ca14bceaf97d7a5cefe70ef6734ada09e3b5706dd0343f8241adfcc73b015ca8cef289bccdafcf5e91c55a8a3d3f07db695d4

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: ruby
 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
@@ -50,6 +50,7 @@ files:
 - Rakefile
 - exe/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