percheron 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15de7f98c12439599c7f39ba23c9667d3114d493
-  data.tar.gz: e5efd6cf80b855d2bc6a477db9406165708f0b9d
+  metadata.gz: d1ba6e0501b9cf6ab5cb77737fec3fb01de42339
+  data.tar.gz: 603bd092e32325a8f7048836cc6bf591a34968da
 SHA512:
-  metadata.gz: ad718e1b22ec751f618b29d0bd37e716fea413291152738d692746dbd9fec849190f78e324de88608271c138455c682d02ef15b3cdcbb23b70593b9b7cc6878b
-  data.tar.gz: 77b283bb036e996e2847ebfb5fe6c77ce11351fd6061ae1352e319d9fd464cef506dbfd30c8cccdbe395bfc44d199d2ed007be08f9dd9402355704ef71ba7a51
+  metadata.gz: c7c5dc74228d637d145daf3e7179392b3919d9e575573285a0d57ef5c1540589fe2c657d4a30d6568a3e2be482a42d20b9399ea56e8fa6a15cf9dd73d36d792c
+  data.tar.gz: 998bc9494e00c05e73ff9667ecd51502315208aee1f9900a40854832b072a68a8f93e3b70c0629fde4336c7fb7207d112bf2dade4eaa75019ddbf0bf2933446f

data/README.md

@@ -53,9 +53,16 @@ $ gem install percheron
 
 TODO
 
+## Debugging
+
+To debug Percheron, set the `DEBUG=true` environment variable.
+
+To debug Percheron and Docker, set the `DOCKER_DEBUG=true` environment variable.
+
 ## Examples
 
 * [Rails](https://github.com/ashmckenzie/percheron-rails#quickstart) - Rails 4.2, PostgreSQL, redis, HAProxy and postfix
+* [Redis](https://github.com/ashmckenzie/percheron-redis#quickstart) - Redis cluster + sentinel, master, two slaves and tools
 * [Torrent](https://github.com/ashmckenzie/percheron-torrent#quickstart) - Tracker (chihaya), seeder (aria2) and three peers (aria2)
 * [SaltStack](https://github.com/ashmckenzie/percheron-saltstack#quickstart) - SaltStack v2015.2.0rc2 with master and minion
 

data/lib/percheron/actions/purge.rb

@@ -4,9 +4,9 @@ module Percheron
 
       include Base
 
-      def initialize(container, delete_image: true)
+      def initialize(container, force: false)
         @container = container
-        @delete_image = delete_image
+        @force = force
       end
 
       def execute!
@@ -19,20 +19,20 @@ module Percheron
 
       private
 
-        attr_reader :container, :delete_image
+        attr_reader :container, :force
 
         def stop!
           Stop.new(container).execute!
         end
 
         def delete_image?
-          delete_image && container.image_exists? && container.buildable?
+          container.image_exists? && container.buildable?
         end
 
         def delete_container!
           return nil unless container.exists?
           $logger.info "Deleting '#{container.name}' container"
-          container.docker_container.remove
+          container.docker_container.remove(force: force)
         rescue Docker::Error::ConflictError => e
           $logger.error "Unable to delete '%s' container - %s" % [ container.name, e.inspect ]
         end
@@ -40,7 +40,7 @@ module Percheron
         def delete_image!
           return nil unless delete_image?
           $logger.info "Deleting '#{container.image_name}' image"
-          container.image.remove
+          container.image.remove(force: force)
         rescue Docker::Error::ConflictError => e
           $logger.error "Unable to delete '%s' image - %s" % [ container.image_name, e.inspect ]
         end

data/lib/percheron/actions/shell.rb

@@ -12,15 +12,18 @@ module Percheron
       end
 
       def execute!
-        Validators::DockerClient.new.validate_docker_client_available!
         $logger.debug "Executing #{shell} on '#{container.name}' container"
-        exec!
+        exec! if valid?
       end
 
       private
 
         attr_reader :container, :shell
 
+        def valid?
+          Validators::DockerClient.new.valid?
+        end
+
         def exec!
           system('%s exec -ti %s %s' % [ DOCKER_CLIENT, container.full_name, shell ])
         end

data/lib/percheron/commands/logs.rb

@@ -4,7 +4,6 @@ module Percheron
 
       parameter('STACK_NAME', 'stack name', required: true)
       parameter('CONTAINER_NAME', 'container name', required: true)
-
       option('--follow', :flag, 'follow the logs', default: false)
 
       def execute

data/lib/percheron/commands/purge.rb

@@ -3,10 +3,11 @@ module Percheron
     class Purge < Abstract
 
       default_parameters!
+      option([ '-f', '--force' ], :flag, 'Force container/image removal', default: false)
 
       def execute
         super
-        stack.purge!(container_names: container_names)
+        stack.purge!(container_names: container_names, force: force?)
       end
     end
   end

data/lib/percheron/commands/shell.rb

@@ -4,7 +4,6 @@ module Percheron
 
       parameter('STACK_NAME', 'stack name', required: true)
       parameter('CONTAINER_NAME', 'container name', required: true)
-
       option('--shell', 'SHELL', 'Shell to use', default: Percheron::Actions::Shell::DEFAULT_SHELL)
 
       def execute

data/lib/percheron/stack.rb

@@ -74,8 +74,8 @@ module Percheron
       execute!(Actions::Recreate, filter_container_names(container_names), start: start)
     end
 
-    def purge!(container_names: [])
-      execute!(Actions::Purge, filter_container_names(container_names).reverse)
+    def purge!(container_names: [], force: false)
+      execute!(Actions::Purge, filter_container_names(container_names).reverse, force: force)
     end
 
     def execute!(klass, container_names, args=nil)

data/lib/percheron/version.rb

@@ -1,3 +1,3 @@
 module Percheron
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percheron
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Ash McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp