rory-deploy 1.8.4.1 → 1.8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee9cb9eb9869b7178ba48e01ad3a37475abba0bb
-  data.tar.gz: 5d9d656af71896e63b1f361da86b596b90140ce2
+  metadata.gz: 28c70019cc82629eac23f476f8d6598eceab7316
+  data.tar.gz: b9f80eea07cbbc7a9d0f7b9f83fdc0d2f7b954a2
 SHA512:
-  metadata.gz: 31910e1843a61237f658b02acc7692e27d9d475350d288754dc7091aceba2f3631dbcf0860b54a8fea3d9a214c659725dfa46c33c5c9f92186b251cc1d3e1b44
-  data.tar.gz: d914407cd09ace69d4af9e2f9ee137c38b7eba6792627bf5c1ddb96e46a015e5be6104bf38c3e6ae4c17c34a0526df642ffd4d2f7478ce3b347f63a42f150638
+  metadata.gz: f2f4a7dd87cadb63a8f9e4274526b752b7ef8a652ad3c83ba83ab5fdb8f481c2669107d468b29015e2e19b02882725694fb710fefa3e0bbcd0f4415993f74645
+  data.tar.gz: 5585737548049cbb225c36c96b639dc0497b0e1dbf9d21c996a8c3caaf08ca4de81776204c162471ab888ad89395aeb21acf2cc8811956b400592fe5e4dea3d7

data/CONTRIBUTORS.md

@@ -13,7 +13,6 @@ Your name could be here!
  * [Jon Wood][jellybob]
  * [Mark Borcherding][markborcherding]
  * [Nick Laferriere][laferrieren]
- * [Hugo Chinchilla][hugochinchilla]
 
 Pre-release
 -----------

data/README.md

@@ -5,10 +5,21 @@ This is a fork of [centurion by newrelic](https://github.com/newrelic/centurion/
 
 It includes some modifications needed for deploying our applications at Habitissimo. We will try to get all our modifications included in the newrelic upstream but as we can not wait for the newrelic team to accept our patches we need to keep our own fork.
 
+Install
+=======
+
+```
+gem install rory-deploy
+```
+
 The name of the fork is based on the character [Rory Williams](https://en.wikipedia.org/wiki/Rory_Williams) from Doctor Who, which became "The last centurion".
 
+Original Documentation
+======================
+
 Original documentation is appended below, **remember to replace centurion with rory for all commands listed in it**.
 
+
 Centurion
 =========
 

data/bin/rory

@@ -55,7 +55,7 @@ invoke("environment:#{opts[:environment]}")
 set :image, opts[:image] if opts[:image]
 set :tag,   opts[:tag] if opts[:tag]
 set :hosts, opts[:hosts].split(",") if opts[:hosts]
-set :name,  opts[:project].gsub(/_/, '-')
+set :name,  opts[:project].gsub(/_/, '-') unless fetch(:name)
 
 # Override environment variables when specified
 if opts[:override_env]

data/lib/centurion/deploy.rb

@@ -126,14 +126,4 @@ module Centurion::Deploy
 
     server.attach(container['Id'])
   end
-
-  def enter_container(server, service)
-    container = if service.public_ports.nil? || service.public_ports.empty?
-      server.find_containers_by_name(service.name).first
-    else
-      server.find_containers_by_public_port(service.public_ports.first).first
-    end
-
-    server.exec_it(container["Id"], "/bin/bash")
-  end
 end

data/lib/centurion/deploy_dsl.rb

@@ -8,10 +8,6 @@ module Centurion::DeployDSL
     build_server_group.tap { |hosts| hosts.each { |host| block.call(host) } }
   end
 
-  def on_first_docker_host(&block)
-    build_server_group.tap { |hosts| block.call(hosts.first) }
-  end
-
   def env_vars(new_vars)
     current = fetch(:env_vars, {})
     new_vars.each_pair do |new_key, new_value|

data/lib/centurion/docker_server.rb

@@ -16,7 +16,7 @@ class Centurion::DockerServer
   def_delegators :docker_via_api, :create_container, :inspect_container,
                  :inspect_image, :ps, :start_container, :stop_container,
                  :remove_container, :restart_container
-  def_delegators :docker_via_cli, :pull, :tail, :attach, :exec, :exec_it
+  def_delegators :docker_via_cli, :pull, :tail, :attach, :exec
 
   def initialize(host, docker_path, tls_params = {})
     @docker_path = docker_path

data/lib/centurion/docker_via_cli.rb

@@ -31,14 +31,6 @@ class Centurion::DockerViaCli
     Centurion::Shell.echo(build_command(:exec, "#{container_id} #{commandline}"))
   end
 
-  def exec_it(container_id, commandline)
-    # the "or true" on the command is to prevent an exception from Shell.validate_status
-    # because docker exec returns the same exit code as the latest command executed on
-    # the shell, which causes an exception to be raised if the latest comand executed
-    # was unsuccessful when you exit the shell.
-    Centurion::Shell.echo(build_command(:exec, "-it #{container_id} #{commandline} || true"))
-  end
-
   private
 
   def self.tls_keys

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.4.1'
+  VERSION = '1.8.4.2'
 end

data/lib/tasks/deploy.rake

@@ -12,7 +12,7 @@ end
 
 task :deploy_console do
   invoke 'deploy:get_image'
-  #invoke 'deploy:stop'
+  invoke 'deploy:stop'
   invoke 'deploy:launch_console'
   invoke 'deploy:cleanup'
 end
@@ -24,7 +24,6 @@ task :rolling_deploy do
 end
 
 task :stop => ['deploy:stop']
-task :enter_container => ['deploy:enter_container']
 
 namespace :dev do
   task :export_only do
@@ -107,18 +106,11 @@ namespace :deploy do
   end
 
   task :launch_console do
-    on_first_docker_host do |server|
-      defined_service.port_bindings.clear
+    on_each_docker_host do |server|
       launch_console(server, defined_service)
     end
   end
 
-  task :enter_container do
-    on_first_docker_host do |server|
-      enter_container(server, defined_service)
-    end
-  end
-
   task :rolling_deploy do
     on_each_docker_host do |server|
       service = defined_service

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory-deploy
 version: !ruby/object:Gem::Version
-  version: 1.8.4.1
+  version: 1.8.4.2
 platform: ruby
 authors:
 - Hugo Chinchilla