itamae-mitsurin 0.24 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baac90f0f5aa705c0c2d1e3a9bdd222b1ce47e3b
-  data.tar.gz: 1d112209337e4cb63cd2f6d00962db1d78e28b10
+  metadata.gz: 3aa5cbb917a9a7142ee4869e8e37db1afa8a2faa
+  data.tar.gz: c1907411f6c07ad790e73826d0e5febacb3ee530
 SHA512:
-  metadata.gz: 5b0823ffe5231992c98be804f49a5b0f1c667855a747867a2088151ae58a359916d5e6989dad0eeb8bdafd3169e7009d0f80b273fc90fa831cfdb54f10f7a44b
-  data.tar.gz: 4ee53138a35fb70339e09d5675c37f9baeca35c6d7dd08a7951ee0d1aaedf83d43820bc9c7b0c1b2c99e9aadd99226b386598de83c1b176e525b429b05853be8
+  metadata.gz: 9615f64653565c2c8b5684de05797d28c4f13667ec41a27ffdca70af1a24e4aa2ede985d268fad6d588bb5068f64ee7df8a91ef4e714135e7ebdc38647410357
+  data.tar.gz: 14e0d357b6985d32919b4887213f298ecd251c995e41ea00756477e4be4fd562ad0e39081ba3d33cb9732edd5264f676ea4c6170dedecab8633e81a1eb655306

data/lib/itamae-mitsurin/cli.rb

@@ -23,6 +23,9 @@ module ItamaeMitsurin
       option :shell, type: :string, default: "/bin/sh"
       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"
+
+
     end
 
     desc "local RECIPE [RECIPE...]", "Run Itamae locally"
@@ -32,7 +35,7 @@ module ItamaeMitsurin
         raise "Please specify recipe files."
       end
 
-      Runner.run(recipe_files, :local, options)
+      run(recipe_files, :local, options)
     end
 
     desc "ssh RECIPE [RECIPE...]", "Run Itamae via ssh"
@@ -53,7 +56,7 @@ module ItamaeMitsurin
         raise "Please set '-h <hostname>' or '--vagrant'"
       end
 
-      Runner.run(recipe_files, :ssh, options)
+      run(recipe_files, :local, options)
     end
 
     desc "docker RECIPE [RECIPE...]", "Create Docker image"
@@ -66,7 +69,7 @@ module ItamaeMitsurin
         raise "Please specify recipe files."
       end
 
-      Runner.run(recipe_files, :docker, options)
+      run(recipe_files, :local, options)
     end
 
     desc "version", "Print version"
@@ -82,5 +85,12 @@ module ItamaeMitsurin
         end
       end
     end
+
+    def run(recipe_files, backend_type, options)
+      runner = Runner.run(recipe_files, backend_type, options)
+      if options[:detailed_exitcode] && runner.diff?
+        exit 2
+      end
+    end
   end
 end

data/lib/itamae-mitsurin/handler/json.rb

@@ -9,7 +9,7 @@ module ItamaeMitsurin
 
       def event(type, payload = {})
         super
-        @f.puts({'time' => Time.now.iso8601, 'event' => type, 'payload' => payload}.to_json)
+        @f.puts({'time' => Time.now.iso8601, 'event' => type, 'payload' => payload}.to_s.encode.to_json)
       end
 
       private

data/lib/itamae-mitsurin/logger.rb

@@ -73,12 +73,9 @@ module ItamaeMitsurin
       attr_accessor :colored
 
       def call(severity, datetime, progname, msg)
-        log = "%s : %s\n" % ["%5s" % severity, msg2str(msg)]
-        if colored
-          colorize(log, severity)
-        else
-          log
-        end
+        log = "%s : %s" % ["%5s" % severity, msg2str(msg)]
+
+        (colored ? colorize(log, severity) : log) + "\n"
       end
 
       def color(code)

data/lib/itamae-mitsurin/mitsurin/creators/templates/project/spec/spec_helper.rb

@@ -31,3 +31,5 @@ options[:port] = ENV['SSH_PORT']
 set :host, options[:host_name] || host
 set :shell, '/bin/bash'
 set :ssh_options, options
+
+set :request_pty, true

data/lib/itamae-mitsurin/mitsurin/itamae_task.rb

@@ -119,7 +119,13 @@ module ItamaeMitsurin
 
             puts TaskBase.hl.color(%!Run Itamae to \"#{bname}\"!, :red)
             run_list_noti = []
-            command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
+            command_recipe.each { |c_recipe|
+              unless c_recipe.split("/")[4].split(".")[0] == 'default'
+                run_list_noti << c_recipe.split("/")[2] + "::#{c_recipe.split("/")[4].split(".")[0]}"
+              else
+                run_list_noti << c_recipe.split("/")[2]
+              end
+            }
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
             puts TaskBase.hl.color(%!#{command}!, :white)
             st = system command

data/lib/itamae-mitsurin/mitsurin/itamae_with_git_task.rb

@@ -136,7 +136,13 @@ module ItamaeMitsurin
 
             puts TaskBase.hl.color(%!Run Itamae to \"#{bname}\"!, :red)
             run_list_noti = []
-            command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
+            command_recipe.each { |c_recipe|
+              unless c_recipe.split("/")[4].split(".")[0] == 'default'
+                run_list_noti << c_recipe.split("/")[2] + "::#{c_recipe.split("/")[4].split(".")[0]}"
+              else
+                run_list_noti << c_recipe.split("/")[2]
+              end
+            }
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
             puts TaskBase.hl.color(%!#{command}!, :white)
             st = system command

data/lib/itamae-mitsurin/mitsurin/local_task.rb

@@ -114,7 +114,13 @@ module ItamaeMitsurin
 
             puts TaskBase.hl.color(%!Run Itamae to \"#{bname}\"!, :red)
             run_list_noti = []
-            command_recipe.each {|c_recipe| run_list_noti << c_recipe.split("/") [2]}
+            command_recipe.each { |c_recipe|
+              unless c_recipe.split("/")[4].split(".")[0] == 'default'
+                run_list_noti << c_recipe.split("/")[2] + "::#{c_recipe.split("/")[4].split(".")[0]}"
+              else
+                run_list_noti << c_recipe.split("/")[2]
+              end
+            }
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
             puts TaskBase.hl.color(%!#{command}!, :white)
             begin

data/lib/itamae-mitsurin/mitsurin/serverspec_task.rb

@@ -72,7 +72,13 @@ module Itamae
             spec_pattern.sort_by! {|item| File.dirname(item)}
             specs << spec_pattern.join
             run_list_noti = []
-            spec_pattern.each {|c_spec| run_list_noti << c_spec.split("/") [2]}
+            spec_pattern.each { |c_spec|
+              unless c_spec.split("/")[4].split(".")[0] == 'default'
+                run_list_noti << c_spec.split("/")[2] + "::#{c_spec.split("/")[4].split(".")[0]}"
+              else
+                run_list_noti << c_spec.split("/")[2]
+              end
+            }
             puts TaskBase.hl.color(%!Run Serverspec to \"#{node_name}\"!, :red)
             puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
             st = system specs

data/lib/itamae-mitsurin/resource/base.rb

@@ -139,6 +139,7 @@ module ItamaeMitsurin
 
             verify unless runner.dry_run?
             if updated?
+              runner.diff_found!
               notify
               runner.handler.event(:resource_updated)
             end

data/lib/itamae-mitsurin/resource/file.org

@@ -0,0 +1,185 @@
+require 'itamae-mitsurin'
+
+module ItamaeMitsurin
+  module Resource
+    class File < Base
+      define_attribute :action, default: :create
+      define_attribute :path, type: String, default_name: true
+      define_attribute :content, type: String, default: nil
+      define_attribute :mode, type: String
+      define_attribute :owner, type: String
+      define_attribute :group, type: String
+      define_attribute :block, type: Proc, default: proc {}
+
+      def pre_action
+        case @current_action
+        when :create
+          attributes.exist = true
+        when :delete
+          attributes.exist = false
+        when :edit
+          attributes.exist = true
+
+          unless runner.dry_run?
+            content = backend.receive_file(attributes.path)
+            attributes.block.call(content)
+            attributes.content = content
+          end
+        end
+
+        send_tempfile
+      end
+
+      def set_current_attributes
+        current.exist = run_specinfra(:check_file_is_file, attributes.path)
+
+        if current.exist
+          current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          current.group = run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
+        else
+          current.mode = nil
+          current.owner = nil
+          current.group = nil
+        end
+      end
+
+      def show_differences
+        current.mode    = current.mode.rjust(4, '0') if current.mode
+        attributes.mode = attributes.mode.rjust(4, '0') if attributes.mode
+
+        super
+
+        if @temppath && @current_action != :delete
+          compare_file
+        end
+      end
+
+      def action_create(options)
+        if !current.exist && !@temppath
+          run_command(["touch", attributes.path])
+        end
+
+        if @temppath
+          if run_specinfra(:check_file_is_file, attributes.path)
+            unless check_command(["diff", "-q", @temppath, attributes.path])
+              # the file is modified
+              updated!
+            end
+          else
+            # new file
+            updated!
+          end
+        end
+
+        change_target = @temppath && updated?  ? @temppath : attributes.path
+
+        if attributes.mode
+          run_specinfra(:change_file_mode, change_target, attributes.mode)
+        end
+
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
+        end
+
+        if @temppath && updated?
+          run_specinfra(:move_file, @temppath, attributes.path)
+        end
+      end
+
+      def action_delete(options)
+        if run_specinfra(:check_file_is_file, attributes.path)
+          run_specinfra(:remove_file, attributes.path)
+        end
+      end
+
+      def action_edit(options)
+        if attributes.mode
+          run_specinfra(:change_file_mode, @temppath, attributes.mode)
+        else
+          mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
+          run_specinfra(:change_file_mode, @temppath, mode)
+        end
+
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
+        else
+          owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
+          group = run_specinfra(:get_file_owner_group, attributes.path).stdout.chomp
+          run_specinfra(:change_file_owner, @temppath, owner)
+          run_specinfra(:change_file_group, @temppath, group)
+        end
+
+        unless check_command(["diff", "-q", @temppath, attributes.path])
+          # the file is modified
+          updated!
+        end
+
+        run_specinfra(:move_file, @temppath, attributes.path)
+      end
+
+      private
+
+      def compare_file
+        compare_to = if current.exist
+                       attributes.path
+                     else
+                       '/dev/null'
+                     end
+
+        diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
+        if diff.exit_status == 0
+          # no change
+          ItamaeMitsurin.logger.debug "file content will not change"
+        else
+          ItamaeMitsurin.logger.info "diff:"
+          diff.stdout.each_line do |line|
+            color = if line.start_with?('+')
+                      :green
+                    elsif line.start_with?('-')
+                      :red
+                    else
+                      :clear
+                    end
+            ItamaeMitsurin.logger.color(color) do
+              ItamaeMitsurin.logger.info line.chomp
+            end
+          end
+          runner.handler.event(:file_content_changed, diff: diff.stdout)
+        end
+      end
+
+      # will be overridden
+      def content_file
+        nil
+      end
+
+      def send_tempfile
+        if !attributes.content && !content_file
+          @temppath = nil
+          return
+        end
+
+        begin
+          src = if content_file
+                  content_file
+                else
+                  f = Tempfile.open('itamae')
+                  f.write(attributes.content)
+                  f.close
+                  f.path
+                end
+
+          @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+
+          run_command(["touch", @temppath])
+          run_specinfra(:change_file_mode, @temppath, '0600')
+          backend.send_file(src, @temppath)
+          run_specinfra(:change_file_mode, @temppath, '0600')
+        ensure
+          f.unlink if f
+        end
+      end
+    end
+  end
+end

data/lib/itamae-mitsurin/resource/file.rb

@@ -12,6 +12,8 @@ module ItamaeMitsurin
       define_attribute :block, type: Proc, default: proc {}
 
       def pre_action
+        current.exist = run_specinfra(:check_file_is_file, attributes.path)
+
         case @current_action
         when :create
           attributes.exist = true
@@ -20,7 +22,7 @@ module ItamaeMitsurin
         when :edit
           attributes.exist = true
 
-          unless runner.dry_run?
+          if !runner.dry_run? || current.exist
             content = backend.receive_file(attributes.path)
             attributes.block.call(content)
             attributes.content = content
@@ -28,11 +30,11 @@ module ItamaeMitsurin
         end
 
         send_tempfile
+        compare_file
       end
 
       def set_current_attributes
-        current.exist = run_specinfra(:check_file_is_file, attributes.path)
-
+        current.modified = false
         if current.exist
           current.mode = run_specinfra(:get_file_mode, attributes.path).stdout.chomp
           current.owner = run_specinfra(:get_file_owner_user, attributes.path).stdout.chomp
@@ -51,7 +53,7 @@ module ItamaeMitsurin
         super
 
         if @temppath && @current_action != :delete
-          compare_file
+          show_content_diff
         end
       end
 
@@ -60,19 +62,7 @@ module ItamaeMitsurin
           run_command(["touch", attributes.path])
         end
 
-        if @temppath
-          if run_specinfra(:check_file_is_file, attributes.path)
-            unless check_command(["diff", "-q", @temppath, attributes.path])
-              # the file is modified
-              updated!
-            end
-          else
-            # new file
-            updated!
-          end
-        end
-
-        change_target = @temppath && updated?  ? @temppath : attributes.path
+        change_target = attributes.modified ? @temppath : attributes.path
 
         if attributes.mode
           run_specinfra(:change_file_mode, change_target, attributes.mode)
@@ -82,7 +72,7 @@ module ItamaeMitsurin
           run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
         end
 
-        if @temppath && updated?
+        if attributes.modified
           run_specinfra(:move_file, @temppath, attributes.path)
         end
       end
@@ -110,29 +100,39 @@ module ItamaeMitsurin
           run_specinfra(:change_file_group, @temppath, group)
         end
 
-        unless check_command(["diff", "-q", @temppath, attributes.path])
-          # the file is modified
-          updated!
-        end
-
         run_specinfra(:move_file, @temppath, attributes.path)
       end
 
       private
 
-      def compare_file
-        compare_to = if current.exist
-                       attributes.path
-                     else
-                       '/dev/null'
-                     end
-
-        diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
-        if diff.exit_status == 0
-          # no change
-          ItamaeMitsurin.logger.debug "file content will not change"
+      def compare_to
+        if current.exist
+          attributes.path
         else
+          '/dev/null'
+        end
+      end
+
+      def compare_file
+        attributes.modified = false
+        unless @temppath
+          return
+        end
+
+        case run_command(["diff", "-q", compare_to, @temppath], error: false).exit_status
+        when 1
+          # diff found
+          attributes.modified = true
+        when 2
+          # error
+          raise ItamaeMitsurin::Backend::CommandExecutionError, "diff command exited with 2"
+        end
+      end
+
+      def show_content_diff
+        if attributes.modified
           ItamaeMitsurin.logger.info "diff:"
+          diff = run_command(["diff", "-u", compare_to, @temppath], error: false)
           diff.stdout.each_line do |line|
             color = if line.start_with?('+')
                       :green
@@ -146,6 +146,9 @@ module ItamaeMitsurin
             end
           end
           runner.handler.event(:file_content_changed, diff: diff.stdout)
+        else
+          # no change
+          ItamaeMitsurin.logger.debug "file content will not change"
         end
       end
 

data/lib/itamae-mitsurin/resource/git.rb

@@ -72,7 +72,11 @@ module ItamaeMitsurin
       end
 
       def run_command_in_repo(*args)
-        run_command(*args, cwd: attributes.destination)
+        unless args.last.is_a?(Hash)
+          args << {}
+        end
+        args.last[:cwd] = attributes.destination
+        run_command(*args)
       end
 
       def current_branch
@@ -80,7 +84,11 @@ module ItamaeMitsurin
       end
 
       def get_revision(branch)
-        run_command_in_repo("git rev-list #{shell_escape(branch)} | head -n1").stdout.strip
+        result = run_command_in_repo("git rev-list #{shell_escape(branch)}", error: false)
+        unless result.exit_status == 0
+          fetch_origin!
+        end
+        run_command_in_repo("git rev-list #{shell_escape(branch)}").stdout.lines.first.strip
       end
 
       def fetch_origin!

data/lib/itamae-mitsurin/resource/http_request.rb

@@ -7,6 +7,9 @@ module ItamaeMitsurin
     class HttpRequest < File
       RedirectLimitExceeded = Class.new(StandardError)
 
+      alias_method :_action_create, :action_create
+      undef_method :action_create, :action_delete, :action_edit
+
       define_attribute :action, default: :get
       define_attribute :headers, type: Hash, default: {}
       define_attribute :message, type: String, default: ""
@@ -14,6 +17,23 @@ module ItamaeMitsurin
       define_attribute :url, type: String, required: true
 
       def pre_action
+        attributes.exist = true
+        attributes.content = fetch_content
+
+        send_tempfile
+        compare_file
+      end
+
+      def show_differences
+        current.mode    = current.mode.rjust(4, '0') if current.mode
+        attributes.mode = attributes.mode.rjust(4, '0') if attributes.mode
+
+        super
+
+        show_content_diff
+      end
+
+      def fetch_content
         uri = URI.parse(attributes.url)
         response = nil
         redirects_followed = 0
@@ -45,26 +65,27 @@ module ItamaeMitsurin
         attributes.content = response.body
 
         super
+        response.body
       end
 
       def action_delete(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_get(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_options(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_post(options)
-        action_create(options)
+        _action_create(options)
       end
 
       def action_put(options)
-        action_create(options)
+        _action_create(options)
       end
     end
   end

data/lib/itamae-mitsurin/resource/user.rb

@@ -18,6 +18,11 @@ module ItamaeMitsurin
         when :create
           attributes.exist = true
         end
+
+        if attributes.gid.is_a?(String)
+          # convert name to gid
+          attributes.gid = run_specinfra(:get_group_gid, attributes.gid).stdout.to_i
+        end
       end
 
       def set_current_attributes

data/lib/itamae-mitsurin/runner.rb

@@ -12,6 +12,8 @@ module ItamaeMitsurin
         runner = self.new(backend, options)
         runner.load_recipes(recipe_files)
         runner.run
+
+        runner
       end
     end
 
@@ -31,6 +33,7 @@ module ItamaeMitsurin
       @node = create_node
       @tmpdir = "/tmp/itamae_tmp"
       @children = RecipeChildren.new
+      @diff = false
 
       @backend.run_command(["mkdir", "-p", @tmpdir])
       @backend.run_command(["chmod", "777", @tmpdir])
@@ -80,6 +83,14 @@ module ItamaeMitsurin
       end
     end
 
+    def diff?
+      @diff
+    end
+
+    def diff_found!
+      @diff = true
+    end
+
     private
     def create_node
       hash = {}

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.24
+0.26

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.24'
+  version: '0.26'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -347,6 +347,7 @@ files:
 - lib/itamae-mitsurin/resource/base.rb
 - lib/itamae-mitsurin/resource/directory.rb
 - lib/itamae-mitsurin/resource/execute.rb
+- lib/itamae-mitsurin/resource/file.org
 - lib/itamae-mitsurin/resource/file.rb
 - lib/itamae-mitsurin/resource/gem_package.rb
 - lib/itamae-mitsurin/resource/git.rb