itamae 1.0.0.beta27 → 1.0.0.beta28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f71dbe4da1c49cacda9dac2d10c5c1cb0263e6b4
-  data.tar.gz: 09480bb0d8624135546598f390cabd30428b8ce0
+  metadata.gz: 710ad7e0b74c9481270f46dbd3770667d7f976b1
+  data.tar.gz: 87341f1c3733b3bc88733013fb3f3dd620ef7adc
 SHA512:
-  metadata.gz: 4238df2db65e2f9a66d5a0021d724e0e1d1f2234f97b62b4e3fab49f8560e92150124221b2a755f450cf782a919e3ad121ae3a8179021eaeba59eaed9fb08d18
-  data.tar.gz: ada64866b96afadc1f916e3a4b106e9e4f59acc8c01e5797e6c86f26988a5b6af207d97de8d09e5ee25816c8e31ad4ad6b49f4abcafe4bbb54395e3c5110ca0f
+  metadata.gz: 9ed18ecbf3dfd0f0ba72b6112c07712f23c386e698a42601e925454c0841469c08b60fbc978f2587206f5f8edb2ff1bc3ef5e1e8d7d469ef0b04a5128457d360
+  data.tar.gz: 6a9e781b54749f87d0c4c9f35add213d302ec133dde426697a650d1c0697d87a5a9b0d4d9c7d9e634fef40abbb9e6de1c5d9613029c4ebd9bebc9c7f74586b20

data/lib/itamae/backend.rb

@@ -78,7 +78,7 @@ module Itamae
       {"stdout" => result.stdout, "stderr" => result.stderr}.each_pair do |name, value|
         next unless value && value != ''
 
-        if value.bytesize > 1024
+        if value.bytesize > 1024 * 1024
           Logger.public_send(method, "    #{name} is suppressed because it's too large")
           next
         end

data/lib/itamae/resource/file.rb

@@ -75,6 +75,13 @@ module Itamae
 
         run_specinfra(:move_file, @temppath, path)
       end
+
+      def delete_action
+        if run_specinfra(:check_file_is_file, path)
+          # TODO: delegate to Specinfra
+          run_command(["rm", path])
+        end
+      end
     end
   end
 end

data/lib/itamae/resource/package.rb

@@ -6,6 +6,7 @@ module Itamae
       define_attribute :action, default: :install
       define_attribute :name, type: String, default_name: true
       define_attribute :version, type: String
+      define_attribute :options, type: String
 
       def set_current_attributes
         installed = run_specinfra(:check_package_is_installed, name)
@@ -22,8 +23,16 @@ module Itamae
 
       def install_action
         unless run_specinfra(:check_package_is_installed, name, version)
-          run_specinfra(:install_package, name, version)
-          updated!
+          if %w!ubuntu debian!.include?(backend.os[:family])
+            # TODO: delegate to Specinfra
+            package_name = name
+            package_name += "=#{version}" if version
+            run_command("DEBIAN_FRONTEND='noninteractive' apt-get -y #{options} install #{shell_escape(package_name)}")
+            updated!
+          else
+            run_specinfra(:install_package, name, version)
+            updated!
+          end
         end
       end
     end

data/lib/itamae/resource/user.rb

@@ -58,7 +58,13 @@ module Itamae
       end
 
       def current_password
-        run_command("cat /etc/shadow | grep -E ^itamae:").stdout.split(":")[1]
+        result = run_command("cat /etc/shadow | grep -E ^#{shell_escape(username)}:", error: false)
+
+        if result.exit_status == 0
+          result.stdout.split(":")[1]
+        else
+          nil
+        end
       end
     end
   end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta27
+1.0.0.beta28

data/spec/integration/default_spec.rb

@@ -97,3 +97,7 @@ describe file('/tmp/created_in_default2') do
   it { should be_file }
 end
 
+describe file('/tmp/should_not_exist') do
+  it { should_not be_file }
+end
+

data/spec/integration/recipes/default.rb

@@ -107,7 +107,9 @@ execute "ps -C cron > /tmp/cron_running; true"
 
 ######
 
-package "nginx"
+package "nginx" do
+  options "--force-yes"
+end
 
 service "nginx" do
   action [:enable, :start]
@@ -158,3 +160,13 @@ execute "echo 'notify to resource in default2.rb'" do
   notifies :create, "file[put file in default2.rb]"
 end
 
+#####
+
+file "/tmp/should_not_exist" do
+  action :create
+end
+
+file "/tmp/should_not_exist" do
+  action :delete
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta27
+  version: 1.0.0.beta28
 platform: ruby
 authors:
 - Ryota Arai