capistrano-container 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66d2f2836473bfc923351f031c8df1e6631734c
-  data.tar.gz: a80e51690199e3b4bf45c62017e87f5120db9658
+  metadata.gz: b9b6ae24727c2feb732526e24c24c3424e419cbc
+  data.tar.gz: 752f1343ceb509c3afc74df3a44d2c38be3987ca
 SHA512:
-  metadata.gz: 0249e96887773e12a302fb6b6e18f46e0ed681711e18285467f954097231aa07e969618a5c11e7ff0cd70ad37b6e2aa613ae86e4e48ddc81f105c4993d20e259
-  data.tar.gz: 2c8161968220469a38f5a14c89b6771c03f77c16c2149e6ef96995d26b8e2aab9dcb7d4823cb47b18b0df063fafb9ab95938002413dbf9c9be4c224450405d1b
+  metadata.gz: f530de0e25adcb551771e64281aacbe2faa01f289a68128bff94f27829dce434feefffcc59d0db866b1f4ef73ae6cf9b536df342d522cdfc34d954189c9802dc
+  data.tar.gz: ba74dde5e0ee280aced46d21f891994cd24e7f5e56fb4c1243df717a0ccabaff8ebd6cdb3c72dd1c87eda43d375c9492755cf0e242fbf9d45fa32ecec48292f1

data/README.md

@@ -2,15 +2,15 @@
 
 Helps managing [docker](https://www.docker.com/) container and files inside docker container for Capistrano 3.x.
 
-This project is in an early stage but helps me alot dealing with my container deployments and keeps my code clean. It is not only ment for docker, but at the moment it only supports docker, feel free to contribute =)
+This project is in an early stage but helps me a lot dealing with my container deployments and keeps my code clean. It is not only meant for docker, but at the moment there is only support for docker, feel free to contribute =)
 
-This gem does not handle Dockerfiles or such things, for that there are enough capistrano modules available.
+This gem does not handle Dockerfiles (build, push, etc.) but handles docker container on your dev or staging system.
 
-Container auto detect if they should execute on local or remote depending on stage (see below).
+The container implementation auto detects if it should run on local or remote docker-engine (see below).
 
 ## Installation
 
-Add this lines to your application's Gemfile:
+Add this lines to your application's `Gemfile`:
 
 ```ruby
 gem 'capistrano', '>= 3.0.0'
@@ -25,7 +25,7 @@ Or install it yourself as:
 
     $ gem install capistrano-container
 
-Dont forget to require the module in your Capfile:
+Dont forget to require the module in your `Capfile`:
 
 ```ruby
 require 'capistrano/container'
@@ -33,12 +33,12 @@ require 'capistrano/container'
 
 ## Usage
 ### definition
-To define and register a container do the following in your stage config or deploy.rb:
+Define and register a container by doing the following in your `deploy.rb` (or `[stage].rb`):
 
 ```ruby
 ...
 
-server('www.example.com', user: 'root', roles: %w{web})
+server 'www.example.com', user: 'root', roles: %w{web}
 
 container 'db',  roles: %w{db},
                  container_id: 'website_company_beta_db',
@@ -51,15 +51,15 @@ container 'php', roles: %w{php},
 ...
 ```
 
-This registers two container (db, php) for the server www.example.com. The roles can later be used to filter container like the way you filter server in capistrano.
+This registers two container (db, php) for the server www.example.com. You can use the container roles later to filter container like the way you filter server in capistrano (`on([:role]) do ...` expresion).
 
-The container id is optional. If not set, the container id is equal to the name you give the container as first argument. The container id will later be used to run docker commands.
+The container id is optional. If its not set, the container id equals to the name you gave the container as first argument. The container id will be used later to run commands like `container.upload` or `container.execute` (with `docker exec [container_id] [command]`).
 
-If you define a container, the role `:container_host` will be added to the given hosts, so you can filter hosts that are running container. Also a container specific role will be added, for a container named php `:container_php`.
+If you define a container, the role `:container_host` will be added to the given hosts, so you can filter hosts that are running that specific container. Also a container specific role will be added. For a container like `container 'php', roles: %w{php}, ...` the host get a role named `:container_php`.
 
 
 ### commandline tasks
-There are general tasks you can run, if needed you will be asked on which container_id the command should run.
+There are generic container tasks you can run on local or remote host (you will be asked for `container_id` sometimes).
 
 ```ruby
 cap container:all                  # show all docker containers
@@ -79,7 +79,7 @@ cap container:unpause              # unpause a docker container
 cap container:update_docker        # update docker
 ```
 
-For every registered container, individual tasks will be creazed. For a container named php the following tasks will be available. (With `cap -T` you can see the container specific tasks, but only if you register your container in the deploy.rb and not in the stage file)
+Also individual tasks will be created for every container you define in your `deploy.rb`:
 
 ```ruby
 cap container:php:delete           # delete a docker container
@@ -97,12 +97,12 @@ cap container:php:unpause          # unpause a docker container
 ```
 
 ### ruby tasks
-You can access the defined container like this:
+You can run the pre defined tasks on your container like these:
 
 ```ruby
 after :deploy, :updated do
-  on roles :web do
-    # do your application restarts
+  on roles :web do |host|
+    # do your plain old host application restarts
   end
 
   on_container_roles :php do |container, host|
@@ -110,18 +110,18 @@ after :deploy, :updated do
   end
 end
 ```
-This filters container with the role `:php` and invokes the task `container:#{container.name}:restart`.
+This snipped filters container by the role `:php` and invokes the task `container:#{container.name}:restart`.
 
-Or inside other tasks
+Available container accessors:
 ```ruby
   container = container_by_name :db
   container = container_by_roles :php
   container = container_by_id 'website_company_beta_db'
 ```
 
-Note that you have to use this commands inside a SSHKit context, means inside a `on roles :containers_host do` block for example.
+Note that you have to use these commands inside a SSHKit context, means inside a `on roles :container_host do` block for example.
 
-A container has the following methods:
+A container provides the following methods:
 ```ruby
   # tests if the container has a specific role
   def has_role?(role)
@@ -132,13 +132,13 @@ A container has the following methods:
   # the container specific role, for a container named php `:container_php`
   def container_role
 
-  # uploads a local file to a temp file on host /tmp, then copies the file into the container with docker cp
+  # uploads a local file to local or remote running container (with docker cp)
   def upload!(src, target)
 
-  # doenloads a container file to host /tmp and then to a local file
+  # downloads a local or remote container file to your local host
   def download!(src, target)
 
-  # executes a command on the docker container with docker exec
+  # executes a command on the local or remote docker container(with docker exec)
   def execute(command)
 
   # invokes a container specific task
@@ -146,13 +146,16 @@ A container has the following methods:
 ```
 
 ### local stage detection
-Local stage per default is named ```:local```. If you which to change do ```set :local_stage_name, :local``` in your stage config.
+Local stage per default is named `:local`. If you wish to change insert `set :local_stage_name, :my_local` in your `deploy.rb`.
 
 ## TODO
-  * Write tests.
+  * integration tests(travis).
   * Implement adapter pattern for other container manager.
 
 ## Changes
+### Version 0.0.6
+  * use clean module namespaces
+
 ### Version 0.0.5
   * container now auto detect if they should execute, download and upload on local or remote host.
 

data/capistrano-container.gemspec

@@ -4,8 +4,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'capistrano-container'
-  spec.version     = '0.0.5'
-  spec.date        = '2016-09-26'
+  spec.version     = '0.0.6'
+  spec.date        = '2018-02-03'
   spec.summary     = 'Helps managing docker container and files inside docker container for Capistrano 3.x'
   spec.description = spec.summary
   spec.authors     = ['Tom Hanoldt']

data/lib/capistrano/container.rb

@@ -1,14 +1,9 @@
 require_relative 'tasks/container.rb'
+require_relative 'container/instance.rb'
+require_relative 'container/manager.rb'
+require_relative 'container/mixins.rb'
 
-module Capistrano
-  module Container
-    require_relative 'container/instance.rb'
-    require_relative 'container/manager.rb'
-    require_relative 'container/mixins.rb'
-  end
-end
-
-$container_manager = Manager.new
+$container_manager = Capistrano::Container::Manager.new
 
 module Capistrano
   module DSL

data/lib/capistrano/container/instance.rb

@@ -1,77 +1,82 @@
 require 'securerandom'
 
-class Instance
-  attr_reader :name
-  attr_reader :config
-  attr_writer :dsl
-
-  def initialize(name, config)
-    @dsl    = nil
-    @name   = name
-    @config = {shared_on_host: '/tmp'}.merge(config)
-  end
+module Capistrano
+  module Container
+    class Instance
+      attr_reader :name
+      attr_reader :config
+      attr_writer :dsl
 
-  def has_role?(role)
-    return false unless @config.key? :roles
+      def initialize(name, config)
+        @dsl    = nil
+        @name   = name
+        @config = {shared_on_host: '/tmp'}.merge(config)
+      end
 
-    role = role.to_s if role.is_a? Symbol
+      def has_role?(role)
+        return false unless @config.key? :roles
 
-    @config[:roles].include? role
-  end
+        role = role.to_s if role.is_a? Symbol
 
-  def container_id
-    return @name unless @config.key? :container_id
+        @config[:roles].include? role
+      end
 
-    @config[:container_id]
-  end
+      def container_id
+        return @name unless @config.key? :container_id
 
-  def container_role
-    "container_#{@name}".to_sym
-  end
+        @config[:container_id]
+      end
 
-  def upload!(src, target)
-    if @dsl.local_stage?
-      self.cp(src, "#{container_id}:#{target}")
-      return
-    end
+      def container_role
+        "container_#{@name}".to_sym
+      end
 
-    tmp = "#{@config[:shared_on_host]}/capistrano-docker.#{SecureRandom.uuid}.tmp"
+      def upload!(src, target)
+        if @dsl.local_stage?
+          self.cp(src, "#{container_id}:#{target}")
+          return
+        end
 
-    @dsl.upload!(src, tmp)
+        tmp = "#{@config[:shared_on_host]}/capistrano-docker.#{SecureRandom.uuid}.tmp"
 
-    self.cp(tmp, "#{container_id}:#{target}")
+        @dsl.upload!(src, tmp)
 
-    @dsl.execute("rm -rf #{tmp}")
-  end
+        self.cp(tmp, "#{container_id}:#{target}")
 
-  def download!(src, target)
-    if @dsl.local_stage?
-      self.cp("#{container_id}:#{src}", target)
-      return
-    end
+        @dsl.execute("rm -rf #{tmp}")
+      end
 
-    tmp = "#{@config[:shared_on_host]}/capistrano-docker.#{SecureRandom.uuid}.tmp"
+      def download!(src, target)
+        if @dsl.local_stage?
+          self.cp("#{container_id}:#{src}", target)
+          return
+        end
 
-    self.cp("#{container_id}:#{src}", tmp)
+        tmp = "#{@config[:shared_on_host]}/capistrano-docker.#{SecureRandom.uuid}.tmp"
 
-    @dsl.download!(tmp, target)
+        self.cp("#{container_id}:#{src}", tmp)
 
-    @dsl.execute("rm -rf #{tmp}")
-  end
+        @dsl.download!(tmp, target)
 
-  def execute(command)
-    command = "docker exec -i #{container_id} sh -c '#{command.gsub("'", "\'")}'"
+        @dsl.execute("rm -rf #{tmp}")
+      end
 
-    @dsl.execute_local_or_remote(command)
-  end
+      def execute(command)
+        command = "docker exec -i #{container_id} sh -c '#{command.gsub("'", "\'")}'"
 
-  def cp(src, target)
-    command = "docker cp #{src} #{target}"
+        @dsl.execute_local_or_remote(command)
+      end
 
-    @dsl.execute_local_or_remote(command)
-  end
+      def cp(src, target)
+        command = "docker cp #{src} #{target}"
+
+        @dsl.execute_local_or_remote(command)
+      end
+
+      def invoke(task_name)
+        @dsl.invoke "container:#{@name}:#{task_name}"
+      end
+    end
 
-  def invoke(task_name)
-    @dsl.invoke "container:#{@name}:#{task_name}"
   end
 end

data/lib/capistrano/container/manager.rb

@@ -1,55 +1,60 @@
 require 'rake/dsl_definition'
 
-class Manager
-  include Rake::DSL
+module Capistrano
+  module Container
+    class Manager
+      include Rake::DSL
 
-  def initialize()
-    @container = {}
-  end
+      def initialize()
+        @container = {}
+      end
 
-  def add(name, config)
-    @container[name.to_sym] = container = Instance.new(name, config)
+      def add(name, config)
+        @container[name.to_sym] = container = Instance.new(name, config)
 
-    config[:server].map!{ |ip| server(ip) }
+        config[:server].map!{ |ip| server(ip) }
 
-    config[:server].each do |server|
-      server.add_roles [:container_host, container.container_role]
-    end
+        config[:server].each do |server|
+          server.add_roles [:container_host, container.container_role]
+        end
 
-    self.create_container_tasks(container)
+        self.create_container_tasks(container)
 
-    container
-  end
+        container
+      end
 
-  def by_name(name)
-    @container[name.to_sym]
-  end
+      def by_name(name)
+        @container[name.to_sym]
+      end
 
-  def by_id(id)
-    @container.each do |name, instance|
-      return instance if instance.container_id == id
-    end
-  end
+      def by_id(id)
+        @container.each do |name, instance|
+          return instance if instance.container_id == id
+        end
+      end
 
-  def by_roles(roles)
-    roles = Array(roles)
+      def by_roles(roles)
+        roles = Array(roles)
 
-    return @container.values if roles.include? :all
+        return @container.values if roles.include? :all
 
-    tmp = {}
-    roles.each do |role|
-      @container.each do |name, instance|
-        tmp[name] = instance if instance.has_role? role
+        tmp = {}
+        roles.each do |role|
+          @container.each do |name, instance|
+            tmp[name] = instance if instance.has_role? role
+          end
+        end
+        tmp.values
       end
-    end
-    tmp.values
-  end
 
-  def create_container_tasks(container)
-    namespace :container do
-      namespace container.name do
-        Mixins.define_tasks(container)
+      def create_container_tasks(container)
+        namespace :container do
+          namespace container.name do
+            Mixins.define_tasks(container)
+          end
+        end
       end
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-container
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom Hanoldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Helps managing docker container and files inside docker container for Capistrano