docker-spoon 0.1.0 → 0.2.0

data/.gitignore

@@ -2,3 +2,4 @@
 results.html
 pkg
 html
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docker-spoon (0.1.0)
+    docker-spoon (0.1.1)
       docker-api (~> 1.11)
       methadone (~> 1.4.0)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    aruba (0.5.4)
+    aruba (0.6.0)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
@@ -23,11 +23,11 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.11.2)
+    docker-api (1.13.1)
       archive-tar-minitar
-      excon (>= 0.37.0)
+      excon (>= 0.38.0)
       json
-    excon (0.37.0)
+    excon (0.38.0)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
@@ -39,10 +39,10 @@ GEM
     rake (0.9.6)
     rdoc (4.1.1)
       json (~> 1.4)
-    rspec-expectations (3.0.2)
+    rspec-expectations (3.0.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+    rspec-support (3.0.3)
 
 PLATFORMS
   ruby

data/README.md

@@ -16,8 +16,6 @@ Spoon is intended to make this process as easy as possible.
 #### Why Spoon?
 [Learn more about spooning](https://www.youtube.com/watch?v=dYBjVTMUQY0)
 
-In the mean time - [learn more about spooning](https://www.youtube.com/watch?v=dYBjVTMUQY0)
-
 ## Installation
 
 ```
@@ -151,9 +149,9 @@ options["pre-build-commands"] = [
 
 #### Container expectations
 
-When building a container for use with docker-spoon you must build a
-container which runs an ssh daemon. An example of a Dockerfile which
-creates a container which runs ssh is included in the `docker/`
+When building an image for use with docker-spoon you must build an
+image which runs an ssh daemon. An example of a Dockerfile which
+creates an image which runs ssh is included in the `docker/`
 directory inside this repository
 
 ## Contributing

data/{spoon.gemspec → docker-spoon.gemspec}

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["anichols@trumped.org"]
   spec.summary       = %q{Create on-demand pairing environments in Docker}
   spec.description   = %q{Create on-demand pairing environments in Docker}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/adnichols/docker-spoon"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/features/spoon.feature

@@ -10,4 +10,15 @@ Feature: My bootstrapped app kinda works
     And the banner should document that this app takes options
     And the following options should be documented:
       |--version|
-    And the banner should document that this app takes no arguments
+      |--list|
+      |--destroy|
+      |--build|
+      |--builddir|
+      |--pre-build-commands|
+      |--url|
+      |--list-images|
+      |--image|
+      |--network|
+      |--prefix|
+      |--config|
+      |--debug|

data/lib/spoon.rb

@@ -1,7 +1,6 @@
 require "spoon/version"
 require 'docker'
 require 'json'
-require 'pp'
 require 'uri'
 
 module Spoon
@@ -21,6 +20,8 @@ module Spoon
       image_build
     elsif options[:destroy]
       instance_destroy(apply_prefix(options[:destroy]))
+    elsif options[:network]
+      instance_network(apply_prefix(options[:network]))
     elsif instance
       instance_connect(apply_prefix(instance), options[:command])
     else
@@ -35,6 +36,7 @@ module Spoon
   on("-l", "--list", "List available spoon instances")
   on("-d", "--destroy NAME", "Destroy spoon instance with NAME")
   on("-b", "--build", "Build image from Dockerfile using name passed to --image")
+  on("-n", "--network NAME", "Display exposed ports using name passed to NAME")
 
   # Configurables
   options[:builddir] = '.'
@@ -76,7 +78,7 @@ module Spoon
     # Run pre-build commands
     options["pre-build-commands"].each do |command|
       sh command
-    end
+    end unless options["pre-build-commands"].nil?
     D "pre-build commands complete, building Docker image"
 
     docker_url
@@ -123,6 +125,11 @@ module Spoon
       instance_create(name)
     end
 
+    container = get_container(name)
+    unless is_running?(container)
+      instance_start(container)
+    end
+
     puts "Connecting to `#{name}`"
     instance_ssh(name, command)
   end
@@ -130,12 +137,47 @@ module Spoon
   def self.instance_list
     docker_url
     puts "List of available spoon containers:"
-    container_list = Docker::Container.all
+    container_list = get_all_containers
     container_list.each do |container|
       name = container.info["Names"].first.to_s
       if name.start_with? "/#{options[:prefix]}"
-        puts remove_prefix(name)
+        running = is_running?(container) ? "Running" : "Stopped"
+        puts "#{remove_prefix(name)} [ #{running} ]".rjust(40)
+      end
+    end
+  end
+
+  def self.strip_slash(name)
+    if name.start_with? "/"
+      name[1..-1]
+    else
+      name
+    end
+  end
+
+  def self.is_running?(container)
+    container = Docker::Container.get(container.info["id"])
+    status = container.info["State"]["Running"] || nil
+    unless status.nil?
+      return status
+    else
+      return false
+    end
+  end
+
+  def self.instance_network(name)
+    docker_url
+
+    container = get_container(name)
+
+    if is_running?(container)
+      ports = container.json['NetworkSettings']['Ports']
+      ports.each do |p_name, p_port|
+        tcp_name = p_name.split('/')[0]
+        puts "#{tcp_name} -> #{p_port.first['HostPort']}"
       end
+    else
+      puts "Container is not running, cannot show ports"
     end
   end
 
@@ -181,12 +223,25 @@ module Spoon
     end
   end
 
+  def self.get_all_containers
+    Docker::Container.all(:all => true)
+  end
+
+  def self.get_running_containers
+    Docker::Container.all
+  end
+
+  def self.instance_start(container)
+    container.start!
+  end
+
   def self.get_container(name)
     docker_url
-    container_list = Docker::Container.all
+    container_list = get_all_containers
 
+    l_name = strip_slash(name)
     container_list.each do |container|
-      if container.info["Names"].first.to_s == "/#{name}"
+      if container.info["Names"].first.to_s == "/#{l_name}"
         return container
       end
     end

data/lib/spoon/version.rb

@@ -1,3 +1,3 @@
 module Spoon
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-spoon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - README.md
 - Rakefile
 - bin/spoon
+- docker-spoon.gemspec
 - docker/Dockerfile
 - docker/resources/log/run
 - docker/resources/run
@@ -150,9 +151,8 @@ files:
 - features/support/env.rb
 - lib/spoon.rb
 - lib/spoon/version.rb
-- spoon.gemspec
 - test/tc_something.rb
-homepage: ''
+homepage: https://github.com/adnichols/docker-spoon
 licenses:
 - MIT
 post_install_message: