rplusplus 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446702f23e9654cb84e635114fa2b9d27fc3e2a2
-  data.tar.gz: bccd78bcfb59ba820bdebab6f61ca2652cf7b46a
+  metadata.gz: 0989e8c5ffe3aae629bfbf79784467f6c1677b32
+  data.tar.gz: 635f42a74effc1ff5e20ce09448735cd1e3a62eb
 SHA512:
-  metadata.gz: 458624828a67224493f6023640750ecb14a78addd9cf6f3e1b6169f86bd1ec9afff3e0119268364c68386a4d870739e11174bd61e1bbe435a059b63e3fdf34ef
-  data.tar.gz: 9cbe6ac573fe8e1550cfe06bea6e5b3536bedf6fd8fa1029c70275d1d765d9d1dcb18b362a3b3e5807846d28da6486848943e308ebf54e2b305227829be477f6
+  metadata.gz: 8da90c09d0bb646389ec6012013f153adca607234b44eff0d0e4fc40ee8a706c26cb5fee12d631e24f31da4ee0709b1435595c09c88acecd2f2a9326febcd676
+  data.tar.gz: 09919db3de64c94cb4e61b0b0501d7bd84fe4e03178c9254b0fef12c59dc6f2ca6ab7f445959858ff36e5ce96775ed9c6f602741cb108a8060bd4a92c56bc875

data/README.md

@@ -1,4 +1,4 @@
-# R++
+# R++ [![Gem Version](https://badge.fury.io/rb/rplusplus.svg)](http://badge.fury.io/rb/rplusplus) [![Code Climate](https://codeclimate.com/github/jellymann/rplusplus/badges/gpa.svg)](https://codeclimate.com/github/jellymann/rplusplus) [![Test Coverage](https://codeclimate.com/github/jellymann/rplusplus/badges/coverage.svg)](https://codeclimate.com/github/jellymann/rplusplus/coverage) [![Circle CI](https://circleci.com/gh/jellymann/rplusplus.svg?style=svg)](https://circleci.com/gh/jellymann/rplusplus)
 
 Making C++ slightly less painful.
 

data/lib/rplusplus/environment.rb

@@ -31,88 +31,69 @@ module RPlusPlus
       end
 
       def objects_hash
-        @cpp_info ||= info_hash('cpp')
-        @header_info ||= info_hash('h')
+        @cpp_metadata ||= metadata_for_filetype('cpp')
+        @header_metadata ||= metadata_for_filetype('h')
 
-        hash = {}
-        @cpp_info.each do |cpp,info|
-          hash[objectify cpp] = [cpp] | deps_for(info)
+        @cpp_metadata.each_with_object({}) do |(cpp_file, metadata), hash|
+          hash[objectify cpp_file] = [cpp_file] | dependencies_from_metadata(metadata)
         end
-        hash
       end
 
-      def deps_for info
-        info[:deps] | info[:deps].map do |d|
-          deps_for(@header_info[d])
-        end.flatten
+      def dependencies_from_metadata metadata
+        dependency_dependencies = metadata[:dependencies].flat_map do |dependency|
+          dependencies_from_metadata(@header_metadata[dependency])
+        end
+        metadata[:dependencies] | dependency_dependencies
       end
 
       def builds_hash
         objects
-        hash = {}
-        @cpp_info.each do |cpp,info|
-          next unless info[:main]
-
-          hash[basename cpp] = obj_deps objectify(cpp)
+        @cpp_metadata.each_with_object({}) do |(cpp_file, metadata), hash|
+          hash[File.basename cpp_file, '.cpp'] = object_dependencies objectify(cpp_file) if metadata[:is_main]
         end
-        hash
       end
 
-      def obj_deps obj, visited=[]
-        deps = []
-        objects[obj].each do |d|
-          o = objectify(d)
-          next if visited.include?(o)
-          if objects.include?(o)
-            deps << o
-            deps |= obj_deps(o, [o,*visited])
+      def object_dependencies object_file, visited=[]
+        objects[object_file].each_with_object([]) do |source_dependency, dependencies|
+          object_dependency = objectify(source_dependency)
+          if !visited.include?(object_dependency) && objects.include?(object_dependency)
+            dependencies << object_dependency
+            dependencies |= object_dependencies(object_dependency, [object_dependency, *visited])
           end
         end
-        deps
       end
 
-      def info_hash type
-        hash = {}
-        Dir[Pathname(@path).join("**/*.#{type}")].each do |f|
-          hash[f] = info_for f
+      def metadata_for_filetype type
+        metadata = Dir[Pathname(@path).join("**/*.#{type}")].each_with_object({}) do |filename, hash|
+          hash[filename] = metadata_for filename
         end
-        Dir[Pathname(@path).join("**/*.#{type}.erb")].each do |f|
-          hash[unerb(f)] = info_for f
+        Dir[Pathname(@path).join("**/*.#{type}.erb")].each_with_object(metadata) do |filename, hash|
+          hash[File.basename filename, '.erb'] = metadata_for filename
         end
-        hash
       end
 
-      def info_for fn
-        main = false
-        deps = []
-        File.foreach(fn) do |l|
-          main ||= !!main_match(l)
-          dep = include_match l
-          deps << dep if dep
+      def metadata_for filename
+        is_main = false
+        dependencies = []
+        File.foreach(filename) do |line|
+          is_main ||= is_main_declaration(line)
+          dependency = get_included_file line
+          dependencies << dependency if dependency
         end
-        {main: main, deps: deps}
-      end
-
-      def unerb fn
-        fn.gsub(/\.erb$/,'')
+        {is_main: is_main, dependencies: dependencies}
       end
 
-      def basename fn
-        fn.gsub(/\..*$/,'')
+      def is_main_declaration line
+        !!(line =~ /^\W*int\W*main\(.*?\)/)
       end
 
-      def main_match l
-        l =~ /^\W*int\W*main\(.*?\)/
-      end
-
-      def include_match l
-        m = /#include "(?<file>.*)"/.match(l)
+      def get_included_file line
+        m = /#include "(?<file>.*)"/.match(line)
         m[:file] if m
       end
 
       def objectify filename
         filename.gsub(/\.(cpp|cpp\.erb|h|h\.erb)$/,'.o')
       end
-
   end
 end

data/lib/rplusplus/version.rb

@@ -1,3 +1,3 @@
 module Rplusplus
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/rplusplus.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "fakefs", "~> 0.6"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'bundler/setup'
-require 'fakefs/spec_helpers'
 
 require 'rplusplus'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rplusplus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Smith
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.4'
 description: A collection of command-line tools for making C++ development easier.
 email:
 - jellymann@gmail.com