rpmchange 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2MzZGQyM2ZmZWQ3ZTgxYjQ3MjAzYjA1MzcwODdhZjg5MDZlN2QxOQ==
+    YWEzMTc0Y2MzNTg0ZGM4NGFmZWRkMzhhZDAwMDgxNmZmZjFhOGY4Mg==
   data.tar.gz: !binary |-
-    NzViYzgxOTlmYTEwMzZmMWFhM2NiNjczZWM3MTY2ZjA0Nzk1NGZlMQ==
+    YmNjYzgwY2FkMzEyNWZkZDIyYjVmMzMzNzVhNGIzYmE0NTBiODI3NQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDEzYjQ4ODI4MjFlOTNkNzNiMmFjOWU0MGNjNzVmYTc2YTVmOTcwYmRkMjcz
-    YTZlNmJiZTI2ODM0ZTY2ZjlmNWNiZjE0N2U4ODhiYzdjYTRlODgzMmE5MzU1
-    OGMxMjcwMzJlYTU1NTgyYTVjYTQ4MzRhNDk3ODM3MjcyYjM4MWE=
+    ZDMwMDgwNjljNTc1ZjhhMjkxMzk0MTM3MDJlNjdlMjY2OTdjOGZjMzhmODYy
+    MmZhZTUxZTEzMTk4OGQ0MjRkNDNlNTgwNGFlY2JiZWQzYjBkYmU5ZTEzYWZh
+    NDM2Y2VhOTU2YWE2ZDAxNDY3NjkzMDliM2YwOTVhMmQxMGFhY2E=
   data.tar.gz: !binary |-
-    NjZkNWJhZTBlNmFmZTVhYTkwNTJjY2UwZjQxNjFmODExYTlhZDViMWFhYTE5
-    MGE0ZWExODg0MDU0ZjAxN2NiNWJhZWYwNGI2NjJjMWRhYzNhYjRjNzZlYjc0
-    NjU5NGU3ODdlMmM0Mzc5MTU0MjkwZjIxNjQyYThiMmYyMGM0MTg=
+    OGE0MTY1MWNlNmZiNGI5MWVjNDg2N2NkNTcyOGZlMTg0MGM2MGZlMGIyNjAy
+    MGE5N2Q3MjkxMzM0YTg3MjgzMDdhZTA2ZWEzMDg5MTU3NGQ1YWE2ZmU5ZmY1
+    ZDcxYThhMWMyMmY2NGMzYTEzMmUzODI2NzEyZTExZDk1ODlkODA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rpmchange (0.0.4)
+    rpmchange (0.0.5)
       diffy (>= 3.1.0, < 4.0)
       thor (>= 0.19.1, < 1.0)
 

data/lib/rpmchange/cli.rb

@@ -57,7 +57,7 @@ module Rpmchange
       end
     end
 
-    desc "patch", "append patch"
+    desc "patch", "append patch tag and macro"
     shared_options
     method_option :name, {type: :string, desc: "patch name", required: true}
     def patch
@@ -65,5 +65,44 @@ module Rpmchange
       spec.append_patch(options['name'])
       self.class.spec_write! spec, options
     end
+
+    desc "append", "append given value in section"
+    shared_options
+    method_option :section, {type: :string, desc: "spec file section name", required: true}
+    method_option :value, {type: :string, desc: "value to append", required: true}
+    method_option :after, {type: :string, desc: "append value after line matching given regex"}
+    def append
+      spec = self.class.spec_construct options
+      after = options['after']
+      after = Regexp.new(after) if after
+      spec.append(section: options['section'], value: options['value'], after: after)
+      self.class.spec_write! spec, options
+    end
+
+    desc "prepend", "prepend given value in section"
+    shared_options
+    method_option :section, {type: :string, desc: "spec file section name", required: true}
+    method_option :value, {type: :string, desc: "value to prepend", required: true}
+    method_option :before, {type: :string, desc: "prepend value before line matching given regex"}
+    def prepend
+      spec = self.class.spec_construct options
+      before = options['before']
+      before = Regexp.new(before) if before
+      spec.prepend(section: options['section'], value: options['value'], before: before)
+      self.class.spec_write! spec, options
+    end
+
+    desc "replace", "replace line matching given regex in section"
+    shared_options
+    method_option :section, {type: :string, desc: "spec file section name", required: true}
+    method_option :value, {type: :string, desc: "replace with value", required: true}
+    method_option :match, {type: :string, desc: "regex to match line"}
+    def replace
+      spec = self.class.spec_construct options
+      match = options['match']
+      match = Regexp.new(match) if match
+      spec.replace(section: options['section'], value: options['value'], match: match)
+      self.class.spec_write! spec, options
+    end
   end # Cli
 end # Rpmchange

data/lib/rpmchange/spec.rb

@@ -102,7 +102,7 @@ module Rpmchange
       ["* #{Time.now.strftime("%a %b %e %Y")} #{name} <#{email}> - #{full_version}",
         message_lines.join("\n"),
         "",
-      ].reverse_each {|line| _prepend_line(lines: changelog_lines, new_line: line)}
+      ].reverse_each {|line| _prepend_value(lines: changelog_lines, value: line)}
     end
 
     def to_tag_name(tag)
@@ -116,11 +116,11 @@ module Rpmchange
     end
 
     def set_tag(tag, value)
-      _replace_line(lines: preamble_lines, new_line: "#{to_tag_name(tag)}: #{value.strip}", match: /#{to_tag_name(tag)}:/)
+      _replace_line(lines: preamble_lines, value: "#{to_tag_name(tag)}: #{value.strip}", match: /#{to_tag_name(tag)}:/)
     end
 
     def append_tag(tag, value)
-      _append_line(lines: preamble_lines, new_line: "#{to_tag_name(tag)}: #{value}")
+      _append_value(lines: preamble_lines, value: "#{to_tag_name(tag)}: #{value}")
     end
 
     def append_patch(value)
@@ -145,15 +145,31 @@ module Rpmchange
         end
         "Patch#{patch_num}: #{value}"
       end
-      _append_line(lines: preamble_lines, new_line: make_line, after: _patch_tag_line_regex)
+      _append_value(lines: preamble_lines, value: make_line, after: _patch_tag_line_regex)
       patch_num
     end
 
     def append_patch_macro(num)
-      _append_line(lines: prep_lines, new_line: "%patch#{num} -p1", after: _patch_macro_line_regex)
+      _append_value(lines: prep_lines, value: "%patch#{num} -p1", after: _patch_macro_line_regex)
       nil
     end
 
+    def append(section:, value:, after: nil)
+      _append_value(lines: section_lines(section), value: value, after: after)
+    end
+
+    def prepend(section:, value:, before: nil)
+      _prepend_value(lines: section_lines(section), value: value, before: before)
+    end
+
+    def replace(section:, value:, match:)
+      _replace_line(lines: section_lines(section), value: value, match: match)
+    end
+
+    def delete(section:, match:)
+      _delete_all_lines(lines: section_lines(section), match: match)
+    end
+
     def sections
       @sections ||= {}
     end
@@ -164,7 +180,9 @@ module Rpmchange
 
     SECTIONS = %i{prep build install clean check files changelog}
     SECTIONS.each do |section|
-      define_method("#{section}_lines") {|params=nil| (sections[section] || {})[params] || []}
+      define_method(:section_lines) {|section, params: nil| (sections[section.to_sym] || {})[params] || []}
+      define_method(:section?) {|section, params: nil| sections.key?(section.to_sym) and sections[section.to_sym].key?(params)}
+      define_method("#{section}_lines") {|**kwargs| section_lines(section, **kwargs)}
     end
 
     protected
@@ -173,7 +191,7 @@ module Rpmchange
       @_patch_macro_line_regex ||= /^%patch[0-9]*/
     end
 
-    def _append_line(lines:, new_line:, after: nil)
+    def _append_value(lines:, value:, after: nil)
       find_index = proc do |lines|
         if after
           ind = lines.rindex {|line| line.to_s =~ after}
@@ -182,10 +200,10 @@ module Rpmchange
           -1
         end
       end
-      _insert_line(lines: lines, new_line: new_line, find_index: find_index)
+      _insert_value(lines: lines, value: value, find_index: find_index)
     end
 
-    def _prepend_line(lines:, new_line:, before: nil)
+    def _prepend_value(lines:, value:, before: nil)
       find_index = proc do |lines|
         if before
           lines.index {|line| line.to_s =~ before} || 0
@@ -193,23 +211,31 @@ module Rpmchange
           0
         end
       end
-      _insert_line(lines: lines, new_line: new_line, find_index: find_index)
+      _insert_value(lines: lines, value: value, find_index: find_index)
+    end
+
+    def _value_to_lines(value, *args)
+      res = (value.respond_to?(:call) ? value.call(*args) : value).to_s
+      res.empty? ? [res] : res.split("\n")
     end
 
-    def _insert_line(lines:, new_line:, find_index:)
+    def _insert_value(lines:, value:, find_index:)
       if ind = find_index.call(lines)
-        line = (new_line.respond_to?(:call) ? new_line.call(ind) : new_line).to_s.chomp
-        lines.insert(ind, line)
+        lines.insert(ind, *_value_to_lines(value, ind))
       end
     end
 
-    def _replace_line(lines:, new_line:, match:)
+    def _replace_line(lines:, value:, match:)
       if ind = lines.index {|line| line.to_s =~ match}
-        line = (new_line.respond_to?(:call) ? new_line.call(ind) : new_line).to_s.chomp
-        lines[ind] = line
+        lines.delete_at(ind)
+        lines.insert(ind, *_value_to_lines(value, ind))
       end
     end
 
+    def _delete_all_lines(lines:, match:)
+      lines.delete_if {|line| line.to_s =~ match}
+    end
+
     def _patch_tag_line_parse(line)
       tag, value = line.split(':', 2)
       [tag.split('Patch').last.to_i, value.strip] if tag

data/lib/rpmchange/version.rb

@@ -1,3 +1,3 @@
 module Rpmchange
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end # Rpmchange

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpmchange
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - flant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor