itamae 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3ca04345f9e1c2f82343f422c6017c8ccdd982
-  data.tar.gz: ded46e740f4c6c1845df1dce58ca0f6fff546513
+  metadata.gz: 44eee9b5132dfd112bce4aab19c8c2eb682f0594
+  data.tar.gz: 6b734f3066592d75c6010e84c7fb8d7a04bce474
 SHA512:
-  metadata.gz: db3709e61d480faa823f4ddce0d29f18f988f2f949dc2bd1272b5b0f2160a53070d9e8fd3f14f55a46acbfaa4ec1c70baef4a2958401396fd02fa2db9633b55f
-  data.tar.gz: c1244f6570776c26d621c6d4053a100a8f44452937240be45502e9af3412b170f91af127ee283fd5237ba56d14c9815340b7f8dd0d90d8047af4d95a3fd0db3d
+  metadata.gz: 7dea2c537c25ee9df8969bae5028ad0820e9e32517cf0d1b4455b2c52dd326b22a77d9131cf894aeaa02a42a469bd93ccbf5ee6cb6558f093be0dba2049a4ff6
+  data.tar.gz: 118451e0e59cbbb5e679a1aa8344fda380ed251ac4121937a0b72f1935dc1b64a98b3ce9dca649b71cea7fa80d18b0af3730f5a94706bc1a386d7a658a6e3dff

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## v1.1.1
+
+Features
+
+- New resource `remote_directory` which transfers a directory from local to remote like `remote_file` resource. (Thanks to @k0kubun)
+  - https://github.com/ryotarai/itamae/pull/66
+
 ## v1.1.0
 
 Incompatible changes
 
-- `uid` and `gid` attributes of `user` resource accepts only Integer. (https://github.com/ryotarai/itamae/pull/65)
+- `uid` and `gid` attributes of `user` resource accept only Integer. (https://github.com/ryotarai/itamae/pull/65)
 

data/lib/itamae/backend.rb

@@ -113,5 +113,9 @@ module Itamae
     def send_file(*args)
       Specinfra::Runner.send_file(*args)
     end
+
+    def send_directory(*args)
+      Specinfra::Runner.send_directory(*args)
+    end
   end
 end

data/lib/itamae/resource.rb

@@ -2,6 +2,7 @@ require 'itamae'
 require 'itamae/resource/base'
 require 'itamae/resource/file'
 require 'itamae/resource/package'
+require 'itamae/resource/remote_directory'
 require 'itamae/resource/remote_file'
 require 'itamae/resource/directory'
 require 'itamae/resource/template'

data/lib/itamae/resource/base.rb

@@ -236,6 +236,17 @@ module Itamae
         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/remote_directory.rb

@@ -0,0 +1,84 @@
+require 'itamae'
+
+module Itamae
+  module Resource
+    class RemoteDirectory < Base
+      define_attribute :action, default: :create
+      define_attribute :path, type: String, default_name: true
+      define_attribute :source, type: String, required: true
+      define_attribute :mode, type: String
+      define_attribute :owner, type: String
+      define_attribute :group, type: String
+
+      def pre_action
+        directory = ::File.expand_path(attributes.source, ::File.dirname(@recipe.path))
+        src = ::File.expand_path(directory, ::File.dirname(@recipe.path))
+
+        @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+        send_directory(src, @temppath)
+
+        case @current_action
+        when :create
+          attributes.exist = true
+        end
+      end
+
+      def set_current_attributes
+        current.exist = run_specinfra(:check_file_is_directory, 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
+        super
+
+        if current.exist
+          diff = run_command(["diff", "-u", attributes.path, @temppath], error: false)
+          if diff.exit_status == 0
+            # no change
+            Logger.debug "directory content will not change"
+          else
+            Logger.info "diff:"
+            diff.stdout.each_line do |line|
+              Logger.info "#{line.strip}"
+            end
+          end
+        end
+      end
+
+      def action_create(options)
+        if attributes.mode
+          run_specinfra(:change_file_mode, @temppath, attributes.mode)
+        end
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, @temppath, attributes.owner, attributes.group)
+        end
+
+        if run_specinfra(:check_file_is_file, attributes.path)
+          unless check_command(["diff", "-q", @temppath, attributes.path])
+            updated!
+          end
+        else
+          updated!
+        end
+
+        run_specinfra(:remove_file, attributes.path)
+        run_specinfra(:move_file, @temppath, attributes.path)
+      end
+
+      def action_delete(options)
+        if run_specinfra(:check_file_is_directory, attributes.path)
+          run_specinfra(:remove_file, attributes.path)
+        end
+      end
+    end
+  end
+end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.0
+1.1.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -173,6 +173,7 @@ files:
 - lib/itamae/resource/link.rb
 - lib/itamae/resource/local_ruby_block.rb
 - lib/itamae/resource/package.rb
+- lib/itamae/resource/remote_directory.rb
 - lib/itamae/resource/remote_file.rb
 - lib/itamae/resource/service.rb
 - lib/itamae/resource/template.rb