nutkins 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81e39fa94b02bf61d5ddfe5ebc3576d16fa997d7
-  data.tar.gz: 981ebad358ce8c793b30e6b93d6e58a0fe354593
+  metadata.gz: 798a771286c34b95adbba75636c14ec38e7bc639
+  data.tar.gz: 472275ac590b8eab6d01f12e4a23d0f2c1a193bb
 SHA512:
-  metadata.gz: 1f2f6671e0d59fe84696a5d51ee18d555f5c2bd65900c81a20a1c7016962aae968dd7825831b998045b1631462e72824e218bcfcd6738e6d4a0219732a0229eb
-  data.tar.gz: 4bbd8ceb51f5c6b4ea8fb4724dcdf9408d7a7587eeea70936dc7ed069cddf6620840305f20f9b70447752d0feca918110ce90aa20710d1a72b828baf06954f40
+  metadata.gz: e532d69c2de6b5266ba035aa77a35014ce95e2351f651744129c9b461d6d76f0a23e68c2cbc4218bc61744bcb3a68e7bd999e3fdb29c493c2056cfef97bd69d1
+  data.tar.gz: 24d5cc0027b41f1b3100d76cc07c6bd6a759a6d1ac3f58664e0981a72175d101e62da3a650d837835633bee41bb7a9b510b3ee7e3e5c1cb57a17607a90aa7ad3

data/lib/nutkins/docker.rb

@@ -19,7 +19,7 @@ module Nutkins::Docker
 
   def self.run_get_stdout *args
     stdout_str, stderr_str, status = Open3.capture3 'docker', *args
-    status.success? && stdout_str.chomp
+    status.success? ? stdout_str.chomp : nil
   end
 
   def self.run *args, stdout: false, stderr: true

data/lib/nutkins/version.rb

@@ -1,3 +1,3 @@
 module Nutkins
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/nutkins.rb

@@ -4,6 +4,7 @@ require "net/http"
 require "uri"
 require "fileutils"
 require "json"
+require "net/http"
 
 module Nutkins ; end
 
@@ -16,6 +17,7 @@ module Nutkins
   CONFIG_FILE_NAME = 'nutkins.yaml'
   IMG_CONFIG_FILE_NAME = 'nutkin.yaml'
   VOLUMES_PATH = 'volumes'
+  ETCD_PORT = 2379
 
   class CloudManager
     def initialize(project_dir: nil)
@@ -45,7 +47,7 @@ module Nutkins
 
       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
+        if prev_image_id and image_id != prev_image_id
           puts "deleting previous image #{prev_image_id}"
           Docker.run "rmi", prev_image_id
         end
@@ -190,13 +192,45 @@ module Nutkins
     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
+      if existing
+        Docker.run 'stop', name
+        rm_etcd_docker_container existing
+      end
+
+      Docker.run 'create', '--name', name, '-p', "#{ETCD_PORT}:#{ETCD_PORT}",
+                 'quay.io/coreos/etcd',
+                 'etcd', '-name', name,
+                 '-advertise-client-urls', "http://0.0.0.0:#{ETCD_PORT}",
+                 '-listen-client-urls', "http://0.0.0.0:#{ETCD_PORT}"
+
+      img_names = get_all_img_names(img_names)
+      configs = img_names.map &method(:get_image_config)
+      etcd_store = {}
+      configs.each do |config|
+        etcd_store.merge! config['etcd']['data'] if config.dig('etcd', 'data')
       end
 
       if Docker.run 'start', name
         puts 'started etcd container'
+        # even after port is open it still refuses http requests for a while
+        # so just sleep until it is ready... ideally test for working HTTP
+        sleep 1
+
+        etcd_store.each do |key, val|
+          uri = URI("http://127.0.0.1:#{ETCD_PORT}/v2/keys/#{key}")
+          req = Net::HTTP::Put.new(uri)
+          req.body = 'value=' + val
+          res = Net::HTTP.start(uri.hostname, uri.port) do |http|
+            http.request(req)
+          end
+
+          if not res.is_a? Net::HTTPCreated
+            puts "etcd: failed to set #{key} to #{val}"
+            puts res
+          end
+        end
       else
         puts 'failed to start etcd container'
       end
@@ -205,10 +239,15 @@ module Nutkins
     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'
+
+      existing = Docker.container_id_for_name name
+      if existing
+        if Docker.run 'stop', name
+          puts 'stopped etcd container'
+          rm_etcd_docker_container existing
+        else
+          puts 'failed to stop etcd container'
+        end
       end
     end
 
@@ -257,5 +296,10 @@ module Nutkins
       img_dir = get_project_dir img_name
       Dir.glob("#{img_dir}/{volumes,secrets}/*.gpg")
     end
+
+    private
+    def rm_etcd_docker_container existing
+      raise 'could not delete existing container' unless Docker.run 'rm', existing if existing
+    end
   end
 end

metadata

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