itamae 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c2bbaa65e9c33670186255fd00fcd0ec14a7d9
-  data.tar.gz: 71f925946fb5f63bd562b918c28756d389caa5e9
+  metadata.gz: 217d5dd79f8f883f0224aaebe09cf2e0eef4e1c1
+  data.tar.gz: 80a27dfa6ee6b0d04200001eb2ab57a1480264f9
 SHA512:
-  metadata.gz: 1c7e267d4bcf255cdebb1b88a83821664a4de6ef43a9757ca963ad74fa94fb79f3fbe7bb1f2f71c1ed472b02160f0d0bb11e081dc16e4ad208498a71de17a2b0
-  data.tar.gz: 4500e83e08902ab1ab61abd886f5be02f74c351df2a8e9465e4dbf4bc430317255a3640c68f78607235c16ae544c98c15cc025b7c94008fe9b35942801e7c110
+  metadata.gz: b980d16ac6c8ee8eb112c4a55bd7f0bab97ae4eaa148d783fc5af741b9afb9a3275b1ebbba8a9bb5dd34dc07f1a8d13ab7e4d2320e601993316024646182d318
+  data.tar.gz: c6400d880e7f96d67a55af5973881fe9c6f5e6b1678a7faad4fb094e74af5a157629eda2ad20f75366b58b1465e41d1bdd740eb8dd25af498d1a0a9503eef2aa

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.9.11
+
+Features
+
+- [docker backend: Support image tagging](https://github.com/itamae-kitchen/itamae/pull/230)
+- [docker backend: Support docker_container_create_options](https://github.com/itamae-kitchen/itamae/pull/231)
+
+
+Bugfixes
+
+- [Fix help subcommand](https://github.com/itamae-kitchen/itamae/pull/235)
+
 ## v1.9.10
 
 Features

data/lib/itamae/backend.rb

@@ -270,6 +270,9 @@ module Itamae
     class Docker < Base
       def finalize
         image = @backend.commit_container
+        /\A(?<repo>.+?)(?:|:(?<tag>[^:]+))\z/.match(@options[:tag]) do |m|
+          image.tag(repo: m[:repo], tag: m[:tag])
+        end
         Itamae.logger.info "Image created: #{image.id}"
       end
 
@@ -289,6 +292,7 @@ module Itamae
           docker_image: @options[:image],
           docker_container: @options[:container],
           shell: @options[:shell],
+          docker_container_create_options: @options[:docker_container_create_options],
         )
       end
     end

data/lib/itamae/cli.rb

@@ -5,15 +5,11 @@ module Itamae
   class CLI < Thor
     GENERATE_TARGETS = %w[cookbook role].freeze
 
-    class_option :log_level, type: :string, aliases: ['-l'], default: 'info'
-    class_option :color, type: :boolean, default: true
-    class_option :config, type: :string, aliases: ['-c']
-
     def initialize(*)
       super
 
-      Itamae.logger.level = ::Logger.const_get(options[:log_level].upcase)
-      Itamae.logger.formatter.colored = options[:color]
+      Itamae.logger.level = ::Logger.const_get(options[:log_level].upcase) if options[:log_level]
+      Itamae.logger.formatter.colored = options[:color] if options[:color]
     end
 
     def self.define_exec_options
@@ -26,6 +22,9 @@ module Itamae
       option :ohai, type: :boolean, default: false, desc: "This option is DEPRECATED and will be unavailable."
       option :profile, type: :string, desc: "[EXPERIMENTAL] Save profiling data", banner: "PATH"
       option :detailed_exitcode, type: :boolean, default: false, desc: "exit code 0 - The run succeeded with no changes or failures, exit code 1 - The run failed, exit code 2 - The run succeeded, and some resources were changed"
+      option :log_level, type: :string, aliases: ['-l'], default: 'info'
+      option :color, type: :boolean, default: true
+      option :config, type: :string, aliases: ['-c']
     end
 
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
@@ -65,6 +64,7 @@ module Itamae
     option :image, type: :string, desc: "This option or 'container' option is required."
     option :container, type: :string, desc: "This option or 'image' option is required."
     option :tls_verify_peer, type: :boolean, default: true
+    option :tag, type: :string
     def docker(*recipe_files)
       if recipe_files.empty?
         raise "Please specify recipe files."

data/lib/itamae/version.rb

@@ -1,3 +1,3 @@
 module Itamae
-  VERSION = "1.9.10"
+  VERSION = "1.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.9.11
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool