rewritepclint 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d615dd6910f0a60215f428fa57df7d92b7e9a219
-  data.tar.gz: 27adea91ab82f5c1b714daefd2d52d3630113f92
+  metadata.gz: b1c927c7b81b792333d95df7e100d2b6c3cbad45
+  data.tar.gz: 5dbdfe94cfed184e3119b5fc279addf576fe8bc1
 SHA512:
-  metadata.gz: afdb517371b3261f0335d7a68be7ae1fb3c27878d1f03d32e939274e562bdb4d0d86925b0d704305bc1892c21e75205054ede6c1fb242d1b401678b29a440064
-  data.tar.gz: a27ceeff1508b74800eae43b5b6ca50bb69ed91f4d70188ec5f18d527e3d0c8f9ff8abc7e337942afde376c50e2e4bbdf542c5fefa81bb6bcf0920b0b4481791
+  metadata.gz: ae5a4a118d63ba0017fd7f018e5177ef0a61f5b5c3ddf75dc05fa7915c540fc12b1c8fc216f730a195d0d56a3c1931aa57fdffceb2eb5714a11cce49bcecc6c3
+  data.tar.gz: c3eec86246173d979cd5976ca7e69e50de58c4addeac722a43d704dba98e577df9387c8e75f80525cda002fefc328a80d1d2a0fd92f41c318c4ee6ebab2d737f

data/.ruby-gemset

@@ -0,0 +1 @@
+bsw-all

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/bin/rewritepclint

@@ -2,4 +2,4 @@
 
 require 'rewritepclint'
 
-Rewritepclint::file_with_current_directory()
+Rewritepclint::files_with_prefix_current_directory()

data/lib/rewritepclint.rb

@@ -1,5 +1,5 @@
 require 'rewritepclint/version'
-#require 'nokogiri'
+require 'pathname'
 
 module Rewritepclint
 #  def self.with(prefix: prefix, content: content)
@@ -11,12 +11,15 @@ module Rewritepclint
 #    return doc.to_xml()
 #  end
   def self.with(prefix: prefix, content: content)
-    content = content.gsub('err:menubuilder:init_xdg error looking up the desktop directory', '')
+    #content = content.gsub('err:menubuilder:init_xdg error looking up the desktop directory', '')
     match = content.match(Regexp.new(".*(<.xml.*</doc>.).*", Regexp::MULTILINE))
     content = match[1]
     content = content.gsub(Regexp.new("<file>(.*?)</file>")) do |match|
       new_filename = $1.gsub("\\", "/")
-      "<file>#{File.join(prefix, new_filename)}</file>"
+      if !new_filename.start_with?('/')
+        new_filename = Pathname.new(File.join(prefix, new_filename)).cleanpath
+      end
+      "<file>#{new_filename}</file>"
     end
   end
   def self.files_with_prefix_current_directory()

data/lib/rewritepclint/version.rb

@@ -1,3 +1,3 @@
 module Rewritepclint
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/rewrite_spec.rb

@@ -8,9 +8,9 @@ bla
 bla
 <?xml version="1.0"?>
 <doc>
-<message><file>test\\test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'argc' (line 6) not referenced</desc></message>
+<message><file>\\test\\test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'argc' (line 6) not referenced</desc></message>
 <message><file>test\\test.cpp</file> <line>6</line> <type>Info</type> <code>830</code> <desc>Location cited in prior message</desc></message>
-<message><file>test\\test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'args' (line 6) not referenced</desc></message>
+<message><file>..\\test\\test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'args' (line 6) not referenced</desc></message>
 </doc>
 blub
 blub
@@ -19,9 +19,9 @@ eos
     should_be_plist = <<-eos
 <?xml version="1.0"?>
 <doc>
-<message><file>prefix/test/test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'argc' (line 6) not referenced</desc></message>
+<message><file>/test/test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'argc' (line 6) not referenced</desc></message>
 <message><file>prefix/test/test.cpp</file> <line>6</line> <type>Info</type> <code>830</code> <desc>Location cited in prior message</desc></message>
-<message><file>prefix/test/test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'args' (line 6) not referenced</desc></message>
+<message><file>test/test.cpp</file> <line>8</line> <type>Info</type> <code>715</code> <desc>Symbol 'args' (line 6) not referenced</desc></message>
 </doc>
 eos
     new_content = Rewritepclint.with(prefix: 'prefix', content: original)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rewritepclint
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Christian Köstlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md