c-dependencies 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4710ae38237a141810ec0bfab78b5a00f7f19f74
-  data.tar.gz: c21b6ab27d7456536c22ff292278dece6e15da53
+  metadata.gz: 09d1e1c95ea48673c0f6a108c92933f0efd6003e
+  data.tar.gz: c966beca09ab5b52bfd5e10924bb981862d8379f
 SHA512:
-  metadata.gz: c641b8d87f6596e3a48b53bcb9f8e7208aa4fe025cbf22873a7afcd9f50f0e000a5802514f8c2d1c8fee7a51688fb9108f6428a9c96d48d57755e7cd5d864f05
-  data.tar.gz: 8eb08801174891763d9705852888429a9cab76de56e279ca44bab9c26b1b239bff89a7eb4a25fe6fbfa1b8ddf988b79e6bf05bd1c33fa8236e2d916de9bb6279
+  metadata.gz: 7de1a7cd8d6f2ef0c096760ade5535ab1c8af6ff8b9813c01637dbe871cffd4791579ef948bd07ca2d6a284c7eb561f64f9977fd629afd1ebe50d4a71785c29f
+  data.tar.gz: bbe72d140e388907d9c28ea1a764dbc381ea77efbbe0379e9d8b2e650eb2c251a848557697cb1fe47eb29a01943a4ac24af49da54e74382fa4238c78f505ee7a

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+sudo: false
+
+os:
+  - linux
+  - osx

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    c-dependencies (0.1.0)
+    c-dependencies (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -18,7 +18,10 @@ Or install it yourself as:
 
     $ gem install c-dependencies
 
+## Contributing
+
+This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/c-dependencies/compiler_invocation.rb

@@ -6,7 +6,6 @@ module CDependencies
     attr_accessor :tool_name
     attr_accessor :flags
     attr_accessor :input_path
-    attr_accessor :output_file
     attr_accessor :output_path
 
     EXTENSION_MAP = { '.c' => 'cc',
@@ -30,6 +29,19 @@ module CDependencies
     end
 
     def tool_name
+      name = default_tool_name
+
+      case name
+      when 'c++'
+        get_env_named('CXX') || name
+      when 'cc'
+        get_env_named('CC') || name
+      else
+        name
+      end
+    end
+
+    def default_tool_name
       EXTENSION_MAP[input_extension]
     end
 
@@ -37,17 +49,22 @@ module CDependencies
       "#{tool_cmd} #{dependency_flag} '#{input_path}'"
     end
 
-    def has_flags?
-      !flags.nil? && flags != ''
+    def compile_cmd
+      cmd = tool_cmd
+      cmd += " -c '#{input_path}'"
+      cmd += " -o '#{output_path}'"
+      cmd
     end
 
     private
     def tool_cmd
-      has_flags? ? "#{tool_name} #{flags}" : tool_name
+      cmd = tool_name
+      cmd += ' ' + flags if !flags.nil? && flags != ''
+      cmd
     end
 
     def dependency_flag
-      case tool_name
+      case default_tool_name
       when 'cc', 'c++'
         # -MM suppresses system header dependencies
         '-MM'
@@ -55,5 +72,16 @@ module CDependencies
         '-M'
       end
     end
+
+    private
+    def get_env_named(name)
+      env_var = ENV[name]
+
+      if env_var.nil? || env_var == ''
+        nil
+      else
+        env_var
+      end
+    end
   end
 end

data/lib/c-dependencies/dependency_list.rb

@@ -19,15 +19,25 @@ module CDependencies
       list = File.readlines(path)
       list.map! { |x| x.chomp() }
 
-      # make a non-empty list of files that also exist
-      list.reject! { |x| x.empty? || !File.exist?(x) }
+      # make a non-empty list of files
+      list.reject! { |x| x.empty? }
+
+      # [path, sha] throwing away the sha part for now
+      list.map! { |x| x.split(',')[0] }
+
+      # remove files that do not exist
+      list.reject! { |x| !File.exist?(x) }
 
       DependencyList.new(list)
     end
 
+    def append(path)
+      @paths << File.absolute_path(path)
+    end
+
     private
     def serializable_dependency_entry(entry)
-      entry
+      "#{entry}, #{file_hash(entry)}"
     end
 
     def serializable_entries

data/lib/c-dependencies/version.rb

@@ -1,3 +1,3 @@
 module CDependencies
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Massicotte
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock