serverkit 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b5913dfd17ab82dcc688aba30f392c4fb36f02
-  data.tar.gz: b80f8bd60e1a500e5ca7b497d90c0d26144207e6
+  metadata.gz: d638957343d75f83244b7d7589662ee2364c7bd6
+  data.tar.gz: a16ef58fad113e7e9e58305a8ec4146d604bf7ff
 SHA512:
-  metadata.gz: 750ad9c4d49922d310ac45455566c78f98871c10318f751a8dfcbc41b5a7b597759b889df73de3167d0c0ddc94dc851e4ca62f70d24b350d5eb1c0df833dd4c4
-  data.tar.gz: 5054ae0860bfe29c22e489cc5f3efd55273bedc304d172595c7cb8a9c5c1bd0cd5eb5906d61ef3404b3c48fb8fa32babc29e9527cc6afaf2e7123d2dc5c2b2dc
+  metadata.gz: 498492872c31a830b67dc9cbcd2fbef34b8149aa2391428540168a93e0268fbcfa37f2655b93d14fff502cf4144f128357f2be26b6e1349677f7dc317f8cfb14
+  data.tar.gz: c671b47059e43d9560d5ecc50580e0b9a0a3e7aa24b81c3f1951ea084fdbbbe85e92990682d8802e338f09129b1aab65a3082634383d23cae51762d29973bc75

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.0
+- Add `cwd` and `user` attributes on all resources
+
 ## 0.5.1
 - Fix user resource behavior on nil password case
 

data/doc/resource.md

@@ -7,9 +7,11 @@ By default, all types of resource can or must have the following attributes:
 
 - type - what type this resource represents (required)
 - check_script - pass shell script to override the `#check` phase
-- recheck_script - pass shell script to override the `#recheck` phase (runned after `#apply`)
+- cwd - pass current working directory path
 - id - change resource identifier used in log, and also used for `notify`
 - notify - specify an Array of handler ids that should be applied after changed
+- recheck_script - pass shell script to override the `#recheck` phase (runned after `#apply`)
+- user - specify user for `sudo -u`
 
 ## Example
 Here is a tiny example recipe that has only one resource with `type` and `name` attributes.

data/lib/serverkit/backends/base_backend.rb

@@ -5,6 +5,7 @@ module Serverkit
   module Backends
     class BaseBackend
       delegate(
+        :command,
         :send_file,
         to: :specinfra_backend,
       )
@@ -13,21 +14,6 @@ module Serverkit
         @log_level = log_level
       end
 
-      # @return [true, false]
-      def check_command(*args)
-        run_command(*args).success?
-      end
-
-      # @return [true, false]
-      def check_command_from_identifier(*args)
-        run_command_from_identifier(*args).success?
-      end
-
-      # @return [String]
-      def get_command_from_identifier(*args)
-        specinfra_backend.command.get(*args)
-      end
-
       # @note Override me
       # @return [String]
       # @example "localhost"
@@ -42,21 +28,17 @@ module Serverkit
         end
       end
 
+      # @param [String] command one-line shell script to be executed on remote machine
       # @return [Specinfra::CommandResult]
-      def run_command(*args)
-        logger.debug("Running #{args.first.inspect} on #{host}")
-        specinfra_backend.run_command(*args).tap do |result|
+      def run_command(command)
+        logger.debug("Running #{command} on #{host}")
+        specinfra_backend.run_command(command).tap do |result|
           logger.debug(result.stdout) unless result.stdout.empty?
           logger.debug(result.stderr) unless result.stderr.empty?
           logger.debug("Finished with #{result.exit_status} on #{host}")
         end
       end
 
-      # @return [Specinfra::CommandResult]
-      def run_command_from_identifier(*args)
-        run_command(get_command_from_identifier(*args))
-      end
-
       def send_file(from, to)
         logger.debug("Sending file #{from} to #{to}")
         specinfra_backend.send_file(from, to)

data/lib/serverkit/resources/base.rb

@@ -34,17 +34,14 @@ module Serverkit
       attr_reader :attributes, :check_result, :recheck_result, :recipe
 
       attribute :check_script, type: String
+      attribute :cwd, type: String
       attribute :id, type: String
       attribute :notify, type: Array
       attribute :recheck_script, type: String
       attribute :type, type: String
+      attribute :user, type: String
 
       delegate(
-        :check_command,
-        :check_command_from_identifier,
-        :get_command_from_identifier,
-        :run_command,
-        :run_command_from_identifier,
         :send_file,
         to: :backend,
       )
@@ -64,6 +61,21 @@ module Serverkit
         attribute_validation_errors
       end
 
+      # @return [true, false]
+      def check_command(*args)
+        run_command(*args).success?
+      end
+
+      # @return [true, false]
+      def check_command_from_identifier(*args)
+        run_command_from_identifier(*args).success?
+      end
+
+      # @return [String]
+      def get_command_from_identifier(*args)
+        backend.command.get(*args)
+      end
+
       # @return [Array<Serverkit::Resource>]
       def handlers
         @handlers ||= Array(notify).map do |id|
@@ -209,6 +221,20 @@ module Serverkit
         end
       end
 
+      # @note Wraps backend.run_command for `cwd` and `user` attributes
+      # @param [String] command one-line shell script to be executed on remote machine
+      # @return [Specinfra::CommandResult]
+      def run_command(command)
+        command = "cd #{Shellwords.escape(cwd)} && #{command}" unless cwd.nil?
+        command = "sudo -u #{user} -- /bin/sh -c #{Shellwords.escape(command)}" unless user.nil?
+        backend.run_command(command)
+      end
+
+      # @return [Specinfra::CommandResult]
+      def run_command_from_identifier(*args)
+        run_command(get_command_from_identifier(*args))
+      end
+
       # Update remote file content on given path with given content
       # @param [String] content
       # @param [String] path

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel