itamae 1.1.17 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16aa08aedcb8ca1d05f9e64a3c25114f09fc2025
-  data.tar.gz: b9a6807d96fb67075231852495c4f40d519e4f03
+  metadata.gz: 21d7a4d489e16899e9c5554fc59a8741ec2aa0cc
+  data.tar.gz: c188142a5e592f79df63523e0f193b266432d888
 SHA512:
-  metadata.gz: 9a5fabef2a518f3c4a2859b98affb21de321ded98e33b92407de1b0c93631bbaff9c2b5b54ecbd0c9ab1a83943750fd70aeb96ae38be503c13754ac843d02b83
-  data.tar.gz: 8138b073c53e2ff24a788354daf77fdb13ad884889afdc5a5dabd9e6bcdca517d19238e031ce19f6f0e0dea3824f59223df84b0832b92881293c571aa3d64038
+  metadata.gz: 8221d7deaa055b4091ccb439c8ca9411f8d91baa938d1dd12dba5ca661b991f755a30eb8ed1789c2cb8c78239f739a1a0e28ffb02e8cb8dcceb21490934701d1
+  data.tar.gz: deee523a22ae7d96c6d814580f67aed9afa8d5f120a9d131dc1d68ae594a6ba0d4da032070d63e625334a6dcb5fa03cc8a542c369076b8ad16a4ab976780d75c

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v1.1.18
+
+Improvements
+
+- [Add remove action to package resource (by @eagletmt)](https://github.com/itamae-kitchen/itamae/pull/92)
+- Colorize diff output of file resource
+  - removed lines in red
+  - inserted lines in green
+
 ## v1.1.17
 
 Bugfixes

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.12.1"
+  spec.add_runtime_dependency "specinfra", ">= 2.18.2"
   spec.add_runtime_dependency "hashie"
   spec.add_runtime_dependency "ansi"
 

data/lib/itamae/resource/file.rb

@@ -55,18 +55,7 @@ module Itamae
         super
 
         if current.exist
-          diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
-          if diff.exit_status == 0
-            # no change
-            Logger.debug "file content will not change"
-          else
-            Logger.formatter.color :green do
-              Logger.info "diff:"
-              diff.stdout.each_line do |line|
-                Logger.info line.chomp
-              end
-            end
-          end
+          show_file_diff
         end
       end
 
@@ -96,6 +85,28 @@ module Itamae
           run_specinfra(:remove_file, attributes.path)
         end
       end
+
+      def show_file_diff
+        diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
+        if diff.exit_status == 0
+          # no change
+          Logger.debug "file content will not change"
+        else
+          Logger.info "diff:"
+          diff.stdout.each_line do |line|
+            color = if line.start_with?('+')
+                      :green
+                    elsif line.start_with?('-')
+                      :red
+                    else
+                      :clear
+                    end
+            Logger.formatter.color(color) do
+              Logger.info line.chomp
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/itamae/resource/package.rb

@@ -12,6 +12,8 @@ module Itamae
         case @current_action
         when :install
           attributes.installed = true
+        when :remove
+          attributes.installed = false
         end
       end
 
@@ -29,6 +31,13 @@ module Itamae
           updated!
         end
       end
+
+      def action_remove(action_options)
+        if run_specinfra(:check_package_is_installed, attributes.name, nil)
+          run_specinfra(:remove_package, attributes.name, attributes.options)
+          updated!
+        end
+      end
     end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.17
+1.1.18

data/spec/integration/default_spec.rb

@@ -18,6 +18,10 @@ describe package('sl') do
   it { should be_installed }
 end
 
+describe package('resolvconf') do
+  it { should_not be_installed }
+end
+
 describe file('/tmp/remote_file') do
   it { should be_file }
   its(:content) { should match(/Hello Itamae/) }

data/spec/integration/recipes/default.rb

@@ -25,6 +25,10 @@ package 'sl' do
   version '3.03-17'
 end
 
+package 'resolvconf' do
+  action :remove
+end
+
 ######
 
 package "ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
 platform: ruby
 authors:
 - Ryota Arai
@@ -28,16 +28,16 @@ dependencies:
   name: specinfra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.18.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement