docker-spoon 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8560cffb7fd59a8f21670b4e79b29d437b983ec2
-  data.tar.gz: afd021a9f0b9f3f636afa3300df0fd7f22c0ff20
+  metadata.gz: 44d1699d5dfe6932ecb60d0c9ab0da39f7d8aa9a
+  data.tar.gz: a8552620c5ee5b7ad52d08231f42ef7ad74d337f
 SHA512:
-  metadata.gz: 429d54094e6d70341b226ec3a89696fc3ef6bae4860143612946b3fc27315025e465f06c9d5c4c0db1a0e0b8b7eb256e9d514d4eba088b5e3b3a11df87585355
-  data.tar.gz: 8143c4d158264afa614b17b820cd0363e9483f43ea6a366b0ecadaa9da996063af07b5c68bdb6c4adbabc7e6940dfb164b2f90269e2c4d21aea0b1e3954a449d
+  metadata.gz: 2849495539fe5b88f718b2125d23251006142355bda39980d5c0eaa3d4065072ca6f50bdbc6a9653fc59b9dd9485fc2c76b287d4048fbb2b9a1de9501b0dd8c3
+  data.tar.gz: 00fea86de864e662b76ca61791e4a24cf7a6f62c39316fdd0f8219c7071cd0ddddba277f0091e581117d21e6ac23e7683eb12adae643fba6cf3060f1aae763e2

data/.gitignore

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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    docker-spoon (0.6.0)
-      docker-api (~> 1.11)
+    docker-spoon (0.8.0)
+      docker-api (~> 1.13)
       methadone (~> 1.4.0)
       rainbow (~> 2.0)
 
@@ -15,7 +15,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     builder (3.2.2)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     cucumber (1.3.17)
       builder (>= 2.1.2)
@@ -24,12 +24,12 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.13.3)
+    docker-api (1.13.6)
       archive-tar-minitar
       excon (>= 0.38.0)
       json
-    excon (0.39.6)
-    ffi (1.9.5)
+    excon (0.40.0)
+    ffi (1.9.6)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     json (1.8.1)
@@ -44,7 +44,7 @@ GEM
     rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.1)
+    rspec-support (3.1.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -95,6 +95,11 @@ in.
 - `--image`, The image name to use when starting a spoon container.
 - `--prefix`, The prefix to use for creating, listing & destroying
   containers.
+- `--portforwards`, This is a space separated list of ports to forward
+  over ssh. The format is either `sourceport:destport` or  just `sourceport`
+  in which case the same port will be used for source & destination.
+	Multiple port forwards may be separated by spaces, for exampe
+	`--portforwards '8080 8081:9090'`
 
 ### List
 
@@ -120,10 +125,16 @@ The `--destroy NAME` option will destroy the specified spoon container.
 
 ```shell
 $ spoon -d fortesting
+Are you sure you want to destroy spoon-fortesting? (y/n) y
 Destroying spoon-fortesting
 Done!
 ```
 
+To skip any confirmations:
+
+  * add `-f` or `--force` to the command-line
+  * add `options[:force] = true` to your `.spoonrc`.
+
 ### Network
 
 The `--network NAME` option will show the forwarded ports for a spoon
@@ -196,6 +207,19 @@ the .ssh directory in the example above.
 Example:
 ```
 options[:add_authorized_keys] = "id_rsa.pub"
+```
+
+  `run_on_create` - This is a list of commands to run on a spoon container
+  once it has been started. This allows you to quickly and automatically
+  modify a spoon environment upon creation to meet any needs you have
+  which aren't baked into the Docker image. This is a config-only
+	option, there is no command line for this. Commands are run one at a
+	time over ssh - enabling :add_authorized_keys makes this option more
+	tolerable.
+
+Example:
+```
+options[:run_on_create] = [ "sudo apt-get -y install emacs" ]
 ```
 
 #### Container expectations

data/docker/Dockerfile

@@ -3,28 +3,31 @@ FROM ubuntu:14.04
 RUN locale-gen en_US.UTF-8
 RUN apt-get update
 RUN apt-get install -y python-software-properties
-RUN apt-get install -y software-properties-common 
-RUN apt-get install -y python-setuptools 
+RUN apt-get install -y software-properties-common
+RUN apt-get install -y python-setuptools
 RUN add-apt-repository ppa:webupd8team/java
 RUN apt-get update
-RUN apt-get install -y zip 
+RUN apt-get install -y zip
 RUN apt-get install -y openssl
-RUN apt-get install -y git 
-RUN apt-get install -y emacs24 
-RUN apt-get install -y tmux 
-RUN apt-get install -y ack-grep 
-RUN apt-get install -y python 
-RUN apt-get install -y wget 
-RUN apt-get install -y xsel 
-RUN apt-get install -y python-pip 
-RUN apt-get install -y zsh 
-RUN apt-get install -y curl 
-RUN apt-get install -y build-essential 
-RUN apt-get install -y runit 
-RUN apt-get install -y openssh-server 
-RUN apt-get install -y ruby 
+RUN apt-get install -y git
+RUN apt-get install -y emacs24
+RUN apt-get install -y tmux
+RUN apt-get install -y ack-grep
+RUN apt-get install -y python
+RUN apt-get install -y wget
+RUN apt-get install -y xsel
+RUN apt-get install -y python-pip
+RUN apt-get install -y zsh
+RUN apt-get install -y curl
+RUN apt-get install -y build-essential
+RUN apt-get install -y runit
+RUN apt-get install -y openssh-server
+RUN apt-get install -y ruby
 RUN apt-get install -y tree
 RUN apt-get install -y vim
+RUN apt-get install -y libevent-dev
+RUN apt-get install -y ncurses-dev
+RUN apt-get install -y rake
 
 RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
@@ -34,20 +37,38 @@ RUN apt-get -y install oracle-java7-installer
 RUN easy_install httpie
 RUN pip install https://github.com/Lokaltog/powerline/tarball/develop
 
-RUN mkdir -p /etc/service
-ADD resources /etc/service/ssh
-ADD runit /etc/runit
-
-RUN mkdir -p /var/run/sshd
+# Tmux
+RUN wget http://downloads.sourceforge.net/tmux/tmux-1.9a.tar.gz
+RUN tar -zxf tmux-1.9a.tar.gz
+RUN cd tmux-1.9a && ./configure && make install
+RUN rm -r /tmux-1.9a*
+RUN pip install --upgrade --user git+git://github.com/Lokaltog/powerline
 
 RUN useradd -s /bin/zsh -m -d /home/pairing -g root pairing
 RUN echo "pairing:pairing" | chpasswd
 RUN echo "pairing        ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-ADD resources/zshrc.default /home/pairing/.zshrc
+USER pairing
+ENV HOME /home/pairing
+RUN git clone https://github.com/robbyrussell/oh-my-zsh.git /home/pairing/.oh-my-zsh
+RUN chown -R pairing /home/pairing/.oh-my-zsh
 
+RUN git clone https://github.com/adnichols/tmux-and-vim.git /home/pairing/.janus
+RUN bash -l -c /home/pairing/.janus/setup/setup.sh
+# Fixup powerline for this setup
+RUN sed -i 's%/usr/local/lib/python2\.7/site-packages%/usr/local/lib/python2.7/dist-packages%' ~/.tmux.conf
+ADD resources/zshrc.default /home/pairing/.zshrc
 RUN mkdir /home/pairing/projects
 
+USER root
+
+# Runit setup
+RUN mkdir -p /etc/service
+ADD runit-ssh /etc/service/ssh
+ADD runit /etc/runit
+
+RUN mkdir -p /var/run/sshd
+
 EXPOSE 22
 
-ENTRYPOINT "/usr/sbin/runit"
+CMD /usr/sbin/sshd -D -o UsePAM=no

data/docker/resources/tmux.conf

@@ -0,0 +1,99 @@
+# Last modified: 2009-11-12T05:59:41+0800
+# Change prefix key to Ctrl+a
+unbind C-b
+set -g prefix `
+bind-key ` send-prefix
+bind-key -n F11 set -g prefix C-o
+bind-key -n F12 set -g prefix `
+
+# Last active window
+unbind l
+bind C-a last-window
+bind C-p previous-window
+bind C-n next-window
+
+set -g mode-mouse on
+set -g mode-keys vi
+bind-key -t vi-copy v begin-selection
+bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+unbind -t vi-copy Enter
+bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
+
+set -g mouse-select-window on
+set -g mouse-select-pane on
+set -g mouse-resize-pane on
+set -g xterm-keys on
+set-window-option -g xterm-keys on
+set-option -g mouse-utf8 on
+set-option -g default-terminal screen-256color
+
+# More straight forward key bindings for splitting
+bind-key | split-window -h
+bind-key - split-window -v
+
+# Smart pane switching with awareness of vim splits
+bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-h) || tmux select-pane -L"
+bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-j) || tmux select-pane -D"
+bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-k) || tmux select-pane -U"
+bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys C-l) || tmux select-pane -R"
+bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iqE '(^|\/)vim$' && tmux send-keys 'C-\\') || tmux select-pane -l"
+
+bind C-l send-keys 'C-l'
+bind-key C-o rotate-window
+
+set-window-option -g other-pane-height 25
+set-window-option -g other-pane-width 80
+
+bind-key C-c run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
+bind-key C-v run "reattach-to-user-namespace pbpaste | tmux load-buffer - && tmux paste-buffer"
+
+set-option -g display-panes-time 1500
+#set-option -g default-command "reattach-to-user-namespace -l zsh"
+set-option -g default-command "/bin/bash -c 'which reattach-to-user-namespace >/dev/null && exec reattach-to-user-namespace $SHELL -l || exec $SHELL -l'"
+
+set-option -g lock-server on
+set-option -g lock-command 'vlock'
+set-option -g lock-after-time 1800
+bind-key C-x lock-server
+
+# History
+set -g history-limit 100000
+
+# Terminal emulator window title
+set -g set-titles on
+set -g set-titles-string '#S:#I.#P #W'
+
+# Status Bar 1.8 format
+# set-option -g status-bg black
+# set-option -g status-fg cyan
+
+# Status Bar 1.9 format
+set-option -g status-style "bg=black"
+set-option -g status-style "fg=cyan"
+
+# Notifying if other windows has activities
+set -g monitor-activity off
+set -g visual-activity on
+
+# Highlighting the active window in status bar (1.8)
+# setw -g window-status-current-bg blue
+# setw -g window-status-current-fg white
+
+# Highlighting the active window in status bar (1.9
+setw -g window-status-current-style "bg=blue"
+setw -g window-status-current-style "fg=white"
+
+# Highlight active window on screen
+set-option -g pane-active-border-fg colour32 # light blue
+
+# Clock
+setw -g clock-mode-colour green
+setw -g clock-mode-style 24
+setw -g aggressive-resize on
+set -g base-index 1
+bind-key S command-prompt -p ssh: "new-window -n %1 'ssh %1'"
+set -g update-environment -r
+set-environment -gu RBENV_VERSION
+
+# Powerline
+source /usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf

data/docker/resources/zshrc.default

@@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="git-taculous"
+ZSH_THEME="robbyrussell"
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/

data/docker/runit-ssh/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd -tt ./main

data/docker-spoon.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('aruba')
   spec.add_development_dependency('rake', '~> 0.9.2')
   spec.add_dependency('methadone', '~> 1.4.0')
-  spec.add_dependency('docker-api', '~> 1.11')
+  spec.add_dependency('docker-api', '~> 1.13')
   spec.add_dependency('rainbow', '~> 2.0')
 end

data/lib/spoon/version.rb

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

data/lib/spoon.rb

@@ -12,11 +12,6 @@ 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
@@ -45,29 +40,49 @@ module Spoon
   on("-n", "--network NAME", "Display exposed ports using name passed to NAME")
 
   # Configurables
-  options[:builddir] = '.'
+  options[:config] ||= "#{ENV['HOME']}/.spoonrc"
+  on("-c FILE", "--config", "Config file to use for spoon options")
+
+  # Read config file & set options
+  if File.exists?(options[:config])
+    eval(File.open(options[:config]).read)
+  end
+
+  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
+  options[:copy_on_create] ||= []
+  options[:run_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")
-  options[:image] = "spoon-pairing"
+  options[:image] ||= "spoon-pairing"
   on("-i", "--image NAME", "Use image for spoon instance")
-  options[:prefix] = 'spoon-'
+  options[:prefix] ||= 'spoon-'
   on("-p", "--prefix PREFIX", "Prefix for container names")
-  options[:command] = ''
-  options[:config] = "#{ENV['HOME']}/.spoonrc"
-  on("-c FILE", "--config", "Config file to use for spoon options")
+  options[:command] ||= ''
+  on("-f", "--force", "Skip any confirmations")
   on("--debug", "Enable debug")
+  on("--debugssh", "Enable SSH debugging")
+  on("-P PORT", "--portforwards", "Forward PORT over ssh (must be > 1023)")
 
 
   arg(:instance, :optional, "Spoon instance to connect to")
 
   use_log_level_option
 
+  def self.confirm_delete?(name)
+    if options[:force]
+      return true
+    else
+      print "Are you sure you want to delete #{name}? (y/n) "
+      answer = $stdin.gets.chomp.downcase
+      return answer == "y"
+    end
+  end
+
   def self.apply_prefix(name)
     "#{options[:prefix]}#{name}"
   end
@@ -129,6 +144,7 @@ module Spoon
       instance_create(name)
       instance_copy_authorized_keys(name, options[:add_authorized_keys])
       instance_copy_files(name)
+      instance_run_actions(name)
     end
 
     container = get_container(name)
@@ -143,8 +159,11 @@ module Spoon
   def self.instance_list
     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 }
+    container_list = get_spoon_containers
+    if container_list.empty?
+      puts "No spoon containers running at #{options[:url]}"
+      exit
+    end
     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|
@@ -200,21 +219,25 @@ module Spoon
     container = get_container(name)
 
     if container
-      puts "Destroying #{name}"
-      begin
-        container.kill
-      rescue
-        puts "Failed to kill container #{container.id}"
-      end
+      if confirm_delete?(name)
+        puts "Destroying #{name}"
+        begin
+          container.kill
+        rescue
+          puts "Failed to kill container #{container.id}"
+        end
 
-      container.wait(10)
+        container.wait(10)
 
-      begin
-        container.delete(:force => true)
-      rescue
-        puts "Failed to remove container #{container.id}"
+        begin
+          container.delete(:force => true)
+        rescue
+          puts "Failed to remove container #{container.id}"
+        end
+        puts "Done!"
+      else
+        puts "Delete aborted.. #{name} lives to pair another day."
       end
-      puts "Done!"
     else
       puts "No container named: #{name}"
     end
@@ -224,37 +247,55 @@ module Spoon
     get_container(name)
   end
 
-  def self.instance_ssh(name, command='')
+  def self.get_port_forwards(forwards = "")
+    if options[:portforwards]
+      options[:portforwards].split.each do |port|
+        (lport,rport) = port.split(':')
+        forwards << "-L #{lport}:127.0.0.1:#{rport || lport} "
+      end
+    end
+    return forwards
+  end
+
+  def self.instance_ssh(name, command='', exec=true)
     container = get_container(name)
+    forwards = get_port_forwards
+    D "Got forwards: #{forwards}"
     host = URI.parse(options[:url]).host
     if container
       ssh_command = "\"#{command}\"" if not command.empty?
       ssh_port = get_port('22', container)
       puts "Waiting for #{name}:#{ssh_port}..." until host_available?(host, ssh_port)
-      exec("ssh -t -o StrictHostKeyChecking=no -p #{ssh_port} pairing@#{host} #{ssh_command}")
+      ssh_options = "-t -o StrictHostKeyChecking=no -p #{ssh_port} #{forwards} "
+      ssh_options << "-v " if options[:debugssh]
+      ssh_cmd = "ssh #{ssh_options} pairing@#{host} #{ssh_command}"
+      D "SSH CMD: #{ssh_cmd}"
+      if exec
+        exec(ssh_cmd)
+      else
+        system(ssh_cmd)
+      end
     else
       puts "No container named: #{container.inspect}"
     end
   end
 
   def self.instance_copy_authorized_keys(name, keyfile)
+    D "Setting up authorized_keys file"
+    # We sleep this once to cope w/ slow starting ssh daemon on create
+    sleep 1
     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
+      full_keyfile = "#{ENV['HOME']}/.ssh/#{keyfile}"
+      key = File.read(full_keyfile).chop
+      D "Read keyfile `#{full_keyfile}` with contents:\n#{key}"
+      cmd = "mkdir -p .ssh ; chmod 700 .ssh ; echo '#{key}' >> .ssh/authorized_keys"
+      instance_ssh(name, cmd, false)
     end
   end
 
   def self.instance_copy_files(name)
     options[:copy_on_create].each do |file|
-      puts "Copying file #{file}"
+      D "Copying file #{file}"
       container = get_container(name)
       host = URI.parse(options[:url]).host
       if container
@@ -267,10 +308,26 @@ module Spoon
     end
   end
 
+  def self.instance_run_actions(name)
+    options[:run_on_create].each do |action|
+      puts "Running command: #{action}"
+      instance_ssh(name, action, false)
+    end
+  end
+
   def self.get_all_containers
     Docker::Container.all(:all => true)
   end
 
+  def self.get_spoon_containers
+    container_list = get_all_containers.select { |c| c.info["Names"].first.to_s.start_with? "/#{options[:prefix]}" }
+    unless container_list.empty?
+      return container_list.sort { |c1, c2| c1.info["Names"].first.to_s <=> c2.info["Names"].first.to_s }
+    else
+      return container_list
+    end
+  end
+
   def self.get_running_containers
     Docker::Container.all
   end
@@ -332,5 +389,3 @@ module Spoon
 
   go!
 end
-
-# option :debug, :type => :boolean, :default => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-spoon
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Aaron Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -140,8 +140,10 @@ files:
 - docker-spoon.gemspec
 - docker/Dockerfile
 - docker/resources/log/run
-- docker/resources/run
+- docker/resources/tmux.conf
 - docker/resources/zshrc.default
+- docker/runit-ssh/log/run
+- docker/runit-ssh/run
 - docker/runit/1
 - docker/runit/2
 - docker/runit/3