gcc-to-clang-analyzer 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 088033f899d0f090b97f68fa01ee1062c7fd721a
-  data.tar.gz: 7ca8d38827b1738728b76b141c0a7bf669a4e0e4
+  metadata.gz: c1f39f8ee53e037f850b152e1e248b270d10e40c
+  data.tar.gz: 3a4dd8986ec3994261e2afe434b838bc9e772f67
 SHA512:
-  metadata.gz: 4bc73355082a846ad78dfaa608b8a192d74125483fc37c05c10627a8a08e8eaaeb1cb919f6d38f1c8226b8a58b7fb16859cc5bf1b9ca7e46273389e729dc2145
-  data.tar.gz: ebd14a2d34aab91804a11ba12b2d6fd707cbda8fe8d9e7fd1e5ac19e8e65673ad7d2741787be6f6649571ee7c53953d3efc6e53850ba58fea56f9fdc4f61573c
+  metadata.gz: f647028ce5da4e45e7aa49669fb5be0a29d5760aafb56df773479d9a4e18d930c398967a757ce4d2a0fc3e93d461b7485376be3cdb047e1a8cfeb5a7078bd9c2
+  data.tar.gz: c91ba13b3661efd82a68d5188606d9c0cd56a46d8a83ce3f984cc127f9c21f59951a623e6bf12fb2fe66aa5189e0ac2b0087f423a98ad739dc86703a2f612226

data/gcc-to-clang-analyzer.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rake'
+  spec.add_runtime_dependency 'nokogiri'
 end

data/lib/gcc_to_clang_analyzer/rewrite_plist_file.rb

@@ -1,6 +1,7 @@
 #require 'plist'
 #require 'ox'
-require 'rexml/document'
+#require 'rexml/document'
+require 'nokogiri'
 
 class RewritePlistFile
 #  def self.with_prefix(prefix, original)
@@ -9,19 +10,27 @@ class RewritePlistFile
 #    v['files'] = files.map{|i|File.join(prefix, i)}
 #    v.to_plist()
   #  end
+#  def self.with_prefix(prefix, original)
+#    doc = REXML::Document.new(original)
+#    array_element = REXML::XPath.first(doc, "//key[text()='files']/following-sibling::array")
+#    if array_element
+#      array_element.elements.each do |s|
+#        s.text = File.join(prefix, s.text)
+#      end
+#      res = StringIO.new
+#      formatter = REXML::Formatters::Pretty.new(2)
+#      formatter.compact = true
+#      formatter.write(doc, res)
+#      return res.string
+#    end
+#    return original
+  #  end
   def self.with_prefix(prefix, original)
-    doc = REXML::Document.new(original)
-    array_element = REXML::XPath.first(doc, "//key[text()='files']/following-sibling::array")
-    if array_element
-      array_element.elements.each do |s|
-        s.text = File.join(prefix, s.text)
-      end
-      res = StringIO.new
-      formatter = REXML::Formatters::Pretty.new(2)
-      formatter.compact = true
-      formatter.write(doc, res)
-      return res.string
+    doc = Nokogiri::XML(original)
+    array_element = doc.xpath("//key[text()='files']/following-sibling::array/string")
+    array_element.each do |e|
+      e.content = File.join(prefix, e.content)
     end
-    return original
+    return doc.to_xml()
   end
 end

data/lib/gcc_to_clang_analyzer/version.rb

@@ -1,3 +1,3 @@
 module GccToClangAnalyzer
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/rewrite_plist_file_spec.rb

@@ -6,22 +6,21 @@ describe RewritePlistFile do
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
- <key>clang_version</key>
-<string>clang version 3.4 (trunk 182989)</string>
- <key>files</key>
- <array>
-  <string>src/eeprommanager/main1.cpp</string>
-  <string>src/eeprommanager/main2.cpp</string>
- </array>
-</dict>
+  <dict>
+    <key>clang_version</key>
+    <string>clang version 3.4 (trunk 182989)</string>
+    <key>files</key>
+    <array>
+      <string>src/eeprommanager/main1.cpp</string>
+      <string>src/eeprommanager/main2.cpp</string>
+    </array>
+  </dict>
 </plist>
 eos
-
     should_be_plist = <<-eos
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version='1.0'>
+<plist version="1.0">
   <dict>
     <key>clang_version</key>
     <string>clang version 3.4 (trunk 182989)</string>
@@ -33,16 +32,15 @@ eos
   </dict>
 </plist>
 eos
-    should_be_plist.strip!
     new_plist = RewritePlistFile.with_prefix('test', original)
     new_plist.should eq(should_be_plist)
   end
 
   it 'should do nothing for empty file arrays' do
     original = <<-eos
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version='1.0'>
+<plist version="1.0">
   <dict>
     <key>clang_version</key>
     <string>clang version 3.4 (trunk 182989)</string>
@@ -52,6 +50,6 @@ eos
 </plist>
 eos
     new_file = RewritePlistFile.with_prefix('test', original)
-    new_file.should eq(original.strip)
+    new_file.should eq(original)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcc-to-clang-analyzer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christian Köstlin
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: It then rewirtes the plist files to put the project name before the sourcefiles.
 email:
 - christian.koestlin@esrlabs.com