docker-spoon 0.8.0 → 1.0.0

data/Rakefile

@@ -24,25 +24,15 @@ def dump_load_path
   end
 end
 require 'bundler'
+require 'rspec/core/rake_task'
 require 'rake/clean'
-
-require 'rake/testtask'
-
 require 'cucumber'
 require 'cucumber/rake/task'
-gem 'rdoc' # we need the installed RDoc gem, not the system one
-require 'rdoc/task'
 
 include Rake::DSL
 
 Bundler::GemHelper.install_tasks
 
-
-Rake::TestTask.new do |t|
-  t.pattern = 'test/tc_*.rb'
-end
-
-
 CUKE_RESULTS = 'results.html'
 CLEAN << CUKE_RESULTS
 Cucumber::Rake::Task.new(:features) do |t|
@@ -50,12 +40,12 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.fork = false
 end
 
-Rake::RDocTask.new do |rd|
-  
-  rd.main = "README.rdoc"
-  
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+task(:testsetup) do
+  cmd = 'bundle exec bin/spoon --url tcp://127.0.0.1:2375 --build --builddir docker --image spoon_test'
+  sh(cmd)
 end
 
-task :default => [:test,:features]
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:features]
 

data/bin/spoon

@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
-require 'methadone'
 require 'spoon.rb'

data/docker-spoon.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rdoc')
   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.13')
+  spec.add_dependency('docker-api', '~> 1.17.0')
   spec.add_dependency('rainbow', '~> 2.0')
 end

data/features/build.feature

@@ -0,0 +1,49 @@
+Feature: Test building
+
+  Scenario: --build should fail with an invalid configuration
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:builddir] = "."
+		"""
+
+		When I run `spoon -c spoon_config --build`
+		Then the exit status should be 1
+		And the output should contain:
+		"""
+		must contain a Dockerfile... cannot continue
+		"""
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:builddir] = "/tmp/this_18881_random_dir_should_not_exist"
+		"""
+
+		When I run `spoon -c spoon_config --build`
+		Then the exit status should be 1
+		And the output should contain:
+		"""
+		must contain a Dockerfile... cannot continue
+		"""
+
+	Scenario: --build should work with a valid configuration
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:builddir] = "../../docker"
+		"""
+
+		When I run `spoon -c spoon_config --build`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Successfully built
+		"""
+
+

data/features/create_list_destroy.feature

@@ -0,0 +1,81 @@
+@build @clean
+Feature: Creating, Listing, Killing, Restarting and Destroying containers works
+
+  Scenario: Creating, Listing & Destroying containers works
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:prefix] = "test-"
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		No spoon containers running at tcp://127.0.0.1:2375
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		The 'test-testcontainer19919' container doesn't exist, creating...
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		List of available spoon containers:
+		"""
+		And the output should contain:
+		"""
+		testcontainer19919 [ Running ] spoon_test
+		"""
+
+		When I run `spoon -c spoon_config --kill testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Container test-testcontainer19919 killed
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		testcontainer19919 [ Stopped ] spoon_test
+		"""
+
+		When I run `spoon -c spoon_config --restart testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Container test-testcontainer19919 restarted
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		testcontainer19919 [ Running ] spoon_test
+		"""
+
+		When I run `spoon -c spoon_config -d testcontainer19919` interactively
+		And I type "n"
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Delete aborted..
+		"""
+
+		When I run `spoon -c spoon_config -d testcontainer19919` interactively
+		And I type "y"
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Destroying test-testcontainer19919
+		Done!
+		"""

data/features/debug.feature

@@ -0,0 +1,25 @@
+Feature: Test debug mode
+
+  Scenario: Normally should not see any debugging output
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 0
+		And the output should not contain "D: "
+
+  Scenario: With --debug I should see debug output
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config -l --debug`
+		Then the exit status should be 0
+		And the output should contain "D: "

data/features/docker_host_env.feature

