nutkins 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e39c7d9fb6cf2c1c75ea934110db18766e507ab8
-  data.tar.gz: b8e2dbfa8a16cd68b564db04bd024114cf4c042a
+  metadata.gz: 7180a966807e27688ba070e225f11faad2f46dbc
+  data.tar.gz: 4a7427067089d88a6a82d576ae7089293fd18cfd
 SHA512:
-  metadata.gz: ec3ae892c0dd327696cee6e7254a1cfb3e50bf2a4e3348b012184fc4a1ff61adba402abe451e9b21a15c0bf2f54d49e85cef11ff9706673ce56fcc115ce0fde8
-  data.tar.gz: c1db55842f25e02cb6163218e6e74d881ab8364f0bbd13763f876cde5c533c9115f7f83fd578ec8a08e400e5e9cac483fa199fef47f11c95af7d616be99e87e1
+  metadata.gz: 4f32b2b6fd85b135b5c492450277a354375b1a64cb6128af26223fb1e3715cd61f066892837048a54aef03b4292f5004f2c6653e2acf5e27a575aa54a45c3c0c
+  data.tar.gz: 39f709c64bfe4f7ef19f6286c21562b1fbe4ef5aec90f65f2ba64557fb287c68ccaf12fc7cdea6db3a61ec4e6642b54e8cbeb53bf57046c04d92919d3000f660

data/README.md

@@ -2,8 +2,6 @@
 
 [![build status](https://circleci.com/gh/ohjames/nutkins.png)](https://circleci.com/gh/ohjames/nutkins)
 
-Nutkins is a tool to manage and test a repository containing one or more docker images.
- * Easy to create and run test instances of any service in a single command.
- * Docker images and containers are managed to avoid the difficulties using the raw `docker` command provides around removing images.
- * A wrapper around `fleetctl` to make upgrading services easy.
- * Extra configuation in `nutkins.yaml` and `nutkin.yaml` to add extra functionality missing from docker.
+Nutkins is a tool to help build and test multiple docker containers configured via etcd and confd. You can:
+ * Describe test volumes and etcd variables using yaml.
+ * Easily rebuild and test containers with a few simple commands.

data/bin/nutkins

@@ -42,6 +42,9 @@ module Nutkins::Command
       op.subcommand 'build-secret,B path', 'build secret files/volumes'
       op.subcommand 'extract-secrets,X [*names]', 'extract secret files/volumes'
 
+      op.subcommand 'start-etcd', 'start container running etcd'
+      op.subcommand 'stop-etcd', 'stop container running etcd'
+
       parsed_cfg = op.parse(args).to_h
 
       global_config = OpenStruct.new parsed_cfg[:config]
@@ -75,6 +78,10 @@ module Nutkins::Command
       nutkins.build_secret config.path
     when 'extract-secrets'
       nutkins.extract_secrets config.names
+    when 'start-etcd'
+      nutkins.start_etcd_container
+    when 'stop-etcd'
+      nutkins.stop_etcd_container
     end
   rescue RuntimeError => e
     puts e.to_s

data/lib/nutkins/docker.rb

@@ -1,10 +1,8 @@
+require 'open3'
+
 module Nutkins::Docker
   def self.image_id_for_tag tag
-    regex = /^#{tag} +/
-    `docker images`.each_line do |line|
-      return line.split(' ')[2] if line =~ regex
-    end
-    nil
+    self.run_get_stdout 'inspect', '--format="{{.Id}}"', tag
   end
 
   def self.container_id_for_tag tag
@@ -14,4 +12,26 @@ module Nutkins::Docker
     end
     nil
   end
+
+  def self.container_id_for_name name
+    self.run_get_stdout 'inspect', '--format="{{.Id}}"', name
+  end
+
+  def self.run_get_stdout *args
+    stdout_str, stderr_str, status = Open3.capture3 'docker', *args
+    status.success? && stdout_str.chomp
+  end
+
+  def self.run *args, stdout: false, stderr: true
+    stdout_backup = ! stdout && $stdout.clone
+    stderr_backup = ! stderr && $stderr.clone
+    $stdout.reopen File.new('/dev/null', 'w') unless stdout
+    $stderr.reopen File.new('/dev/null', 'w') unless stderr
+    begin
+      system 'docker', *args
+    ensure
+      $stdout.reopen stdout_backup unless stdout
+      $stderr.reopen stderr_backup unless stderr
+    end
+  end
 end

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/nutkins.rb

@@ -32,7 +32,7 @@ module Nutkins
       cfg = get_image_config img_name
       img_dir = get_project_dir img_name
       raise "directory `#{img_dir}' does not exist" unless Dir.exists? img_dir
-      tag = get_tag cfg
+      tag = cfg['tag']
 
       build_cfg = cfg["build"]
       if build_cfg
@@ -43,11 +43,11 @@ module Nutkins
 
       prev_image_id = Docker.image_id_for_tag tag
 
-      if run_docker "build", "-t", tag, img_dir
+      if Docker.run 'build', '-t', cfg['latest_tag'], '-t', tag, img_dir, stdout: true
         image_id = Docker.image_id_for_tag tag
         if not prev_image_id.nil? and image_id != prev_image_id
           puts "deleting previous image #{prev_image_id}"
-          run_docker "rmi", prev_image_id
+          Docker.run "rmi", prev_image_id
         end
       else
         raise "issue building docker image for #{img_name}"
@@ -75,10 +75,10 @@ module Nutkins
         end
       end
 
-      tag = get_tag cfg
+      tag = cfg['tag']
       prev_container_id = Docker.container_id_for_tag tag unless preserve
       puts "creating new docker image"
-      unless run_docker "create", "-it", *flags, tag, *docker_args
+      unless Docker.run "create", "-it", *flags, tag, *docker_args
         raise "failed to create `#{img_name}' container"
       end
 
@@ -86,7 +86,7 @@ module Nutkins
         container_id = Docker.container_id_for_tag tag
         if not prev_container_id.nil? and container_id != prev_container_id
           puts "deleting previous container #{prev_container_id}"
-          run_docker "rm", prev_container_id
+          Docker.run "rm", prev_container_id
         end
       end
 
@@ -95,7 +95,7 @@ module Nutkins
 
     def run img_name, reuse: false, shell: false
       cfg = get_image_config img_name
-      tag = get_tag cfg
+      tag = cfg['tag']
       create_args = []
       if shell
         raise '--shell and --reuse arguments are incompatible' if reuse
@@ -124,11 +124,12 @@ module Nutkins
 
     def delete img_name
       cfg = get_image_config img_name
-      tag = get_tag cfg
+      tag = cfg['tag']
       container_id = Docker.container_id_for_tag tag
       raise "no container to delete" if container_id.nil?
       puts "deleting container #{container_id}"
-      run_docker "rm", container_id
+      # TODO: also delete :latest
+      Docker.run "rm", container_id
     end
 
     def delete_all
@@ -176,11 +177,46 @@ module Nutkins
       puts "TODO: exec #{img_name}: #{cmd.join ' '}"
     end
 
+    def start_etcd_container
+      name = get_etcd_container_name
+      return unless name
+      existing = Docker.container_id_for_name name
+      unless existing
+        Docker.run 'create', '--name', name, '-p', '4001:4001', 'microbox/etcd:latest', '-name', name
+      end
+
+      if Docker.run 'start', name
+        puts 'started etcd container'
+      else
+        puts 'failed to start etcd container'
+      end
+    end
+
+    def stop_etcd_container
+      name = get_etcd_container_name
+      return unless name
+      if Docker.run 'stop', name
+        puts 'stopped etcd container'
+      else
+        puts 'failed to stop etcd container'
+      end
+    end
+
     private
+    def get_etcd_container_name
+      repository = @config.repository
+      repository && "nutkins-etcd-#{repository}"
+    end
+
     def get_image_config path
       img_cfg_path = File.join get_project_dir(path), IMG_CONFIG_FILE_NAME
       img_cfg = File.exists?(img_cfg_path) ? YAML.load_file(img_cfg_path) : {}
       img_cfg["image"] ||= path if path != '.'
+      img_cfg["version"] ||= @config.version if @config.version
+      img_cfg['version'] = img_cfg['version'].to_s
+      raise 'missing mandatory version field' unless img_cfg.has_key? 'version'
+      img_cfg['latest_tag'] = get_tag img_cfg
+      img_cfg['tag'] = img_cfg['latest_tag'] + ':' + img_cfg['version']
       img_cfg
     end
 
@@ -211,9 +247,5 @@ module Nutkins
       img_dir = get_project_dir img_name
       Dir.glob("#{img_dir}/{volumes,secrets}/*.gpg")
     end
-
-    def run_docker *args
-      system 'docker', *args
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutkins
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler