itamae 1.1.26 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb27312cdd1e4cbfccca56ee5eb7a85e48188d2a
-  data.tar.gz: 164226caebc7e74dad4d9584f694b03b07bfd61f
+  metadata.gz: 3c531f6aca9ae4e769d8f073077e47c722be40c5
+  data.tar.gz: 35844bba50ca0705a464208a49e521ff0525da0b
 SHA512:
-  metadata.gz: b6b7ac732a3b58aea5425e075ce7b787be1167cf38dc85a19300ec256bf6af4d9e0dd1e66ed33cc5fb5ba5ece0a76cbcb583a07895269119ad53dea55667a254
-  data.tar.gz: b510acec0c54fee7d6bfcca40c5fec9129f41b3ffe307dfaa2046f4dcf60f0b9b8e02bdb868a8d54bfab3d81bbf9aebbd6847b762ef5672f54a7d4af5d17d432
+  metadata.gz: 84bf522e5530b3b3f11901987098106e33f15674017d1d32eacbf6e2806b62036e7a4394c7c544e46cdfdcadac3082b2179e25f3c344890d2bbe7e805bde0fda
+  data.tar.gz: 7588acd8fb22db71c6a261bc47e09233535a24a0de9db260522980b85962b67085ba5394e6b496438c1b53e4c35e86b1952ba95c6ab9edc7e83a7656e78c930a

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+## v1.2.0
+
+Feature
+
+- Docker backend
+  - This backend builds a Docker image.
+  - Usage: `itamae docker --image baseimage recipe.rb`
+  - NOTE: This feature is experimental.
+
+## v1.1.26
+
+Bugfix
+
+- Always outdent.
+
+## v1.1.25
+
+Improvements
+
+- Make logging less verbose by default. (by @eagletmt)
+- Change indent width from 3 to 2.
+
+## v1.1.24
+
+Bugfixes
+
+- Make `node` accessible from define block.
+
 ## v1.1.23
 
 Feature

data/itamae.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "thor"
-  spec.add_runtime_dependency "specinfra", ">= 2.18.2"
+  spec.add_runtime_dependency "specinfra", ">= 2.21.1"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
   spec.add_runtime_dependency "schash", "~> 0.1.0"
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "serverspec", "~> 2.1"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "docker-api", "~> 1.20"
 end

data/lib/itamae/backend.rb

@@ -20,102 +20,147 @@ module Specinfra
 end
 
 module Itamae
-  class Backend
+  module Backend
     UnknownBackendTypeError = Class.new(StandardError)
     CommandExecutionError = Class.new(StandardError)
 
-    include Singleton
-
-    def set_type(type, options = {})
-      case type
-      when :local
-        Specinfra.configuration.backend = :exec
-      when :ssh
-        Specinfra.configuration.request_pty = true
-        Specinfra.configuration.host = options.delete(:host)
-        Specinfra.configuration.disable_sudo = options.delete(:disable_sudo)
-        Specinfra.configuration.ssh_options = options
-
-        Specinfra.configuration.backend = :ssh
-      else
-        raise UnknownBackendTypeError, "'#{type}' backend is unknown."
+    class << self
+      def set_type(type, opts = {})
+        @instance = self.const_get(type.capitalize).new(opts)
       end
-    end
 
-    def run_command(commands, options = {})
-      options = {error: true}.merge(options)
-
-      if commands.is_a?(Array)
-        command = commands.map do |cmd|
-          Shellwords.escape(cmd)
-        end.join(' ')
-      else
-        command = commands
-      end
+      def instance
+        unless @instance
+          raise "Before calling Backend.instance, call Backend.set_type."
+        end
 
-      cwd = options[:cwd]
-      if cwd
-        command = "cd #{Shellwords.escape(cwd)} && #{command}"
+        @instance
       end
+    end
 
-      user = options[:user]
-      if user
-        command = "sudo -u #{Shellwords.escape(user)} -- /bin/sh -c #{Shellwords.escape(command)}"
-      end
+    class Base
+      def run_command(commands, options = {})
+        options = {error: true}.merge(options)
 
-      Logger.debug "Executing `#{command}`..."
+        if commands.is_a?(Array)
+          command = commands.map do |cmd|
+            Shellwords.escape(cmd)
+          end.join(' ')
+        else
+          command = commands
+        end
 
-      result = Specinfra::Runner.run_command(command)
-      exit_status = result.exit_status
+        cwd = options[:cwd]
+        if cwd
+          command = "cd #{Shellwords.escape(cwd)} && #{command}"
+        end
 
-      Logger.formatter.with_indent do
-        if exit_status == 0 || !options[:error]
-          method = :debug
-          message = "exited with #{exit_status}"
-        else
-          method = :error
-          message = "Command `#{command}` failed. (exit status: #{exit_status})"
+        user = options[:user]
+        if user
+          command = "sudo -u #{Shellwords.escape(user)} -- /bin/sh -c #{Shellwords.escape(command)}"
         end
 
-        Logger.public_send(method, message)
+        Logger.debug "Executing `#{command}`..."
 
-        {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
-          next unless value && value != ''
+        result = Specinfra::Runner.run_command(command)
+        exit_status = result.exit_status
 
-          if value.bytesize > 1024 * 1024
-            Logger.public_send(method, "#{name} is suppressed because it's too large")
-            next
+        Logger.formatter.with_indent do
+          if exit_status == 0 || !options[:error]
+            method = :debug
+            message = "exited with #{exit_status}"
+          else
+            method = :error
+            message = "Command `#{command}` failed. (exit status: #{exit_status})"
           end
 
-          value.each_line do |line|
-            # remove control chars
-            case line.encoding
-            when Encoding::UTF_8
-              line = line.tr("\u0000-\u001f\u007f\u2028",'')
+          Logger.public_send(method, message)
+
+          {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
+            next unless value && value != ''
+
+            if value.bytesize > 1024 * 1024
+              Logger.public_send(method, "#{name} is suppressed because it's too large")
+              next
             end
 
-            Logger.public_send(method, "#{name} | #{line}")
+            value.each_line do |line|
+              # remove control chars
+              case line.encoding
+              when Encoding::UTF_8
+                line = line.tr("\u0000-\u001f\u007f\u2028",'')
+              end
+
+              Logger.public_send(method, "#{name} | #{line}")
+            end
           end
         end
+
+        if options[:error] && exit_status != 0
+          raise CommandExecutionError
+        end
+
+        result
+      end
+
+      def get_command(*args)
+        Specinfra.command.get(*args)
       end
 
-      if options[:error] && exit_status != 0
-        raise CommandExecutionError
+      def send_file(*args)
+        Specinfra::Runner.send_file(*args)
       end
 
-      result
+      def send_directory(*args)
+        Specinfra::Runner.send_directory(*args)
+      end
+
+      def finalize
+        # pass
+      end
     end
 
-    def get_command(*args)
-      Specinfra.command.get(*args)
+    # TODO: Make Specinfra's backends instanciatable 
+    class Local < Base
+      def initialize(options)
+        Specinfra.configuration.backend = :exec
+      end
     end
 
-    def send_file(*args)
-      Specinfra::Runner.send_file(*args)
+    class Ssh < Base
+      def initialize(options)
+        Specinfra.configuration.request_pty = true
+        Specinfra.configuration.host = options.delete(:host)
+        Specinfra.configuration.disable_sudo = options.delete(:disable_sudo)
+        Specinfra.configuration.ssh_options = options
+
+        Specinfra.configuration.backend = :ssh
+      end
     end
 
-    def send_directory(*args)
-      Specinfra::Runner.send_directory(*args)
+    class Docker < Base
+      def initialize(options)
+        begin
+          require 'docker'
+        rescue LoadError
+          Logger.fatal "To use docker backend, please install 'docker-api' gem"
+        end
+
+        Specinfra.configuration.docker_image = options[:image]
+        Specinfra.configuration.docker_container = options[:container]
+
+        # TODO: Move to Specinfra?
+        Excon.defaults[:ssl_verify_peer] = options[:tls_verify_peer]
+
+        Specinfra.configuration.backend = :docker
+
+        ::Docker.logger = Logger
+      end
+
+      def finalize
+        image = Specinfra.backend.commit_container
+        Logger.info "Image created: #{image.id}"
+      end
     end
   end
 end

data/lib/itamae/cli.rb

@@ -53,6 +53,17 @@ module Itamae
       Runner.run(recipe_files, :ssh, options)
     end
 
+    desc "docker RECIPE [RECIPE...]", "Create Docker image"
+    option :image, type: :string, required: true
+    option :tls_verify_peer, type: :boolean, default: true
+    def docker(*recipe_files)
+      if recipe_files.empty?
+        raise "Please specify recipe files."
+      end
+
+      Runner.run(recipe_files, :docker, options)
+    end
+
     desc "version", "Print version"
     def version
       puts "Itamae v#{Itamae::VERSION}"

data/lib/itamae/ext/specinfra.rb

@@ -8,4 +8,3 @@ Specinfra::Command::Base::User.class_eval do
     end
   end
 end
-

data/lib/itamae/runner.rb

@@ -58,8 +58,6 @@ module Itamae
         opts = {}
 
         case type
-        when :local
-          # do nothing
         when :ssh
           opts[:host] = options[:host]
           opts[:user] = options[:user] || Etc.getlogin
@@ -81,9 +79,11 @@ module Itamae
             print "\n"
             opts.merge!(password: password)
           end
+        when :docker
+          opts = options
         end
 
-        Backend.instance.set_type(type, opts)
+        Backend.set_type(type, opts)
       end
     end
 
@@ -110,6 +110,7 @@ module Itamae
 
     def run(options)
       children.run(options)
+      Backend.instance.finalize
     end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.26
+1.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.26
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.2
+        version: 2.21.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.2
+        version: 2.21.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: docker-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
 description: 
 email:
 - ryota.arai@gmail.com
@@ -240,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool