hako 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d9c90e89394fc7f064a57f0ae81e1048262fe8
-  data.tar.gz: 7c91399a8265c5b71114b2e318e163064e93c074
+  metadata.gz: acb16772f9adf1b88875ca6b5512f18b7625b926
+  data.tar.gz: 570621547d7fcb12fa9a4687e08cf77e9c732e85
 SHA512:
-  metadata.gz: c99e6a8cb5da22ef0f1306fa3be90c5de4a8167cd267c6934d54a3854e6a627cc86bf91d63c8ff0fd6e00995793c9e58d6565dd2c19d15c391c6e9e348aa0f06
-  data.tar.gz: f37d8c0dfbdb5bc3f3fe6ddc1b5a6f9c371af0efbbb0b6749b40c51f6972d8d9134782d76415f3183f1c358ef2efffecd3455aed36d028e11d2fafb7210f6631
+  metadata.gz: 18bb12686bd0cac7c726c4dc759ecfbb071034bc41a9033a73dbd8d20f7d957cfe10d9af1652ef3906540c8408ccdccb6c9f25ad6380c9c9f9fb0523fae0f023
+  data.tar.gz: d18f665c6d2c61ee745deccb09e39d38518df4c610e281ca413dc0a1666ca3d584d311ddc83e4bd6ffb91eee6b3caf5df4e8bf726e1380d28bc47eccb0e04df9

data/lib/hako/application.rb

@@ -9,7 +9,7 @@ module Hako
       path = Pathname.new(yaml_path)
       @id = path.basename.sub_ext('').to_s
       @root_path = path.parent
-      @yaml = YamlLoader.load(path)
+      @yaml = YamlLoader.new.load(path)
     end
   end
 end

data/lib/hako/cli.rb

@@ -24,7 +24,7 @@ module Hako
     desc 'show-yaml FILE', 'Show expanded YAML'
     def show_yaml(yaml_path)
       require 'hako/yaml_loader'
-      puts YamlLoader.load(Pathname.new(yaml_path)).to_yaml
+      puts YamlLoader.new.load(Pathname.new(yaml_path)).to_yaml
     end
 
     desc 'status FILE', 'Show deployment status'

data/lib/hako/container.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
+require 'hako/version'
+
 module Hako
   class Container
     def initialize(app, definition, dry_run:)
       @app = app
       @definition = default_config.merge(definition)
+      @definition['docker_labels'].merge!(default_labels)
       @dry_run = dry_run
     end
 
@@ -54,5 +57,11 @@ module Hako
         'links' => [],
       }
     end
+
+    def default_labels
+      {
+        'cc.wanko.hako.version' => VERSION,
+      }
+    end
   end
 end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/hako/yaml_loader.rb

@@ -2,22 +2,24 @@
 require 'psych'
 
 module Hako
-  module YamlLoader
-    class << self
-      def load(path)
-        class_loader = Psych::ClassLoader.new
-        scanner = Psych::ScalarScanner.new(class_loader)
-        prev_path = @current_path
-        @current_path = path
-        visitor = Visitor.new(scanner, class_loader) do |_, val|
-          load(@current_path.parent.join(val))
-        end
-        path.open do |f|
-          visitor.accept(Psych.parse(f))
-        end
-      ensure
-        @current_path = prev_path
+  class YamlLoader
+    def initialize
+      @current_path = nil
+    end
+
+    def load(path)
+      class_loader = Psych::ClassLoader.new
+      scanner = Psych::ScalarScanner.new(class_loader)
+      prev_path = @current_path
+      @current_path = path
+      visitor = Visitor.new(scanner, class_loader) do |_, val|
+        load(@current_path.parent.join(val))
+      end
+      path.open do |f|
+        visitor.accept(Psych.parse(f))
       end
+    ensure
+      @current_path = prev_path
     end
 
     class Visitor < Psych::Visitors::ToRuby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Kohei Suzuki