docker-dev 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b790b0f51b1657492a1aa2ab4f6528f6b3d2ab48
-  data.tar.gz: a8a10e13b6483b0b41f7a8cc87f61e68807e616f
+  metadata.gz: 1f8c6ca4e821a2cf3e3542c2236e56f7400893c0
+  data.tar.gz: d34ea21f388b229381e5f80fe2ee9cc886e4d7f3
 SHA512:
-  metadata.gz: 38f16ae99fcc1296a1768d2b6f34be5b17996e481dace95dfbdcbdc5aa5e2959c95548292c77ebad000905a23ec8a78089d35d399c1b5022016417fdb4d0b1c6
-  data.tar.gz: c16ed1806dc1b618c3744acba0455695a46e560b50563fb1bcfa1a44e2b0cb9a6719bae1ddb7c2d9cdb09e9add7e5c85b6d9631d53f8a00d354ed8aeb4ffbe98
+  metadata.gz: 18b087a4880513977c72c6dfdb925037b7935a27a14800c178cbea6ca43e5482257a4c68c3a4b7c1b786559936564b66646cef4ce84ee3f1d20d352f522d790a
+  data.tar.gz: 291ab9e932b5b78b6d6c6dcb80a77c7d1b5897a4662c663745ef53a043f4abd5096366229331a3f4cfff01dfe8c05574c48e0d58a634e1c3d747d867f10c94c5

data/lib/docker.rb

@@ -76,7 +76,26 @@ module Docker
     inspekt.inspekt ? inspekt : NullInspect.new
   end
 
+  def validate_search_parameters(options)
+    bad_args = options.keys.select {|key| key.to_s.end_with?('!')}
+    raise ArgumentError, 'bang method given ' +
+      "as option: #{bad_args.join(', ')}" unless bad_args.empty?
+  end
+
+  def find_image(options = {})
+    klass = options.delete(:klass) || :image
+    validate_search_parameters(options)
+    images(klass).find do |image|
+      found = true 
+      options.each do |option,value| 
+        found = false unless image.send(option) == value 
+      end
+      found
+    end
+  end
+
   def find_container(options = {})
+    validate_search_parameters(options)
     containers.find do |container|
       found = true 
       options.each do |option,value| 
@@ -88,6 +107,7 @@ module Docker
 
   def find_containers(options = {})
     klass = options.delete(:klass)
+    validate_search_parameters(options)
     kontainers = containers
     kontainers.map! { |container| klass.load_from(container) } if klass
     kontainers.select { |container|

data/lib/docker/rails.rb

@@ -21,9 +21,9 @@ module Docker
       Docker::Container.run(image, options, command, path)
     end
 
-    def run_server(app_path)
+    def run_server(app_path, options = "")
       path = Docker::PATH(app_path)
-      Docker::Rails::Server.run(path, postgres)
+      Docker::Rails::Server.run(path, postgres, options)
     end
 
     def run_console(app_path)

data/lib/docker/rails/server.rb

@@ -8,13 +8,14 @@ module Docker
         super
       end
 
-      def self.run(path, postgres)
+      def self.run(path, postgres, options = "")
         server = existing_server(path) 
         return server if server
         migrate_database!(path, postgres)
         server = super(
           "#{rails_image(path.name)}", 
-          "-d --name #{rails_server(path.name)} --link db:db "  +
+          options                                               +
+          " -d --name #{rails_server(path.name)} --link db:db " +
           "-e PG_HOST=#{postgres.ip} -v #{path}:/usr/src/app",
           nil,
           path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-dev
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies: []
 description: Useful interface to docker
 email: jphager2@gmail.com