kitchen-docker 0.1.1.dev → 0.1.1

data/README.md

@@ -4,9 +4,7 @@ A Test Kitchen Driver for Docker.
 
 ## <a name="requirements"></a> Requirements
 
-**TODO:** document any software or library prerequisites that are required to
-use this driver. Implement the `#verify_dependencies` method in your Driver
-class to enforce these requirements in code, if possible.
+* [Docker][docker_getting_started]
 
 ## <a name="installation"></a> Installation and Setup
 
@@ -14,7 +12,22 @@ Please read the [Driver usage][driver_usage] page for more details.
 
 ## <a name="config"></a> Configuration
 
-**TODO:** Write descriptions of all configuration options
+### <a name="config-image"></a> image
+
+The Docker image to use as the base for the suite containers. You can find
+images using the [Docker Index][docker_index].
+
+The default value is `ubuntu` ([image][docker_default_image]).
+
+### <a name="config-platform"></a> platform
+
+The platform of the chosen image. This is used to properly bootstrap the
+suite container for Test Kitchen. Kitchen Docker currently supports:
+
+* `debian` or `ubuntu`
+* `rhel` or `centos`
+
+The default value is `ubuntu`.
 
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
 
@@ -30,7 +43,7 @@ installed. There are several different behaviors available:
   the installed version and the desired version match.
 * `false` or `nil` - no chef is installed.
 
-The default value is unset, or `nil`.
+The default value is `true`.
 
 ## <a name="development"></a> Development
 
@@ -56,9 +69,12 @@ Created and maintained by [Sean Porter][author] (<portertech@gmail.com>)
 Apache 2.0 (see [LICENSE][license])
 
 
-[author]:           https://github.com/enter-github-user
-[issues]:           https://github.com/enter-github-user/kitchen-docker/issues
-[license]:          https://github.com/enter-github-user/kitchen-docker/blob/master/LICENSE
-[repo]:             https://github.com/enter-github-user/kitchen-docker
-[driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
-[chef_omnibus_dl]:  http://www.opscode.com/chef/install/
+[author]:                 https://github.com/portertech
+[issues]:                 https://github.com/portertech/kitchen-docker/issues
+[license]:                https://github.com/portertech/kitchen-docker/blob/master/LICENSE
+[repo]:                   https://github.com/portertech/kitchen-docker
+[docker_getting_started]: http://www.docker.io/gettingstarted/
+[docker_index]:           https://index.docker.io/
+[docker_default_image]:   https://index.docker.io/_/ubuntu/
+[driver_usage]:           http://docs.kitchen-ci.org/drivers/usage
+[chef_omnibus_dl]:        http://www.opscode.com/chef/install/

data/lib/kitchen/driver/docker.rb

@@ -33,7 +33,14 @@ module Kitchen
       default_config :port,                 '22'
       default_config :username,             'kitchen'
       default_config :password,             'kitchen'
-      default_config :require_chef_omnibus, 'latest'
+      default_config :require_chef_omnibus, true
+
+      def verify_dependencies
+        run_command('docker > /dev/null', :quiet => true)
+        rescue
+          raise UserError,
+          'You must first install Docker http://www.docker.io/gettingstarted/'
+      end
 
       def create(state)
         state[:image_id] = build_image(state) unless state[:image_id]
@@ -70,12 +77,14 @@ module Kitchen
           raise ActionFailed,
           "Unknown platform '#{config[:platform]}'"
         end
+        username = config[:username]
+        password = config[:password]
         base = <<-eos
           RUN mkdir /var/run/sshd
           RUN echo '127.0.0.1 localhost.localdomain localhost' >> /etc/hosts
-          RUN useradd -d /home/kitchen -m -s /bin/bash kitchen
-          RUN echo kitchen:kitchen | chpasswd
-          RUN echo 'kitchen ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+          RUN useradd -d /home/#{username} -m -s /bin/bash #{username}
+          RUN echo #{username}:#{password} | chpasswd
+          RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
         eos
         [from, platform, base].join("\n")
       end
@@ -121,7 +130,7 @@ module Kitchen
 
       def container_address(state)
         container_id = state[:container_id]
-        output = run_command("docker inspect #{container_id}", :quiet => true)
+        output = run_command("docker inspect #{container_id}")
         parse_container_ip(output)
       end
 

data/lib/kitchen/driver/docker_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.1.1.dev"
+    DOCKER_VERSION = "0.1.1"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.1.dev
-  prerelease: 6
+  version: 0.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Sean Porter
@@ -137,16 +137,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 3422827801630028328
+      hash: 1503263599404936680
       version: '0'
       segments:
       - 0
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      hash: 1503263599404936680
+      version: '0'
+      segments:
+      - 0
   none: false
 requirements: []
 rubyforge_project: