rat_deployer 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8370c118d92b2f06d327225481cb3d592a11167
-  data.tar.gz: a03cf3b020a9d3e38d99c6f1fa3adf56aa078e0d
+  metadata.gz: 262cf16b057028e511cd9d5e4e9396248c0cd725
+  data.tar.gz: c08531236e1d4ec9257344c42e367812239b7f19
 SHA512:
-  metadata.gz: e6626360686e73f7d236290cd3e842748b6d4b64f41afba11f0d4c8fb0125d71b76a895be6156b42c52c8b04db37d3f3e147c1fe7ccdbad94cbe031f1df63963
-  data.tar.gz: 7a2f2e575bb63d46e7eb7a074fb14e43e4f13f909e2fb0015030d9329e56e10b99f06f7c776c39fdab1a1ead62e972916053a073f7f6dc3d07ba1f07da47ed08
+  metadata.gz: cbbc4deeef649ba8bf002bfdd14bdcf99633624a301bf074e494ea4c3393a11c2b72e1d3fca01915a8e2e4f8dfedf929cc767576b79af8d8296791a37cd2ecd7
+  data.tar.gz: dec480736bdfc188b5b3e9c66e0f88b8651fc4d5063950d7741a69b3b2a3a01c84b809b1cc77f3e56c516dff1f850a1c8b0f65305a7827db98f056b4273075be

data/lib/rat_deployer/cli.rb

@@ -1,88 +1,15 @@
 require 'thor'
 require 'fileutils'
-require 'active_support/core_ext/string/strip'
 
-require 'rat_deployer/command'
-require 'rat_deployer/notifier'
+require 'rat_deployer/commands/compose'
+require 'rat_deployer/commands/deploy'
+require 'rat_deployer/commands/docker'
 
 module RatDeployer
   # The main Thor subclass
   class Cli < Thor
-    include RatDeployer::Command
-
-    desc 'deploy', 'deploys current environment'
-    def deploy(*services)
-      RatDeployer::Notifier.notify_deploy_start
-      do_deploy(*services)
-      RatDeployer::Notifier.notify_deploy_end
-    rescue StandardError => e
-      RatDeployer::Notifier.notify <<-STR.strip_heredoc
-        Failed deploy on #{RatDeployer::Config.env}
-        Reason:
-          #{e.message}
-      STR
-      raise e
-    end
-
-    desc 'compose ARGS...', 'runs docker-compose command with default flags'
-    def compose(cmd, *cmd_flags, silent: false)
-      run(
-        [
-          'docker-compose',
-          compose_flags,
-          cmd,
-          cmd_flags
-        ].flatten.join(' '),
-        silent: silent
-      )
-        .fetch(:output)
-    end
-
-    desc 'docker ARGS...', 'runs docker command with default flags'
-    def docker(cmd, *cmd_flags)
-      flags = []
-
-      if RatDeployer::Config.remote
-        flags.unshift(RatDeployer::Config.remote_machine_flags)
-      end
-
-      cmd = run "docker #{flags.join(' ')} #{cmd} #{cmd_flags.join(' ')}"
-      cmd.fetch(:output)
-    end
-
-    private
-
-    def do_deploy(*services)
-      if services.any?
-        services_str = services.join(' ')
-        compose("pull #{services_str}")
-        compose("up -d --no-deps --force-recreate #{services_str}")
-      else
-        compose('pull')
-        compose('up -d')
-      end
-    end
-
-    def compose_flags
-      env          = RatDeployer::Config.env
-      project_name = RatDeployer::Config.all.fetch('project_name')
-
-      config_files =
-        RatDeployer::Config.for_env['config_files'] || %W[
-          config/default.yml
-          config/#{env}.yml
-        ]
-
-      flags = [
-        config_files.map { |cf| "-f #{cf}" },
-        "-p #{project_name}_#{env}"
-      ]
-
-      if RatDeployer::Config.remote
-        flags.unshift(RatDeployer::Config.remote_machine_flags)
-      end
-
-      flags
-    end
+    include Commands::Compose::Extension
+    include Commands::Deploy::Extension
+    include Commands::Docker::Extension
   end
 end

data/lib/rat_deployer/config.rb

@@ -32,6 +32,11 @@ module RatDeployer
       all.fetch('images', {})
     end
 
+    def self.project_name
+      (for_env['project_name'] || all.fetch('project_name'))
+        .gsub(/\{env\}/, env)
+    end
+
     def self.remote_machine_flags
       machine = for_env.fetch('machine')
 

data/lib/rat_deployer/version.rb

@@ -1,3 +1,3 @@
 module RatDeployer
-  VERSION = '0.5.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rat_deployer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nicolas Oga