serverkit 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8940c786379f55b05d9416d30a0b80488db1bbc4
-  data.tar.gz: c59b253fec99e0a5b4bdccfe30fa205fe5d25c50
+  metadata.gz: 8b8c984c3c718fe947082f6f4d09ae7a22ff289e
+  data.tar.gz: a3e1fdf09683e2a563be79a689558245de424532
 SHA512:
-  metadata.gz: 7121acccc709d1e5dff3d4d69bcfb43eb405f1e4408548e4f73a3b28907b963ec1d5659076891c3f8687fc516570952aa9d7c8f2ac7d5ad9e72ff8de65736144
-  data.tar.gz: b3a2456a7c2b784330900408b0667da7a048e832d89dd2b422727d1b54aaa4671989fa10a34eb2e43a3f2bd353c49accbc2043e36e42c742d02055c59be6580b
+  metadata.gz: 9ec23d869a2e19605833366e7fb211f5aeb1d60342350e8173c5160a9055329e2f8437d1ea334902a9bef239ebf7cd02a3466543e688b37de4f32b42b796494a
+  data.tar.gz: 2e8a2d2e52e428de9cab8071e3aa74a7be137bac4216559b3faff5156328f862cba039c295cda6d0e037a68f0aee0caf64895d0604414b4b9d1dca578c41a803

data/.rubocop.yml

@@ -1,6 +1,12 @@
+Lint/AssignmentInCondition:
+  Enabled: false
+
 Lint/HandleExceptions:
   Enabled: false
 
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.9
+- Add insert_after, insert_before, and pattern attributes on line resource
+- Rescue YAML parse error on recipe loading phase
+
 ## 0.4.8
 - Add line resource
 

data/lib/serverkit/command.rb

@@ -46,7 +46,7 @@ module Serverkit
       else
         raise Errors::UnknownActionNameError, action_name
       end
-    rescue Errors::Base, Slop::MissingArgumentError, Slop::MissingOptionError => exception
+    rescue Errors::Base, Psych::SyntaxError, Slop::MissingArgumentError, Slop::MissingOptionError => exception
       abort "Error: #{exception}"
     end
 

data/lib/serverkit/resources/base.rb

@@ -134,6 +134,17 @@ module Serverkit
         end
       end
 
+      # Create a file on remote side
+      # @param [String] content
+      # @param [String] path
+      def create_remote_file(content: nil, path: nil)
+        ::Tempfile.open("") do |file|
+          file.write(content)
+          file.close
+          backend.send_file(file.path, path)
+        end
+      end
+
       # @note For override
       # @return [String]
       def default_id
@@ -168,6 +179,19 @@ module Serverkit
           send(required_attribute_name)
         end
       end
+
+      # Update remote file content on given path with given content
+      # @param [String] content
+      # @param [String] path
+      def update_remote_file_content(content: nil, path: nil)
+        group = run_command_from_identifier(:get_file_owner_group, path).stdout.rstrip
+        mode = run_command_from_identifier(:get_file_mode, path).stdout.rstrip
+        owner = run_command_from_identifier(:get_file_owner_user, path).stdout.rstrip
+        create_remote_file(content: content, path: path)
+        run_command_from_identifier(:change_file_group, path, group)
+        run_command_from_identifier(:change_file_mode, path, mode)
+        run_command_from_identifier(:change_file_owner, path, owner)
+      end
     end
   end
 end

data/lib/serverkit/resources/line.rb

@@ -11,13 +11,19 @@ module Serverkit
       DEFAULT_STATE = "present"
 
       attribute :path, required: true, type: String
+      attribute :insert_after, type: String
+      attribute :insert_before, type: String
       attribute :line, required: true, type: String
+      attribute :pattern, type: String
       attribute :state, default: DEFAULT_STATE, inclusion: %w[absent present], type: String
 
       # @note Override
       def apply
         if has_correct_file?
-          send_applied_remote_file_content_to_path
+          update_remote_file_content(
+            content: applied_remote_file_content,
+            path: path,
+          )
         end
       end
 
@@ -28,41 +34,135 @@ module Serverkit
 
       private
 
+      def absent?
+        state == "absent"
+      end
+
       # @return [String]
       def applied_remote_file_content
-        if present?
-          remote_file_content << line_with_break
+        case
+        when absent?
+          content.delete(line).to_s
+        when insert_after
+          content.insert_after(Regexp.new(insert_after), line).to_s
+        when insert_before
+          content.insert_before(Regexp.new(insert_before), line).to_s
         else
-          (remote_file_content.each_line.to_a - [line_with_break]).join
+          content.append(line).to_s
         end
       end
 
+      # @return [Serverkit::Resources::Line::Content]
+      def content
+        Content.new(get_remote_file_content)
+      end
+
+      # @return [String]
+      def get_remote_file_content
+        run_command_from_identifier(:get_file_content, path).stdout
+      end
+
       def has_correct_file?
         check_command_from_identifier(:check_file_is_file, path)
       end
 
       def has_correct_line?
-        !(present? ^ remote_file_content.each_line.include?(line_with_break))
+        case
+        when present? && !has_matched_line?
+          false
+        when !present? && has_matched_line?
+          false
+        else
+          true
+        end
       end
 
-      def line_with_break
-        "#{line}\n"
+      def has_matched_line?
+        if pattern
+          content.match(Regexp.new(pattern))
+        else
+          content.match(line)
+        end
       end
 
       def present?
         state == "present"
       end
 
-      # @return [String]
-      def remote_file_content
-        run_command_from_identifier(:get_file_content, path).stdout
-      end
+      # Wrapper class to easily manage lines in remote file content.
+      class Content
+        # @param [String] raw
+        def initialize(raw)
+          @raw = raw
+        end
+
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def append(line)
+          self.class.new([*lines, line, ""].join("\n"))
+        end
+
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def delete(line)
+          self.class.new(@raw.gsub(/^#{line}$/, ""))
+        end
+
+        # Insert the line after the last matched line or EOF
+        # @param [Regexp] regexp
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def insert_after(regexp, line)
+          if index = lines.rindex { |line| line =~ regexp }
+            insert(index + 1, line)
+          else
+            append(line)
+          end
+        end
+
+        # Insert the line before the last matched line or BOF
+        # @param [Regexp] regexp
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def insert_before(regexp, line)
+          if index = lines.rindex { |line| line =~ regexp }
+            insert(index, line)
+          else
+            prepend(line)
+          end
+        end
+
+        # @param [Regexp, String] pattern
+        # @return [false, true] True if any line matches given pattern
+        def match(pattern)
+          lines.lazy.grep(pattern).any?
+        end
+
+        # @note Override
+        def to_s
+          @raw.dup
+        end
+
+        private
+
+        # @return [Array<String>]
+        def lines
+          @lines ||= @raw.each_line.map do |line|
+            line.gsub(/\n$/, "")
+          end
+        end
+
+        # @param [Integer] index
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def insert(index, line)
+          self.class.new([*lines.dup.insert(index, line), ""].join("\n"))
+        end
 
-      def send_applied_remote_file_content_to_path
-        ::Tempfile.open("") do |file|
-          file.write(applied_remote_file_content)
-          file.close
-          backend.send_file(file.path, path)
+        # @param [String] line
+        # @return [Serverkit::Resources::Line::Content]
+        def prepend(line)
+          self.class.new("#{line}\n#{@raw}")
         end
       end
     end

data/lib/serverkit/version.rb

@@ -1,3 +1,3 @@
 module Serverkit
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverkit
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel