fly.io-rails 0.0.20-x86_64-darwin → 0.0.21-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7dcc8e3cb676412613e409cab2e30faea300a076d94e2111d072055ecf68c8
-  data.tar.gz: 341bddcd7a49739441f9d8c84f07417740c913f9870b4ad3b01f93ac8547f7d5
+  metadata.gz: 0a35e68f864cb8eb348f8a184892d149403d910885f29942931b48cf7ae47644
+  data.tar.gz: 5bf6ace934393ce8d72f7eaa1d809f9d0b69ce9adfbc7a6881f7064679ef8cc0
 SHA512:
-  metadata.gz: 1248898f8d43835025988a9c6f78dfa8ef64d744e60c75e68d120490e68f1af8673296807b1afd59d976f857a09a878347568bf22b7e443d01dce4113d57e504
-  data.tar.gz: fae2ff3b054f8ad1fdff4a9223fbfb3107bbc0489f35f036d6bd2947c6ffa2e869f00986726e4cfbd195f03f93d70be070a793510bdfcc7fc2fc907d68ad0c29
+  metadata.gz: d2331e7f919f067d6b3fc6db4868a8f008d48474cd3c6b8fd59b5efaf6ad8d07d2d9268c8d008865c776ce8d6012d4ae59f72533a3439a2d40a39b9e5bcdf438
+  data.tar.gz: 7df414483fbe09f5f6869d12164c67de011d28df23b819bf63433a7ecaf15b2d34be6639e72a21a4ed3802f1481d93d13b79644f08329da7ed92c0113e92c343

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_64-darwin
 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_64-darwin/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