@@ -0,0 +1,24 @@
+@docker_env
+Feature: Validate URL Config
+
+  Scenario: Use DOCKER_HOST
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2376"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c /dev/null --prefix "test-" -l`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		No spoon containers running at tcp://127.0.0.1:2375
+		"""
+
+		When I run `spoon -c spoon_config -l`
+		Then the exit status should be 1
+		And the output should contain:
+		"""
+		Connection refused
+		"""

data/features/help.feature

@@ -0,0 +1,67 @@
+Feature: spoon provides help as necessary
+
+  Scenario: App provides help
+
+    When I run `spoon --help`
+    Then the exit status should be 0
+		And the output should contain "--version"
+    And the output should contain "--list"
+    And the output should contain "--destroy"
+    And the output should contain "--build"
+    And the output should contain "--builddir"
+    And the output should contain "--url"
+    And the output should contain "--list-images"
+    And the output should contain "--image"
+    And the output should contain "--network"
+    And the output should contain "--prefix"
+    And the output should contain "--config"
+    And the output should contain "--debug"
+		And the output should contain "--debugssh"
+		And the output should contain "--force"
+
+	Scenario: Missing arguments throw error
+
+		When I run `spoon --builddir`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --config`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --destroy`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --image`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --kill`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --network`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --portforwards`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --ports`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --prefix`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --restart`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+
+		When I run `spoon --url`
+		Then the exit status should be 1
+		And the output should contain "missing argument:"
+

data/features/list-images.feature

@@ -0,0 +1,17 @@
+@build
+Feature: Test listing of images
+
+  Scenario: As a user of spoon I should be able to list images
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config --list-images`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Image: ["spoon_test:latest"]
+		"""

data/features/portforwards.feature

@@ -0,0 +1,94 @@
+@build @clean 
+Feature: Test ssh port forward specification
+
+  Scenario: portforwards defined in config file with single port
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:portforwards] = [ "19919" ]
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19919
+		"""
+
+	Scenario: portforwards defined on command line with dynamic mapping
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --portforwards 19919 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19919
+		"""
+
+  Scenario: portforwards defined in config file with different rport
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:portforwards] = [ '19919:19918' ]
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19918
+		"""
+
+	Scenario: portforwards defined on command line with different rport
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --portforwards 19919:19918 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19918
+		"""
+
+	Scenario: Multiple portforwards defined
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --portforwards 19919,18818 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19919 -L 18818:127.0.0.1:18818
+		"""
+
+	Scenario: Multiple portforwards defined with different rport
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --portforwards 19919:19918,18818:18819 --nologin`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		SSH Forwards: -L 19919:127.0.0.1:19918 -L 18818:127.0.0.1:18819
+		"""

data/features/ports.feature

@@ -0,0 +1,126 @@
+@build @clean
+Feature: Test port specification
+
+  Scenario: Ports defined in config file with dynamic mapping
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:ports] = [ 19919 ]
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> "
+
+	Scenario: Ports defined on command line with dynamic mapping
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --ports 19919 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> "
+
+  Scenario: Ports defined in config file with static mapping
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		options[:ports] = [ '19919:19919' ]
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> 19919"
+
+	Scenario: Ports defined on command line with static mapping
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --ports 19919:19919 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> 19919"
+
+	Scenario: Multiple ports defined, dynamic
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --ports 19919,18818 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> "
+		And the output should contain "18818 -> "
+
+	Scenario: Multiple ports defined, static
+
+		Given a file named "spoon_config" with:
+		"""
+		options[:url] = "tcp://127.0.0.1:2375"
+		options[:image] = "spoon_test"
+		"""
+
+		When I run `spoon -c spoon_config testcontainer19919 --ports 19919:19919,18818:18818 --nologin`
+		Then the exit status should be 0
+
+		When I run `spoon -c spoon_config -n testcontainer19919`
+		Then the exit status should be 0
+		And the output should contain:
+		"""
+		Host: 127.0.0.1
+		"""
+		And the output should contain "22 ->"
+		And the output should contain "19919 -> 19919"
+		And the output should contain "18818 -> 18818"