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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7240352f4522d685c6f0670e48c823cbe6d9d7fba3f95e8930272e1b1ff1a1e2
-  data.tar.gz: b56940b1a8dd0a072c01120191cb6ca0d274ee55dc2bc5af504fedd17d9bddaf
+  metadata.gz: f173785bd8b4b709b0c35c2c339d576d42ad8874abf0e37237f12b0fa8dd153d
+  data.tar.gz: 924210805c7a4023087882c1645411bb61608f420ae8ade16941e637148aa0c2
 SHA512:
-  metadata.gz: 3bcc0c46ed58cc91527a22ea639c012ee9c1c544a5ad48ce80c27989abf21ce62a6e42621303e1eb47725e2a1d4a9fbd541b02bb0ab4487ae4f25dd9408c693d
-  data.tar.gz: 2645650c173d2bc9ac108d4de1033d3596ba0829599dac6b92da2cde0f6af84df6c2e58259320127ab49fb22fe1c60e6edb6f79132e260dc01f496becd1db247
+  metadata.gz: 4dc311c231af69a08ed89182f7593501576c07b15f7e098250b103108a3f2909f0563fc16b3fe77803937ef504f0eee93854d7597505f6e4c1c0276183e88349
+  data.tar.gz: b56078f2ba98e8a8486043b518f2da121989590f9fd8672c2c216e32f4a2ad0c43689f8ff9216626f39be29501000f049bb5c2c1cc1bdb2681346dd9bb9dacdd

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: arm64-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/arm64-darwin/flyctl
 - 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