deployless 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab6d3d445d5d9e5cff066a80cbdfb755223a78213501c7c8d5298a6de4ca770
-  data.tar.gz: c8cd0548721f23df5816c120d2c4aa5e9f7d04181efced5e2eb51fde483e5687
+  metadata.gz: 0e90092e1f7b282631146db071f6f160f6710b9c9d5e0c0e91a2f4d8c213a2af
+  data.tar.gz: 43f10ccfb7c4c22c391a72006f4c7a034b43f0b1716a1c65afa064e72ae0d138
 SHA512:
-  metadata.gz: b230388676174384f56d044272b83eaa32b0bd2600224a2997ea3d632aa2fcd7b2265dcfe6318682812772612a7aacc923a991f944646a2242cdaf2a3f60ff80
-  data.tar.gz: e1d73bacec3fa78d4494a96a616f1dac3d8e84c663bf1b5926f5168a7a893109176b11cfa310a8451305dd2df24474318ad01963ceb9885355cf4494b7b14a31
+  metadata.gz: b630343cce61bb6a67f1429701e22fbaf92df7d73057f268a87eb9186189aabf77e2f1b5fbe00b6e11f9af2864e70cfa4a92e2e50b2992dafad8bfc6f33e8e1e
+  data.tar.gz: acfb13ca4f5040f3a44c776cd9370d42e995b156851230020d9810ae4f58e7eefb0e2c043a209c54b734466fd18f13b7b2a15a561b1eb1e04961a96db3a2398d

data/bin/dpls

@@ -1,10 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'tty-option'
-require 'tty-prompt'
-require 'tty-file'
-require 'yaml'
-
 require_relative '../lib/deployless'
 
 class Command
@@ -13,6 +8,10 @@ class Command
   argument :command do
     desc "The command to run"
   end
+
+  argument :task do
+    desc "The task to run"
+  end
 end
 
 command = Command.new
@@ -21,41 +20,69 @@ command.parse(ARGV)
 case command.params['command']
 when 'init'
   prompt = TTY::Prompt.new
-  result = prompt.collect do
+  configuration = prompt.collect do
     key(:deployment_setup).enum_select("Deployment setup:", ["Dokku"], required: true)
     key(:background_job_processor).enum_select("Background job processor:", ["None", "Sidekiq"], required: true)
-    key(:production_server_ip).ask("Production server IP:", required: true)
-    key(:production_server_username).ask("Production server username:", required: true, default: 'ubuntu')
-    key(:ssh_key_path).ask("SSH key path:", required: true, default: '~/.ssh/id_rsa')
-    key(:email).ask("Email:", required: true)
     key(:app_name).ask("Application name:", required: true)
-    key(:domain).ask("Domain:", required: true)
+    key(:support_for_staging_environment).enum_select("Support for staging environment?:", ["Yes", "No"], required: true)
   end
 
-  TTY::File.create_file('.deployless.yml', result.to_yaml)
-  TTY::File.safe_append_to_file(".gitignore", ".deployless.yml")
-when 'prepare'
-  prompt = TTY::Prompt.new
-  config = YAML.load_file('.deployless.yml')
-  dokku = ::Deployless::Dokku.new(config)
-  dokku.configure
-  dokku.install
-  dokku.add_ssh_key
-  dokku.create_app
-  dokku.set_initial_environment_variables
-  dokku.install_postgres
-  result = "No"
-
-  while result == "No"
-    result = prompt.enum_select("Add DNS record for the domain #{config.fetch(:domain)} - type: A, value: #{config.fetch(:production_server_ip)}. Is it done?", ["Yes", "No"], required: true)
-    if result == "No"
-      puts "Please add DNS record for the domain #{config.fetch(:domain)} - type: A, value: #{config.fetch(:production_server_ip)} and confirm when done."
+  environments = %i[production]
+  environments << :staging if configuration.fetch(:support_for_staging_environment) == 'Yes'
+
+  environments.each do |environment|
+    puts "Configuring #{environment} environment"
+    configuration[environment] = prompt.collect do
+      key(:server_ip).ask("Server IP:", required: true)
+      key(:ssh_key_path).ask("SSH key path:", required: true, default: '~/.ssh/id_rsa')
+      key(:server_username).ask("Server username:", required: true, default: 'ubuntu')
+      key(:email).ask("Email:", required: true)
+      key(:domain).ask("Domain:", required: true)
     end
+
+    configuration[environment][:environment_variables] = {
+      secret_key_base: SecureRandom.hex(64),
+      rails_env: environment,
+      rake_env: environment,
+      rails_log_to_stdout: 'enabled',
+      rails_serve_static_files: 'enabled'
+    }
   end
 
-  dokku.configure_domain
-  dokku.configure_ssl
-  dokku.print_instructions
+  TTY::File.create_file('.deployless.yml', configuration.to_yaml)
+  TTY::File.safe_append_to_file(".gitignore", ".deployless.yml")
+when 'production', 'staging'
+  case command.params['task']
+  when 'console'
+    config = YAML.load_file('.deployless.yml')
+    raise ArgumentError, "Environment #{command.params['command']} is not configured" if config[command.params['command'].to_sym].nil?
+
+    provider = ::Deployless::Providers::DokkuProvider.new(
+      config: config,
+      environment: command.params['command']
+    )
+    provider.run_console
+  when 'prepare'
+    config = YAML.load_file('.deployless.yml')
+    raise ArgumentError, "Environment #{command.params['command']} is not configured" if config[command.params['command'].to_sym].nil?
+
+    provider = ::Deployless::Providers::DokkuProvider.new(
+      config: config,
+      environment: command.params['command']
+    )
+    provider.configure_environment
+  when 'update-env'
+    config = YAML.load_file('.deployless.yml')
+    raise ArgumentError, "Environment #{command.params['command']} is not configured" if config[command.params['command'].to_sym].nil?
+
+    provider = ::Deployless::Providers::DokkuProvider.new(
+      config: config,
+      environment: command.params['command']
+    )
+    provider.update_environment_variables
+  else
+    puts 'Unknown task'
+  end
 else
   puts 'Unknown command'
 end

data/lib/deployless/providers/dokku_provider.rb

@@ -0,0 +1,186 @@
+require 'sshkit'
+require 'sshkit/dsl'
+require 'securerandom'
+
+module Deployless
+  module Providers
+    class DokkuProvider
+      include SSHKit::DSL
+
+      AppAlreadyExists = Class.new(StandardError)
+
+      VERSION = '0.35.12'
+
+      def initialize(config:, environment:)
+        @config = config
+        @environment = environment
+        configure
+      end
+
+      def run_console
+        server_ip = env_config.fetch(:server_ip)
+  
+        puts "Connecting to #{@environment} rails console..."
+        system("ssh -t dokku@#{server_ip} enter #{app_name} web rails c")
+      end
+
+      def configure_environment
+        install
+        add_ssh_key
+        create_app
+        update_environment_variables
+        install_postgres
+        install_redis if @config.fetch(:background_job_processor) == 'Sidekiq'
+
+        result = "No"
+        prompt = TTY::Prompt.new
+
+        while result == "No"
+          result = prompt.enum_select("Add DNS record for the domain #{env_config.fetch(:domain)} - type: A, value: #{env_config.fetch(:server_ip)}. Is it done?", ["Yes", "No"], required: true)
+          if result == "No"
+            puts "Please add DNS record for the domain #{env_config.fetch(:domain)} - type: A, value: #{env_config.fetch(:server_ip)} and confirm when done."
+          end
+        end
+
+        configure_domain
+        configure_ssl
+        print_instructions
+      end
+
+      def update_environment_variables
+        environment_variables = env_config.fetch(:environment_variables)
+  
+        app = app_name
+        on [env_config.fetch(:server_ip)] do |host|
+          execute :dokku, 'config:set', app, environment_variables.map { |key, value| "#{key.to_s.upcase}=#{value}" }.join(' ')
+        end
+      end
+
+      private
+
+      def configure
+        SSHKit::Backend::Netssh.configure do |ssh|
+          ssh.connection_timeout = 30
+          ssh.ssh_options = {
+            user: env_config.fetch(:server_username),
+            keys: [env_config.fetch(:ssh_key_path)], # Fixed array syntax for keys
+            forward_agent: false,
+            auth_methods: %w(publickey password keyboard-interactive) # Added additional auth methods
+          }
+        end
+      end
+  
+      def install
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test "dokku"
+            execute :wget, '-NP', '.', 'https://dokku.com/bootstrap.sh'
+            execute :sudo, "DOKKU_TAG=#{VERSION}", 'bash', 'bootstrap.sh'
+          end
+        end
+      end
+  
+      def add_ssh_key
+        public_key = File.read(File.expand_path(env_config.fetch(:ssh_key_path) + '.pub'))
+  
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test :dokku, 'ssh-keys:list', 'admin'
+            execute "echo '#{public_key}' | sudo dokku ssh-keys:add admin"
+          end
+        end
+      end
+  
+      def create_app
+        app = app_name
+        on [env_config.fetch(:server_ip)] do |host|
+          if test :dokku, 'apps:exists', app
+            raise AppAlreadyExists, "App #{app} is already created"
+          else
+            execute :dokku, 'apps:create', app
+          end
+        end
+      end
+  
+      def install_postgres
+        app = app_name
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test :dokku, 'postgres'
+            execute :sudo, 'dokku', 'plugin:install', 'https://github.com/dokku/dokku-postgres.git'
+          end
+  
+          unless test :dokku, 'postgres:exists', "#{app}-db"
+            execute :dokku, 'postgres:create', "#{app}-db"
+          end
+  
+          unless test :dokku, 'postgres:linked', "#{app}-db", app
+            execute :dokku, 'postgres:link', "#{app}-db", app
+          end
+        end
+      end
+
+      def install_redis
+        app = app_name
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test :dokku, 'redis'
+            execute :sudo, 'dokku', 'plugin:install', 'https://github.com/dokku/dokku-redis.git'
+          end
+  
+          unless test :dokku, 'redis:exists', "#{app}-redis"
+            execute :dokku, 'redis:create', "#{app}-redis"
+          end
+  
+          unless test :dokku, 'redis:linked', "#{app}-redis", app
+            execute :dokku, 'redis:link', "#{app}-redis", app
+          end
+        end
+      end
+  
+      def configure_domain
+        domain = env_config.fetch(:domain)
+        app = app_name
+  
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test("dokku domains:report #{app} | grep #{domain}")
+            execute :dokku, 'domains:clear-global'
+            execute :dokku, 'domains:clear', app
+            execute :dokku, 'domains:add', app, domain
+          end
+        end
+      end
+  
+      def configure_ssl
+        email = env_config.fetch(:email)
+        app = app_name
+  
+        on [env_config.fetch(:server_ip)] do |host|
+          unless test :dokku, 'letsencrypt'
+            execute :sudo, 'dokku', 'plugin:install', 'https://github.com/dokku/dokku-letsencrypt.git'
+          end
+  
+          unless test("dokku letsencrypt:list | grep #{app}")
+            execute :dokku, 'letsencrypt:set', app, 'email', email
+            execute :dokku, 'letsencrypt:enable', app
+          end
+        end
+      end
+  
+      def print_instructions
+        puts "Configure deployment by adding git remote:"
+        puts "git remote add dokku dokku@#{env_config.fetch(:server_ip)}:#{app_name}"
+        puts "Then you can deploy by running:"
+        puts "git push dokku main"
+      end
+
+      def env_config
+        @config.fetch(@environment.to_sym)
+      end
+
+      def app_name
+        if @environment == 'production'
+          @config.fetch(:app_name)
+        else
+          "#{@config.fetch(:app_name)}-#{@environment}"
+        end
+      end
+    end
+  end
+end

data/lib/deployless/version.rb

@@ -3,7 +3,8 @@ module Deployless
     module_function
 
     def to_s
-      '0.0.2'
+      '0.0.4'
     end
   end
 end
+

data/lib/deployless.rb

@@ -1 +1,6 @@
-require_relative 'deployless/dokku'
+require 'tty-option'
+require 'tty-prompt'
+require 'tty-file'
+require 'yaml'
+
+require_relative 'deployless/providers/dokku_provider'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployless
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Paweł Dąbrowski
@@ -109,7 +109,7 @@ extra_rdoc_files: []
 files:
 - bin/dpls
 - lib/deployless.rb
-- lib/deployless/dokku.rb
+- lib/deployless/providers/dokku_provider.rb
 - lib/deployless/version.rb
 homepage: https://github.com/impactahead/deployless
 licenses:

data/lib/deployless/dokku.rb

@@ -1,104 +0,0 @@
-require 'sshkit'
-require 'sshkit/dsl'
-require 'securerandom'
-
-module Deployless
-  class Dokku
-    include SSHKit::DSL
-
-    def initialize(config)
-      @config = config
-    end
-
-    def configure
-      SSHKit::Backend::Netssh.configure do |ssh|
-        ssh.connection_timeout = 30
-        ssh.ssh_options = {
-          user: @config.fetch(:production_server_username),
-          keys: %w(@config.fetch(:ssh_key_path)),
-          forward_agent: false,
-          auth_methods: %w(publickey)
-        }
-      end
-    end
-
-    def install
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :wget, '-NP', '.', 'https://dokku.com/bootstrap.sh'
-        execute :sudo, 'DOKKU_TAG=v0.35.12', 'bash', 'bootstrap.sh'
-      end
-    end
-
-    def add_ssh_key
-      public_key = File.read(File.expand_path(@config.fetch(:ssh_key_path) + '.pub'))
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute "echo '#{public_key}' | sudo dokku ssh-keys:add admin"
-      end
-    end
-
-    def create_app
-      app_name = @config.fetch(:app_name)
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :dokku, 'apps:create', app_name
-      end
-    end
-
-    def set_initial_environment_variables
-      app_name = @config.fetch(:app_name)
-      secret_key_base = SecureRandom.hex(64)
-
-      environment_variables = {
-        'SECRET_KEY_BASE' => secret_key_base,
-        'RAILS_ENV' => 'production',
-        'RAKE_ENV' => 'production',
-        'RAILS_LOG_TO_STDOUT' => 'enabled',
-        'RAILS_SERVE_STATIC_FILES' => 'enabled'
-      }
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :dokku, 'config:set', app_name, environment_variables.map { |key, value| "#{key}=#{value}" }.join(' ')
-      end
-    end
-
-    def install_postgres
-      app_name = @config.fetch(:app_name)
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :sudo, 'dokku', 'plugin:install', 'https://github.com/dokku/dokku-postgres.git'
-        execute :dokku, 'postgres:create', "#{app_name}-db"
-        execute :dokku, 'postgres:link', "#{app_name}-db", app_name
-      end
-    end
-
-    def configure_domain
-      domain = @config.fetch(:domain)
-      app_name = @config.fetch(:app_name)
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :dokku, 'domains:clear-global'
-        execute :dokku, 'domains:clear', app_name
-        execute :dokku, 'domains:add', app_name, domain
-      end
-    end
-
-    def configure_ssl
-      email = @config.fetch(:email)
-      app_name = @config.fetch(:app_name)
-
-      on [@config.fetch(:production_server_ip)] do |host|
-        execute :sudo, 'dokku', 'plugin:install', 'https://github.com/dokku/dokku-letsencrypt.git'
-        execute :dokku, 'letsencrypt:set', app_name, 'email', email
-        execute :dokku, 'letsencrypt:enable', app_name
-      end
-    end
-
-    def print_instructions
-      puts "Configure deployment by adding git remote:"
-      puts "git remote add dokku dokku@#{@config.fetch(:production_server_ip)}:#{@config.fetch(:app_name)}"
-      puts "Then you can deploy by running:"
-      puts "git push dokku main"
-    end
-  end
-end