itamae 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f6dd38921987f3da2602ed39ac6442380a2fa9
-  data.tar.gz: 096bcdc139c46100637114b230f1fd210b30330c
+  metadata.gz: 1e2b12deeb334b692503acf71eb8055c762321c8
+  data.tar.gz: 59299025a68e4dded3bf4f5b35964cf8283e7aa8
 SHA512:
-  metadata.gz: a344becac6dd490ab6dd5ef564a5c0de644ec3e9ce8427560ec4e4e0f9a5a16dc20e6cd6c8705d98b1ad65fe301e5837b44f9e300bfb66462335b3857e593413
-  data.tar.gz: 91e48dc9ef2169ed3f97a6f3b3e37800d555037f4c03638433aec1f3163e921113ec9c56ca9733cc68e499e490980c37c930de37f755275ddc324acb3f19c3ca
+  metadata.gz: e32608366152de7f363b6659e15091388ae4db4eec2503269bd01c8cadddffe499a1e4adc82dd9f8f7d2371739d509c0aea152d48eed74ffc778c006171cf00c
+  data.tar.gz: 509f6de4c65776642c32b77abb361c0ecb865babcc82e2825f46b424f6f1cc6edd58b936bd224828cc0e8b9dd4ad4c356ea378522e53296df847a9434a1b35f3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v1.2.14
+
+Features
+
+- "edit" action of "file" resource
+
 ## v1.2.13
 
 Features

data/lib/itamae/backend.rb

@@ -107,12 +107,32 @@ module Itamae
         @backend.command.get(*args)
       end
 
-      def send_file(*args)
-        @backend.send_file(*args)
+      def receive_file(src, dst = nil)
+        if dst
+          Logger.debug "Receiving a file from '#{src}' to '#{dst}'..."
+        else
+          Logger.debug "Receiving a file from '#{src}'..."
+        end
+        @backend.receive_file(src, dst)
       end
 
-      def send_directory(*args)
-        @backend.send_directory(*args)
+      def send_file(src, dst)
+        Logger.debug "Sending a file from '#{src}' to '#{dst}'..."
+        unless ::File.exist?(src)
+          raise Error, "The file '#{src}' doesn't exist."
+        end
+        @backend.send_file(src, dst)
+      end
+
+      def send_directory(src, dst)
+        Logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
+        unless ::File.directory?(src)
+          raise Error, "'#{src}' is not directory."
+        end
+        unless ::File.exist?(src)
+          raise Error, "The directory '#{src}' doesn't exist."
+        end
+        @backend.send_directory(src, dst)
       end
 
       def host_inventory

data/lib/itamae/ext/specinfra.rb

@@ -1,2 +1,39 @@
 # TODO: Send patches to Specinfra
 
+module Specinfra
+  module Backend
+    class Base
+      def receive_file(from, to = nil)
+        raise NotImplementedError
+      end
+    end
+
+    class Exec < Base
+      def receive_file(from, to = nil)
+        if to
+          FileUtils.cp(from, to)
+        else
+          ::File.read(from)
+        end
+      end
+    end
+
+    class Ssh < Exec
+      def receive_file(from, to = nil)
+        scp_download!(from, to)
+      end
+
+      private
+
+      def scp_download!(from, to, opt={})
+        if get_config(:scp).nil?
+          set_config(:scp, create_scp)
+        end
+
+        scp = get_config(:scp)
+        scp.download!(from, to, opt)
+      end
+    end
+  end
+end
+

data/lib/itamae/resource/base.rb

@@ -249,25 +249,6 @@ module Itamae
         end
       end
 
-      def send_file(src, dst)
-        Logger.debug "Sending a file from '#{src}' to '#{dst}'..."
-        unless ::File.exist?(src)
-          raise Error, "The file '#{src}' doesn't exist."
-        end
-        backend.send_file(src, dst)
-      end
-
-      def send_directory(src, dst)
-        Logger.debug "Sending a directory from '#{src}' to '#{dst}'..."
-        unless ::File.directory?(src)
-          raise Error, "'#{src}' is not directory."
-        end
-        unless ::File.exist?(src)
-          raise Error, "The directory '#{src}' doesn't exist."
-        end
-        backend.send_directory(src, dst)
-      end
-
       def do_not_run_because_of_only_if?
         @only_if_command &&
           run_command(@only_if_command, error: false).exit_status != 0

data/lib/itamae/resource/file.rb

@@ -9,28 +9,23 @@ module Itamae
       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
-        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)
-          send_file(src, @temppath)
-        ensure
-          f.unlink if f
-        end
-
         case @current_action
         when :create
           attributes.exist = true
+        when :delete
+          attributes.exist = false
+        when :edit
+          attributes.exist = true
+
+          content = backend.receive_file(attributes.path)
+          attributes.block.call(content)
+          attributes.content = content
         end
+
+        send_tempfile
       end
 
       def set_current_attributes
@@ -85,6 +80,14 @@ module Itamae
         end
       end
 
+      def action_edit(options)
+        run_command(['chmod', '--reference', attributes.path, @temppath])
+        run_command(['chown', '--reference', attributes.path, @temppath])
+        run_specinfra(:move_file, @temppath, attributes.path)
+      end
+
+      private
+
       def show_file_diff
         diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
         if diff.exit_status == 0
@@ -111,6 +114,24 @@ module Itamae
       def content_file
         nil
       end
+
+      def send_tempfile
+        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)
+          backend.send_file(src, @temppath)
+        ensure
+          f.unlink if f
+        end
+      end
     end
   end
 end

data/lib/itamae/resource/remote_directory.rb

@@ -15,7 +15,7 @@ module Itamae
         src = ::File.expand_path(directory, ::File.dirname(@recipe.path))
 
         @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
-        send_directory(src, @temppath)
+        backend.send_directory(src, @temppath)
 
         case @current_action
         when :create

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.13
+1.2.14

data/spec/integration/default_spec.rb

@@ -146,3 +146,11 @@ describe file('/tmp/multi_immediately_notifies') do
   it { should be_file }
   its(:content) { should eq("1\n2\n3\n4\n") }
 end
+
+describe file('/tmp/file_edit_sample') do
+  it { should be_file }
+  its(:content) { should eq("Hello, Itamae") }
+  it { should be_mode 444 }
+  it { should be_owned_by "itamae" }
+  it { should be_grouped_into "itamae" }
+end

data/spec/integration/recipes/default.rb

@@ -277,3 +277,19 @@ end
 execute 'echo 4 >> /tmp/multi_immediately_notifies' do
   action :nothing
 end
+
+#####
+
+file '/tmp/file_edit_sample' do
+  content 'Hello, world'
+  owner 'itamae'
+  group 'itamae'
+  mode '444'
+end
+
+file '/tmp/file_edit_sample' do
+  action :edit
+  block do |content|
+    content.gsub!('world', 'Itamae')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor