capistrano-dockercompose-interactive 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b833de26496b0e466f5c83d7f2b0f923e5531e9
-  data.tar.gz: 9faaca5cfa517c0abc3483611798ef4b0f8a18aa
+  metadata.gz: bc7603826a1a9abbe0088d78f3944e7725bbe687
+  data.tar.gz: 1fa307f47928da58951dc58ddcd9e0b01aff6cf6
 SHA512:
-  metadata.gz: 5132dce2dd51224179068dfc56df1c5097e011f5b60d3d7cb3d8e5bc3ba9b798071f2ad69466435028bb5089a4449878376305bd11791e598e83357745c44e2f
-  data.tar.gz: 726080d9da09de26eb62071e5dc99d7bdfbd682fdc254d20c14ebbe36151e104afd88a8196e66396a97c5889a65a7740bb1c7afff11794813635cbf2ee329fc8
+  metadata.gz: c1aaecebc7e9e73e44cfeaf6023ca791048a949968adc95ebe629b178ab5b937599660da566ec483f3f2469425827e2773ceca2534a0f34906217c67df0f6e10
+  data.tar.gz: 6c4d8df7fcddd11bb254aa988b7692387ac92b00541cd8828bdfe633af803fcf4092dc3181a4eb7283084620ae450b962a0468681517ae61ff0ef6086ab712da

data/capistrano-dockercompose-interactive.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'capistrano-dockercompose-interactive'
-  spec.version     = '0.0.1'
+  spec.version     = '0.0.2'
   spec.date        = '2018-02-01'
   spec.summary     = 'Helps managing docker compose excution on local or remote with inetractive shell support'
   spec.description = spec.summary

data/lib/capistrano/dockercompose/interactive/instance.rb

@@ -0,0 +1,32 @@
+require 'yaml'
+require_relative './service'
+
+
+class Instance
+  def initialize(file='', project=nil)
+    @file    = file
+    @project = project
+  end
+
+  def config
+    return @config if @config
+    raw_config = execute_compose_command('config', true)
+    @config = YAML.load(raw_config)
+  end
+
+  def execute_compose_command(cmd, capture = false)
+    project = @project.empty? ? "" : "-p #{@project}"
+    file    = @file.empty?    ? "" : "--file #{@file}"
+    cmd     = "#{file} #{project} #{cmd}"
+
+    if capture
+      return DockerCompose::Interactive.capture_local_or_remote cmd
+    else
+      DockerCompose::Interactive.execute_local_or_remote_interactive cmd
+    end
+  end
+
+  def service(name)
+    Service.new(self, name, config()['services'][name])
+  end
+end

data/lib/capistrano/dockercompose/interactive/service.rb

@@ -0,0 +1,21 @@
+
+class Service
+  def initialize(compose, name, config)
+    @compose, @name, @config = compose, name, config
+  end
+
+  def id
+    result = @compose.execute_compose_command("ps -q #{@name}", true)
+    result.split(';').shift.strip
+  end
+
+  def exec(cmd, capture=false)
+    cmd = "exec #{@name} #{cmd}"
+    @compose.execute_compose_command(cmd, capture)
+  end
+
+  def run(cmd, capture=false, args="--rm")
+    cmd = "run #{args} #{@name} #{cmd}"
+    @compose.execute_compose_command(cmd, capture)
+  end
+end

data/lib/capistrano/dockercompose/interactive.rb

@@ -1,96 +1,48 @@
-require 'yaml'
+module DockerCompose
+  module Interactive
+    require_relative './interactive/instance'
 
-module DockerCompose::Interactive
-  def DockerCompose.instance(file='', project='')
-    Instance.new(file, project)
-  end
-
-  def DockerCompose.local_stage?
-    fetch(:local_stage_name, 'local').to_sym == fetch(:stage).to_sym
-  end
+    def self.instance(file='', project='')
+      Instance.new(file, project)
+    end
 
-  def DockerCompose.capture_local_or_remote(cmd)
-    puts "runnig: docker-compose #{cmd}"
-    result = ''
-    if local_stage?
-      run_locally do
-        result = capture "docker-compose #{cmd}"
-      end
-    else
-      on roles :container_host do |_host|
-        within current_path do
-          result = capture "cd #{current_path} && docker-compose #{cmd}"
-        end
-      end
+    def self.local_stage?
+      fetch(:local_stage_name, 'local').to_sym == fetch(:stage).to_sym
     end
-    result
-  end
 
-  def DockerCompose.execute_local_or_remote_interactive(cmd)
-    puts "runnig: docker-compose #{cmd}"
-    if local_stage?
-      run_locally do
-        execute "docker-compose #{cmd}"
-      end
-    else
-      on roles :container_host do |_host|
-        run_interactively _host do
+    def self.capture_local_or_remote(cmd)
+      puts "runnig: docker-compose #{cmd}"
+      result = ''
+      if local_stage?
+        run_locally do
+          result = capture "docker-compose #{cmd}"
+        end
+      else
+        on roles fetch(:docker_compose_interactive_roles) do |_host|
           within current_path do
-            execute "cd #{current_path} && docker-compose #{cmd}"
+            result = capture "cd #{current_path} && docker-compose #{cmd}"
           end
         end
       end
-    end
-  end
-
-  class Instance
-    def initialize(file='', project=nil)
-      @file    = file
-      @project = project
-    end
-
-    def config
-      return @config if @config
-      raw_config = execute('config', true)
-      @config = YAML.load(raw_config)
+      result
     end
 
-    def execute_compose_command(cmd, capture = false)
-      project = @project.empty? ? "" : "-p #{@project}"
-      file    = @file.empty?    ? "" : "--file #{@file}"
-      cmd     = "#{file} #{project} #{cmd}"
-
-      if capture
-        return DockerCompose.capture_local_or_remote cmd
+    def self.execute_local_or_remote_interactive(cmd)
+      puts "runnig: docker-compose #{cmd}"
+      if local_stage?
+        run_locally do
+          execute "docker-compose #{cmd}"
+        end
       else
-        DockerCompose.execute_local_or_remote_interactive cmd
+        on roles fetch(:docker_compose_interactive_roles) do |host|
+          run_interactively host do
+            within current_path do
+              execute "cd #{current_path} && docker-compose #{cmd}"
+            end
+          end
+        end
       end
     end
 
-    def service(name)
-      Service.new(self, name, config()['services'][name])
-    end
   end
-
-  class Service
-    def initialize(compose, name, config)
-      @compose, @name, @config = compose, name, config
-    end
-
-    def id
-      result = @compose.execute_compose_command("ps -q #{@name}", true)
-      result.split(';').shift.strip
-    end
-
-    def exec(cmd, capture=false)
-      cmd = "exec #{@name} #{cmd}"
-      @compose.execute_compose_command(cmd, capture)
-    end
-
-    def run(cmd, capture=false, args="--rm")
-      cmd = "run #{args} #{@name} #{cmd}"
-      @compose.execute_compose_command(cmd, capture)
-    end
-  end
-
 end

data/lib/capistrano/tasks/docker-compose-interactive.rb

@@ -1,7 +1,7 @@
 
 namespace :dockercompose do
   namespace :interactive do
-
+    
   end
 end
 
@@ -10,5 +10,6 @@ namespace :load do
     set :local_stage_name, :local
     set :docker_compose_interactive_file, ''
     set :docker_compose_interactive_project, ''
+    set :docker_compose_interactive_roles, :container_host
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-dockercompose-interactive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Hanoldt
@@ -82,6 +82,8 @@ files:
 - capistrano-dockercompose-interactive.gemspec
 - lib/capistrano-dockercompose-interactive.rb
 - lib/capistrano/dockercompose/interactive.rb
+- lib/capistrano/dockercompose/interactive/instance.rb
+- lib/capistrano/dockercompose/interactive/service.rb
 - lib/capistrano/tasks/docker-compose-interactive.rb
 homepage: https://github.com/creative-workflow/capistrano-dockercompose-interactive
 licenses: