docker-spoon 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48e180dd50e661fe9d869975261de629fe5f9070
-  data.tar.gz: 1f174fedabb1d9aeb312fbc904015a70bd06efc9
+  metadata.gz: 8560cffb7fd59a8f21670b4e79b29d437b983ec2
+  data.tar.gz: afd021a9f0b9f3f636afa3300df0fd7f22c0ff20
 SHA512:
-  metadata.gz: c7def17b9423ea439700b0ae123578d78531af13676b27d367bc21ca1b9f75084e8a0c8843736eabb9f36c6e5bcb44981f6fbc1f2be63197651434d485dfa2ca
-  data.tar.gz: b72bc31f97a01047c739148ed21253f7bd7c36409194ee9241561f45332a2de0b4b0592ddfaa422522b2aeefb4148020c2d1cb177bda80156f5ef85e680f5727
+  metadata.gz: 429d54094e6d70341b226ec3a89696fc3ef6bae4860143612946b3fc27315025e465f06c9d5c4c0db1a0e0b8b7eb256e9d514d4eba088b5e3b3a11df87585355
+  data.tar.gz: 8143c4d158264afa614b17b820cd0363e9483f43ea6a366b0ecadaa9da996063af07b5c68bdb6c4adbabc7e6940dfb164b2f90269e2c4d21aea0b1e3954a449d

data/.gitignore

@@ -2,4 +2,5 @@
 results.html
 pkg
 html
-*.gem
+*.gem
+.spoonrc #used for testing

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker-spoon (0.5.0)
+    docker-spoon (0.6.0)
       docker-api (~> 1.11)
       methadone (~> 1.4.0)
       rainbow (~> 2.0)
@@ -10,26 +10,26 @@ GEM
   remote: https://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    aruba (0.6.0)
+    aruba (0.6.1)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
     childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.15)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.13.1)
+    docker-api (1.13.3)
       archive-tar-minitar
       excon (>= 0.38.0)
       json
-    excon (0.38.0)
-    ffi (1.9.3)
+    excon (0.39.6)
+    ffi (1.9.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     json (1.8.1)
@@ -39,12 +39,12 @@ GEM
     multi_test (0.1.1)
     rainbow (2.0.0)
     rake (0.9.6)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
-    rspec-expectations (3.0.3)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,7 +1,7 @@
 # docker-spoon
 
 ## Overview
-Spoon creates on demand pairing environments using Docker. 
+Spoon creates on demand pairing environments using Docker.
 
 We pair a lot using tmux & emacs / vim and wanted a way to create
 pairing environments which met a few criteria:
@@ -11,7 +11,7 @@ pairing environments which met a few criteria:
   environments and asking who's using what
 - Are console based to enable low latency remote pairing
 
-Spoon is intended to make this process as easy as possible. 
+Spoon is intended to make this process as easy as possible.
 
 #### Why Spoon?
 [Learn more about spooning](https://www.youtube.com/watch?v=dYBjVTMUQY0)
@@ -42,10 +42,10 @@ All of the `options[]` parameters should map directly to the long form
 of options on the command line. They may be defined as either the
 `:symbol` form or as a string. The limitation is that ruby doesn't
 permit a dash in symbols, so when an option has a dash in it, it must be
-specified as a string. 
+specified as a string.
 
 You may also specify a different config file with the `--config`
-argument. 
+argument.
 
 ## Usage
 
@@ -65,7 +65,7 @@ the spoon container that you specify. If that container doesn't exist,
 spoon will create it for you. Once spoon either creates a container or
 determines that one already exists it will start an ssh connection to
 the host. This will shell out to ssh and should honor your ssh
-configuration locally. 
+configuration locally.
 
 Example (container doesn't exist):
 ```shell
@@ -91,7 +91,7 @@ in.
 - `--url`, The url of the Docker API endpoint. This is in the format
   supported by the docker -H option. This will also read from the
   environment variable `DOCKER_HOST` if this argument is not specified
-  and that env var exists. 
+  and that env var exists.
 - `--image`, The image name to use when starting a spoon container.
 - `--prefix`, The prefix to use for creating, listing & destroying
   containers.
@@ -101,7 +101,7 @@ in.
 The `--list` argument will list any containers on the destination Docker
 host which have the same prefix as specified by `--prefix` (default
 'spoon-'). Images are listed without the prefix specified so that you
-can see only the containers you are interested in. 
+can see only the containers you are interested in.
 
 ```shell
 $ spoon -l
@@ -116,7 +116,7 @@ containers, spoon will re-start them as necessary.
 
 ### Destroy
 
-The `--destroy NAME` option will destroy the specified spoon container. 
+The `--destroy NAME` option will destroy the specified spoon container.
 
 ```shell
 $ spoon -d fortesting
@@ -143,12 +143,12 @@ The `--build` option will build a docker image from the build directory
 specified by `--builddir` (default '.'). This has the same expectations
 as the [docker
 build](https://docs.docker.com/reference/commandline/cli/#build)
-command. 
+command.
 
 #### Options
 
 - `--builddir`, This is the directory where the build process will look
-  for a Dockerfile and any content added to the container using `ADD`. 
+  for a Dockerfile and any content added to the container using `ADD`.
 
 - `--pre-build-commands`, This is a list of commands to run before
   actually kicking off the build process (see below).
@@ -161,7 +161,7 @@ copying stuff into the container which you don't want to have committed
 to the repository. An example of this is that in our environment we need
 chef credentials inside of our container & we use this mechanism to copy
 those credentials into the builddir at build time without adding them to
-our repository containing the Dockerfile. 
+our repository containing the Dockerfile.
 
 Here's an example of how we copy our chef configuration into place:
 ```ruby
@@ -170,6 +170,34 @@ options["pre-build-commands"] = [
 ]
 ```
 
+- `copy_on_create`, - This is a config-only value, there is no command
+  line argument for it. The idea is that you can specify a list of files
+  to copy into place on the destination container upon creation. This is
+  useful if you want to copy in place configs that you keep on your
+  workstation but don't want them as part of the image.
+
+Example:
+```
+options[:copy_on_create] = [
+  ".gitconfig",
+  ".ssh",
+  ".ssh/config"
+]
+```
+NOTE: this does not create any required parent directories on the
+destination system unless they are copied into place, for example like
+the .ssh directory in the example above.
+
+- `add_authorized_keys` - This is a config-only value. This allows you
+  to specify an ssh public key that should reside in your own `~/.ssh`
+  directory to be placed in authorized_keys on the destination system
+  upon container creation.
+
+Example:
+```
+options[:add_authorized_keys] = "id_rsa.pub"
+```
+
 #### Container expectations
 
 When building an image for use with docker-spoon you must build an

data/lib/spoon.rb

@@ -12,6 +12,11 @@ module Spoon
 
   main do |instance|
 
+    # Read config file & set options
+    if File.exists?(options[:config])
+      eval(File.open(options[:config]).read)
+    end
+
     D options.inspect
     if options[:list]
       instance_list
@@ -43,6 +48,9 @@ module Spoon
   options[:builddir] = '.'
   on("--builddir DIR", "Directory containing Dockerfile")
   on("--pre-build-commands", "List of commands to run locally before building image")
+  # These are config only options
+  options[:copy_on_create] = []
+  options[:add_authorized_keys] = false
   options[:url] = Docker.url
   on("-u", "--url URL", "Docker url to connect to")
   on("-L", "--list-images", "List available spoon images")
@@ -52,13 +60,9 @@ module Spoon
   on("-p", "--prefix PREFIX", "Prefix for container names")
   options[:command] = ''
   options[:config] = "#{ENV['HOME']}/.spoonrc"
-  on("-c", "--config FILE", "Config file to use for spoon options")
+  on("-c FILE", "--config", "Config file to use for spoon options")
   on("--debug", "Enable debug")
 
-  # Read config file & set options
-  if File.exists?(options[:config])
-    eval(File.open(options[:config]).read)
-  end
 
   arg(:instance, :optional, "Spoon instance to connect to")
 
@@ -123,6 +127,8 @@ module Spoon
     if not instance_exists? name
       puts "The `#{name}` container doesn't exist, creating..."
       instance_create(name)
+      instance_copy_authorized_keys(name, options[:add_authorized_keys])
+      instance_copy_files(name)
     end
 
     container = get_container(name)
@@ -138,7 +144,7 @@ module Spoon
     docker_url
     puts "List of available spoon containers:"
     container_list = get_all_containers.select { |c| c.info["Names"].first.to_s.start_with? "/#{options[:prefix]}" }
-                                       .sort { |c1, c2| c1.info["Names"].first.to_s <=> c2.info["Names"].first.to_s }
+      .sort { |c1, c2| c1.info["Names"].first.to_s <=> c2.info["Names"].first.to_s }
     max_width_container_name = remove_prefix(container_list.max_by {|c| c.info["Names"].first.to_s.length }.info["Names"].first.to_s)
     max_name_width = max_width_container_name.length
     container_list.each do |container|
@@ -231,6 +237,36 @@ module Spoon
     end
   end
 
+  def self.instance_copy_authorized_keys(name, keyfile)
+    if keyfile
+      container = get_container(name)
+      host = URI.parse(options[:url]).host
+      key = File.read("#{ENV['HOME']}/.ssh/#{keyfile}")
+      if container
+        ssh_port = get_port('22', container)
+        puts "Waiting for #{name}:#{ssh_port}..." until host_available?(host, ssh_port)
+        system("ssh -t -o StrictHostKeyChecking=no -p #{ssh_port} pairing@#{host} \"mkdir -p .ssh && chmod 700 .ssh && echo '#{key}' >> ~/.ssh/authorized_keys\"")
+      else
+        puts "No container named: #{container.inspect}"
+      end
+    end
+  end
+
+  def self.instance_copy_files(name)
+    options[:copy_on_create].each do |file|
+      puts "Copying file #{file}"
+      container = get_container(name)
+      host = URI.parse(options[:url]).host
+      if container
+        ssh_port = get_port('22', container)
+        puts "Waiting for #{name}:#{ssh_port}..." until host_available?(host, ssh_port)
+        system("scp -o StrictHostKeyChecking=no -P #{ssh_port} #{ENV['HOME']}/#{file} pairing@#{host}:#{file}")
+      else
+        puts "No container named: #{container.inspect}"
+      end
+    end
+  end
+
   def self.get_all_containers
     Docker::Container.all(:all => true)
   end
@@ -297,7 +333,4 @@ module Spoon
   go!
 end
 
-  # option :debug, :type => :boolean, :default => true
-
-
-  # private
+# option :debug, :type => :boolean, :default => true

data/lib/spoon/version.rb

@@ -1,3 +1,3 @@
 module Spoon
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spoon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Aaron Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler