docker-rainbow 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730c043f484f68f40d55db9b10a193f345e0b29e
-  data.tar.gz: 4aff75bd0074a35c1e99d7c95277c811b8e8a007
+  metadata.gz: 746c45c4160ff3dfad98a8a1a8587e4aa5ffa0e6
+  data.tar.gz: 4e82aac522206cf8c791245db17659babeb1837c
 SHA512:
-  metadata.gz: 885ac7ae6efadb0d61907f6f78ffdc40e4f74091c2d70dfabfffb1c4968a78686cb39d7d80bb8f13f4b7f79159b74a8c24984c2184fc171321c1fb4a46f3cc73
-  data.tar.gz: 97897f515b6ed46e9d7a57f3ec8993c1e57f7f12fc4b8a0ddcaa905ce8f29f65ff7cf8051330ffbf7cf5a14174a5f91666f6100999cd91d690669aa585474b22
+  metadata.gz: 5de446b922c8f7590feb487d190c3bfe428b37fa86af79f2a82f02812206c151fa04fd5827b40452ae51b262abaa6bdadc558b7a19fc58c1beb2d4c28b9161af
+  data.tar.gz: b20e1eb174fc45f39ff1bb12f6bd7a22385d6156086a28819c14628f76156a22ab8f3b2d0ccaeff0dae43eda9db8c94afa9ccb3898f4667855fde3a784e1a49a

data/lib/docker/rainbow.rb

@@ -26,6 +26,10 @@ module Docker
     # of the world. (That's what `docker logs` is for...)
     PALETTE = ['blue', 'green', 'orange', 'red', 'yellow', 'violet'].freeze
 
+    # Pattern that matches useless pieces of image names, which we exclude
+    # from the resulting containers' names. _Everything_ is a service...
+    NOISE_WORDS = /[_.-]service$/.freeze
+
     # Pattern that matches any container name allowed by Docker.
     VALID_NAME = /^[a-zA-Z0-9][a-zA-Z0-9_.-]+$/.freeze
 
@@ -126,7 +130,7 @@ module Docker
       end
 
       # Strip noise-word suffixes from image name
-      base.sub!(/_service$/, '')
+      base.sub!(NOISE_WORDS, '')
 
       base
     end
@@ -151,10 +155,11 @@ module Docker
       output.each { |dead| self.class.shell("docker rm #{dead}") }
     end
 
+    # @param [Array] containers list of String container names
+    # @return [Array] subset of containers that match a running container's name
     def find_in_use(containers)
-      words = ['docker', 'ps', '--format={{.Names}}']
-      containers.each { |cn| words << "--filter=name=#{cn}" }
-      self.class.shell(words.join(' '))
+      in_use = Set.new(self.class.shell('docker ps --format={{.Names}}'))
+      containers.select { |cn| in_use.include?(cn) }
     end
 
     # Workalike for Object#present? but without dragging in activesupport

data/lib/docker/rainbow/version.rb

@@ -1,5 +1,5 @@
 module Docker
   class Rainbow
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-rainbow
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler